From owner-p4-projects@FreeBSD.ORG Sun Nov 13 02:08:16 2005 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 63CDE16A421; Sun, 13 Nov 2005 02:08:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 477F516A41F for ; Sun, 13 Nov 2005 02:08:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD38C43D45 for ; Sun, 13 Nov 2005 02:08:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAD28D2h071850 for ; Sun, 13 Nov 2005 02:08:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAD27o3E071824 for perforce@freebsd.org; Sun, 13 Nov 2005 02:07:50 GMT (envelope-from marcel@freebsd.org) Date: Sun, 13 Nov 2005 02:07:50 GMT Message-Id: <200511130207.jAD27o3E071824@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 86701 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: Sun, 13 Nov 2005 02:08:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=86701 Change 86701 by marcel@marcel_nfs on 2005/11/13 02:07:11 IFC @86697 Affected files ... .. //depot/projects/tty/MAINTAINERS#15 integrate .. //depot/projects/tty/Makefile.inc1#24 integrate .. //depot/projects/tty/ObsoleteFiles.inc#2 integrate .. //depot/projects/tty/UPDATING#24 integrate .. //depot/projects/tty/bin/csh/config_p.h#2 integrate .. //depot/projects/tty/bin/date/date.1#7 integrate .. //depot/projects/tty/bin/kenv/kenv.1#3 integrate .. //depot/projects/tty/bin/kenv/kenv.c#4 integrate .. //depot/projects/tty/bin/ls/ls.1#12 integrate .. //depot/projects/tty/bin/ls/ls.c#9 integrate .. //depot/projects/tty/bin/rm/rm.1#7 integrate .. //depot/projects/tty/bin/rm/rm.c#6 integrate .. //depot/projects/tty/bin/sh/eval.c#4 integrate .. //depot/projects/tty/bin/sh/exec.c#6 integrate .. //depot/projects/tty/bin/sh/exec.h#4 integrate .. //depot/projects/tty/bin/sh/expand.c#7 integrate .. //depot/projects/tty/bin/sh/histedit.c#4 integrate .. //depot/projects/tty/bin/sh/memalloc.c#5 integrate .. //depot/projects/tty/bin/sh/memalloc.h#3 integrate .. //depot/projects/tty/bin/sh/miscbltin.c#4 integrate .. //depot/projects/tty/bin/sh/options.c#5 integrate .. //depot/projects/tty/bin/sh/sh.1#12 integrate .. //depot/projects/tty/bin/sh/trap.c#3 integrate .. //depot/projects/tty/bin/sh/var.c#7 integrate .. //depot/projects/tty/contrib/bc/bc/main.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/tty/contrib/bsnmp/NEWS#7 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#7 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.3#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpagent.3#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmplib.3#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/tty/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#8 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/trap.c#4 integrate .. //depot/projects/tty/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/tty/contrib/cpio/AUTHORS#1 branch .. //depot/projects/tty/contrib/cpio/COPYING#2 integrate .. //depot/projects/tty/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/tty/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/tty/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/cpio/INSTALL#1 branch .. //depot/projects/tty/contrib/cpio/NEWS#2 integrate .. //depot/projects/tty/contrib/cpio/README#2 integrate .. //depot/projects/tty/contrib/cpio/THANKS#1 branch .. //depot/projects/tty/contrib/cpio/TODO#1 branch .. //depot/projects/tty/contrib/cpio/alloca.c#2 delete .. //depot/projects/tty/contrib/cpio/copyin.c#2 delete .. //depot/projects/tty/contrib/cpio/copyout.c#2 delete .. //depot/projects/tty/contrib/cpio/copypass.c#3 delete .. //depot/projects/tty/contrib/cpio/cpio.1#2 delete .. //depot/projects/tty/contrib/cpio/cpio.h#2 delete .. //depot/projects/tty/contrib/cpio/cpio.texi#2 delete .. //depot/projects/tty/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/tty/contrib/cpio/defer.c#2 delete .. //depot/projects/tty/contrib/cpio/defer.h#2 delete .. //depot/projects/tty/contrib/cpio/dirname.c#2 delete .. //depot/projects/tty/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/tty/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/tty/contrib/cpio/dstring.c#2 delete .. //depot/projects/tty/contrib/cpio/dstring.h#2 delete .. //depot/projects/tty/contrib/cpio/error.c#2 delete .. //depot/projects/tty/contrib/cpio/extern.h#2 delete .. //depot/projects/tty/contrib/cpio/filemode.c#2 delete .. //depot/projects/tty/contrib/cpio/filetypes.h#2 delete .. //depot/projects/tty/contrib/cpio/global.c#2 delete .. //depot/projects/tty/contrib/cpio/idcache.c#2 delete .. //depot/projects/tty/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/error.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/error.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/system.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/tty/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/tty/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/tty/contrib/cpio/main.c#2 delete .. //depot/projects/tty/contrib/cpio/makepath.c#2 delete .. //depot/projects/tty/contrib/cpio/rmt.h#2 delete .. //depot/projects/tty/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/tty/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/tty/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/tty/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/tty/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/tty/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/tty/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/tty/contrib/cpio/src/defer.c#1 branch .. //depot/projects/tty/contrib/cpio/src/defer.h#1 branch .. //depot/projects/tty/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/tty/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/tty/contrib/cpio/src/extern.h#1 branch .. //depot/projects/tty/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/tty/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/tty/contrib/cpio/src/global.c#1 branch .. //depot/projects/tty/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/tty/contrib/cpio/src/main.c#1 branch .. //depot/projects/tty/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/tty/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/tty/contrib/cpio/src/tar.c#1 branch .. //depot/projects/tty/contrib/cpio/src/tar.h#1 branch .. //depot/projects/tty/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/tty/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/tty/contrib/cpio/src/util.c#1 branch .. //depot/projects/tty/contrib/cpio/stripslash.c#2 delete .. //depot/projects/tty/contrib/cpio/system.h#2 delete .. //depot/projects/tty/contrib/cpio/tar.c#3 delete .. //depot/projects/tty/contrib/cpio/tar.h#2 delete .. //depot/projects/tty/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/tty/contrib/cpio/userspec.c#2 delete .. //depot/projects/tty/contrib/cpio/util.c#2 delete .. //depot/projects/tty/contrib/cpio/version.c#2 delete .. //depot/projects/tty/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/tty/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/tty/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/tty/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd-spec.h#8 integrate .. //depot/projects/tty/contrib/groff/COPYING#2 integrate .. //depot/projects/tty/contrib/groff/ChangeLog#3 integrate .. //depot/projects/tty/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/tty/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/tty/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/tty/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/tty/contrib/groff/FDL#2 integrate .. //depot/projects/tty/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/tty/contrib/groff/INSTALL#3 integrate .. //depot/projects/tty/contrib/groff/INSTALL.gen#2 integrate .. //depot/projects/tty/contrib/groff/LICENSE#1 branch .. //depot/projects/tty/contrib/groff/MANIFEST#3 integrate .. //depot/projects/tty/contrib/groff/MORE.STUFF#2 integrate .. //depot/projects/tty/contrib/groff/Makefile#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.ccpg#3 integrate .. //depot/projects/tty/contrib/groff/Makefile.comm#3 integrate .. //depot/projects/tty/contrib/groff/Makefile.cpg#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.in#3 integrate .. //depot/projects/tty/contrib/groff/Makefile.init#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/NEWS#3 integrate .. //depot/projects/tty/contrib/groff/PROBLEMS#3 integrate .. //depot/projects/tty/contrib/groff/PROJECTS#2 integrate .. //depot/projects/tty/contrib/groff/README#2 integrate .. //depot/projects/tty/contrib/groff/README.MinGW#1 branch .. //depot/projects/tty/contrib/groff/README.WIN32#2 delete .. //depot/projects/tty/contrib/groff/REVISION#3 integrate .. //depot/projects/tty/contrib/groff/TODO#2 integrate .. //depot/projects/tty/contrib/groff/aclocal.m4#3 integrate .. //depot/projects/tty/contrib/groff/configure#3 integrate .. //depot/projects/tty/contrib/groff/configure.ac#3 integrate .. //depot/projects/tty/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/tty/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/tty/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/tty/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/tty/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/tty/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/tty/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/tty/contrib/groff/contrib/mm/ChangeLog#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/groff_mm.man#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/m.tmac#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/mmroff.pl#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/tty/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/tty/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/tty/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/tty/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/tty/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/tty/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/tty/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/tty/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/tty/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/tty/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/tty/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/tty/contrib/groff/doc/groff#3 integrate .. //depot/projects/tty/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/tty/contrib/groff/doc/groff-10#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-11#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/tty/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/tty/contrib/groff/doc/groff-4#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-5#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-6#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-7#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-8#3 delete .. //depot/projects/tty/contrib/groff/doc/groff-9#3 delete .. //depot/projects/tty/contrib/groff/doc/groff.css#1 branch .. //depot/projects/tty/contrib/groff/doc/groff.texinfo#3 integrate .. //depot/projects/tty/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/tty/contrib/groff/doc/pic.ms#3 integrate .. //depot/projects/tty/contrib/groff/doc/texinfo.tex#3 integrate .. //depot/projects/tty/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/Makefile#3 integrate .. //depot/projects/tty/contrib/groff/font/devhtml/DESC.proto#3 integrate .. //depot/projects/tty/contrib/groff/font/devhtml/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/font/devhtml/R.proto#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/ALBB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/ALBR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/CB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CLARENDON#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CORONET#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/MARIGOLD#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/TB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/TR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCB#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UI#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UR#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/generate/Makefile#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/tty/contrib/groff/font/devlj4/generate/text.map#3 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/tty/contrib/groff/font/devps/AB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/ABI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/AI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/AR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/HR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/NB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/NBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/NI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/NR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/PB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/PBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/PI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/PR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/S#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/TB#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/TBI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/TI#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/TR#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/generate/Makefile#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/generate/textmap#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/prologue.ps#3 integrate .. //depot/projects/tty/contrib/groff/font/devps/symbolmap#3 integrate .. //depot/projects/tty/contrib/groff/font/devutf8/NOTES#3 integrate .. //depot/projects/tty/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/tty/contrib/groff/install-sh#2 integrate .. //depot/projects/tty/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/tty/contrib/groff/man/groff.man#3 integrate .. //depot/projects/tty/contrib/groff/man/groff_char.man#3 integrate .. //depot/projects/tty/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/tty/contrib/groff/man/groff_font.man#3 integrate .. //depot/projects/tty/contrib/groff/man/groff_out.man#4 integrate .. //depot/projects/tty/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/tty/contrib/groff/man/roff.man#3 integrate .. //depot/projects/tty/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grodvi/grodvi.man#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/grohtml.man#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-text.h#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolbp/lbp.h#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/grolj4.man#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grops/grops.man#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/ps.h#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grotty/grotty.man#3 integrate .. //depot/projects/tty/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/tty/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/tty/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/tty/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/driver.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/errarg.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/font.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/tty/contrib/groff/src/include/html-strings.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/lib.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/nonposix.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/posix.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/printer.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/tty/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/stringclass.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/tty/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/map.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/itoa.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/matherr.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strerror.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strtol.c#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/eqn.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/eqn.man#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/gprint.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/grn.man#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/common.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/object.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/output.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.h#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.man#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.y#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/soelim/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/table.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/tbl.man#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/groff.man#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/pipeline.c#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/pipeline.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/grog/grog.pl#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/grog/grog.sh#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/nroff.man#4 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/nroff.sh#5 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/charinfo.h#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/div.h#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/env.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/node.h#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/request.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/symbol.h#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/token.h#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/troff.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/troff.man#3 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/guess.h#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/afmtodit.man#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/afmtodit.pl#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpftodit.man#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpuni.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/indxbib/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/indxbib/indxbib.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/indxbib/signal.c#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lkbib/lkbib.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lkbib/lkbib.man#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lookbib/lookbib.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lookbib/lookbib.man#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/pfbtops/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/pfbtops/pfbtops.c#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/pfbtops/pfbtops.man#3 integrate .. //depot/projects/tty/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/xtotroff/Makefile.in#1 branch .. //depot/projects/tty/contrib/groff/src/utils/xtotroff/Makefile.sub#1 branch .. //depot/projects/tty/contrib/groff/src/utils/xtotroff/xtotroff.c#1 branch .. //depot/projects/tty/contrib/groff/src/utils/xtotroff/xtotroff.man#1 branch .. //depot/projects/tty/contrib/groff/src/xditview/ChangeLog#3 delete .. //depot/projects/tty/contrib/groff/src/xditview/DESC#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/Dvi.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/Dvi.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/DviChar.c#3 delete .. //depot/projects/tty/contrib/groff/src/xditview/DviChar.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/DviP.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/FontMap#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/GXditview-ad.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/GXditview.ad#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/INSTALL#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/Imakefile.in#3 delete .. //depot/projects/tty/contrib/groff/src/xditview/Menu.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/README#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/TODO#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/XFontName.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/XFontName.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/ad2c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/device.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/device.h#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/draw.c#3 delete .. //depot/projects/tty/contrib/groff/src/xditview/font.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray1.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray2.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray3.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray4.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray5.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray6.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray7.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gray8.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/gxditview.man#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/lex.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/page.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/parse.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/xdit.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/xdit_mask.bm#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/xditview.c#2 delete .. //depot/projects/tty/contrib/groff/src/xditview/xtotroff.c#2 delete .. //depot/projects/tty/contrib/groff/test-groff#2 delete .. //depot/projects/tty/contrib/groff/test-groff.in#1 branch .. //depot/projects/tty/contrib/groff/tmac/Makefile.sub#3 integrate .. //depot/projects/tty/contrib/groff/tmac/TODO#2 integrate .. //depot/projects/tty/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/tty/contrib/groff/tmac/Xps.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/an-old.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/composite.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/devtag.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/doc-common#9 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-ditroff#6 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-syms#7 integrate .. //depot/projects/tty/contrib/groff/tmac/doc.tmac#7 integrate .. //depot/projects/tty/contrib/groff/tmac/dvi.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/e.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_man.man#3 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#7 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_ms.man#2 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_trace.man#2 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_www.man#2 integrate .. //depot/projects/tty/contrib/groff/tmac/html.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/latin5.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/lbp.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/papersize.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/ps.tmac#3 integrate .. //depot/projects/tty/contrib/groff/tmac/s.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/trace.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/troffrc#4 integrate .. //depot/projects/tty/contrib/groff/tmac/troffrc-end#3 integrate .. //depot/projects/tty/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/tty/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/tty/contrib/groff/tmac/unicode.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/www.tmac#3 integrate .. //depot/projects/tty/contrib/pf/man/pf.4#6 integrate .. //depot/projects/tty/contrib/pf/man/pf.conf.5#6 integrate .. //depot/projects/tty/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/tty/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/tty/contrib/smbfs/include/netsmb/smb_lib.h#2 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/ctx.c#6 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/mbuf.c#3 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/rap.c#4 integrate .. //depot/projects/tty/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate .. //depot/projects/tty/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/tty/contrib/top/top.X#5 integrate .. //depot/projects/tty/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/tty/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/tty/crypto/openssl/ssl/s23_srvr.c#3 integrate .. //depot/projects/tty/etc/bluetooth/Makefile#2 integrate .. //depot/projects/tty/etc/bluetooth/hosts#2 integrate .. //depot/projects/tty/etc/bluetooth/protocols#2 integrate .. //depot/projects/tty/etc/defaults/Makefile#4 integrate .. //depot/projects/tty/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/tty/etc/defaults/rc.conf#15 integrate .. //depot/projects/tty/etc/devd.conf#16 integrate .. //depot/projects/tty/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#14 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/tty/etc/netstart#6 integrate .. //depot/projects/tty/etc/pccard_ether#11 integrate .. //depot/projects/tty/etc/periodic/security/550.ipfwlimit#5 integrate .. //depot/projects/tty/etc/portsnap.conf#2 integrate .. //depot/projects/tty/etc/rc.d/Makefile#12 integrate .. //depot/projects/tty/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/tty/etc/rc.d/archdep#6 integrate .. //depot/projects/tty/etc/rc.d/bluetooth#1 branch .. //depot/projects/tty/etc/rc.d/devd#5 integrate .. //depot/projects/tty/etc/rc.d/dumpon#7 integrate .. //depot/projects/tty/etc/rc.d/geli#2 integrate .. //depot/projects/tty/etc/rc.d/hcsecd#1 branch .. //depot/projects/tty/etc/rc.d/ike#5 integrate .. //depot/projects/tty/etc/rc.d/ipfw#7 integrate .. //depot/projects/tty/etc/rc.d/ipmon#7 integrate .. //depot/projects/tty/etc/rc.d/ipsec#6 integrate .. //depot/projects/tty/etc/rc.d/kerberos#4 integrate .. //depot/projects/tty/etc/rc.d/localpkg#4 integrate .. //depot/projects/tty/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/tty/etc/rc.d/mountd#4 integrate .. //depot/projects/tty/etc/rc.d/named#6 integrate .. //depot/projects/tty/etc/rc.d/newsyslog#3 integrate .. //depot/projects/tty/etc/rc.d/pf#5 integrate .. //depot/projects/tty/etc/rc.d/pflog#4 integrate .. //depot/projects/tty/etc/rc.d/pfsync#1 branch .. //depot/projects/tty/etc/rc.d/powerd#2 integrate .. //depot/projects/tty/etc/rc.d/ppp#3 branch .. //depot/projects/tty/etc/rc.d/ppp-user#5 delete .. //depot/projects/tty/etc/rc.d/routing#4 integrate .. //depot/projects/tty/etc/rc.d/sdpd#1 branch .. //depot/projects/tty/etc/rc.d/sendmail#6 integrate .. //depot/projects/tty/etc/rc.d/sshd#6 integrate .. //depot/projects/tty/etc/rc.d/ugidfw#3 integrate .. //depot/projects/tty/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/tty/etc/rc.firewall6#6 integrate .. //depot/projects/tty/etc/rc.initdiskless#4 integrate .. //depot/projects/tty/etc/rc.subr#9 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes2-o#8 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/tty/games/morse/Makefile#2 integrate .. //depot/projects/tty/games/morse/morse.c#5 integrate .. //depot/projects/tty/gnu/lib/libstdc++/config.h#8 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate .. //depot/projects/tty/gnu/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/cpio/config.h#1 branch .. //depot/projects/tty/gnu/usr.bin/cpio/doc/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/diff/diff.1#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/frame-unwind.diff#1 branch .. //depot/projects/tty/gnu/usr.bin/grep/grep.1#5 integrate .. //depot/projects/tty/gnu/usr.bin/grep/grep.c#6 integrate .. //depot/projects/tty/gnu/usr.bin/grep/search.c#6 integrate .. //depot/projects/tty/gnu/usr.bin/groff/Makefile.inc#5 integrate .. //depot/projects/tty/gnu/usr.bin/groff/font/Makefile.tty#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/font/devhtml/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/font/devlj4/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/groff/src/devices/grolj4/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/groff/src/devices/xditview/Makefile#1 branch .. //depot/projects/tty/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/tty/gnu/usr.bin/groff/src/libs/libgroff/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/groff/src/roff/troff/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.man#4 integrate .. //depot/projects/tty/gnu/usr.bin/send-pr/send-pr.sh#6 integrate .. //depot/projects/tty/include/Makefile#19 integrate .. //depot/projects/tty/include/pthread.h#10 integrate .. //depot/projects/tty/include/pthread_np.h#2 integrate .. //depot/projects/tty/include/resolv.h#5 integrate .. //depot/projects/tty/include/signal.h#3 integrate .. //depot/projects/tty/include/stdlib.h#6 integrate .. //depot/projects/tty/include/time.h#4 integrate .. //depot/projects/tty/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/tty/lib/Makefile#19 integrate .. //depot/projects/tty/lib/bind/bind/Makefile#3 integrate .. //depot/projects/tty/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/tty/lib/bind/dns/Makefile#4 integrate .. //depot/projects/tty/lib/bind/isc/Makefile#4 integrate .. //depot/projects/tty/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/tty/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/tty/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/tty/lib/csu/amd64/crt1.c#3 integrate .. //depot/projects/tty/lib/csu/i386-elf/crt1.c#5 integrate .. //depot/projects/tty/lib/libarchive/COPYING#2 integrate .. //depot/projects/tty/lib/libarchive/Makefile#8 integrate .. //depot/projects/tty/lib/libarchive/Makefile.am#3 integrate .. //depot/projects/tty/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/tty/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/tty/lib/libarchive/archive_private.h#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_data_into_fd.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/tty/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/tty/lib/libarchive/configure.ac.in#7 integrate .. //depot/projects/tty/lib/libbsnmp/libbsnmp/Makefile#4 integrate .. //depot/projects/tty/lib/libc/arm/string/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/tty/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/tty/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/tty/lib/libc/db/man/dbopen.3#5 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#13 integrate .. //depot/projects/tty/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/tty/lib/libc/gen/daemon.c#3 integrate .. //depot/projects/tty/lib/libc/gen/devname.c#3 integrate .. //depot/projects/tty/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/tty/lib/libc/gen/gethostname.c#3 integrate .. //depot/projects/tty/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/tty/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/tty/lib/libc/gen/glob.c#4 integrate .. //depot/projects/tty/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/tty/lib/libc/gen/sem.c#3 integrate .. //depot/projects/tty/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/tty/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/tty/lib/libc/i386/gen/_set_tp.c#6 integrate .. //depot/projects/tty/lib/libc/i386/gen/ldexp.c#4 integrate .. //depot/projects/tty/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/tty/lib/libc/locale/runetype.c#5 integrate .. //depot/projects/tty/lib/libc/locale/tolower.c#4 integrate .. //depot/projects/tty/lib/libc/locale/toupper.c#4 integrate .. //depot/projects/tty/lib/libc/posix1e/extattr.c#2 integrate .. //depot/projects/tty/lib/libc/quad/quad.h#2 integrate .. //depot/projects/tty/lib/libc/regex/regex2.h#4 integrate .. //depot/projects/tty/lib/libc/rpc/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/tty/lib/libc/stdio/local.h#4 integrate .. //depot/projects/tty/lib/libc/stdio/makebuf.c#2 integrate .. //depot/projects/tty/lib/libc/stdlib/abort.c#3 integrate .. //depot/projects/tty/lib/libc/stdlib/exit.c#3 integrate .. //depot/projects/tty/lib/libc/stdlib/strfmon.c#3 integrate .. //depot/projects/tty/lib/libc/stdtime/time2posix.3#3 integrate .. //depot/projects/tty/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/tty/lib/libc/sys/sendfile.2#8 integrate .. //depot/projects/tty/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/tty/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/tty/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/tty/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/tty/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/tty/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/tty/lib/libc/sys/umask.2#3 integrate .. //depot/projects/tty/lib/libc/sys/wait.2#4 integrate .. //depot/projects/tty/lib/libdevstat/devstat.c#8 integrate .. //depot/projects/tty/lib/libedit/editline.3#6 integrate .. //depot/projects/tty/lib/libedit/el.c#3 integrate .. //depot/projects/tty/lib/libedit/makelist#4 integrate .. //depot/projects/tty/lib/libedit/map.c#3 integrate .. //depot/projects/tty/lib/libform/Makefile#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_amd64.c#4 integrate .. //depot/projects/tty/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/tty/lib/libmagic/Makefile#4 integrate .. //depot/projects/tty/lib/libmd/sha256.3#3 integrate .. //depot/projects/tty/lib/libmemstat/Makefile#2 integrate .. //depot/projects/tty/lib/libmenu/Makefile#3 integrate .. //depot/projects/tty/lib/libmp/Makefile#5 integrate .. //depot/projects/tty/lib/libncp/Makefile#4 integrate .. //depot/projects/tty/lib/libnetgraph/debug.c#3 integrate .. //depot/projects/tty/lib/libpam/modules/pam_exec/pam_exec.c#4 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/Makefile#7 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/pam_ssh.8#5 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/pam_ssh.c#5 integrate .. //depot/projects/tty/lib/libpanel/Makefile#3 integrate .. //depot/projects/tty/lib/libpthread/pthread.map#8 integrate .. //depot/projects/tty/lib/libpthread/thread/Makefile.inc#12 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/tty/lib/libpthread/thread/thr_init.c#11 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#14 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/tty/lib/libradius/Makefile#6 integrate .. //depot/projects/tty/lib/libsmb/Makefile#4 integrate .. //depot/projects/tty/lib/libstand/cd9660.c#2 integrate .. //depot/projects/tty/lib/libthr/Makefile#11 integrate .. //depot/projects/tty/lib/libthr/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/tty/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/tty/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/tty/lib/libthr/pthread.map#3 integrate .. //depot/projects/tty/lib/libthr/thread/Makefile.inc#5 integrate .. //depot/projects/tty/lib/libthr/thread/thr_create.c#8 integrate .. //depot/projects/tty/lib/libthr/thread/thr_exit.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 13 03:29:49 2005 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 8458016A421; Sun, 13 Nov 2005 03:29:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3436E16A41F for ; Sun, 13 Nov 2005 03:29:48 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD68943D46 for ; Sun, 13 Nov 2005 03:29:47 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAD3TlwU075845 for ; Sun, 13 Nov 2005 03:29:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAD3TMdl075839 for perforce@freebsd.org; Sun, 13 Nov 2005 03:29:22 GMT (envelope-from marcel@freebsd.org) Date: Sun, 13 Nov 2005 03:29:22 GMT Message-Id: <200511130329.jAD3TMdl075839@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 86704 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: Sun, 13 Nov 2005 03:29:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=86704 Change 86704 by marcel@marcel_nfs on 2005/11/13 03:28:31 IFC @86697 Affected files ... .. //depot/projects/ia64/MAINTAINERS#49 integrate .. //depot/projects/ia64/Makefile.inc1#106 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#2 integrate .. //depot/projects/ia64/UPDATING#81 integrate .. //depot/projects/ia64/bin/csh/config_p.h#2 integrate .. //depot/projects/ia64/bin/date/date.1#11 integrate .. //depot/projects/ia64/bin/kenv/kenv.1#4 integrate .. //depot/projects/ia64/bin/kenv/kenv.c#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#27 integrate .. //depot/projects/ia64/bin/ls/ls.c#24 integrate .. //depot/projects/ia64/bin/rm/rm.1#12 integrate .. //depot/projects/ia64/bin/rm/rm.c#14 integrate .. //depot/projects/ia64/bin/sh/eval.c#12 integrate .. //depot/projects/ia64/bin/sh/exec.c#12 integrate .. //depot/projects/ia64/bin/sh/exec.h#5 integrate .. //depot/projects/ia64/bin/sh/expand.c#15 integrate .. //depot/projects/ia64/bin/sh/histedit.c#9 integrate .. //depot/projects/ia64/bin/sh/memalloc.c#8 integrate .. //depot/projects/ia64/bin/sh/memalloc.h#4 integrate .. //depot/projects/ia64/bin/sh/miscbltin.c#8 integrate .. //depot/projects/ia64/bin/sh/options.c#9 integrate .. //depot/projects/ia64/bin/sh/sh.1#33 integrate .. //depot/projects/ia64/bin/sh/trap.c#8 integrate .. //depot/projects/ia64/bin/sh/var.c#13 integrate .. //depot/projects/ia64/contrib/bc/bc/main.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/bsnmp/NEWS#7 integrate .. //depot/projects/ia64/contrib/bsnmp/VERSION#7 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#7 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpclient.3#7 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.h#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.3#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/ia64/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.3#7 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.h#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/trap.c#5 integrate .. //depot/projects/ia64/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/ia64/contrib/cpio/AUTHORS#1 branch .. //depot/projects/ia64/contrib/cpio/COPYING#2 integrate .. //depot/projects/ia64/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/ia64/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/cpio/INSTALL#1 branch .. //depot/projects/ia64/contrib/cpio/NEWS#2 integrate .. //depot/projects/ia64/contrib/cpio/README#2 integrate .. //depot/projects/ia64/contrib/cpio/THANKS#1 branch .. //depot/projects/ia64/contrib/cpio/TODO#1 branch .. //depot/projects/ia64/contrib/cpio/alloca.c#2 delete .. //depot/projects/ia64/contrib/cpio/copyin.c#2 delete .. //depot/projects/ia64/contrib/cpio/copyout.c#2 delete .. //depot/projects/ia64/contrib/cpio/copypass.c#3 delete .. //depot/projects/ia64/contrib/cpio/cpio.1#2 delete .. //depot/projects/ia64/contrib/cpio/cpio.h#2 delete .. //depot/projects/ia64/contrib/cpio/cpio.texi#2 delete .. //depot/projects/ia64/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/ia64/contrib/cpio/defer.c#2 delete .. //depot/projects/ia64/contrib/cpio/defer.h#2 delete .. //depot/projects/ia64/contrib/cpio/dirname.c#2 delete .. //depot/projects/ia64/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/ia64/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/ia64/contrib/cpio/dstring.c#2 delete .. //depot/projects/ia64/contrib/cpio/dstring.h#2 delete .. //depot/projects/ia64/contrib/cpio/error.c#2 delete .. //depot/projects/ia64/contrib/cpio/extern.h#2 delete .. //depot/projects/ia64/contrib/cpio/filemode.c#2 delete .. //depot/projects/ia64/contrib/cpio/filetypes.h#2 delete .. //depot/projects/ia64/contrib/cpio/global.c#2 delete .. //depot/projects/ia64/contrib/cpio/idcache.c#2 delete .. //depot/projects/ia64/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/error.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/error.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/system.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/ia64/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/ia64/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/ia64/contrib/cpio/main.c#2 delete .. //depot/projects/ia64/contrib/cpio/makepath.c#2 delete .. //depot/projects/ia64/contrib/cpio/rmt.h#2 delete .. //depot/projects/ia64/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/ia64/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/ia64/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/defer.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/defer.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/extern.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/global.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/main.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/tar.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/tar.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/ia64/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/ia64/contrib/cpio/src/util.c#1 branch .. //depot/projects/ia64/contrib/cpio/stripslash.c#2 delete .. //depot/projects/ia64/contrib/cpio/system.h#2 delete .. //depot/projects/ia64/contrib/cpio/tar.c#3 delete .. //depot/projects/ia64/contrib/cpio/tar.h#2 delete .. //depot/projects/ia64/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/ia64/contrib/cpio/userspec.c#2 delete .. //depot/projects/ia64/contrib/cpio/util.c#2 delete .. //depot/projects/ia64/contrib/cpio/version.c#2 delete .. //depot/projects/ia64/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/ia64/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/ia64/contrib/cvs/src/cvsbug.in#4 integrate .. //depot/projects/ia64/contrib/gcc/c-decl.c#16 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#18 integrate .. //depot/projects/ia64/contrib/groff/COPYING#2 integrate .. //depot/projects/ia64/contrib/groff/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/ia64/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/ia64/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/ia64/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/ia64/contrib/groff/FDL#2 integrate .. //depot/projects/ia64/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/groff/INSTALL#4 integrate .. //depot/projects/ia64/contrib/groff/INSTALL.gen#3 integrate .. //depot/projects/ia64/contrib/groff/LICENSE#1 branch .. //depot/projects/ia64/contrib/groff/MANIFEST#3 integrate .. //depot/projects/ia64/contrib/groff/MORE.STUFF#3 integrate .. //depot/projects/ia64/contrib/groff/Makefile#2 integrate .. //depot/projects/ia64/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/ia64/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/ia64/contrib/groff/Makefile.cpg#3 integrate .. //depot/projects/ia64/contrib/groff/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/groff/Makefile.init#2 integrate .. //depot/projects/ia64/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/NEWS#4 integrate .. //depot/projects/ia64/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/ia64/contrib/groff/PROJECTS#2 integrate .. //depot/projects/ia64/contrib/groff/README#3 integrate .. //depot/projects/ia64/contrib/groff/README.MinGW#1 branch .. //depot/projects/ia64/contrib/groff/README.WIN32#2 delete .. //depot/projects/ia64/contrib/groff/REVISION#4 integrate .. //depot/projects/ia64/contrib/groff/TODO#2 integrate .. //depot/projects/ia64/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/groff/configure#4 integrate .. //depot/projects/ia64/contrib/groff/configure.ac#4 integrate .. //depot/projects/ia64/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/ia64/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/ia64/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/ia64/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/ia64/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/ia64/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/mmroff.pl#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/ia64/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/ia64/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/ia64/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/ia64/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/ia64/contrib/groff/doc/groff#3 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-10#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-11#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-4#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-5#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-6#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-7#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-8#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff-9#3 delete .. //depot/projects/ia64/contrib/groff/doc/groff.css#1 branch .. //depot/projects/ia64/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/ia64/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/ia64/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/ia64/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/ia64/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/ia64/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/ia64/contrib/groff/font/devhtml/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/Makefile#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/S#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TB#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TBI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TI#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TR#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/generate/Makefile#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/ia64/contrib/groff/font/devps/generate/textmap#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/prologue.ps#4 integrate .. //depot/projects/ia64/contrib/groff/font/devps/symbolmap#4 integrate .. //depot/projects/ia64/contrib/groff/font/devutf8/NOTES#4 integrate .. //depot/projects/ia64/contrib/groff/font/devutf8/R.proto#4 integrate .. //depot/projects/ia64/contrib/groff/install-sh#2 integrate .. //depot/projects/ia64/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/ia64/contrib/groff/man/groff.man#4 integrate .. //depot/projects/ia64/contrib/groff/man/groff_char.man#4 integrate .. //depot/projects/ia64/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/ia64/contrib/groff/man/groff_font.man#4 integrate .. //depot/projects/ia64/contrib/groff/man/groff_out.man#5 integrate .. //depot/projects/ia64/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/ia64/contrib/groff/man/roff.man#4 integrate .. //depot/projects/ia64/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/grodvi.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/grohtml.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-text.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/lbp.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/grolj4.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grops/grops.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/ps.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grotty/grotty.man#5 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/ia64/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/driver.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/include/errarg.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/font.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/ia64/contrib/groff/src/include/html-strings.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/lib.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/nonposix.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/posix.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/printer.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/stringclass.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/ia64/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/map.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/itoa.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/matherr.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strerror.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strtol.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/eqn.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/eqn.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/gprint.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/grn.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/common.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/object.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/output.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.y#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/table.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/tbl.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/groff.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/pipeline.c#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/pipeline.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/grog/grog.pl#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/grog/grog.sh#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.man#5 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#6 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/charinfo.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/div.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/env.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/node.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/request.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/symbol.h#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/token.h#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/troff.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/troff.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/guess.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/afmtodit.man#4 integrate .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/afmtodit.pl#4 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpftodit.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpuni.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/indxbib.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/signal.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lkbib/lkbib.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lkbib/lkbib.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lookbib/lookbib.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lookbib/lookbib.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/pfbtops/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/pfbtops/pfbtops.c#4 integrate .. //depot/projects/ia64/contrib/groff/src/utils/pfbtops/pfbtops.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/xtotroff/Makefile.in#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/xtotroff/Makefile.sub#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/xtotroff/xtotroff.c#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/xtotroff/xtotroff.man#1 branch .. //depot/projects/ia64/contrib/groff/src/xditview/ChangeLog#4 delete .. //depot/projects/ia64/contrib/groff/src/xditview/DESC#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/Dvi.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/Dvi.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/DviChar.c#4 delete .. //depot/projects/ia64/contrib/groff/src/xditview/DviChar.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/DviP.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/FontMap#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/GXditview-ad.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/GXditview.ad#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/INSTALL#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/Imakefile.in#4 delete .. //depot/projects/ia64/contrib/groff/src/xditview/Menu.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/README#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/TODO#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/XFontName.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/XFontName.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/ad2c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/device.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/device.h#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/draw.c#3 delete .. //depot/projects/ia64/contrib/groff/src/xditview/font.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray1.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray2.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray3.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray4.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray5.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray6.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray7.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gray8.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/gxditview.man#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/lex.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/page.c#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/parse.c#3 delete .. //depot/projects/ia64/contrib/groff/src/xditview/xdit.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/xdit_mask.bm#2 delete .. //depot/projects/ia64/contrib/groff/src/xditview/xditview.c#3 delete .. //depot/projects/ia64/contrib/groff/src/xditview/xtotroff.c#2 delete .. //depot/projects/ia64/contrib/groff/test-groff#3 delete .. //depot/projects/ia64/contrib/groff/test-groff.in#1 branch .. //depot/projects/ia64/contrib/groff/tmac/Makefile.sub#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/TODO#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/X.tmac#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/Xps.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/an-old.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/composite.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/devtag.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/doc-common#16 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-ditroff#7 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-nroff#6 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-old.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#9 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#11 integrate .. //depot/projects/ia64/contrib/groff/tmac/dvi.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/e.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_man.man#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#13 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_ms.man#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_trace.man#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_www.man#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/html.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/latin5.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/lbp.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/papersize.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/ps.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/s.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/trace.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/troffrc#6 integrate .. //depot/projects/ia64/contrib/groff/tmac/troffrc-end#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#6 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty.tmac#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/unicode.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/www.tmac#4 integrate .. //depot/projects/ia64/contrib/pf/man/pf.4#7 integrate .. //depot/projects/ia64/contrib/pf/man/pf.conf.5#9 integrate .. //depot/projects/ia64/contrib/pf/man/pfsync.4#7 integrate .. //depot/projects/ia64/contrib/smbfs/include/netsmb/nb_lib.h#2 integrate .. //depot/projects/ia64/contrib/smbfs/include/netsmb/smb_lib.h#3 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/ctx.c#10 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/mbuf.c#3 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nb.c#2 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nb_name.c#3 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nb_net.c#3 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nbns_rq.c#2 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/rap.c#4 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.8#5 integrate .. //depot/projects/ia64/contrib/smbfs/smbutil/view.c#4 integrate .. //depot/projects/ia64/contrib/top/top.X#6 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis.h#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis_.c#1 branch .. //depot/projects/ia64/crypto/openssl/ssl/s23_srvr.c#4 integrate .. //depot/projects/ia64/etc/bluetooth/Makefile#2 integrate .. //depot/projects/ia64/etc/bluetooth/hosts#2 integrate .. //depot/projects/ia64/etc/bluetooth/protocols#2 integrate .. //depot/projects/ia64/etc/defaults/Makefile#6 integrate .. //depot/projects/ia64/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/ia64/etc/defaults/rc.conf#64 integrate .. //depot/projects/ia64/etc/devd.conf#21 integrate .. //depot/projects/ia64/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#35 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#39 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11-4.dist#10 integrate .. //depot/projects/ia64/etc/netstart#7 integrate .. //depot/projects/ia64/etc/pccard_ether#18 integrate .. //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#9 integrate .. //depot/projects/ia64/etc/portsnap.conf#2 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#36 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#9 integrate .. //depot/projects/ia64/etc/rc.d/archdep#8 integrate .. //depot/projects/ia64/etc/rc.d/bluetooth#1 branch .. //depot/projects/ia64/etc/rc.d/devd#8 integrate .. //depot/projects/ia64/etc/rc.d/dumpon#8 integrate .. //depot/projects/ia64/etc/rc.d/geli#2 integrate .. //depot/projects/ia64/etc/rc.d/hcsecd#1 branch .. //depot/projects/ia64/etc/rc.d/ike#5 integrate .. //depot/projects/ia64/etc/rc.d/ipfw#10 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#12 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#10 integrate .. //depot/projects/ia64/etc/rc.d/kerberos#5 integrate .. //depot/projects/ia64/etc/rc.d/localpkg#4 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#11 integrate .. //depot/projects/ia64/etc/rc.d/mountd#12 integrate .. //depot/projects/ia64/etc/rc.d/named#15 integrate .. //depot/projects/ia64/etc/rc.d/newsyslog#4 integrate .. //depot/projects/ia64/etc/rc.d/pf#6 integrate .. //depot/projects/ia64/etc/rc.d/pflog#6 integrate .. //depot/projects/ia64/etc/rc.d/pfsync#1 branch .. //depot/projects/ia64/etc/rc.d/powerd#2 integrate .. //depot/projects/ia64/etc/rc.d/ppp#4 branch .. //depot/projects/ia64/etc/rc.d/ppp-user#8 delete .. //depot/projects/ia64/etc/rc.d/routing#6 integrate .. //depot/projects/ia64/etc/rc.d/sdpd#1 branch .. //depot/projects/ia64/etc/rc.d/sendmail#13 integrate .. //depot/projects/ia64/etc/rc.d/sshd#8 integrate .. //depot/projects/ia64/etc/rc.d/ugidfw#4 integrate .. //depot/projects/ia64/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/ia64/etc/rc.firewall6#7 integrate .. //depot/projects/ia64/etc/rc.initdiskless#4 integrate .. //depot/projects/ia64/etc/rc.subr#24 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#51 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#13 integrate .. //depot/projects/ia64/games/fortune/datfiles/limerick#6 integrate .. //depot/projects/ia64/games/morse/Makefile#2 integrate .. //depot/projects/ia64/games/morse/morse.c#6 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/config.h#10 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cpio/config.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/cpio/doc/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/diff.1#5 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/main.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt.c#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/libgdb/frame-unwind.diff#1 branch .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#10 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.c#8 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/Makefile.inc#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.tty#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devhtml/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devlj4/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/xditview/Makefile#1 branch .. //depot/projects/ia64/gnu/usr.bin/groff/src/include/config.h#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/libs/libgroff/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/roff/troff/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.man#6 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#8 integrate .. //depot/projects/ia64/include/Makefile#50 integrate .. //depot/projects/ia64/include/pthread.h#14 integrate .. //depot/projects/ia64/include/pthread_np.h#6 integrate .. //depot/projects/ia64/include/resolv.h#8 integrate .. //depot/projects/ia64/include/signal.h#10 integrate .. //depot/projects/ia64/include/stdlib.h#27 integrate .. //depot/projects/ia64/include/time.h#15 integrate .. //depot/projects/ia64/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/ia64/lib/Makefile#55 integrate .. //depot/projects/ia64/lib/bind/bind/Makefile#3 integrate .. //depot/projects/ia64/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/ia64/lib/bind/dns/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/isc/Makefile#4 integrate .. //depot/projects/ia64/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/ia64/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/ia64/lib/bind/lwres/Makefile#5 integrate .. //depot/projects/ia64/lib/csu/amd64/crt1.c#3 integrate .. //depot/projects/ia64/lib/csu/i386-elf/crt1.c#10 integrate .. //depot/projects/ia64/lib/libarchive/COPYING#2 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#17 integrate .. //depot/projects/ia64/lib/libarchive/Makefile.am#3 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_private.h#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/ia64/lib/libarchive/configure.ac.in#6 integrate .. //depot/projects/ia64/lib/libbsnmp/libbsnmp/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/arm/string/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/ia64/lib/libc/compat-43/gethostid.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/sethostid.c#4 integrate .. //depot/projects/ia64/lib/libc/db/man/dbopen.3#8 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#34 integrate .. //depot/projects/ia64/lib/libc/gen/_pthread_stubs.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/daemon.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/devname.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getcwd.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/gethostname.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getosreldate.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getpagesize.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/glob.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/readdir.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/sem.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/sethostname.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/strtofflags.c#5 integrate .. //depot/projects/ia64/lib/libc/i386/gen/_set_tp.c#6 integrate .. //depot/projects/ia64/lib/libc/i386/gen/ldexp.c#6 integrate .. //depot/projects/ia64/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/ia64/lib/libc/locale/runetype.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/tolower.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/toupper.c#6 integrate .. //depot/projects/ia64/lib/libc/posix1e/extattr.c#4 integrate .. //depot/projects/ia64/lib/libc/quad/quad.h#3 integrate .. //depot/projects/ia64/lib/libc/regex/regex2.h#5 integrate .. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#10 integrate .. //depot/projects/ia64/lib/libc/stdio/makebuf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/abort.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/exit.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#10 integrate .. //depot/projects/ia64/lib/libc/stdtime/time2posix.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#23 integrate .. //depot/projects/ia64/lib/libc/sys/sendfile.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/ia64/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/ia64/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/ia64/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/ia64/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/ia64/lib/libc/sys/umask.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/wait.2#7 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.c#11 integrate .. //depot/projects/ia64/lib/libedit/editline.3#7 integrate .. //depot/projects/ia64/lib/libedit/el.c#4 integrate .. //depot/projects/ia64/lib/libedit/makelist#5 integrate .. //depot/projects/ia64/lib/libedit/map.c#3 integrate .. //depot/projects/ia64/lib/libform/Makefile#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_amd64.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/ia64/lib/libmagic/Makefile#6 integrate .. //depot/projects/ia64/lib/libmd/sha256.3#3 integrate .. //depot/projects/ia64/lib/libmemstat/Makefile#2 integrate .. //depot/projects/ia64/lib/libmenu/Makefile#4 integrate .. //depot/projects/ia64/lib/libmp/Makefile#7 integrate .. //depot/projects/ia64/lib/libncp/Makefile#5 integrate .. //depot/projects/ia64/lib/libnetgraph/debug.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.c#4 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ssh/Makefile#11 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.8#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#15 integrate .. //depot/projects/ia64/lib/libpanel/Makefile#5 integrate .. //depot/projects/ia64/lib/libpthread/pthread.map#15 integrate .. //depot/projects/ia64/lib/libpthread/thread/Makefile.inc#17 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#23 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#50 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/ia64/lib/libradius/Makefile#10 integrate .. //depot/projects/ia64/lib/libsmb/Makefile#7 integrate .. //depot/projects/ia64/lib/libstand/cd9660.c#3 integrate .. //depot/projects/ia64/lib/libthr/Makefile#11 integrate .. //depot/projects/ia64/lib/libthr/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/ia64/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/include/pthread_md.h#4 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#3 integrate .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#18 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#14 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 13 18:11:55 2005 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 9272516A421; Sun, 13 Nov 2005 18:11:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46A2516A41F for ; Sun, 13 Nov 2005 18:11:54 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E572243D45 for ; Sun, 13 Nov 2005 18:11:53 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jADIBr63068921 for ; Sun, 13 Nov 2005 18:11:53 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jADIBrS5068918 for perforce@freebsd.org; Sun, 13 Nov 2005 18:11:53 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 13 Nov 2005 18:11:53 GMT Message-Id: <200511131811.jADIBrS5068918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 86727 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: Sun, 13 Nov 2005 18:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=86727 Change 86727 by soc-victor@soc-victor_Pentium4 on 2005/11/13 18:11:27 Integrated form CVS Affected files ... .. //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile.inc#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate Differences ... ==== //depot/projects/soc2005/mta_bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.15 2005/05/23 09:03:39 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ * * Interfaces group. */ @@ -280,8 +280,22 @@ break; case LEAF_ifOperStatus: - value->v.integer = - (ifp->mib.ifmd_flags & IFF_RUNNING) ? 1 : 2; + /* + * According to RFC 2863 the state should be Up if the + * interface is ready to transmit packets. We takes this to + * mean that the interface should be running and should have + * a carrier. If it is running and has no carrier we interpret + * this as 'waiting for an external event' (plugging in the + * cable) and hence return 'dormant'. + */ + if (ifp->mib.ifmd_flags & IFF_RUNNING) { + if (ifp->mib.ifmd_data.ifi_link_state == + LINK_STATE_DOWN) + value->v.integer = 5; /* state dormant */ + else + value->v.integer = 1; /* state up */ + } else + value->v.integer = 2; /* state down */ break; case LEAF_ifLastChange: ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/Makefile.inc#2 (text+ko) ==== @@ -1,32 +1,7 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.11 2005/10/04 15:03:39 harti Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.12 2005/11/10 10:14:56 harti Exp $ SHLIB_MAJOR= 4 WARNS?= 6 -INCSDIR= ${INCLUDEDIR}/bsnmp - -SHLIB_NAME= snmp_${MOD}.so.${SHLIB_MAJOR} -SRCS+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h -CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h -CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H -CFLAGS+= -DHAVE_INTTYPES_H - -${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} - cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET} - -.ORDER: ${MOD}_tree.c ${MOD}_tree.h -${MOD}_tree.c ${MOD}_tree.h: ${MOD}_tree.def ${EXTRAMIBDEFS} - cat ${.ALLSRC} | gensnmptree -l -p ${MOD}_ - -.if defined(DEFS) -FILESGROUPS+= DEFS -.endif -DEFSDIR= ${SHAREDIR}/snmp/defs - -.if defined(BMIBS) -FILESGROUPS+= BMIBS -.endif -BMIBSDIR= ${SHAREDIR}/snmp/mibs MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ -e 's%@DEFPATH@%${DEFSDIR}/%g' \ ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/Makefile,v 1.3 2005/05/25 12:04:44 harti Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_atm/Makefile,v 1.4 2005/11/10 10:14:56 harti Exp $ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp -SNMP_ATM=${.CURDIR}/../../../../contrib/ngatm/snmp_atm -.PATH: ${SNMP_ATM} +CONTRIB= ${.CURDIR}/../../../../contrib/ngatm +.PATH: ${CONTRIB}/snmp_atm MOD= atm SRCS= snmp_atm.c atm_sys.c @@ -17,6 +16,6 @@ EXTRAMIBDEFS= atm_freebsd.def -CFLAGS+= -I${SNMP_ATM} +CFLAGS+= -I${CONTRIB}/snmp_atm -.include +.include ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile,v 1.5 2004/01/23 16:22:49 harti Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile,v 1.6 2005/11/10 10:14:56 harti Exp $ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp +CONTRIB= ${.CURDIR}/../../../../contrib/bsnmp .PATH: ${CONTRIB}/snmp_mibII MOD= mibII @@ -13,7 +13,9 @@ ipForward ifIndex linkDown linkUp MAN= snmp_mibII.3 +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd + DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -.include +.include ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#2 (text+ko) ==== @@ -1,9 +1,7 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile,v 1.6 2004/01/24 20:12:30 harti Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile,v 1.7 2005/11/10 10:14:56 harti Exp $ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp - MOD= netgraph SRCS= snmp_netgraph.c XSYM= begemotNg @@ -16,4 +14,4 @@ DPADD= ${LIBNETGRAPH} LDADD= -lnetgraph -.include +.include ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * 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/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c,v 1.5 2005/05/23 11:24:39 harti Exp $ + * $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c,v 1.6 2005/11/10 10:12:01 harti Exp $ * * Netgraph interface for SNMPd. */ @@ -44,7 +44,7 @@ #include #include #include -#include "snmpmod.h" +#include #include "snmp_netgraph.h" #include "netgraph_tree.h" #include "netgraph_oid.h" ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 (text+ko) ==== @@ -1,9 +1,7 @@ -# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile,v 1.1 2005/03/14 22:16:39 philip Exp $ +# $FreeBSD: src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile,v 1.2 2005/11/10 10:14:57 harti Exp $ # # Author: Philip Paeps -CONTRIB=${.CURDIR}/../../../../contrib/bsnmp - MOD= pf SRCS= pf_snmp.c WARNS?= 6 @@ -12,4 +10,4 @@ DEFS= ${MOD}_tree.def BMIBS= BEGEMOT-PF-MIB.txt -.include +.include From owner-p4-projects@FreeBSD.ORG Sun Nov 13 22:31:25 2005 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 386DA16A421; Sun, 13 Nov 2005 22:31:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED08416A41F for ; Sun, 13 Nov 2005 22:31:24 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB46843D53 for ; Sun, 13 Nov 2005 22:31:24 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jADMVOw3092974 for ; Sun, 13 Nov 2005 22:31:24 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jADMVOq5092971 for perforce@freebsd.org; Sun, 13 Nov 2005 22:31:24 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 13 Nov 2005 22:31:24 GMT Message-Id: <200511132231.jADMVOq5092971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 86735 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: Sun, 13 Nov 2005 22:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=86735 Change 86735 by soc-victor@soc-victor_Pentium4 on 2005/11/13 22:31:14 Use bsd.snmpmod.mk Affected files ... .. //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/Makefile#2 edit Differences ... ==== //depot/projects/soc2005/mta_bsnmp/usr.sbin/bsnmpd/modules/snmp_mta/Makefile#2 (text+ko) ==== @@ -29,19 +29,13 @@ CONTRIB=${.CURDIR}/../../../../contrib/bsnmp MOD= mta - SRCS= mta_snmp.c - -WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr CFLAGS+= -DNDEBUG +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd XSYM= mta - DEFS= ${MOD}_tree.def - - BMIBS= MTA-MIB.txt - -.include +.include From owner-p4-projects@FreeBSD.ORG Mon Nov 14 12:37:47 2005 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 7835816A421; Mon, 14 Nov 2005 12:37:46 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3392416A41F for ; Mon, 14 Nov 2005 12:37:46 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D67243D46 for ; Mon, 14 Nov 2005 12:37:45 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAECbj4c049266 for ; Mon, 14 Nov 2005 12:37:45 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAECbjAd049263 for perforce@freebsd.org; Mon, 14 Nov 2005 12:37:45 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 14 Nov 2005 12:37:45 GMT Message-Id: <200511141237.jAECbjAd049263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 86749 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, 14 Nov 2005 12:37:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=86749 Change 86749 by soc-bushman@soc-bushman_stinger on 2005/11/14 12:37:33 comments were added for almost all files Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#3 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#10 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#5 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#3 (text+ko) ==== @@ -28,6 +28,13 @@ #ifndef __CACHED_AGENT_H__ #define __CACHED_AGENT_H__ +/* + * Agents are used to perform the actual lookups from the caching daemon. + * There are two types of daemons: for common requests and for multipart + * requests. + * All agents are stored in the agents table, which is the singleton. + */ + enum agent_type { COMMON_AGENT = 0, MULTIPART_AGENT = 1 ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#3 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#10 (text+ko) ==== @@ -91,6 +91,11 @@ void get_time_func(struct timeval *); +/* + * We use our own routines to get the time (in seconds) that has elapsed + * since the daemon startup. This approach should probably be changed in + * future. + */ static void * get_time_thread(void *args) { @@ -181,8 +186,8 @@ for (i = 0; i < size; ++i) { config_entry = configuration_get_entry(config, i); /* - * we should register common entries now - multipart entries - * would be registered automatically during the queries + * We should register common entries now - multipart entries + * would be registered automatically during the queries. */ res = register_cache_entry(retval, (struct cache_entry_params *) &config_entry->positive_cache_params); @@ -203,6 +208,10 @@ TRACE_OUT(destroy_cache_); } +/* + * Socket and kqueues are prepared here. We have one global queue for both + * socket and timers events. + */ static struct runtime_env * init_runtime_env(struct configuration *config) { @@ -360,6 +369,14 @@ } qstate = (struct query_state *)event_data->udata; + /* + * If the buffer that is to be send/received is too large, + * we send it implicitly, by using query_io_buffer_read and + * query_io_buffer_write functions in the query_state. These functions + * use the temporary buffer, which is later send/received in parts. + * The code below implements buffer splitting/mergind for send/receive + * operations. It also does the actual socket IO operations. + */ if (((qstate->use_alternate_io == 0) && (qstate->kevent_watermark <= event_data->data)) || ((qstate->use_alternate_io != 0) && @@ -425,6 +442,7 @@ return; } + /* updating the query_state lifetime variable */ get_time_func(&query_timeout); query_timeout.tv_usec = 0; query_timeout.tv_sec -= qstate->creation_time.tv_sec; @@ -439,6 +457,15 @@ qstate->use_alternate_io = 0; if (qstate->use_alternate_io == 0) { + /* + * If we must send/receive the large block of data, + * we should prepare the query_state's io_XXX fields. + * We should also substitute its write_func and read_func + * with the query_io_buffer_write and query_io_buffer_read, + * which will allow us to implicitly send/receive this large + * buffer later (in the subsequent calls to the + * process_socket_event). + */ if (qstate->kevent_watermark > MAX_SOCKET_IO_SIZE) { if (qstate->io_buffer != NULL) free(qstate->io_buffer); @@ -492,6 +519,10 @@ TRACE_OUT(process_socket_event); } +/* + * This routine is called if timer event has been signaled in the kqueue. It + * just closes the socket and destroys the query_state. + */ static void process_timer_event(struct kevent *event_data, struct runtime_env *env, struct configuration *config) @@ -507,6 +538,10 @@ TRACE_OUT(process_timer_event); } +/* + * Processing loop is the basic processing routine, that forms a body of each + * procssing thread + */ static void processing_loop(cache the_cache, struct runtime_env *env, struct configuration *config) @@ -524,10 +559,13 @@ nevents = kevent(env->queue, NULL, 0, eventlist, eventlist_size, NULL); + /* + * we can only receive 1 event on success + */ if (nevents == 1) { struct kevent *event_data; event_data = &eventlist[0]; - + if (event_data->ident == env->sockfd) accept_connection(event_data, env, config); else { @@ -553,6 +591,10 @@ TRACE_MSG("<= processing_loop"); } +/* + * Wrapper above the processing loop function. It sets the thread signal mask + * to avoid SIGPIPE signals (which can happen if the client works incorrectly). + */ static void * processing_thread(void *data) { @@ -584,6 +626,14 @@ pthread_rwlock_unlock(&s_time_lock); } +/* + * The idea of _nss_cache_cycle_prevention_function is that nsdispatch will + * search for this symbol in the executable. This symbol is the attribute of + * the caching daemon. So, if it exists, nsdispatch won't try to connect to + * the caching daemon and will just ignore the 'cache' source in the + * nsswitch.conf. This method helps to avoid cycles and organize + * self-performing requests. + */ void _nss_cache_cycle_prevention_function(void) { ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#10 (text+ko) ==== @@ -63,6 +63,9 @@ static int ht_items_cmp_func(const void *, const void *); static hashtable_index_t ht_item_hash_func(const void *, size_t); +/* + * Hashing and comparing routines, that are used with the hash tables + */ static int ht_items_cmp_func(const void *p1, const void *p2) { @@ -102,9 +105,13 @@ HASHTABLE_GENERATE(cache_ht_, cache_ht_item_, struct cache_ht_item_data_, data, ht_item_hash_func, ht_items_cmp_func); +/* + * Routines to sort and search the entries by name + */ static int entries_bsearch_cmp_func(const void *key, const void *ent) { + assert(key != NULL); assert(ent != NULL); @@ -115,6 +122,7 @@ static int entries_qsort_cmp_func(const void *e1, const void *e2) { + assert(e1 != NULL); assert(e2 != NULL); @@ -125,6 +133,7 @@ static struct cache_entry_ ** find_cache_entry_p(struct cache_ *the_cache, const char *entry_name) { + return ((struct cache_entry_ **)(bsearch(entry_name, the_cache->entries, the_cache->entries_size, sizeof(struct cache_entry_ *), entries_bsearch_cmp_func))); @@ -133,6 +142,7 @@ static void destroy_cache_mp_write_session(struct cache_mp_write_session_ *ws) { + struct cache_mp_data_item_ *data_item; TRACE_IN(destroy_cache_mp_write_session); @@ -151,6 +161,7 @@ static void destroy_cache_mp_read_session(struct cache_mp_read_session_ *rs) { + TRACE_IN(destroy_cache_mp_read_session); assert(rs != NULL); free(rs); @@ -184,6 +195,7 @@ HASHTABLE_DESTROY(&(common_entry->items), data); + /* FIFO policy is always first */ destroy_cache_fifo_policy(common_entry->policies[0]); switch (common_entry->common_params.policy) { case CPT_LRU: @@ -283,22 +295,35 @@ } } +/* + * When passed to the flush_cache_policy, ensures that all old elements are + * deleted. + */ static int cache_lifetime_common_continue_func(struct cache_common_entry_ *entry, struct cache_policy_item_ *item) { + return ((item->last_request_time.tv_sec - item->creation_time.tv_sec > - entry->common_params.max_lifetime.tv_sec) ? 1: 0); + entry->common_params.max_lifetime.tv_sec) ? 1: 0); } +/* + * When passed to the flush_cache_policy, ensures that all elements, that + * exceed the size limit, are deleted. + */ static int cache_elemsize_common_continue_func(struct cache_common_entry_ *entry, struct cache_policy_item_ *item) { + return ((entry->items_size > entry->common_params.satisf_elemsize) ? 1 : 0); } +/* + * Removes the elements from the cache entry, while the continue_func returns 1. + */ static void flush_cache_policy(struct cache_common_entry_ *entry, struct cache_policy_ *policy, @@ -402,7 +427,6 @@ } } } -/* static stuff implementation - end */ struct cache_ * init_cache(struct cache_params const *params) @@ -435,6 +459,7 @@ void destroy_cache(struct cache_ *the_cache) { + TRACE_IN(destroy_cache); assert(the_cache != NULL); @@ -628,6 +653,14 @@ } } +/* + * Tries to read the element with the specified key from the cache. If the + * value_size is too small, it will be filled with the proper number, and + * the user will need to call cache_read again with the value buffer, that + * is large enough. + * Function returns 0 on success, -1 on error, and -2 if the value_size is too + * small. + */ int cache_read(struct cache_entry_ *entry, const char *key, size_t key_size, char *value, size_t *value_size) @@ -725,6 +758,10 @@ return (0); } +/* + * Writes the value with the specified key into the cache entry. + * Functions returns 0 on success, and -1 on error. + */ int cache_write(struct cache_entry_ *entry, const char *key, size_t key_size, char const *value, size_t value_size) @@ -820,6 +857,14 @@ return (0); } +/* + * Initializes the write session for the specified multipart entry. This + * session then should be filled with data either committed or abandoned by + * using close_cache_mp_write_session or abandon_cache_mp_write_session + * respectively. + * Returns NULL on errors (when there are too many opened write sessions for + * the entry). + */ struct cache_mp_write_session_ * open_cache_mp_write_session(struct cache_entry_ *entry) { @@ -852,6 +897,10 @@ return (retval); } +/* + * Writes data to the specified session. Return 0 on success and -1 on errors + * (when write session size limit is exceeded). + */ int cache_mp_write(struct cache_mp_write_session_ *ws, char *data, size_t data_size) @@ -886,9 +935,13 @@ return (0); } +/* + * Abandons the write session and frees all the connected resources. + */ void abandon_cache_mp_write_session(struct cache_mp_write_session_ *ws) { + TRACE_IN(abandon_cache_mp_write_session); assert(ws != NULL); assert(ws->parent_entry != NULL); @@ -901,9 +954,13 @@ TRACE_OUT(abandon_cache_mp_write_session); } +/* + * Commits the session to the entry, for which it was created. + */ void close_cache_mp_write_session(struct cache_mp_write_session_ *ws) { + TRACE_IN(close_cache_mp_write_session); assert(ws != NULL); assert(ws->parent_entry != NULL); @@ -913,10 +970,18 @@ --ws->parent_entry->ws_size; if (ws->parent_entry->completed_write_session == NULL) { + /* + * If there is no completed session yet, this will be the one + */ ws->parent_entry->get_time_func( &ws->parent_entry->creation_time); ws->parent_entry->completed_write_session = ws; } else { + /* + * If there is a completed session, then we'll save our session + * as a pending session. If there is already a pending session, + * it would be destroyed. + */ if (ws->parent_entry->pending_write_session != NULL) destroy_cache_mp_write_session( ws->parent_entry->pending_write_session); @@ -926,6 +991,10 @@ TRACE_OUT(close_cache_mp_write_session); } +/* + * Opens read session for the specified entry. Returns NULL on errors (when + * there are no data in the entry, or the data are obsolete). + */ struct cache_mp_read_session_ * open_cache_mp_read_session(struct cache_entry_ *entry) { @@ -970,9 +1039,16 @@ return (retval); } +/* + * Reads the data from the read session - step by step. + * Returns 0 on success, -1 on error (when there are no more data), and -2 if + * the data_size is too small. In the last case, data_size would be filled + * the proper value. + */ int cache_mp_read(struct cache_mp_read_session_ *rs, char *data, size_t *data_size) { + TRACE_IN(cache_mp_read); assert(rs != NULL); @@ -1000,9 +1076,15 @@ return (0); } +/* + * Closes the read session. If there are no more read sessions and there is + * a pending write session, it will be committed and old + * completed_write_session will be destroyed. + */ void close_cache_mp_read_session(struct cache_mp_read_session_ *rs) { + TRACE_IN(close_cache_mp_read_session); assert(rs != NULL); assert(rs->parent_entry != NULL); @@ -1023,6 +1105,9 @@ TRACE_OUT(close_cache_mp_read_session); } +/* + * Transforms all cache entries, by applying the specified transformation. + */ int transform_cache(struct cache_ *the_cache, enum cache_transformation_t transformation) @@ -1049,6 +1134,7 @@ transform_cache_entry(struct cache_entry_ *entry, enum cache_transformation_t transformation) { + switch (transformation) { case CTT_CLEAR: clear_cache_entry(entry); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#10 (text+ko) ==== @@ -76,7 +76,7 @@ char *entry_name; }; -/* params, used for most entrues */ +/* params, used for most entries */ struct common_cache_entry_params { /* inherited fields */ @@ -87,7 +87,9 @@ size_t cache_entries_size; size_t max_elemsize; /* if 0 then no check is made */ - size_t satisf_elemsize; + size_t satisf_elemsize; /* if entry size is exceeded, + * this number of elements will be left, + * others will be deleted */ struct timeval max_lifetime; /* if 0 then no check is made */ enum cache_policy_t policy; /* policy used for transformations */ }; @@ -139,6 +141,12 @@ HASHTABLE_HEAD(cache_ht_, cache_ht_item_) items; size_t items_size; + /* + * Entry always has the FIFO policy, that is used to eliminate old + * elements (the ones, with lifetime more than max_lifetime). Besides, + * user can specify another policy to be applied, when there are too + * many elements in the entry. So policies_size can be 1 or 2. + */ struct cache_policy_ ** policies; size_t policies_size; @@ -156,6 +164,10 @@ { struct cache_mp_entry_ *parent_entry; + /* + * All items are accumulated in this queue. When the session is + * committed, they all will be copied to the multipart entry. + */ TAILQ_HEAD(cache_mp_data_item_head, cache_mp_data_item_) items; size_t items_size; @@ -177,12 +189,23 @@ struct mp_cache_entry_params mp_params; + /* All opened write sessions */ TAILQ_HEAD(write_sessions_head, cache_mp_write_session_) ws_head; size_t ws_size; + /* All opened read sessions */ TAILQ_HEAD(read_sessions_head, cache_mp_read_session_) rs_head; size_t rs_size; + /* + * completed_write_session is the committed write sessions. All read + * sessions use data from it. If the completed_write_session is out of + * date, but still in use by some of the read sessions, the newly + * committed write session is stored in the pending_write_session. + * In such a case, completed_write_session will be substituted with + * pending_write_session as soon as it won't be used by any of + * the read sessions. + */ struct cache_mp_write_session_ *completed_write_session; struct cache_mp_write_session_ *pending_write_session; struct timeval creation_time; @@ -211,6 +234,11 @@ #define INVALID_CACHE_MP_WRITE_SESSION (NULL) #define INVALID_CACHE_MP_READ_SESSION (NULL) +/* + * NOTE: all cache operations are thread-unsafe. You must ensure thread-safety + * externally, by yourself. + */ + /* cache initialization/destruction routines */ extern cache init_cache(struct cache_params const *); extern void destroy_cache(cache); @@ -234,10 +262,7 @@ extern int cache_mp_read(cache_mp_read_session, char *, size_t *); extern void close_cache_mp_read_session(cache_mp_read_session); -/* - * transforms the specified cache entry, or all entries if - * the entry_name is NULL - */ +/* transformation routines */ extern int transform_cache(cache, enum cache_transformation_t); extern int transform_cache_entry(cache_entry, enum cache_transformation_t); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#10 (text+ko) ==== @@ -67,7 +67,12 @@ static void destroy_cache_queue_policy(struct cache_queue_policy_ *); static struct cache_queue_policy_ *init_cache_queue_policy(void); -/* queue common policy implementation */ +/* + * All cache_queue_policy_XXX functions below will be used to fill + * the cache_queue_policy structure. They implement the most functionality of + * LRU and FIFO policies. LRU and FIFO policies are actually the + * cache_queue_policy_ with cache_update_item function changed. + */ static struct cache_policy_item_ * cache_queue_policy_create_item() { @@ -175,6 +180,10 @@ cache_queue_policy_head_, entries)); } +/* + * Initializes cache_queue_policy_ by filling the structure with the functions + * pointers, defined above + */ static struct cache_queue_policy_ * init_cache_queue_policy(void) { @@ -222,7 +231,11 @@ TRACE_OUT(destroy_cache_queue_policy); } -/* fifo policy specific part */ +/* + * Makes cache_queue_policy_ behave like FIFO policy - we don't do anything, + * when the cache element is updated. So it always stays in its initial + * position in the queue - that is exactly the FIFO functionality. + */ static void cache_fifo_policy_update_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) @@ -257,7 +270,11 @@ TRACE_OUT(destroy_cache_fifo_policy); } -/* lru policy specific part */ +/* + * Makes cache_queue_policy_ behave like LRU policy. On each update, cache + * element is moved to the end of the queue - so it would be deleted in last + * turn. That is exactly the LRU policy functionality. + */ static void cache_lru_policy_update_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) @@ -298,7 +315,16 @@ TRACE_OUT(destroy_cache_lru_policy); } -/* lfu policy implementation */ +/* + * LFU (least frequently used) policy implementation differs much from the + * LRU and FIFO (both based on cache_queue_policy_). Almost all cache_policy_ + * functions are implemented specifically for this policy. The idea of this + * policy is to represent frequency (real number) as the integer number and + * use it as the index in the array. Each array's element is + * the list of elements. For example, if we have the 100-elements + * array for this policy, the elements with frequency 0.1 (calls per-second) + * would be in 10th element of the array. + */ static struct cache_policy_item_ * cache_lfu_policy_create_item(void) { @@ -317,12 +343,17 @@ static void cache_lfu_policy_destroy_item(struct cache_policy_item_ *item) { + TRACE_IN(cache_lfu_policy_destroy_item); assert(item != NULL); free(item); TRACE_OUT(cache_lfu_policy_destroy_item); } +/* + * When placed in the LFU policy queue for the first time, the maximum + * frequency is assigned to the element + */ static void cache_lfu_policy_add_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) @@ -340,6 +371,10 @@ TRACE_OUT(cache_lfu_policy_add_item); } +/* + * On each update the frequency of the element is recalculated and, if it + * changed, the element would be moved to the another place in the array. + */ static void cache_lfu_policy_update_item(struct cache_policy_ *policy, struct cache_policy_item_ *item) @@ -352,12 +387,21 @@ lfu_policy = (struct cache_lfu_policy_ *)policy; lfu_item = (struct cache_lfu_policy_item_ *)item; + /* + * We calculate the square of the request_count to avoid grouping of + * all elements at the start of the array (for example, if array size is + * 100 and most of its elements has frequency below the 0.01, they + * all would be grouped in the first array's position). Other + * techniques should be used here later to ensure, that elements are + * equally distributed in the array and not grouped in its beginning. + */ if (lfu_item->parent_data.last_request_time.tv_sec != lfu_item->parent_data.creation_time.tv_sec) { - index = ((double)lfu_item->parent_data.request_count / + index = ((double)lfu_item->parent_data.request_count * + (double)lfu_item->parent_data.request_count / (lfu_item->parent_data.last_request_time.tv_sec - - lfu_item->parent_data.creation_time.tv_sec)) * - CACHELIB_MAX_FREQUENCY; + lfu_item->parent_data.creation_time.tv_sec + 1)) * + CACHELIB_MAX_FREQUENCY; if (index >= CACHELIB_MAX_FREQUENCY) index = CACHELIB_MAX_FREQUENCY - 1; } else @@ -481,6 +525,10 @@ return ((struct cache_policy_item_ *)lfu_item); } +/* + * Initializes the cache_policy_ structure by filling it with appropriate + * functions pointers + */ struct cache_policy_ * init_cache_lfu_policy() { ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#10 (text+ko) ==== @@ -35,6 +35,11 @@ /* common policy definitions */ #define CACHELIB_MAX_FREQUENCY 100 +/* + * cache_policy_item_ represents some abstract cache element in the policy + * queue. connected_item pointers to the corresponding cache_policy_item_ in + * another policy queue. + */ struct cache_policy_item_ { char *key; @@ -47,6 +52,10 @@ struct cache_policy_item_ *connected_item; }; +/* + * cache_policy_ represents an abstract policy queue. It can be customized by + * setting appropriate function pointers + */ struct cache_policy_ { struct cache_policy_item_* (*create_item_func)(); @@ -69,6 +78,9 @@ struct cache_policy_ *, struct cache_policy_item_ *); }; +/* + * LFU cache policy item "inherited" from cache_policy_item_ structure + */ struct cache_lfu_policy_item_ { struct cache_policy_item_ parent_data; @@ -79,18 +91,27 @@ TAILQ_HEAD(cache_lfu_policy_group_, cache_lfu_policy_item_); +/* + * LFU policy queue "inherited" from cache_policy_. + */ struct cache_lfu_policy_ { struct cache_policy_ parent_data; struct cache_lfu_policy_group_ groups[CACHELIB_MAX_FREQUENCY]; }; +/* + * LRU and FIFO policies item "inherited" from cache_policy_item_ + */ struct cache_queue_policy_item_ { struct cache_policy_item_ parent_data; TAILQ_ENTRY(cache_queue_policy_item_) entries; }; +/* + * LRU and FIFO policies "inherited" from cache_policy_ + */ struct cache_queue_policy_ { struct cache_policy_ parent_data; ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#10 (text+ko) ==== @@ -34,10 +34,9 @@ #include "debug.h" #include "log.h" -#define INITIAL_ENTRIES_CAPACITY 8 -#define DEFAULT_SOCKET_PATH "/var/run/cached" -#define DEFAULT_PIDFILE_PATH "/var/run/cached.pid" - +/* + * Default entries, which always exist in the configuration + */ const char *c_default_entries[6] = { NSDB_PASSWD, NSDB_GROUP, @@ -169,6 +168,9 @@ return (retval); } +/* + * Creates configuration entry and fills it with default values + */ struct configuration_entry * create_def_configuration_entry(const char *name) { @@ -183,16 +185,16 @@ sizeof(struct common_cache_entry_params)); positive_params.entry_type = CET_COMMON; positive_params.cache_entries_size = DEFAULT_CACHE_HT_SIZE; - positive_params.max_elemsize = 2048; - positive_params.satisf_elemsize = 1024; - positive_params.max_lifetime.tv_sec = 60 * 60 * 12; + positive_params.max_elemsize = DEFAULT_POSITIVE_ELEMENTS_SIZE; + positive_params.satisf_elemsize = DEFAULT_POSITIVE_ELEMENTS_SIZE / 2; + positive_params.max_lifetime.tv_sec = DEFAULT_POSITIVE_LIFETIME; positive_params.policy = CPT_LRU; memcpy(&negative_params, &positive_params, sizeof(struct common_cache_entry_params)); - negative_params.max_elemsize = 512; - negative_params.satisf_elemsize = 256; - negative_params.max_lifetime.tv_sec = 60 * 60; + negative_params.max_elemsize = DEFAULT_NEGATIVE_ELEMENTS_SIZE; + negative_params.satisf_elemsize = DEFAULT_NEGATIVE_ELEMENTS_SIZE / 2; + negative_params.max_lifetime.tv_sec = DEFAULT_NEGATIVE_LIFETIME; negative_params.policy = CPT_FIFO; memset(&default_common_timeout, 0, sizeof(struct timeval)); @@ -204,9 +206,9 @@ memset(&mp_params, 0, sizeof(struct mp_cache_entry_params)); mp_params.entry_type = CET_MULTIPART; - mp_params.max_elemsize = 1024 * 8; - mp_params.max_sessions = 1024; - mp_params.max_lifetime.tv_sec = 60 * 60 * 12; + mp_params.max_elemsize = DEFAULT_MULTIPART_ELEMENTS_SIZE; + mp_params.max_sessions = DEFAULT_MULITPART_SESSIONS_SIZE; + mp_params.max_lifetime.tv_sec = DEFAULT_MULITPART_LIFETIME; res = create_configuration_entry(name, &default_common_timeout, &default_mp_timeout, &positive_params, &negative_params, @@ -306,6 +308,9 @@ return ((retval != NULL) ? *retval : NULL); } +/* + * Configuration entry uses rwlock to handle access to its fields. + */ void configuration_lock_rdlock(struct configuration *config) { @@ -330,6 +335,11 @@ TRACE_OUT(configuration_unlock); } +/* + * Configuration entry uses 3 mutexes to handle cache operations. They are + * acquired by configuration_lock_entry and configuration_unlock_entry + * functions. + */ void configuration_lock_entry(struct configuration_entry *entry, enum config_entry_lock_type lock_type) @@ -425,12 +435,12 @@ memset(config->pidfile_path, 0, len + 1); memcpy(config->pidfile_path, DEFAULT_PIDFILE_PATH, len); - config->socket_mode = S_IFSOCK | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | - S_IROTH | S_IWOTH; + config->socket_mode = S_IFSOCK | S_IRUSR | S_IWUSR | + S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; config->force_unlink = 1; - config->query_timeout = 8; - config->threads_num = 8; + config->query_timeout = DEFAULT_QUERY_TIMEOUT; + config->threads_num = DEFAULT_THREADS_NUM; for (i = 0; i < config->entries_size; ++i) destroy_configuration_entry(config->entries[i]); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#10 (text+ko) ==== @@ -35,17 +35,46 @@ #include #include "cachelib.h" +#define DEFAULT_QUERY_TIMEOUT 8 +#define DEFAULT_THREADS_NUM 8 + #define DEFAULT_COMMON_ENTRY_TIMEOUT 10 #define DEFAULT_MP_ENTRY_TIMEOUT 60 #define DEFAULT_CACHE_HT_SIZE 257 +#define INITIAL_ENTRIES_CAPACITY 8 +#define DEFAULT_SOCKET_PATH "/var/run/cached" +#define DEFAULT_PIDFILE_PATH "/var/run/cached.pid" + +#define DEFAULT_POSITIVE_ELEMENTS_SIZE (2048) +#define DEFAULT_POSITIVE_LIFETIME (60 * 60 * 12) + +#define DEFAULT_NEGATIVE_ELEMENTS_SIZE (512) +#define DEFAULT_NEGATIVE_LIFETIME (60 * 60) + +#define DEFAULT_MULTIPART_ELEMENTS_SIZE (1024 * 8) +#define DEFAULT_MULITPART_SESSIONS_SIZE (1024) +#define DEFAULT_MULITPART_LIFETIME (60 * 60 * 12) + extern const char *c_default_entries[6]; +/* + * Configuration entry represents the details of each cache entry in the + * config file (i.e. passwd or group). Its purpose also is to acquire locks + * of three different types (for usual read/write caching, for multipart + * caching and for caching of the negative results) for that cache entry. + */ struct configuration_entry { struct common_cache_entry_params positive_cache_params; struct common_cache_entry_params negative_cache_params; struct mp_cache_entry_params mp_cache_params; - + + /* + * configuration_entry holds pointers for all actual cache_entries, + * which are used for it. There is one for positive caching, one for + * for negative caching, and several (one per each euid/egid) for + * multipart caching. + */ cache_entry positive_cache_entry; cache_entry negative_cache_entry; @@ -64,7 +93,9 @@ int enabled; }; -/* the cached configuration parameters */ +/* + * Contains global configuration options and array of all configuration entries + */ struct configuration { char *pidfile_path; char *socket_path; ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#10 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#10 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 14 23:35:24 2005 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 078FF16A42B; Mon, 14 Nov 2005 23:35:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 765E116A452 for ; Mon, 14 Nov 2005 23:35:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B31E43D45 for ; Mon, 14 Nov 2005 23:35:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAENZBAN061406 for ; Mon, 14 Nov 2005 23:35:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAENZ9uM061403 for perforce@freebsd.org; Mon, 14 Nov 2005 23:35:09 GMT (envelope-from peter@freebsd.org) Date: Mon, 14 Nov 2005 23:35:09 GMT Message-Id: <200511142335.jAENZ9uM061403@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 86773 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, 14 Nov 2005 23:35:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=86773 Change 86773 by peter@peter_daintree on 2005/11/14 23:34:56 IFC @86771 Affected files ... .. //depot/projects/hammer/Makefile.inc1#107 integrate .. //depot/projects/hammer/bin/ls/ls.1#23 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/hammer/etc/bluetooth/hosts#2 integrate .. //depot/projects/hammer/etc/bluetooth/protocols#2 integrate .. //depot/projects/hammer/etc/defaults/Makefile#5 integrate .. //depot/projects/hammer/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/hammer/etc/devd.conf#23 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#37 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#42 integrate .. //depot/projects/hammer/etc/rc.d/bluetooth#1 branch .. //depot/projects/hammer/etc/rc.d/pf#11 integrate .. //depot/projects/hammer/games/morse/Makefile#2 integrate .. //depot/projects/hammer/games/morse/morse.c#7 integrate .. //depot/projects/hammer/include/Makefile#49 integrate .. //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#29 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#6 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#17 integrate .. //depot/projects/hammer/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/hammer/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/hammer/lib/libc/sys/wait.2#6 integrate .. //depot/projects/hammer/lib/libform/Makefile#3 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#7 integrate .. //depot/projects/hammer/lib/libmemstat/Makefile#3 integrate .. //depot/projects/hammer/lib/libmenu/Makefile#3 integrate .. //depot/projects/hammer/lib/libmp/Makefile#6 integrate .. //depot/projects/hammer/lib/libncp/Makefile#6 integrate .. //depot/projects/hammer/lib/libpanel/Makefile#3 integrate .. //depot/projects/hammer/lib/libradius/Makefile#10 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#8 integrate .. //depot/projects/hammer/lib/msun/src/e_coshf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_logf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_sinhf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#5 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/k_tanf.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#31 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#17 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#5 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#9 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#21 integrate .. //depot/projects/hammer/sbin/mount/Makefile#6 integrate .. //depot/projects/hammer/sbin/mount/extern.h#3 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#7 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#9 integrate .. //depot/projects/hammer/sbin/mount/mount.c#19 integrate .. //depot/projects/hammer/sbin/mount/mount_fs.c#1 branch .. //depot/projects/hammer/sbin/mount/mount_ufs.c#6 integrate .. //depot/projects/hammer/sbin/mount_cd9660/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#11 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#10 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/mount_reiserfs.c#4 integrate .. //depot/projects/hammer/share/man/man4/Makefile#78 integrate .. //depot/projects/hammer/share/man/man4/ciss.4#10 integrate .. //depot/projects/hammer/share/man/man4/de.4#10 integrate .. //depot/projects/hammer/share/man/man4/joy.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#32 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/linux.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/spkr.4#5 delete .. //depot/projects/hammer/share/man/man4/snd_ich.4#6 integrate .. //depot/projects/hammer/share/man/man4/spkr.4#1 branch .. //depot/projects/hammer/share/man/man5/rc.conf.5#64 integrate .. //depot/projects/hammer/share/man/man7/Makefile#7 integrate .. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#1 branch .. //depot/projects/hammer/share/man/man8/rescue.8#2 integrate .. //depot/projects/hammer/share/mk/Makefile#7 integrate .. //depot/projects/hammer/share/mk/bsd.README#8 integrate .. //depot/projects/hammer/share/mk/bsd.snmpmod.mk#1 branch .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#129 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#87 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#27 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#37 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#38 integrate .. //depot/projects/hammer/sys/conf/files.amd64#79 integrate .. //depot/projects/hammer/sys/conf/files.i386#66 integrate .. //depot/projects/hammer/sys/conf/files.pc98#49 integrate .. //depot/projects/hammer/sys/conf/options.pc98#37 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#15 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#35 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#28 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#38 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#22 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#55 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#12 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.h#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.h#5 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#36 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#36 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#52 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#26 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#25 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#19 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#23 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#54 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#22 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#25 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#17 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#15 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#29 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#23 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#10 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#22 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#36 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/hammer/sys/dev/owi/if_owi.c#12 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fea.c#7 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#9 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#8 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#11 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#10 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#22 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#36 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#17 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#23 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#14 integrate .. //depot/projects/hammer/sys/dev/speaker/speaker.h#1 branch .. //depot/projects/hammer/sys/dev/speaker/spkr.c#1 branch .. //depot/projects/hammer/sys/dev/tx/if_tx.c#24 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#15 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#14 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#22 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#45 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#20 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#23 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#80 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#76 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#51 integrate .. //depot/projects/hammer/sys/i386/include/speaker.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/spkr.c#12 delete .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#25 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#50 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#34 integrate .. //depot/projects/hammer/sys/kern/init_main.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#65 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#33 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#60 integrate .. //depot/projects/hammer/sys/modules/Makefile#91 integrate .. //depot/projects/hammer/sys/modules/md/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/speaker/Makefile#2 integrate .. //depot/projects/hammer/sys/net/fddi.h#4 integrate .. //depot/projects/hammer/sys/net/if.c#58 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#18 integrate .. //depot/projects/hammer/sys/net/if_arp.h#8 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#17 integrate .. //depot/projects/hammer/sys/net/if_disc.c#19 integrate .. //depot/projects/hammer/sys/net/if_ef.c#15 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#50 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#19 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#13 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#17 integrate .. //depot/projects/hammer/sys/net/if_mib.c#6 integrate .. //depot/projects/hammer/sys/net/if_tap.c#27 integrate .. //depot/projects/hammer/sys/net/if_var.h#37 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#33 integrate .. //depot/projects/hammer/sys/net/iso88025.h#6 integrate .. //depot/projects/hammer/sys/net/route.c#22 integrate .. //depot/projects/hammer/sys/net/rtsock.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#24 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#17 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#26 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#67 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#54 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#43 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#9 integrate .. //depot/projects/hammer/sys/pci/if_de.c#29 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#34 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#52 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#39 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#45 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#45 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#43 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#37 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#28 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#40 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#34 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#61 integrate .. //depot/projects/hammer/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofw_machdep.c#9 integrate .. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#11 integrate .. //depot/projects/hammer/sys/sys/ata.h#13 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#7 integrate .. //depot/projects/hammer/sys/sys/mdioctl.h#11 integrate .. //depot/projects/hammer/sys/sys/param.h#69 integrate .. //depot/projects/hammer/sys/sys/proc.h#91 integrate .. //depot/projects/hammer/sys/sys/signal.h#13 integrate .. //depot/projects/hammer/sys/sys/wait.h#5 integrate .. //depot/projects/hammer/tools/regression/geom_gpt/gctl.t#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/default.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/head.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#16 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#26 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#10 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#20 integrate .. //depot/projects/hammer/usr.bin/col/col.c#4 integrate .. //depot/projects/hammer/usr.bin/indent/indent.c#7 integrate .. //depot/projects/hammer/usr.bin/indent/indent_globs.h#6 integrate .. //depot/projects/hammer/usr.bin/indent/io.c#5 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#9 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#12 integrate .. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#19 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#11 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#13 integrate .. //depot/projects/hammer/usr.bin/rlogin/rlogin.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_clntout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_cout.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_hout.c#5 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_main.c#10 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_parse.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_parse.h#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_sample.c#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_scan.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_scan.h#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_svcout.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_tblout.c#7 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.h#5 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.4#7 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#6 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#3 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#11 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#107 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.515 2005/11/07 15:03:04 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.518 2005/11/12 19:31:30 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -496,6 +496,7 @@ # Require DESTDIR to be set if installing for a different architecture. # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} +.if !make(distributeworld) SPECIAL_INSTALLCHECKS+= installcheck_DESTDIR installcheck_DESTDIR: .if !defined(DESTDIR) || empty(DESTDIR) @@ -503,6 +504,7 @@ false .endif .endif +.endif # # installcheck @@ -989,8 +991,8 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libipx lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ @@ -1003,8 +1005,7 @@ .if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl -lib/libradius__L: secure/lib/libssl__L -secure/lib/libssl__L: secure/lib/libcrypto__L +lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L @@ -1107,15 +1108,14 @@ && rm ${RM_I} "${DESTDIR}/${file}")) .endfor # Remove catpages without corresponding manpages. - @for dir in ${DESTDIR}/usr/share/man/cat*; do \ - for catpage in $${dir}/*; do \ - manpage=$$(echo $${catpage} \ - | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:') \ - check_empty=$$(echo $${catpage} \ - | sed 's:.*\*:empty:'); \ - [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \ - && rm ${RM_I} $${catpage} || true; \ - done; \ + @3<&0; \ + find ${DESTDIR}/usr/share/man/cat* ! -type d | \ + sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ + while read catpage; do \ + read manpage; \ + if [ ! -e "$${manpage}" ]; then \ + rm ${RM_I} $${catpage} <&3 ; \ + fi; \ done @echo ">>> Old files removed" @@ -1125,15 +1125,13 @@ @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" .endfor # Check for catpages without corresponding manpages. - @for dir in ${DESTDIR}/usr/share/man/cat*; do \ - for catpage in $${dir}/*; do \ - manpage=$$(echo $${catpage} \ - | sed 's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:'); \ - check_empty=$$(echo $${catpage} \ - | sed 's:.*\*:empty:'); \ - [ "$${check_empty}" != "empty" -a ! -e "$${manpage}" ] \ - && echo $${catpage} || true; \ - done; \ + @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ + sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ + while read catpage; do \ + read manpage; \ + if [ ! -e "$${manpage}" ]; then \ + echo $${catpage} ; \ + fi; \ done delete-old-libs: ==== //depot/projects/hammer/bin/ls/ls.1#23 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.92 2005/11/10 00:02:32 mux Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.93 2005/11/10 14:26:50 mux Exp $ .\" -.Dd September 6, 2005 +.Dd November 10, 2005 .Dt LS 1 .Os .Sh NAME @@ -652,6 +652,7 @@ .Xr sticky 8 .Sh STANDARDS With the exception of options +.Fl I , .Fl g , .Fl n and ==== //depot/projects/hammer/contrib/tcpdump/print-tcp.c#5 (text+ko) ==== @@ -799,7 +799,7 @@ MD5_Update(&ctx, tcpmd5secret, strlen(tcpmd5secret)); MD5_Final(sig, &ctx); - if (memcmp(rcvsig, sig, 16)) + if (memcmp(rcvsig, sig, 16) == 0) return (SIGNATURE_VALID); else return (SIGNATURE_INVALID); ==== //depot/projects/hammer/etc/bluetooth/hosts#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $ -# $FreeBSD: src/etc/bluetooth/hosts,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/hosts,v 1.2 2005/11/10 19:09:22 emax Exp $ # # Bluetooth Host Database # @@ -7,5 +7,4 @@ # # BD_ADDR Name [ alias0 alias1 ... ] -ff:ff:ff:00:00:00 localhost local # Magic sdpd address - +# 00:11:22:33:44:55 phone ==== //depot/projects/hammer/etc/bluetooth/protocols#2 (text+ko) ==== @@ -1,9 +1,10 @@ # $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $ -# $FreeBSD: src/etc/bluetooth/protocols,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/etc/bluetooth/protocols,v 1.2 2005/11/10 19:09:22 emax Exp $ # # Bluetooth Protocol/Service Multiplexor (PSM) names and numbers # -# See also http://www.bluetoothsig.org/assigned-numbers/ +# See also +# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers # # Protocol PSM Alias Reference ==== //depot/projects/hammer/etc/defaults/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.5 2004/12/21 08:46:49 ru Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.6 2005/11/10 19:09:22 emax Exp $ -FILES= devfs.rules pccard.conf periodic.conf rc.conf +FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults FILESMODE= 444 ==== //depot/projects/hammer/etc/devd.conf#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.28 2005/08/02 18:28:31 sam Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.29 2005/11/12 03:42:56 emax Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -86,6 +86,16 @@ device-name "ed50"; }; +# When a USB Bluetooth dongle appears activate it +attach 100 { + device-name "ubt[0-9]+"; + action "/etc/rc.d/bluetooth start $device-name"; +}; +detach 100 { + device-name "ubt[0-9]+"; + action "/etc/rc.d/bluetooth stop $device-name"; +}; + # When a USB keyboard arrives, attach it as the console keyboard. attach 100 { device-name "ukbd0"; ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.103 2005/11/08 09:53:28 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.104 2005/11/11 17:38:10 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -58,6 +58,8 @@ .. smbus .. + speaker + .. usb .. utopia ==== //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.27 2005/06/15 02:27:41 lesi Exp $ +# $FreeBSD: src/etc/mtree/BSD.x11-4.dist,v 1.28 2005/11/11 21:05:40 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -478,7 +478,7 @@ .. .. .. - pixmaps - .. + pixmaps + .. .. .. ==== //depot/projects/hammer/etc/rc.d/Makefile#42 (text+ko) ==== @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.59 2005/10/29 05:05:52 yar Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.60 2005/11/10 19:09:22 emax Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ apm apmd archdep atm1 atm2 atm3 \ - bgfsck bootparams bsnmpd \ + bgfsck bluetooth bootparams bsnmpd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ dmesg dumpon \ ==== //depot/projects/hammer/etc/rc.d/pf#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.11 2005/11/03 13:17:49 rse Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.12 2005/11/10 10:40:15 rse Exp $ # # PROVIDE: pf @@ -20,7 +20,7 @@ reload_cmd="pf_reload" resync_cmd="pf_resync" status_cmd="pf_status" -extra_commands="check reload resync" +extra_commands="check reload resync status" required_files="$pf_rules" pf_prestart() ==== //depot/projects/hammer/games/morse/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/morse/Makefile,v 1.7 2001/03/26 14:20:58 ru Exp $ +# $FreeBSD: src/games/morse/Makefile,v 1.8 2005/11/11 09:57:32 ru Exp $ PROG= morse MAN= morse.6 -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" CFLAGS += -DSPEAKER=\"/dev/speaker\" .endif ==== //depot/projects/hammer/games/morse/morse.c#7 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.20 2005/06/07 19:01:41 joerg Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $"; #endif /* not lint */ #include @@ -64,7 +64,7 @@ #include #ifdef SPEAKER -#include +#include #endif struct morsetab { ==== //depot/projects/hammer/include/Makefile#49 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.249 2005/10/03 07:09:40 scottl Exp $ +# $FreeBSD: src/include/Makefile,v 1.250 2005/11/11 16:48:01 delphij Exp $ # # Doing a "make install" builds /usr/include. @@ -36,7 +36,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio dev/ppbus dev/smbus dev/usb dev/wi dev/utopia \ + dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ ==== //depot/projects/hammer/kerberos5/tools/asn1_compile/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.5 2004/12/21 08:47:01 ru Exp $ +# $FreeBSD: src/kerberos5/tools/asn1_compile/Makefile,v 1.6 2005/11/10 21:03:58 ru Exp $ PROG= asn1_compile NO_MAN= @@ -31,13 +31,13 @@ print_version.h: ../make-print-version/make-print-version ../make-print-version/make-print-version ${.TARGET} -../make-print-version/make-print-version: +../make-print-version/make-print-version: .PHONY cd ${.CURDIR}/../make-print-version && ${MAKE} roken.h: ../make-roken/make-roken ../make-roken/make-roken > ${.TARGET} -../make-roken/make-roken: +../make-roken/make-roken: .PHONY cd ${.CURDIR}/../make-roken && ${MAKE} .include ==== //depot/projects/hammer/lib/libarchive/Makefile#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.41 2005/10/14 16:32:50 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.42 2005/11/10 18:07:05 ru Exp $ # This Makefile is for use with the FreeBSD buid system. For # non-FreeBSD systems, you should first "make distfile" on FreeBSD, @@ -6,6 +6,8 @@ # autoconf/automake-generated build system--on the other system. LIB= archive +DPADD= ${LIBBZ2} ${LIBZ} +LDADD= -lbz2 -lz # Versioning . There are three distinct sets of version # numbers: ==== //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11 2004/07/29 18:07:08 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.12 2005/11/12 16:00:29 deischen Exp $"); #include #include @@ -97,8 +97,8 @@ #define FUNC_EXP(name) __CONCAT(name, _exp) #define STUB_FUNC(name, idx, ret) \ - static ret FUNC_EXP(name)(void) __used; \ - static ret FUNC_INT(name)(void) __used; \ + static ret FUNC_EXP(name)(void) __used; \ + static ret FUNC_INT(name)(void) __used; \ WEAK_REF(FUNC_EXP(name), name); \ WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ typedef ret (*FUNC_TYPE(name))(void); \ @@ -176,7 +176,7 @@ STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *) STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *) STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) -STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *) +STUB_FUNC2(pthread_cond_wait, PJT_COND_WAIT, int, void *, void *) STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) ==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113 2005/07/07 18:17:55 jhb Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.115 2005/11/11 07:48:38 davidxu Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -77,10 +77,11 @@ rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \ setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \ setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \ - sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigreturn.2 \ - sigstack.2 sigsuspend.2 sigwait.2 \ + sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \ + sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \ socket.2 socketpair.2 stat.2 statfs.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ + timer_create.2 timer_delete.2 timer_settime.2 \ truncate.2 umask.2 undelete.2 \ unlink.2 utimes.2 utrace.2 uuidgen.2 vfork.2 wait.2 write.2 .if !defined(NO_P1003_1B) @@ -134,10 +135,12 @@ MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2 MLINKS+=shmat.2 shmdt.2 +MLINKS+=sigwaitinfo.2 sigtimedwait.2 MLINKS+=stat.2 fstat.2 stat.2 lstat.2 MLINKS+=statfs.2 fstatfs.2 MLINKS+=syscall.2 __syscall.2 MLINKS+=swapon.2 swapoff.2 +MLINKS+=timer_settime.2 timer_gettime.2 timer_settime.2 timer_getoverrun.2 MLINKS+=truncate.2 ftruncate.2 MLINKS+=utimes.2 futimes.2 utimes.2 lutimes.2 MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2 ==== //depot/projects/hammer/lib/libc/sys/sigwait.2#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sigwait.2,v 1.11 2004/07/03 23:14:34 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigwait.2,v 1.12 2005/11/11 05:40:39 davidxu Exp $ .\" .Dd April 27, 2000 .Dt SIGWAIT 2 @@ -58,6 +58,24 @@ .Fa set should be blocked at the time of the call to .Fn sigwait . +.Pp +If more than one thread is using +.Fn sigwait +to wait for the same signal, no more than one of these threads will return from +.Fn sigwait +with the signal number. If more than a single thread is blocked in +.Fn sigwait +for a signal when that signal is generated for the process, it is unspecified +which of the waiting threads returns from +.Fn sigwait . +If the signal is generated for a specific thread, as by +.Fn pthread_kill , +only that thread will return. +.Pp +Should any of the multiple pending signals in the range SIGRTMIN to SIGRTMAX be +selected, it will be the lowest numbered one. The selection order between realtime +and non-realtime signals, or between multiple pending non-realtime signals, +is unspecified. .Sh RETURN VALUES If successful, .Fn sigwait @@ -75,8 +93,14 @@ .Fa set argument specifies one or more invalid signal numbers. +.It Bq Er EFAULT +Any arguments point outside the allocated address space or there is a +memory protection fault. .El .Sh SEE ALSO +.Xr sigtimedwait 2 , +.Xr sigwaitinfo 2 , +.Xr sigqueue 2 , .Xr sigaction 2 , .Xr sigpending 2 , .Xr sigsuspend 2 , ==== //depot/projects/hammer/lib/libc/sys/wait.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)wait.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.20 2005/01/20 09:17:05 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.23 2005/11/12 01:37:03 davidxu Exp $ .\" .Dd April 19, 1994 .Dt WAIT 2 @@ -133,7 +133,7 @@ is non-zero, a summary of the resources used by the terminated process and all its children is returned (this information is currently not available -for stopped processes). +for stopped or continued processes). .Pp When the .Dv WNOHANG @@ -233,10 +233,23 @@ see .Xr intro 2 , System call restart. +.Pp +The implementation queues one SIGCHLD signal for each child process whose +status has changed, if +.Fn wait +returns because the status of a child process is available, the pending +SIGCHLD signal associated with the process ID of the child process will +be discarded. Any other pending SIGCHLD signals remain pending. +.Pp +If SIGCHLD is blocked, +.Fn wait +returns because the status of a child process is available, the pending +SIGCHLD signal will be cleared unless another status of the child process +is available. .Sh RETURN VALUES If .Fn wait -returns due to a stopped +returns due to a stopped, continued, or terminated child process, the process ID of the child is returned to the calling process. Otherwise, a value of -1 @@ -249,7 +262,7 @@ .Fn wait3 , or .Fn waitpid -returns due to a stopped +returns due to a stopped, continued, or terminated child process, the process ID of the child is returned to the calling process. If there are no children not previously awaited, @@ -260,7 +273,7 @@ Otherwise, if .Dv WNOHANG is specified and there are -no stopped or exited children, +no stopped, continued or exited children, 0 is returned. If an error is detected or a caught signal aborts the call, a value of -1 ==== //depot/projects/hammer/lib/libform/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libform -# $FreeBSD: src/lib/libform/Makefile,v 1.8 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libform/Makefile,v 1.9 2005/11/10 18:07:05 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -8,6 +8,9 @@ .PATH: ${NCURSES}/man LIB= form +DPADD= ${LIBNCURSES} +LDADD= -lncurses + AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libmagic/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.7 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.8 2005/11/10 18:07:05 ru Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -6,6 +6,8 @@ LIB= magic SHLIB_MAJOR= 1 +DPADD= ${LIBZ} +LDADD= -lz MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \ ==== //depot/projects/hammer/lib/libmemstat/Makefile#3 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/lib/libmemstat/Makefile,v 1.3 2005/07/24 01:41:47 rwatson Exp $ +# $FreeBSD: src/lib/libmemstat/Makefile,v 1.5 2005/11/13 13:42:03 rwatson Exp $ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 1 +DPADD= ${LIBKVM} +LDADD= -lkvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c @@ -21,5 +23,8 @@ MLINKS+= libmemstat.3 memstat_sysctl_all.3 MLINKS+= libmemstat.3 memstat_sysctl_malloc.3 MLINKS+= libmemstat.3 memstat_sysctl_uma.3 +MLINKS+= libmemstat.3 memstat_kvm_all.3 +MLINKS+= libmemstat.3 memstat_kvm_malloc.3 +MLINKS+= libmemstat.3 memstat_kvm_uma.3 .include ==== //depot/projects/hammer/lib/libmenu/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libmenu -# $FreeBSD: src/lib/libmenu/Makefile,v 1.10 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libmenu/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -7,6 +7,8 @@ .PATH: ${NCURSES}/man LIB= menu +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libmp/Makefile#6 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $ +# $FreeBSD: src/lib/libmp/Makefile,v 1.11 2005/11/10 18:07:06 ru Exp $ LIB= mp SHLIB_MAJOR= 4 +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c ==== //depot/projects/hammer/lib/libncp/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncp/Makefile,v 1.6 2005/07/22 17:19:02 kensmith Exp $ +# $FreeBSD: src/lib/libncp/Makefile,v 1.7 2005/11/10 18:07:06 ru Exp $ NCPLIB=${.CURDIR} @@ -6,6 +6,9 @@ SHLIB_MAJOR= 1 +DPADD= ${LIBIPX} +LDADD= -lipx + NO_MAN= SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ ==== //depot/projects/hammer/lib/libpanel/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libpanel -# $FreeBSD: src/lib/libpanel/Makefile,v 1.9 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/lib/libpanel/Makefile,v 1.10 2005/11/10 18:07:06 ru Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -7,6 +7,8 @@ .PATH: ${NCURSES}/man LIB= panel +DPADD= ${LIBNCURSES} +LDADD= -lncurses AWK?= awk SRCS= ncurses_def.h \ ==== //depot/projects/hammer/lib/libradius/Makefile#10 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libradius/Makefile,v 1.12 2005/07/22 17:19:03 kensmith Exp $ +# $FreeBSD: src/lib/libradius/Makefile,v 1.13 2005/11/10 18:07:06 ru Exp $ LIB= radius SRCS= radlib.c @@ -35,8 +35,8 @@ DPADD= ${LIBMD} LDADD= -lmd .else -DPADD= ${LIBSSL} -LDADD= -lssl +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto CFLAGS+= -DWITH_SSL .endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 14 23:40:20 2005 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 CF88F16A423; Mon, 14 Nov 2005 23:40:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A36E916A430 for ; Mon, 14 Nov 2005 23:40:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6261E43D45 for ; Mon, 14 Nov 2005 23:40:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAENeIHD061768 for ; Mon, 14 Nov 2005 23:40:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAENeH1G061765 for perforce@freebsd.org; Mon, 14 Nov 2005 23:40:17 GMT (envelope-from peter@freebsd.org) Date: Mon, 14 Nov 2005 23:40:17 GMT Message-Id: <200511142340.jAENeH1G061765@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 86775 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, 14 Nov 2005 23:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=86775 Change 86775 by peter@peter_daintree on 2005/11/14 23:39:17 integ -b i386_hammer, excluding XBOX Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#85 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#88 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#24 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#85 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#88 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1211) +# (XXX from i386:NOTES,v 1.1212) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.48 2005/11/11 09:57:29 ru Exp $ # ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#24 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 15 01:00:57 2005 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 3DE2516A421; Tue, 15 Nov 2005 01:00:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 128A516A41F for ; Tue, 15 Nov 2005 01:00:57 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0C1F43D4C for ; Tue, 15 Nov 2005 01:00:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAF10unn073283 for ; Tue, 15 Nov 2005 01:00:56 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAF10uD7073280 for perforce@freebsd.org; Tue, 15 Nov 2005 01:00:56 GMT (envelope-from wsalamon@computer.org) Date: Tue, 15 Nov 2005 01:00:56 GMT Message-Id: <200511150100.jAF10uD7073280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 86777 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, 15 Nov 2005 01:00:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=86777 Change 86777 by wsalamon@gretsch on 2005/11/15 00:59:55 Pass in the correct type of object for the pipe() call: an array of file descriptors and not a single one. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#4 (text+ko) ==== @@ -37,12 +37,12 @@ #define AUDIT_CLASSES (AU_IPC) - int fd; + int filedes[2]; AUT_INIT(); /* Generate an AUE_PIPE audit record */ - if (pipe(&fd) < 0) + if (pipe(filedes) < 0) AUT_PERROR("pipe()"); aut_assert(AUE_PIPE); From owner-p4-projects@FreeBSD.ORG Thu Nov 17 00:03:15 2005 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 CF5C516A421; Thu, 17 Nov 2005 00:03:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93F4416A41F for ; Thu, 17 Nov 2005 00:03:14 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A19E43D45 for ; Thu, 17 Nov 2005 00:03:14 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAH03D49025125 for ; Thu, 17 Nov 2005 00:03:13 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAH030mg025118 for perforce@freebsd.org; Thu, 17 Nov 2005 00:03:00 GMT (envelope-from cognet@freebsd.org) Date: Thu, 17 Nov 2005 00:03:00 GMT Message-Id: <200511170003.jAH030mg025118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86852 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, 17 Nov 2005 00:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=86852 Change 86852 by cognet@cognet on 2005/11/17 00:02:19 Big IFC of doom {-1} {cursed} Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/busdma_machdep.c#4 integrate .. //depot/projects/arm/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/arm/src/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/arm/src/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/timerreg.h#2 delete .. //depot/projects/arm/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/arm/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/arm/src/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/arm/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/arm/src/sys/alpha/include/_bus.h#1 branch .. //depot/projects/arm/src/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/arm/src/sys/alpha/include/bus.h#3 integrate .. //depot/projects/arm/src/sys/alpha/include/bus_memio.h#2 delete .. //depot/projects/arm/src/sys/alpha/include/bus_pio.h#2 delete .. //depot/projects/arm/src/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/critical.h#3 delete .. //depot/projects/arm/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/arm/src/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/arm/src/sys/alpha/include/proc.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/signal.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/arm/src/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/arm/src/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/arm/src/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/imgact_osf1.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_proto.h#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_syscall.h#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/osf1_sysent.c#2 integrate .. //depot/projects/arm/src/sys/alpha/osf1/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/arm/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/arm/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/arm/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/critical.c#2 delete .. //depot/projects/arm/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/arm/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/arm/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/arm/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/arm/src/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_amd64.h#4 delete .. //depot/projects/arm/src/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_memio.h#2 delete .. //depot/projects/arm/src/sys/amd64/include/bus_pio.h#2 delete .. //depot/projects/arm/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/critical.h#4 delete .. //depot/projects/arm/src/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/ieeefp.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/arm/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/arm/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/arm/src/sys/amd64/include/tss.h#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/arm/src/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/timerreg.h#2 delete .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/arm/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm3.S#2 delete .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_arm67.S#2 delete .. //depot/projects/arm/src/sys/arm/arm/critical.c#2 delete .. //depot/projects/arm/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/arm/src/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/arm/src/sys/arm/arm/intr.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/locore.S#9 integrate .. //depot/projects/arm/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/arm/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/arm/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/arm/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/arm/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/arm/src/sys/arm/include/_limits.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/bus.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/bus_memio.h#2 delete .. //depot/projects/arm/src/sys/arm/include/bus_pio.h#2 delete .. //depot/projects/arm/src/sys/arm/include/clock.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/critical.h#2 delete .. //depot/projects/arm/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/float.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/intr.h#4 integrate .. //depot/projects/arm/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/arm/src/sys/arm/include/proc.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/signal.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq80321.c#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/obio.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/obiovar.h#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/arm/src/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/arm/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/arm/src/sys/boot/common/console.c#2 integrate .. //depot/projects/arm/src/sys/boot/common/help.common#2 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/arm/src/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/arm/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/arm/src/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/arm/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/lib.h#2 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/comconsole.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/arm/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/arm/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/ski/bootinfo.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/arm/src/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/arm/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/arm/src/sys/bsm/audit.h#1 branch .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/arm/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/arm/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/arm/src/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/arm/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/arm/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/arm/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/arm/src/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/arm/src/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#6 integrate .. //depot/projects/arm/src/sys/conf/files#4 integrate .. //depot/projects/arm/src/sys/conf/files.alpha#2 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#4 integrate .. //depot/projects/arm/src/sys/conf/files.arm#2 integrate .. //depot/projects/arm/src/sys/conf/files.i386#5 integrate .. //depot/projects/arm/src/sys/conf/files.ia64#2 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#2 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/arm/src/sys/conf/kern.mk#3 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/arm/src/sys/conf/majors#3 delete .. //depot/projects/arm/src/sys/conf/majors.awk#2 delete .. //depot/projects/arm/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/arm/src/sys/conf/options#5 integrate .. //depot/projects/arm/src/sys/conf/options.amd64#2 integrate .. //depot/projects/arm/src/sys/conf/options.arm#4 integrate .. //depot/projects/arm/src/sys/conf/options.i386#3 integrate .. //depot/projects/arm/src/sys/conf/options.pc98#2 integrate .. //depot/projects/arm/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/arm/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/amd64/nvenetlib.README#1 branch .. //depot/projects/arm/src/sys/contrib/dev/nve/i386/nvenetlib.README#1 branch .. //depot/projects/arm/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/oltr/if_oltrvar.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.c#2 delete .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ngatm/netnatm/api/ccpriv.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ngatm/netnatm/api/unisap.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/arm/src/sys/crypto/rijndael/rijndael-alg-fst.c#3 integrate .. //depot/projects/arm/src/sys/crypto/via/padlock.c#1 branch .. //depot/projects/arm/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_print.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/arm/src/sys/ddb/db_watch.c#2 integrate .. //depot/projects/arm/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_compat.h#2 delete .. //depot/projects/arm/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_fujitsu.c#1 branch .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/arm/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/arm/src/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/arm/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/adlink/adlink.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/arm/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/arm/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#3 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_compat.h#2 delete .. //depot/projects/arm/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/arm/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/arm/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-commands.h#2 delete .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata_if.m#1 branch .. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/atkbd.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbd_atkbdc.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_ebus.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_isa.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_subr.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc_subr.h#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdcreg.h#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdreg.h#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#1 branch .. //depot/projects/arm/src/sys/dev/atkbdc/psm.h#1 branch .. //depot/projects/arm/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/arm/src/sys/dev/awi/am79c930.c#2 integrate .. //depot/projects/arm/src/sys/dev/awi/awi.c#3 integrate .. //depot/projects/arm/src/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/arm/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_tuner.h#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbusreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/arm/src/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/arm/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/arm/src/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/arm/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/arm/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/arm/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/arm/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/arm/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/arm/src/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/arm/src/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/arm/src/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/arm/src/sys/dev/digi/CX.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/arm/src/sys/dev/digi/digi.c#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/ati_pcigart.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_auth.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_bufs.h#3 delete .. //depot/projects/arm/src/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_context.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_dma.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_drawable.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_drv.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_fops.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_irq.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_lock.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_memory.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_memory_debug.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_os_freebsd.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_pci.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_scatter.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_vm.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/mga.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/r128_cce.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/r300_cmdbuf.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/r300_reg.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/radeon.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/arm/src/sys/dev/drm/sis.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/arm/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx.h#2 delete .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/arm/src/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/arm/src/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/arm/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed98.h#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/arm/src/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/arm/src/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/arm/src/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/README#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/en/midway.c#2 integrate .. //depot/projects/arm/src/sys/dev/en/midwayvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/arm/src/sys/dev/ep/if_ep_pccard.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 17 00:27:45 2005 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 46FBA16A421; Thu, 17 Nov 2005 00:27:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E1E916A420 for ; Thu, 17 Nov 2005 00:27:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033343D4C for ; Thu, 17 Nov 2005 00:27:44 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAH0RiY3026565 for ; Thu, 17 Nov 2005 00:27:44 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAH0Ring026562 for perforce@freebsd.org; Thu, 17 Nov 2005 00:27:44 GMT (envelope-from cognet@freebsd.org) Date: Thu, 17 Nov 2005 00:27:44 GMT Message-Id: <200511170027.jAH0Ring026562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86854 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, 17 Nov 2005 00:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=86854 Change 86854 by cognet@cognet on 2005/11/17 00:27:24 Grrr. One more file forgotten while cvs diff'ing Affected files ... .. //depot/projects/arm/gnu-arm.diff#9 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#9 (text+ko) ==== @@ -72,6 +72,25 @@ +/* $FreeBSD$ */ + +#include "tc-arm.h" +Index: gnu/usr.bin/binutils/ld/Makefile.arm +=================================================================== +RCS file: gnu/usr.bin/binutils/ld/Makefile.arm +diff -N gnu/usr.bin/binutils/ld/Makefile.arm +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ gnu/usr.bin/binutils/ld/Makefile.arm 29 Aug 2005 12:39:27 -0000 +@@ -0,0 +1,12 @@ ++# $FreeBSD$ ++ ++NATIVE_EMULATION= armelf_fbsd ++ ++SRCS+= e${NATIVE_EMULATION}.c ++CLEANFILES+= e${NATIVE_EMULATION}.c ++e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ ++ scripttempl/elf.sc genscripts.sh stringify.sed ++ sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ++ ${TOOLS_PREFIX}/usr \ ++ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ ++ "${NATIVE_EMULATION}" "" no ${NATIVE_EMULATION} "${TARGET_TUPLE}" Index: gnu/usr.bin/binutils/libbfd/Makefile.arm =================================================================== RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm @@ -980,8 +999,8 @@ RCS file: gnu/usr.bin/gdb/kgdb/trgt_arm.c diff -N gnu/usr.bin/gdb/kgdb/trgt_arm.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 4 Oct 2005 22:28:59 -0000 -@@ -0,0 +1,199 @@ ++++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 4 Oct 2005 23:17:12 -0000 +@@ -0,0 +1,196 @@ +/* + * Copyright (c) 2004 Marcel Moolenaar + * All rights reserved. @@ -1151,10 +1170,7 @@ + cache = kgdb_trgt_frame_cache(next_frame, this_cache); + *addrp = cache->sp + ofs; + *lvalp = lval_memory; -+ if (regnum == ARM_FP_REGNUM) -+ *(CORE_ADDR *)valuep = cache->fp; -+ else -+ target_read_memory(*addrp, valuep, regsz); ++ target_read_memory(*addrp, valuep, regsz); +} + +static const struct frame_unwind kgdb_trgt_trapframe_unwind = { From owner-p4-projects@FreeBSD.ORG Thu Nov 17 01:35:07 2005 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 44FBD16A421; Thu, 17 Nov 2005 01:35:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 102EE16A41F for ; Thu, 17 Nov 2005 01:35:07 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD36C43D45 for ; Thu, 17 Nov 2005 01:35:06 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAH1Z6UT036399 for ; Thu, 17 Nov 2005 01:35:06 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAH1Z66g036396 for perforce@freebsd.org; Thu, 17 Nov 2005 01:35:06 GMT (envelope-from cognet@freebsd.org) Date: Thu, 17 Nov 2005 01:35:06 GMT Message-Id: <200511170135.jAH1Z66g036396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86857 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, 17 Nov 2005 01:35:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=86857 Change 86857 by cognet@cognet on 2005/11/17 01:34:49 A few bits for AT91RM9200 support. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#1 add .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#1 add .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#1 add .. //depot/projects/arm/src/sys/arm/at91/files.kb920x#1 add .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/at91/std.at91rm92#1 add .. //depot/projects/arm/src/sys/arm/at91/std.kb920x#1 add .. //depot/projects/arm/src/sys/arm/conf/KB920X#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Nov 17 18:28:39 2005 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 D1D9616A433; Thu, 17 Nov 2005 18:28:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8ECB816A42D for ; Thu, 17 Nov 2005 18:28:38 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E29C943D45 for ; Thu, 17 Nov 2005 18:28:35 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAHISZf2012540 for ; Thu, 17 Nov 2005 18:28:35 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAHISZeY012537 for perforce@freebsd.org; Thu, 17 Nov 2005 18:28:35 GMT (envelope-from cognet@freebsd.org) Date: Thu, 17 Nov 2005 18:28:35 GMT Message-Id: <200511171828.jAHISZeY012537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86880 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, 17 Nov 2005 18:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=86880 Change 86880 by cognet@cognet on 2005/11/17 18:27:55 A lot more reg definition, taken from the datasheet and the linux driver. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#2 (text+ko) ==== @@ -45,7 +45,13 @@ /* Usart */ #define AT91RM92_USART0_BASE 0xffc0000 +#define AT91RM92_USART0_PDC 0xffc0100 #define AT91RM92_USART1_BASE 0xffc4000 +#define AT91RM92_USART1_PDC 0xffc4100 +#define AT91RM92_USART2_BASE 0xffc8000 +#define AT91RM92_USART2_PDC 0xffc8100 +#define AT91RM92_USART3_BASE 0xffcc000 +#define AT91RM92_USART3_PDC 0xffcc100 #define AT91RM92_USART_SIZE 0x4000 #define USART_CR 0x00 /* Control register */ @@ -74,39 +80,218 @@ #define UART_OVRE (0x1 << 5) /* Overrun Interrupt */ #define UART_FRAME (0x1 << 6) /* Framing Error Interrupt */ #define UART_PARE (0x1 << 7) /* Parity Error Interrupt */ -#define UART_TIMEOUT ( 0x1 << 8) // (USART) Receiver Time-out -#define UART_TXEMPTY ( 0x1 << 9) // (USART) TXEMPTY Interrupt -#define UART_ITERATION ( 0x1 << 10) // (USART) Max number of Repetitions Reached -#define UART_TXBUFE ( 0x1 << 11) // (USART) TXBUFE Interrupt -#define UART_RXBUFF ( 0x1 << 12) // (USART) RXBUFF Interrupt -#define UART_NACK ( 0x1 << 13) // (USART) Non Acknowledge -#define UART_RIIC ( 0x1 << 16) // (USART) Ring INdicator Input Change Flag -#define AT91RM92_US_DSRIC ( 0x1 << 17) // (USART) Data Set Ready Input Change Flag -#define AT91RM92_US_DCDIC ( 0x1 << 18) // (USART) Data Carrier Flag -#define AT91RM92_US_CTSIC ( 0x1 << 19) // (USART) Clear To Send Input Change Flag +#define UART_TIMEOUT ( 0x1 << 8) /* (USART) Receiver Time-out */ +#define UART_TXEMPTY ( 0x1 << 9) /* (USART) TXEMPTY Interrupt */ +#define UART_ITERATION ( 0x1 << 10) /* (USART) Max number of Repetitions Reached */ +#define UART_TXBUFE ( 0x1 << 11) /* (USART) TXBUFE Interrupt */ +#define UART_RXBUFF ( 0x1 << 12) /* (USART) RXBUFF Interrupt */ +#define UART_NACK ( 0x1 << 13) /* (USART) Non Acknowledge */ +#define UART_RIIC ( 0x1 << 16) /* (USART) Ring INdicator Input Change Flag */ +#define AT91RM92_US_DSRIC ( 0x1 << 17) /* (USART) Data Set Ready Input Change Flag */ +#define AT91RM92_US_DCDIC ( 0x1 << 18) /* (USART) Data Carrier Flag */ +#define AT91RM92_US_CTSIC ( 0x1 << 19) /* (USART) Clear To Send Input Change Flag */ + +/* System Registers */ + +#define AT91RM92_SYS_BASE 0xffff000 +#define AT91RM92_SYS_SIZE 0x1000 +/* Interrupt Controller */ +#define IC_SMR (AT91RM92_SYS_BASE) /* Source mode register */ +#define IC_SVR (AT91RM92_SYS_BASE + 128) /* Source vector register */ +#define IC_IVR (AT91RM92_SYS_BASE + 256) /* IRQ vector register */ +#define IC_FVR (AT91RM92_SYS_BASE + 260) /* FIQ vector register */ +#define IC_ISR (AT91RM92_SYS_BASE + 264) /* Interrupt status register */ +#define IC_IPR (AT91RM92_SYS_BASE + 268) /* Interrupt pending register */ +#define IC_IMR (AT91RM92_SYS_BASE + 272) /* Interrupt status register */ +#define IC_CISR (AT91RM92_SYS_BASE + 276) /* Core interrupt status register */ +#define IC_IECR (AT91RM92_SYS_BASE + 288) /* Interrupt enable command register */ +#define IC_IDCR (AT91RM92_SYS_BASE + 292) /* Interrupt disable command register */ +#define IC_ICCR (AT91RM92_SYS_BASE + 296) /* Interrupt clear command register */ +#define IC_ISCR (AT91RM92_SYS_BASE + 300) /* Interrupt set command register */ +#define IC_EOICR (AT91RM92_SYS_BASE + 304) /* End of interrupt command register */ +#define IC_SPU (AT91RM92_SYS_BASE + 308) /* Spurious vector register */ +#define IC_DCR (AT91RM92_SYS_BASE + 312) /* Debug control register */ +#define IC_FFER (AT91RM92_SYS_BASE + 320) /* Fast forcing enable register */ +#define IC_FFDR (AT91RM92_SYS_BASE + 324) /* Fast forcing disable register */ +#define IC_FFSR (AT91RM92_SYS_BASE + 328) /* Fast forcing status register */ + +/* DBGU */ -/* Interrupt controller */ +#define DBGU_CR (AT91RM92_SYS_BASE + 0x200) /* Control register */ +#define DBGU_MR (AT91RM92_SYS_BASE + 0x200 + 4) /* Mode register */ +#define DBGU_IER (AT91RM92_SYS_BASE + 0x200 + 8) /* Interrupt Enable Register */ +#define DBGU_IDR (AT91RM92_SYS_BASE + 0x200 + 12) /* Interrupt Disable Register */ +#define DBGU_IMR (AT91RM92_SYS_BASE + 0x200 + 16) /* Interrupt Mask Register */ +#define DBGU_CSR (AT91RM92_SYS_BASE + 0x200 + 20) /* Channel Status Register */ +#define DBGU_RHR (AT91RM92_SYS_BASE + 0x200 + 24) /* Receiver Holding Register */ +#define DBGU_THR (AT91RM92_SYS_BASE + 0x200 + 28) /* Transmitter Holding Register */ +#define DBGU_BRGR (AT91RM92_SYS_BASE + 0x200 + 32) /* Baud Rate Generator Register */ +#define DBGU_C1R (AT91RM92_SYS_BASE + 0x200 + 64) /* Chip ID1 Register */ +#define DBGU_C2R (AT91RM92_SYS_BASE + 0x200 + 68) /* Chip ID2 Register */ +#define DBGU_FNTR (AT91RM92_SYS_BASE + 0x200 + 72) /* Force NTRST Register */ +#define DBGU_RPR (AT91RM92_SYS_BASE + 0x200 + 256) /* Receive Pointer Register */ +#define DBGU_RCR (AT91RM92_SYS_BASE + 0x200 + 260) /* Receive Counter Register */ +#define DBGU_TPR (AT91RM92_SYS_BASE + 0x200 + 264) /* Transmit Pointer Register */ +#define DBGU_TCR (AT91RM92_SYS_BASE + 0x200 + 268) /* Transmit Counter Register */ +#define DBGU_RNPR (AT91RM92_SYS_BASE + 0x200 + 272) /* Receive Next Pointer Register */ +#define DBGU_RNCR (AT91RM92_SYS_BASE + 0x200 + 276) /* Receive Next Counter Register */ +#define DBGU_TNPR (AT91RM92_SYS_BASE + 0x200 + 280) /* Transmit Next Pointer Register */ +#define DBGU_TNCR (AT91RM92_SYS_BASE + 0x200 + 284) /* Transmit Next Counter Register */ +#define DBGU_PTCR (AT91RM92_SYS_BASE + 0x200 + 288) /* PDC Transfer Control Register */ +#define DBGU_PTSR (AT91RM92_SYS_BASE + 0x200 + 292) /* PDC Transfer Status Register */ -#define AT91RM92_IC_BASE 0xffff000 -#define AT91RM92_IC_SIZE 0x1000 -#define IC_SMR (AT91RM92_IC_BASE) /* Source mode register */ -#define IC_SVR (AT91RM92_IC_BASE + 128) /* Source vector register */ -#define IC_IVR (AT91RM92_IC_BASE + 256) /* IRQ vector register */ -#define IC_FVR (AT91RM92_IC_BASE + 260) /* FIQ vector register */ -#define IC_ISR (AT91RM92_IC_BASE + 264) /* Interrupt status register */ -#define IC_IPR (AT91RM92_IC_BASE + 268) /* Interrupt pending register */ -#define IC_IMR (AT91RM92_IC_BASE + 272) /* Interrupt status register */ -#define IC_CISR (AT91RM92_IC_BASE + 276) /* Core interrupt status register */ -#define IC_IECR (AT91RM92_IC_BASE + 288) /* Interrupt enable command register */ -#define IC_IDCR (AT91RM92_IC_BASE + 292) /* Interrupt disable command register */ -#define IC_ICCR (AT91RM92_IC_BASE + 296) /* Interrupt clear command register */ -#define IC_ISCR (AT91RM92_IC_BASE + 300) /* Interrupt set command register */ -#define IC_EOICR (AT91RM92_IC_BASE + 304) /* End of interrupt command register */ -#define IC_SPU (AT91RM92_IC_BASE + 308) /* Spurious vector register */ -#define IC_DCR (AT91RM92_IC_BASE + 312) /* Debug control register */ -#define IC_FFER (AT91RM92_IC_BASE + 320) /* Fast forcing enable register */ -#define IC_FFDR (AT91RM92_IC_BASE + 324) /* Fast forcing disable register */ +#define PIOA_PER (AT91RM92_SYS_BASE + 0x400) /* PIO Enable Register */ +#define PIOA_PDR (AT91RM92_SYS_BASE + 0x400 + 4) /* PIO Disable Register */ +#define PIOA_PSR (AT91RM92_SYS_BASE + 0x400 + 8) /* PIO status register */ +#define PIOA_OER (AT91RM92_SYS_BASE + 0x400 + 12) /* Output enable register */ +#define PIOA_ODR (AT91RM92_SYS_BASE + 0x400 + 20) /* Output disable register */ +#define PIOA_OSR (AT91RM92_SYS_BASE + 0x400 + 24) /* Output status register */ +#define PIOA_IFER (AT91RM92_SYS_BASE + 0x400 + 28) /* Input filter enable register */ +#define PIOA_IFDR (AT91RM92_SYS_BASE + 0x400 + 36) /* Input filter disable register */ +#define PIOA_IFSR (AT91RM92_SYS_BASE + 0x400 + 40) /* Input filter status register */ +#define PIOA_SODR (AT91RM92_SYS_BASE + 0x400 + 48) /* Set output data register */ +#define PIOA_CODR (AT91RM92_SYS_BASE + 0x400 + 52) /* Clear output data register */ +#define PIOA_ODSR (AT91RM92_SYS_BASE + 0x400 + 56) /* Output data status register */ +#define PIOA_PDSR (AT91RM92_SYS_BASE + 0x400 + 60) /* Pin data status register */ +#define PIOA_IER (AT91RM92_SYS_BASE + 0x400 + 64) /* Interrupt enable register */ +#define PIOA_IDR (AT91RM92_SYS_BASE + 0x400 + 68) /* Interrupt disable register */ +#define PIOA_IMR (AT91RM92_SYS_BASE + 0x400 + 72) /* Interrupt mask register */ +#define PIOA_ISR (AT91RM92_SYS_BASE + 0x400 + 76) /* Interrupt status register */ +#define PIOA_MDER (AT91RM92_SYS_BASE + 0x400 + 80) /* Multi driver enable register */ +#define PIOA_MDDR (AT91RM92_SYS_BASE + 0x400 + 84) /* Multi driver disable register */ +#define PIOA_MDSR (AT91RM92_SYS_BASE + 0x400 + 88) /* Multi driver status register */ +#define PIOA_PPUDR (AT91RM92_SYS_BASE + 0x400 + 96) /* Pull-up disable register */ +#define PIOA_PPUER (AT91RM92_SYS_BASE + 0x400 + 100) /* Pull-up enable register */ +#define PIOA_PPUSR (AT91RM92_SYS_BASE + 0x400 + 104) /* Pad pull-up status register */ +#define PIOA_ASR (AT91RM92_SYS_BASE + 0x400 + 112) /* Select A register */ +#define PIOA_BSR (AT91RM92_SYS_BASE + 0x400 + 116) /* Select B register */ +#define PIOA_BSR (AT91RM92_SYS_BASE + 0x400 + 120) /* AB Select status register */ +#define PIOA_OWER (AT91RM92_SYS_BASE + 0x400 + 160) /* Output Write enable register */ +#define PIOA_OWDR (AT91RM92_SYS_BASE + 0x400 + 164) /* Output write disable register */ +#define PIOA_OWSR (AT91RM92_SYS_BASE + 0x400 + 168) /* Output write status register */ +#define PIOB_PER (AT91RM92_SYS_BASE + 0x400) /* PIO Enable Register */ +#define PIOB_PDR (AT91RM92_SYS_BASE + 0x600 + 4) /* PIO Disable Register */ +#define PIOB_PSR (AT91RM92_SYS_BASE + 0x600 + 8) /* PIO status register */ +#define PIOB_OER (AT91RM92_SYS_BASE + 0x600 + 12) /* Output enable register */ +#define PIOB_ODR (AT91RM92_SYS_BASE + 0x600 + 20) /* Output disable register */ +#define PIOB_OSR (AT91RM92_SYS_BASE + 0x600 + 24) /* Output status register */ +#define PIOB_IFER (AT91RM92_SYS_BASE + 0x600 + 28) /* Input filter enable register */ +#define PIOB_IFDR (AT91RM92_SYS_BASE + 0x600 + 36) /* Input filter disable register */ +#define PIOB_IFSR (AT91RM92_SYS_BASE + 0x600 + 40) /* Input filter status register */ +#define PIOB_SODR (AT91RM92_SYS_BASE + 0x600 + 48) /* Set output data register */ +#define PIOB_CODR (AT91RM92_SYS_BASE + 0x600 + 52) /* Clear output data register */ +#define PIOB_ODSR (AT91RM92_SYS_BASE + 0x600 + 56) /* Output data status register */ +#define PIOB_PDSR (AT91RM92_SYS_BASE + 0x600 + 60) /* Pin data status register */ +#define PIOB_IER (AT91RM92_SYS_BASE + 0x600 + 64) /* Interrupt enable register */ +#define PIOB_IDR (AT91RM92_SYS_BASE + 0x600 + 68) /* Interrupt disable register */ +#define PIOB_IMR (AT91RM92_SYS_BASE + 0x600 + 72) /* Interrupt mask register */ +#define PIOB_ISR (AT91RM92_SYS_BASE + 0x600 + 76) /* Interrupt status register */ +#define PIOB_MDER (AT91RM92_SYS_BASE + 0x600 + 80) /* Multi driver enable register */ +#define PIOB_MDDR (AT91RM92_SYS_BASE + 0x600 + 84) /* Multi driver disable register */ +#define PIOB_MDSR (AT91RM92_SYS_BASE + 0x600 + 88) /* Multi driver status register */ +#define PIOB_PPUDR (AT91RM92_SYS_BASE + 0x600 + 96) /* Pull-up disable register */ +#define PIOB_PPUER (AT91RM92_SYS_BASE + 0x600 + 100) /* Pull-up enable register */ +#define PIOB_PPUSR (AT91RM92_SYS_BASE + 0x600 + 104) /* Pad pull-up status register */ +#define PIOB_ASR (AT91RM92_SYS_BASE + 0x600 + 112) /* Select A register */ +#define PIOB_BSR (AT91RM92_SYS_BASE + 0x600 + 116) /* Select B register */ +#define PIOB_BSR (AT91RM92_SYS_BASE + 0x600 + 120) /* AB Select status register */ +#define PIOB_OWER (AT91RM92_SYS_BASE + 0x600 + 160) /* Output Write enable register */ +#define PIOB_OWDR (AT91RM92_SYS_BASE + 0x600 + 164) /* Output write disable register */ +#define PIOB_OWSR (AT91RM92_SYS_BASE + 0x600 + 168) /* Output write status register */ +#define PIOC_PER (AT91RM92_SYS_BASE + 0x800) /* PIO Enable Register */ +#define PIOC_PDR (AT91RM92_SYS_BASE + 0x800 + 4) /* PIO Disable Register */ +#define PIOC_PSR (AT91RM92_SYS_BASE + 0x800 + 8) /* PIO status register */ +#define PIOC_OER (AT91RM92_SYS_BASE + 0x800 + 12) /* Output enable register */ +#define PIOC_ODR (AT91RM92_SYS_BASE + 0x800 + 20) /* Output disable register */ +#define PIOC_OSR (AT91RM92_SYS_BASE + 0x800 + 24) /* Output status register */ +#define PIOC_IFER (AT91RM92_SYS_BASE + 0x800 + 28) /* Input filter enable register */ +#define PIOC_IFDR (AT91RM92_SYS_BASE + 0x800 + 36) /* Input filter disable register */ +#define PIOC_IFSR (AT91RM92_SYS_BASE + 0x800 + 40) /* Input filter status register */ +#define PIOC_SODR (AT91RM92_SYS_BASE + 0x800 + 48) /* Set output data register */ +#define PIOC_CODR (AT91RM92_SYS_BASE + 0x800 + 52) /* Clear output data register */ +#define PIOC_ODSR (AT91RM92_SYS_BASE + 0x800 + 56) /* Output data status register */ +#define PIOC_PDSR (AT91RM92_SYS_BASE + 0x800 + 60) /* Pin data status register */ +#define PIOC_IER (AT91RM92_SYS_BASE + 0x800 + 64) /* Interrupt enable register */ +#define PIOC_IDR (AT91RM92_SYS_BASE + 0x800 + 68) /* Interrupt disable register */ +#define PIOC_IMR (AT91RM92_SYS_BASE + 0x800 + 72) /* Interrupt mask register */ +#define PIOC_ISR (AT91RM92_SYS_BASE + 0x800 + 76) /* Interrupt status register */ +#define PIOC_MDER (AT91RM92_SYS_BASE + 0x800 + 80) /* Multi driver enable register */ +#define PIOC_MDDR (AT91RM92_SYS_BASE + 0x800 + 84) /* Multi driver disable register */ +#define PIOC_MDSR (AT91RM92_SYS_BASE + 0x800 + 88) /* Multi driver status register */ +#define PIOC_PPUDR (AT91RM92_SYS_BASE + 0x800 + 96) /* Pull-up disable register */ +#define PIOC_PPUER (AT91RM92_SYS_BASE + 0x800 + 100) /* Pull-up enable register */ +#define PIOC_PPUSR (AT91RM92_SYS_BASE + 0x800 + 104) /* Pad pull-up status register */ +#define PIOC_ASR (AT91RM92_SYS_BASE + 0x800 + 112) /* Select A register */ +#define PIOC_BSR (AT91RM92_SYS_BASE + 0x800 + 116) /* Select B register */ +#define PIOC_BSR (AT91RM92_SYS_BASE + 0x800 + 120) /* AB Select status register */ +#define PIOC_OWER (AT91RM92_SYS_BASE + 0x800 + 160) /* Output Write enable register */ +#define PIOC_OWDR (AT91RM92_SYS_BASE + 0x800 + 164) /* Output write disable register */ +#define PIOC_OWSR (AT91RM92_SYS_BASE + 0x800 + 168) /* Output write status register */ +#define PIOD_PER (AT91RM92_SYS_BASE + 0xa00) /* PIO Enable Register */ +#define PIOD_PDR (AT91RM92_SYS_BASE + 0xa00 + 4) /* PIO Disable Register */ +#define PIOD_PSR (AT91RM92_SYS_BASE + 0xa00 + 8) /* PIO status register */ +#define PIOD_OER (AT91RM92_SYS_BASE + 0xa00 + 12) /* Output enable register */ +#define PIOD_ODR (AT91RM92_SYS_BASE + 0xa00 + 20) /* Output disable register */ +#define PIOD_OSR (AT91RM92_SYS_BASE + 0xa00 + 24) /* Output status register */ +#define PIOD_IFER (AT91RM92_SYS_BASE + 0xa00 + 28) /* Input filter enable register */ +#define PIOD_IFDR (AT91RM92_SYS_BASE + 0xa00 + 36) /* Input filter disable register */ +#define PIOD_IFSR (AT91RM92_SYS_BASE + 0xa00 + 40) /* Input filter status register */ +#define PIOD_SODR (AT91RM92_SYS_BASE + 0xa00 + 48) /* Set output data register */ +#define PIOD_CODR (AT91RM92_SYS_BASE + 0xa00 + 52) /* Clear output data register */ +#define PIOD_ODSR (AT91RM92_SYS_BASE + 0xa00 + 56) /* Output data status register */ +#define PIOD_PDSR (AT91RM92_SYS_BASE + 0xa00 + 60) /* Pin data status register */ +#define PIOD_IER (AT91RM92_SYS_BASE + 0xa00 + 64) /* Interrupt enable register */ +#define PIOD_IDR (AT91RM92_SYS_BASE + 0xa00 + 68) /* Interrupt disable register */ +#define PIOD_IMR (AT91RM92_SYS_BASE + 0xa00 + 72) /* Interrupt mask register */ +#define PIOD_ISR (AT91RM92_SYS_BASE + 0xa00 + 76) /* Interrupt status register */ +#define PIOD_MDER (AT91RM92_SYS_BASE + 0xa00 + 80) /* Multi driver enable register */ +#define PIOD_MDDR (AT91RM92_SYS_BASE + 0xa00 + 84) /* Multi driver disable register */ +#define PIOD_MDSR (AT91RM92_SYS_BASE + 0xa00 + 88) /* Multi driver status register */ +#define PIOD_PPUDR (AT91RM92_SYS_BASE + 0xa00 + 96) /* Pull-up disable register */ +#define PIOD_PPUER (AT91RM92_SYS_BASE + 0xa00 + 100) /* Pull-up enable register */ +#define PIOD_PPUSR (AT91RM92_SYS_BASE + 0xa00 + 104) /* Pad pull-up status register */ +#define PIOD_ASR (AT91RM92_SYS_BASE + 0xa00 + 112) /* Select A register */ +#define PIOD_BSR (AT91RM92_SYS_BASE + 0xa00 + 116) /* Select B register */ +#define PIOD_BSR (AT91RM92_SYS_BASE + 0xa00 + 120) /* AB Select status register */ +#define PIOD_OWER (AT91RM92_SYS_BASE + 0xa00 + 160) /* Output Write enable register */ +#define PIOD_OWDR (AT91RM92_SYS_BASE + 0xa00 + 164) /* Output write disable register */ +#define PIOD_OWSR (AT91RM92_SYS_BASE + 0xa00 + 168) /* Output write status register */ +/* IRQs : */ +/* + * 0: AIC + * 1: System peripheral (System timer, RTC, DBGU) + * 2: PIO Controller A + * 3: PIO Controller B + * 4: PIO Controller C + * 5: PIO Controller D + * 6: USART 0 + * 7: USART 1 + * 8: USART 2 + * 9: USART 3 + * 10: MMC Interface + * 11: USB device port + * 12: Two-wirte interface + * 13: SPI + * 14: SSC + * 15: SSC + * 16: SSC + * 17: Timer Counter 0 + * 18: Timer Counter 1 + * 19: Timer Counter 2 + * 20: Timer Counter 3 + * 21: Timer Counter 4 + * 22: Timer Counter 6 + * 23: USB Host port + * 24: Ethernet + * 25: AIC + * 26: AIC + * 27: AIC + * 28: AIC + * 29: AIC + * 30: AIC + * 31: AIC + */ /* Timer */ #define AT91RM92_TIMER_BASE 0xffffd00 @@ -122,4 +307,361 @@ #define TIMER_IMR 0x1c /* Interrupt mask register */ #define TIMER_RTAR 0x20 /* Real-time alarm register */ #define TIMER_CRTR 0x24 /* Current real-time register */ + +#define AT91RM92_SPI_BASE 0xffe0000 +#define AT91RM92_SPI_SIZE 0x4000 +#define AT91RM92_SPI_PDC 0xffe0100 + +#define AT91RM92_SSC0_BASE 0xffd0000 +#define AT91RM92_SSC0_PDC 0xffd0100 + +#define AT91RM92_SSC1_BASE 0xffd4000 +#define AT91RM92_SSC1_PDC 0xffd4100 + +#define AT91RM92_SSC2_BASE 0xffd8000 +#define AT91RM92_SSC2_PDC 0xffd8100 + +#define AT91RM92_SSC_SIZE 0x4000 + +#define AT91RM92_MAC_BASE 0xffbc000 +#define AT91RM92_MAC_SIZE 0x4000 + +#define AT91RM92_TWI_BASE 0xffb8000 +#define AT91RM92_TWI_SIZE 0x4000 + +#define AT91RM92_MCI_BASE 0xffb4000 +#define AT91RM92_MCI_PDC 0xffb4100 +#define AT91RM92_MCI_SIZE 0x4000 + +#define AT91RM92_UDP_BASE 0xffb0000 +#define AT91RM92_UDP_SIZE 0x4000 + +#define AT91RM92_TC0_BASE 0xffa0000 +#define AT91RM92_TC0_SIZE 0x4000 +#define AT91RM92_TC0C0_BASE 0xffa0000 +#define AT91RM92_TC0C1_BASE 0xffa0040 +#define AT91RM92_TC0C2_BASE 0xffa0080 + +#define AT91RM92_TC1_BASE 0xffa4000 +#define AT91RM92_TC1_SIZE 0x4000 +#define AT91RM92_TC1C0_BASE 0xffa4000 +#define AT91RM92_TC1C1_BASE 0xffa4040 +#define AT91RM92_TC1C2_BASE 0xffa4080 + +/* Pio definitions */ +#define AT91RM92_PIO_PA0 (1 << 0) +#define AT91RM92_PA0_MISO (AT91RM92_PIO_PA0) /* SPI Master In Slave */ +#define AT91RM92_PA0_PCK3 (AT91RM92_PIO_PA0) /* PMC Programmable Clock Output 3 */ +#define AT91RM92_PIO_PA1 (1 << 1) +#define AT91RM92_PA1_MOSI (AT91RM92_PIO_PA1) /* SPI Master Out Slave */ +#define AT91RM92_PA1_PCK0 (AT91RM92_PIO_PA1) /* PMC Programmable Clock Output 0 */ +#define AT91RM92_PIO_PA2 (1 << 2) +#define AT91RM92_PA2_SPCK (AT91RM92_PIO_PA2) /* SPI Serial Clock */ +#define AT91RM92_PA2_IRQ4 (AT91RM92_PIO_PA2) /* AIC Interrupt Input 4 */ +#define AT91RM92_PIO_PA3 (1 << 3) +#define AT91RM92_PA3_NPCS0 (AT91RM92_PIO_PA3) /* SPI Peripheral Chip Select 0 */ +#define AT91RM92_PA3_IRQ5 (AT91RM92_PIO_PA3) /* AIC Interrupt Input 5 */ +#define AT91RM92_PIO_PA4 (1 << 4) +#define AT91RM92_PA4_NPCS1 (AT91RM92_PIO_PA4) /* SPI Peripheral Chip Select 1 */ +#define AT91RM92_PA4_PCK1 (AT91RM92_PIO_PA4) /* PMC Programmable Clock Output 1 */ +#define AT91RM92_PIO_PA5 (1 << 5) +#define AT91RM92_PA5_NPCS2 (AT91RM92_PIO_PA5) /* SPI Peripheral Chip Select 2 */ +#define AT91RM92_PA5_TXD3 (AT91RM92_PIO_PA5) /* USART 3 Transmit Data */ +#define AT91RM92_PIO_PA6 (1 << 6) +#define AT91RM92_PA6_NPCS3 (AT91RM92_PIO_PA6) /* SPI Peripheral Chip Select 3 */ +#define AT91RM92_PA6_RXD3 (AT91RM92_PIO_PA6) /* USART 3 Receive Data */ +#define AT91RM92_PIO_PA7 (1 << 7) +#define AT91RM92_PA7_ETXCK_EREFC (AT91RM92_PIO_PA7) /* Ethernet MAC Transmit Clock/Reference Clock */ +#define AT91RM92_PA7_PCK2 (AT91RM92_PIO_PA7) /* PMC Programmable Clock 2 */ +#define AT91RM92_PIO_PA8 (1 << 8) +#define AT91RM92_PA8_ETXEN (AT91RM92_PIO_PA8) /* Ethernet MAC Transmit Enable */ +#define AT91RM92_PA8_MCCDB (AT91RM92_PIO_PA8) /* Multimedia Card B Command */ +#define AT91RM92_PIO_PA9 (1 << 9) +#define AT91RM92_PA9_ETX0 (AT91RM92_PIO_PA9) /* Ethernet MAC Transmit Data 0 */ +#define AT91RM92_PA9_MCDB0 (AT91RM92_PIO_PA9) /* Multimedia Card B Data 0 */ +#define AT91RM92_PIO_PA10 (1 << 10) +#define AT91RM92_PA10_ETX1 (AT91RM92_PIO_PA10) /* Ethernet MAC Transmit Data 1 */ +#define AT91RM92_PA10_MCDB1 (AT91RM92_PIO_PA10) /* Multimedia Card B Data 1 */ +#define AT91RM92_PIO_PA11 (1 << 11) +#define AT91RM92_PA11_ECRS_ECRSDV (AT91RM92_PIO_PA11) /* Ethernet MAC Carrier Sense/Carrier Sense and Data Valid */ +#define AT91RM92_PA11_MCDB2 (AT91RM92_PIO_PA11) /* Multimedia Card B Data 2 */ +#define AT91RM92_PIO_PA12 (1 << 12) +#define AT91RM92_PA12_ERX0 (AT91RM92_PIO_PA12) /* Ethernet MAC Receive Data 0 */ +#define AT91RM92_PA12_MCDB3 (AT91RM92_PIO_PA12) /* Multimedia Card B Data 3 */ +#define AT91RM92_PIO_PA13 (1 << 13) +#define AT91RM92_PA13_ERX1 (AT91RM92_PIO_PA13) /* Ethernet MAC Receive Data 1 */ +#define AT91RM92_PA13_TCLK0 (AT91RM92_PIO_PA13) /* Timer Counter 0 external clock input */ +#define AT91RM92_PIO_PA14 (1 << 14) +#define AT91RM92_PA14_ERXER (AT91RM92_PIO_PA14) /* Ethernet MAC Receive Error */ +#define AT91RM92_PA14_TCLK1 (AT91RM92_PIO_PA14) /* Timer Counter 1 external clock input */ +#define AT91RM92_PIO_PA15 (1 << 15) +#define AT91RM92_PA15_EMDC (AT91RM92_PIO_PA15) /* Ethernet MAC Management Data Clock */ +#define AT91RM92_PA15_TCLK2 (AT91RM92_PIO_PA15) /* Timer Counter 2 external clock input */ +#define AT91RM92_PIO_PA16 (1 << 16) +#define AT91RM92_PA16_EMDIO (AT91RM92_PIO_PA16) /* Ethernet MAC Management Data Input/Output */ +#define AT91RM92_PA16_IRQ6 (AT91RM92_PIO_PA16) /* AIC Interrupt input 6 */ +#define AT91RM92_PIO_PA17 (1 << 17) +#define AT91RM92_PA17_TXD0 (AT91RM92_PIO_PA17) /* USART 0 Transmit Data */ +#define AT91RM92_PA17_TIOA0 (AT91RM92_PIO_PA17) /* Timer Counter 0 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PA18 (1 << 18) +#define AT91RM92_PA18_RXD0 (AT91RM92_PIO_PA18) /* USART 0 Receive Data */ +#define AT91RM92_PA18_TIOB0 (AT91RM92_PIO_PA18) /* Timer Counter 0 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PA19 (1 << 19) +#define AT91RM92_PA19_SCK0 (AT91RM92_PIO_PA19) /* USART 0 Serial Clock */ +#define AT91RM92_PA19_TIOA1 (AT91RM92_PIO_PA19) /* Timer Counter 1 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PA20 (1 << 20) +#define AT91RM92_PA20_CTS0 (AT91RM92_PIO_PA20) /* USART 0 Clear To Send */ +#define AT91RM92_PA20_TIOB1 (AT91RM92_PIO_PA20) /* Timer Counter 1 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PA21 (1 << 21) +#define AT91RM92_PA21_RTS0 (AT91RM92_PIO_PA21) /* USART 0 Ready To Send */ +#define AT91RM92_PA21_TIOA2 (AT91RM92_PIO_PA21) /* Timer Counter 2 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PA22 (1 << 22) +#define AT91RM92_PA22_RXD2 (AT91RM92_PIO_PA22) /* USART 2 Receive Data */ +#define AT91RM92_PA22_TIOB2 (AT91RM92_PIO_PA22) /* Timer Counter 2 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PA23 (1 << 23) +#define AT91RM92_PA23_TXD2 (AT91RM92_PIO_PA23) /* USART 2 Transmit Data */ +#define AT91RM92_PA23_IRQ3 (AT91RM92_PIO_PA23) /* Interrupt input 3 */ +#define AT91RM92_PIO_PA24 (1 << 24) +#define AT91RM92_PA24_SCK2 (AT91RM92_PIO_PA24) /* USART 2 Serial Clock */ +#define AT91RM92_PA24_PCK1 (AT91RM92_PIO_PA24) /* PMC Programmable Clock Output 1 */ +#define AT91RM92_PIO_PA25 (1 << 25) +#define AT91RM92_PA25_TWD (AT91RM92_PIO_PA25) /* TWI Two-wire Serial Data */ +#define AT91RM92_PA25_IRQ2 (AT91RM92_PIO_PA25) /* Interrupt input 2 */ +#define AT91RM92_PIO_PA26 (1 << 26) +#define AT91RM92_PA26_TWCK (AT91RM92_PIO_PA26) /* TWI Two-wire Serial Clock */ +#define AT91RM92_PA26_IRQ1 (AT91RM92_PIO_PA26) /* Interrupt input 1 */ +#define AT91RM92_PIO_PA27 (1 << 27) +#define AT91RM92_PA27_MCCK (AT91RM92_PIO_PA27) /* Multimedia Card Clock */ +#define AT91RM92_PA27_TCLK3 (AT91RM92_PIO_PA27) /* Timer Counter 3 External Clock Input */ +#define AT91RM92_PIO_PA28 (1 << 28) +#define AT91RM92_PA28_MCCDA (AT91RM92_PIO_PA28) /* Multimedia Card A Command */ +#define AT91RM92_PA28_TCLK4 (AT91RM92_PIO_PA28) /* Timer Counter 4 external Clock Input */ +#define AT91RM92_PIO_PA29 (1 << 29) +#define AT91RM92_PA29_MCDA0 (AT91RM92_PIO_PA29) /* Multimedia Card A Data 0 */ +#define AT91RM92_PA29_TCLK5 (AT91RM92_PIO_PA29) /* Timer Counter 5 external clock input */ +#define AT91RM92_PIO_PA30 (1 << 30) +#define AT91RM92_PA30_DRXD (AT91RM92_PIO_PA30) /* DBGU Debug Receive Data */ +#define AT91RM92_PA30_CTS2 (AT91RM92_PIO_PA30) /* USART 2 Clear To Send */ +#define AT91RM92_PIO_PA31 (1 << 31) +#define AT91RM92_PA31_DTXD (AT91RM92_PIO_PA31) /* DBGU Debug Transmit Data */ +#define AT91RM92_PA31_RTS2 (AT91RM92_PIO_PA31) /* USART 2 Ready To Send */ + +#define AT91RM92_PIO_PB0 (1 << 0) +#define AT91RM92_PB0_TF0 (AT91RM92_PIO_PB0) /* SSC Transmit Frame Sync 0 */ +#define AT91RM92_PB0_RTS3 (AT91RM92_PIO_PB0) /* USART 3 Ready To Send */ +#define AT91RM92_PIO_PB1 (1 << 1) +#define AT91RM92_PB1_TK0 (AT91RM92_PIO_PB1) /* SSC Transmit Clock 0 */ +#define AT91RM92_PB1_CTS3 (AT91RM92_PIO_PB1) /* USART 3 Clear To Send */ +#define AT91RM92_PIO_PB2 (1 << 2) +#define AT91RM92_PB2_TD0 (AT91RM92_PIO_PB2) /* SSC Transmit data */ +#define AT91RM92_PB2_SCK3 (AT91RM92_PIO_PB2) /* USART 3 Serial Clock */ +#define AT91RM92_PIO_PB3 (1 << 3) +#define AT91RM92_PB3_RD0 (AT91RM92_PIO_PB3) /* SSC Receive Data */ +#define AT91RM92_PB3_MCDA1 (AT91RM92_PIO_PB3) /* Multimedia Card A Data 1 */ +#define AT91RM92_PIO_PB4 (1 << 4) +#define AT91RM92_PB4_RK0 (AT91RM92_PIO_PB4) /* SSC Receive Clock */ +#define AT91RM92_PB4_MCDA2 (AT91RM92_PIO_PB4) /* Multimedia Card A Data 2 */ +#define AT91RM92_PIO_PB5 (1 << 5) +#define AT91RM92_PB5_RF0 (AT91RM92_PIO_PB5) /* SSC Receive Frame Sync 0 */ +#define AT91RM92_PB5_MCDA3 (AT91RM92_PIO_PB5) /* Multimedia Card A Data 3 */ +#define AT91RM92_PIO_PB6 (1 << 6) +#define AT91RM92_PB6_TF1 (AT91RM92_PIO_PB6) /* SSC Transmit Frame Sync 1 */ +#define AT91RM92_PB6_TIOA3 (AT91RM92_PIO_PB6) /* Timer Counter 4 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PB7 (1 << 7) +#define AT91RM92_PB7_TK1 (AT91RM92_PIO_PB7) /* SSC Transmit Clock 1 */ +#define AT91RM92_PB7_TIOB3 (AT91RM92_PIO_PB7) /* Timer Counter 3 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PB8 (1 << 8) +#define AT91RM92_PB8_TD1 (AT91RM92_PIO_PB8) /* SSC Transmit Data 1 */ +#define AT91RM92_PB8_TIOA4 (AT91RM92_PIO_PB8) /* Timer Counter 4 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PB9 (1 << 9) +#define AT91RM92_PB9_RD1 (AT91RM92_PIO_PB9) /* SSC Receive Data 1 */ +#define AT91RM92_PB9_TIOB4 (AT91RM92_PIO_PB9) /* Timer Counter 4 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PB10 (1 << 10) +#define AT91RM92_PB10_RK1 (AT91RM92_PIO_PB10) /* SSC Receive Clock 1 */ +#define AT91RM92_PB10_TIOA5 (AT91RM92_PIO_PB10) /* Timer Counter 5 Multipurpose Timer I/O Pin A */ +#define AT91RM92_PIO_PB11 (1 << 11) +#define AT91RM92_PB11_RF1 (AT91RM92_PIO_PB11) /* SSC Receive Frame Sync 1 */ +#define AT91RM92_PB11_TIOB5 (AT91RM92_PIO_PB11) /* Timer Counter 5 Multipurpose Timer I/O Pin B */ +#define AT91RM92_PIO_PB12 (1 << 12) +#define AT91RM92_PB12_TF2 (AT91RM92_PIO_PB12) /* SSC Transmit Frame Sync 2 */ +#define AT91RM92_PB12_ETX2 (AT91RM92_PIO_PB12) /* Ethernet MAC Transmit Data 2 */ +#define AT91RM92_PIO_PB13 (1 << 13) +#define AT91RM92_PB13_TK2 (AT91RM92_PIO_PB13) /* SSC Transmit Clock 2 */ +#define AT91RM92_PB13_ETX3 (AT91RM92_PIO_PB13) /* Ethernet MAC Transmit Data 3 */ +#define AT91RM92_PIO_PB14 (1 << 14) +#define AT91RM92_PB14_TD2 (AT91RM92_PIO_PB14) /* SSC Transmit Data 2 */ +#define AT91RM92_PB14_ETXER (AT91RM92_PIO_PB14) /* Ethernet MAC Transmikt Coding Error */ +#define AT91RM92_PIO_PB15 (1 << 15) +#define AT91RM92_PB15_RD2 (AT91RM92_PIO_PB15) /* SSC Receive Data 2 */ +#define AT91RM92_PB15_ERX2 (AT91RM92_PIO_PB15) /* Ethernet MAC Receive Data 2 */ +#define AT91RM92_PIO_PB16 (1 << 16) +#define AT91RM92_PB16_RK2 (AT91RM92_PIO_PB16) /* SSC Receive Clock 2 */ +#define AT91RM92_PB16_ERX3 (AT91RM92_PIO_PB16) /* Ethernet MAC Receive Data 3 */ +#define AT91RM92_PIO_PB17 (1 << 17) +#define AT91RM92_PB17_RF2 (AT91RM92_PIO_PB17) /* SSC Receive Frame Sync 2 */ +#define AT91RM92_PB17_ERXDV (AT91RM92_PIO_PB17) /* Ethernet MAC Receive Data Valid */ +#define AT91RM92_PIO_PB18 (1 << 18) +#define AT91RM92_PB18_RI1 (AT91RM92_PIO_PB18) /* USART 1 Ring Indicator */ +#define AT91RM92_PB18_ECOL (AT91RM92_PIO_PB18) /* Ethernet MAC Collision Detected */ +#define AT91RM92_PIO_PB19 (1 << 19) +#define AT91RM92_PB19_DTR1 (AT91RM92_PIO_PB19) /* USART 1 Data Terminal ready */ +#define AT91RM92_PB19_ERXCK (AT91RM92_PIO_PB19) /* Ethernet MAC Receive Clock */ +#define AT91RM92_PIO_PB20 (1 << 20) +#define AT91RM92_PB20_TXD1 (AT91RM92_PIO_PB20) /* USART 1 Transmit Data */ +#define AT91RM92_PIO_PB21 (1 << 21) +#define AT91RM92_PB21_RXD1 (AT91RM92_PIO_PB21) /* USART 1 Receive Data */ +#define AT91RM92_PIO_PB22 (1 << 22) +#define AT91RM92_PB22_SCK1 (AT91RM92_PIO_PB22) /* USART 1 Serial Clock */ +#define AT91RM92_PIO_PB23 (1 << 23) +#define AT91RM92_PB23_DCD1 (AT91RM92_PIO_PB23) /* USART 1 Data Carrier Detect */ +#define AT91RM92_PIO_PB24 (1 << 24) +#define AT91RM92_PB24_CTS1 (AT91RM92_PIO_PB24) /* USART 1 Clear To Send */ +#define AT91RM92_PIO_PB25 (1 << 25) +#define AT91RM92_PB25_DSR1 (AT91RM92_PIO_PB25) /* USART 1 Data Set ready */ +#define AT91RM92_PB25_EF100 (AT91RM92_PIO_PB25) /* Ethernet MAC Force 100 Mbits/sec */ +#define AT91RM92_PIO_PB26 (1 << 26) +#define AT91RM92_PB26_RTS1 (AT91RM92_PIO_PB26) /* USART 1 Ready To Send */ +#define AT91RM92_PIO_PB27 (1 << 27) +#define AT91RM92_PB27_PCK0 (AT91RM92_PIO_PB27) /* PMC Programmable Clock Output 0 */ +#define AT91RM92_PIO_PB28 (1 << 28) +#define AT91RM92_PB28_FIQ (AT91RM92_PIO_PB28) /* AIC Fast Interrupt Input */ +#define AT91RM92_PIO_PB29 (1 << 29) +#define AT91RM92_PB29_IRQ0 (AT91RM92_PIO_PB29) /* Interrupt input 0 */ + +#define AT91RM92_PIO_PC0 (1 << 0) +#define AT91RM92_PC0_BFCK (AT91RM92_PIO_PC0) /* Burst Flash Clock */ +#define AT91RM92_PIO_PC1 (1 << 1) +#define AT91RM92_PC1_BFRDY_SMOE (AT91RM92_PIO_PC1) /* Burst Flash Ready */ +#define AT91RM92_PIO_PC2 (1 << 2) +#define AT91RM92_PC2_BFAVD (AT91RM92_PIO_PC2) /* Burst Flash Address Valid */ +#define AT91RM92_PIO_PC3 (1 << 3) +#define AT91RM92_PC3_BFBAA_SMWE (AT91RM92_PIO_PC3) /* Burst Flash Address Advance / SmartMedia Write Enable */ +#define AT91RM92_PIO_PC4 (1 << 4) +#define AT91RM92_PC4_BFOE (AT91RM92_PIO_PC4) /* Burst Flash Output Enable */ +#define AT91RM92_PIO_PC5 (1 << 5) +#define AT91RM92_PC5_BFWE (AT91RM92_PIO_PC5) /* Burst Flash Write Enable */ +#define AT91RM92_PIO_PC6 (1 << 6) +#define AT91RM92_PC6_NWAIT (AT91RM92_PIO_PC6) /* NWAIT */ +#define AT91RM92_PIO_PC7 (1 << 7) +#define AT91RM92_PC7_A23 (AT91RM92_PIO_PC7) /* Address Bus[23] */ +#define AT91RM92_PIO_PC8 (1 << 8) +#define AT91RM92_PC8_A24 (AT91RM92_PIO_PC8) /* Address Bus[24] */ +#define AT91RM92_PIO_PC9 (1 << 9) +#define AT91RM92_PC9_A25_CFRNW (AT91RM92_PIO_PC9) /* Address Bus[25] / Compact Flash Read Not Write */ +#define AT91RM92_PIO_PC10 (1 << 10) +#define AT91RM92_PC10_NCS4_CFCS (AT91RM92_PIO_PC10) /* Compact Flash Chip Select */ +#define AT91RM92_PIO_PC11 (1 << 11) +#define AT91RM92_PC11_NCS5_CFCE1 (AT91RM92_PIO_PC11) /* Chip Select 5 / Compact Flash Chip Enable 1 */ +#define AT91RM92_PIO_PC12 (1 << 12) +#define AT91RM92_PC12_NCS6_CFCE2(AT91RM92_PIO_PC12) /* Chip Select 6 / Compact Flash Chip Enable 2 */ +#define AT91RM92_PIO_PC13 (1 << 13) +#define AT91RM92_PC13_NCS7 (AT91RM92_PIO_PC13) /* Chip Select 7 */ +#define AT91RM92_PIO_PC14 (1 << 14) +#define AT91RM92_PIO_PC15 (1 << 15) +#define AT91RM92_PIO_PC16 (1 << 16) +#define AT91RM92_PC16_D16 (AT91RM92_PIO_PC16) /* Data Bus [16] */ +#define AT91RM92_PIO_PC17 (1 << 17) +#define AT91RM92_PC17_D17 (AT91RM92_PIO_PC17) /* Data Bus [17] */ +#define AT91RM92_PIO_PC18 (1 << 18) +#define AT91RM92_PC18_D18 (AT91RM92_PIO_PC18) /* Data Bus [18] */ +#define AT91RM92_PIO_PC19 (1 << 19) +#define AT91RM92_PC19_D19 (AT91RM92_PIO_PC19) /* Data Bus [19] */ +#define AT91RM92_PIO_PC20 (1 << 20) +#define AT91RM92_PC20_D20 (AT91RM92_PIO_PC20) /* Data Bus [20] */ +#define AT91RM92_PIO_PC21 (1 << 21) +#define AT91RM92_PC21_D21 (AT91RM92_PIO_PC21) /* Data Bus [21] */ +#define AT91RM92_PIO_PC22 (1 << 22) +#define AT91RM92_PC22_D22 (AT91RM92_PIO_PC22) /* Data Bus [22] */ +#define AT91RM92_PIO_PC23 (1 << 23) +#define AT91RM92_PC23_D23 (AT91RM92_PIO_PC23) /* Data Bus [23] */ +#define AT91RM92_PIO_PC24 (1 << 24) +#define AT91RM92_PC24_D24 (AT91RM92_PIO_PC24) /* Data Bus [24] */ +#define AT91RM92_PIO_PC25 (1 << 25) +#define AT91RM92_PC25_D25 (AT91RM92_PIO_PC25) /* Data Bus [25] */ +#define AT91RM92_PIO_PC26 (1 << 26) +#define AT91RM92_PC26_D26 (AT91RM92_PIO_PC26) /* Data Bus [26] */ +#define AT91RM92_PIO_PC27 (1 << 27) +#define AT91RM92_PC27_D27 (AT91RM92_PIO_PC27) /* Data Bus [27] */ +#define AT91RM92_PIO_PC28 (1 << 28) +#define AT91RM92_PC28_D28 (AT91RM92_PIO_PC28) /* Data Bus [28] */ +#define AT91RM92_PIO_PC29 (1 << 29) +#define AT91RM92_PC29_D29 (AT91RM92_PIO_PC29) /* Data Bus [29] */ +#define AT91RM92_PIO_PC30 (1 << 30) +#define AT91RM92_PC30_D30 (AT91RM92_PIO_PC30) /* Data Bus [30] */ +#define AT91RM92_PIO_PC31 (1 << 31) +#define AT91RM92_PC31_D31 (AT91RM92_PIO_PC31) /* Data Bus [31] */ + +#define AT91RM92_PIO_PD0 (1 << 0) +#define AT91RM92_PD0_ETX0 (AT91RM92_PIO_PD0) /* Ethernet MAC Transmit Data 0 */ +#define AT91RM92_PIO_PD1 (1 << 1) +#define AT91RM92_PD1_ETX1 (AT91RM92_PIO_PD1) /* Ethernet MAC Transmit Data 1 */ +#define AT91RM92_PIO_PD2 (1 << 2) +#define AT91RM92_PD2_ETX2 (AT91RM92_PIO_PD2) /* Ethernet MAC Transmit Data 2 */ +#define AT91RM92_PIO_PD3 (1 << 3) +#define AT91RM92_PD3_ETX3 (AT91RM92_PIO_PD3) /* Ethernet MAC Transmit Data 3 */ +#define AT91RM92_PIO_PD4 (1 << 4) +#define AT91RM92_PD4_ETXEN (AT91RM92_PIO_PD4) /* Ethernet MAC Transmit Enable */ +#define AT91RM92_PIO_PD5 (1 << 5) +#define AT91RM92_PD5_ETXER (AT91RM92_PIO_PD5) /* Ethernet MAC Transmit Coding Error */ +#define AT91RM92_PIO_PD6 (1 << 6) +#define AT91RM92_PD6_DTXD (AT91RM92_PIO_PD6) /* DBGU Debug Transmit Data */ +#define AT91RM92_PIO_PD7 (1 << 7) +#define AT91RM92_PD7_PCK0 (AT91RM92_PIO_PD7) /* PMC Programmable Clock Output 0 */ +#define AT91RM92_PD7_TSYNC (AT91RM92_PIO_PD7) /* ETM Synchronization signal */ +#define AT91RM92_PIO_PD8 (1 << 8) +#define AT91RM92_PD8_PCK1 (AT91RM92_PIO_PD8) /* PMC Programmable Clock Output 1 */ +#define AT91RM92_PD8_TCLK (AT91RM92_PIO_PD8) /* ETM Trace Clock signal */ +#define AT91RM92_PIO_PD9 (1 << 9) +#define AT91RM92_PD9_PCK2 (AT91RM92_PIO_PD9) /* PMC Programmable Clock 2 */ +#define AT91RM92_PD9_TPS0 (AT91RM92_PIO_PD9) /* ETM ARM9 pipeline status 0 */ +#define AT91RM92_PIO_PD10 (1 << 10) +#define AT91RM92_PD10_PCK3 (AT91RM92_PIO_PD10) /* PMC Programmable Clock Output 3 */ +#define AT91RM92_PD10_TPS1 (AT91RM92_PIO_PD10) /* ETM ARM9 pipeline status 1 */ +#define AT91RM92_PIO_PD11 (1 << 11) +#define AT91RM92_PD11_TPS2 (AT91RM92_PIO_PD11) /* ETM ARM9 pipeline status 2 */ +#define AT91RM92_PIO_PD12 (1 << 12) +#define AT91RM92_PD12_TPK0 (AT91RM92_PIO_PD12) /* ETM Trace Packet 0 */ +#define AT91RM92_PIO_PD13 (1 << 13) +#define AT91RM92_PD13_TPK1 (AT91RM92_PIO_PD13) /* ETM Trace Packet 1 */ +#define AT91RM92_PIO_PD14 (1 << 14) +#define AT91RM92_PD14_TPK2 (AT91RM92_PIO_PD14) /* ETM Trace Packet 2 */ +#define AT91RM92_PIO_PD15 (1 << 15) +#define AT91RM92_PD15_TD0 (AT91RM92_PIO_PD15) /* SSC Transmit data */ +#define AT91RM92_PD15_TPK3 (AT91RM92_PIO_PD15) /* ETM Trace Packet 3 */ +#define AT91RM92_PIO_PD16 (1 << 16) +#define AT91RM92_PD16_TD1 (AT91RM92_PIO_PD16) /* SSC Transmit Data 1 */ +#define AT91RM92_PD16_TPK4 (AT91RM92_PIO_PD16) /* ETM Trace Packet 4 */ +#define AT91RM92_PIO_PD17 (1 << 17) +#define AT91RM92_PD17_TD2 (AT91RM92_PIO_PD17) /* SSC Transmit Data 2 */ +#define AT91RM92_PD17_TPK5 (AT91RM92_PIO_PD17) /* ETM Trace Packet 5 */ +#define AT91RM92_PIO_PD18 (1 << 18) +#define AT91RM92_PD18_NPCS1 (AT91RM92_PIO_PD18) /* SPI Peripheral Chip Select 1 */ +#define AT91RM92_PD18_TPK6 (AT91RM92_PIO_PD18) /* ETM Trace Packet 6 */ +#define AT91RM92_PIO_PD19 (1 << 19) +#define AT91RM92_PD19_NPCS2 (AT91RM92_PIO_PD19) /* SPI Peripheral Chip Select 2 */ +#define AT91RM92_PD19_TPK7 (AT91RM92_PIO_PD19) /* ETM Trace Packet 7 */ +#define AT91RM92_PIO_PD20 (1 << 20) +#define AT91RM92_PD20_NPCS3 (AT91RM92_PIO_PD20) /* SPI Peripheral Chip Select 3 */ +#define AT91RM92_PD20_TPK8 (AT91RM92_PIO_PD20) /* ETM Trace Packet 8 */ +#define AT91RM92_PIO_PD21 (1 << 21) +#define AT91RM92_PD21_RTS0 (AT91RM92_PIO_PD21) /* Usart 0 Ready To Send */ +#define AT91RM92_PD21_TPK9 (AT91RM92_PIO_PD21) /* ETM Trace Packet 9 */ +#define AT91RM92_PIO_PD22 (1 << 22) +#define AT91RM92_PD22_RTS1 (AT91RM92_PIO_PD22) /* Usart 0 Ready To Send */ +#define AT91RM92_PD22_TPK10 (AT91RM92_PIO_PD22) /* ETM Trace Packet 10 */ +#define AT91RM92_PIO_PD23 (1 << 23) +#define AT91RM92_PD23_RTS2 (AT91RM92_PIO_PD23) /* USART 2 Ready To Send */ +#define AT91RM92_PD23_TPK11 (AT91RM92_PIO_PD23) /* ETM Trace Packet 11 */ +#define AT91RM92_PIO_PD24 (1 << 24) +#define AT91RM92_PD24_RTS3 (AT91RM92_PIO_PD24) /* USART 3 Ready To Send */ +#define AT91RM92_PD24_TPK12 (AT91RM92_PIO_PD24) /* ETM Trace Packet 12 */ +#define AT91RM92_PIO_PD25 (1 << 25) +#define AT91RM92_PD25_DTR1 (AT91RM92_PIO_PD25) /* USART 1 Data Terminal ready */ +#define AT91RM92_PD25_TPK13 (AT91RM92_PIO_PD25) /* ETM Trace Packet 13 */ +#define AT91RM92_PIO_PD26 (1 << 26) +#define AT91RM92_PD26_TPK14 (AT91RM92_PIO_PD26) /* ETM Trace Packet 14 */ +#define AT91RM92_PIO_PD27 (1 << 27) +#define AT91RM92_PD27_TPK15 (AT91RM92_PIO_PD27) /* ETM Trace Packet 15 */ + + #endif /* AT91RM92REG_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Nov 17 18:29:48 2005 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 80A0216A424; Thu, 17 Nov 2005 18:29:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 276DF16A41F for ; Thu, 17 Nov 2005 18:29:47 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5423E43D70 for ; Thu, 17 Nov 2005 18:29:37 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAHITbVS012591 for ; Thu, 17 Nov 2005 18:29:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAHITbLw012588 for perforce@freebsd.org; Thu, 17 Nov 2005 18:29:37 GMT (envelope-from cognet@freebsd.org) Date: Thu, 17 Nov 2005 18:29:37 GMT Message-Id: <200511171829.jAHITbLw012588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86881 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, 17 Nov 2005 18:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=86881 Change 86881 by cognet@cognet on 2005/11/17 18:29:03 Better interrupt stuff, it still lacks the PIO handling (yeek) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#2 (text+ko) ==== @@ -44,8 +44,6 @@ #include #include -static int irqmask = 0; - static struct at91rm92_softc *at91rm92_softc; static int @@ -192,6 +190,7 @@ at91rm92_attach(device_t dev) { struct at91rm92_softc *sc = device_get_softc(dev); + int i; at91rm92_softc = sc; sc->sc_st = &at91rm92_bs_tag; @@ -200,16 +199,30 @@ sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_IC_BASE, - AT91RM92_IC_SIZE, &sc->sc_irq_sh) != 0) + AT91RM92_IC_SIZE, &sc->sc_sys_sh) != 0) panic("Enable to map IRQ registers"); if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91rm92_attach: failed to set up IRQ rman"); - /* Mask all interrupts. */ - bus_space_write_4(sc->sc_st, sc->sc_irq_sh, IC_IMR, 0); - /* Set the interrupt handler. */ - bus_space_write_4(sc->sc_st, sc->sc_irq_sh, IC_SPU, (uint32_t)irq_entry); + for (i = 0; i < 32; i++) { + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + + i * 4, i); + /* Priority. */ + /* XXX: Give better priorities to IRQs */ + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SMR + i * 4, + 0); + if (i < 8) + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_EOICR, + 1); + + } + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SPU, 32); + /* No debug. */ + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_DCR, 0); + /* Disable and clear all interrupts. */ + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, 0xffffffff); + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); device_add_child(dev, "at91rm92_timer", 0); bus_generic_probe(dev); bus_generic_attach(dev); @@ -243,8 +256,8 @@ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); - irqmask |= 1 << rman_get_start(ires); - bus_space_write_4(sc->sc_st, sc->sc_irq_sh, IC_IMR, irqmask); + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, + 1 << rman_get_start(ires)); return (0); } @@ -254,9 +267,8 @@ { struct at91rm92_softc *sc = device_get_softc(dev); - irqmask &= ~(1 << rman_get_start(res)); - bus_space_write_4(sc->sc_st, sc->sc_irq_sh, IC_IMR, irqmask); - + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, + 1 << rman_get_start(res)); return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } @@ -282,29 +294,36 @@ arm_mask_irq(uintptr_t nb) { - irqmask &= ~(1 << nb); bus_space_write_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_irq_sh, IC_IMR, irqmask); + at91rm92_softc->sc_sys_sh, IC_IDCR, 1 << nb); } int arm_get_next_irq() { - int irq = bus_space_read_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_irq_sh, IC_IPR); - irq &= irqmask; - return (ffs(irq) - 1); + int status; + int irq; + + irq = bus_space_read_4(at91rm92_softc->sc_st, + at91rm92_softc->sc_sys_sh, IC_IVR); + status = bus_space_read_4(at91rm92_softc->sc_st, + at91rm92_softc->sc_sys_sh, IC_ISR); + if (status == 0) { + bus_space_write_4(at91rm92_softc->sc_st, + at91rm92_softc->sc_sys_sh, IC_EOICR, 1); + return (-1); + } + return (irq); } void arm_unmask_irq(uintptr_t nb) { - irqmask |= 1 << nb; bus_space_write_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_irq_sh, IC_IMR, irqmask); + at91rm92_softc->sc_sys_sh, IC_IECR, 1 << nb); } ==== //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ device_t dev; bus_space_tag_t sc_st; bus_space_handle_t sc_sh; - bus_space_handle_t sc_irq_sh; + bus_space_handle_t sc_sys_sh; struct rman sc_irq_rman; }; From owner-p4-projects@FreeBSD.ORG Fri Nov 18 13:30:17 2005 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 E31FD16A421; Fri, 18 Nov 2005 13:30:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A85A16A41F for ; Fri, 18 Nov 2005 13:30:16 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BDCF43D45 for ; Fri, 18 Nov 2005 13:30:16 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAIDUGTk001547 for ; Fri, 18 Nov 2005 13:30:16 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAIDUFvF001544 for perforce@freebsd.org; Fri, 18 Nov 2005 13:30:15 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 18 Nov 2005 13:30:15 GMT Message-Id: <200511181330.jAIDUFvF001544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 86904 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, 18 Nov 2005 13:30:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=86904 Change 86904 by soc-bushman@soc-bushman_stinger on 2005/11/18 13:29:56 cache invalidation feature (with -i and -I command line arguments) was added libpidfile is now used (through libutil) all chages should be tested carefully Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#4 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#7 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#11 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#6 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#12 (text+ko) ==== @@ -5,11 +5,12 @@ MAN=cached.conf.5 cached.8 WARNS?=2 -SRCS= agent.c cached.c cachelib.c cacheplcs.c debug.c log.c config.c query.c\ - mp_ws_query.c mp_rs_query.c singletons.c protocol.c parser.c +SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \ + config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ + parser.c CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" -DPADD+=${LIBM} ${LIBPTHREAD} -LDADD+=${LIBM} ${LIBPTHREAD} +DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} +LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic FILESGROUPS=STARTUP CONF ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#4 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#7 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#11 (text+ko) ==== @@ -29,10 +29,13 @@ #include #include #include +#include #include #include +#include #include #include +#include #include #include #include @@ -44,6 +47,7 @@ #include "agents/group.h" #include "agents/services.h" #include "agents/hosts.h" +#include "cachedcli.h" #include "cachelib.h" #include "config.h" #include "debug.h" @@ -53,7 +57,7 @@ #include "singletons.h" #ifndef CONFIG_PATH -#define CONFIG_PATH "/usr/local/etc/cached.conf" +#define CONFIG_PATH "/etc/cached.conf" #endif #define DEFAULT_CONFIG_PATH "cached.conf" @@ -86,7 +90,6 @@ static void process_timer_event(struct kevent *, struct runtime_env *, struct configuration *); static void *processing_thread(void *); -static int write_pid_file(const char *); static void usage(void); void get_time_func(struct timeval *); @@ -128,29 +131,6 @@ TRACE_OUT(destroy_global_timer); } -static int -write_pid_file(const char *filename) -{ - char *pid_string; - FILE *pidfile; - - pidfile = fopen(filename, "w"); - if (pidfile == NULL) { - LOG_ERR_2("write_pid_file", "can't write to pidfile %s", - filename); - return (-1); - } - - asprintf(&pid_string,"%u",getpid()); - assert(pid_string != NULL); - - fwrite(pid_string,strlen(pid_string), 1, pidfile); - free(pid_string); - fclose(pidfile); - - return (0); -} - static void print_version_info(void) { @@ -162,7 +142,7 @@ static void usage(void) { - fprintf(stderr,"usage: cached [-nst]\n"); + fprintf(stderr,"usage: cached [-nstiId]\n"); exit(1); } @@ -190,9 +170,18 @@ * would be registered automatically during the queries. */ res = register_cache_entry(retval, (struct cache_entry_params *) - &config_entry->positive_cache_params); + &config_entry->positive_cache_params); + config_entry->positive_cache_entry = find_cache_entry(retval, + config_entry->positive_cache_params.entry_name); + assert(config_entry->positive_cache_entry != + INVALID_CACHE_ENTRY); + res = register_cache_entry(retval, (struct cache_entry_params *) &config_entry->negative_cache_params); + config_entry->negative_cache_entry = find_cache_entry(retval, + config_entry->negative_cache_params.entry_name); + assert(config_entry->negative_cache_entry != + INVALID_CACHE_ENTRY); } LOG_MSG_2("cache", "cache was successfully initialized"); @@ -642,6 +631,12 @@ int main(int argc, char *argv[]) { + struct processing_thread_args *thread_args; + pthread_t *threads; + + struct pidfh *pidfile; + pid_t pid; + char const *config_file; char const *error_str; int error_line; @@ -650,9 +645,11 @@ int trace_mode_enabled; int force_single_threaded; int do_not_daemonize; + int clear_user_cache_entries, clear_all_cache_entries; + char *user_config_entry_name, *global_config_entry_name; + int show_statistics; + int daemon_mode, interactive_mode; - struct processing_thread_args *thread_args; - pthread_t *threads; /* by default all debug messages are omitted */ TRACE_OFF(); @@ -664,7 +661,12 @@ trace_mode_enabled = 0; force_single_threaded = 0; do_not_daemonize = 0; - while ((res = getopt(argc, argv, "nst")) != -1) { + clear_user_cache_entries = 0; + clear_all_cache_entries = 0; + show_statistics = 0; + user_config_entry_name = NULL; + global_config_entry_name = NULL; + while ((res = getopt(argc, argv, "nstdi:I:")) != -1) { switch (res) { case 'n': do_not_daemonize = 1; @@ -675,6 +677,22 @@ case 't': trace_mode_enabled = 1; break; + case 'i': + clear_user_cache_entries = 1; + if (optarg != NULL) + if (strcmp(optarg, "all") != 0) + user_config_entry_name = strdup(optarg); + break; + case 'I': + clear_all_cache_entries = 1; + if (optarg != NULL) + if (strcmp(optarg, "all") != 0) + global_config_entry_name = + strdup(optarg); + break; + case 'd': + show_statistics = 1; + break; case '?': default: usage(); @@ -682,6 +700,92 @@ } } + daemon_mode = do_not_daemonize | force_single_threaded | + trace_mode_enabled; + interactive_mode = clear_user_cache_entries | clear_all_cache_entries | + show_statistics; + + if ((daemon_mode != 0) && (interactive_mode != 0)) { + LOG_ERR_1("main", "daemon mode and interactive_mode arguments " + "can't be used together"); + usage(); + } + + if (interactive_mode != 0) { + FILE *pidfin = fopen(DEFAULT_PIDFILE_PATH, "r"); + char pidbuf[256]; + + struct cached_connection_params connection_params; + cached_connection connection; + + int result; + + if (pidfin == NULL) + errx(EXIT_FAILURE, "There is no daemon running."); + + memset(pidbuf, 0, sizeof(pidbuf)); + fread(pidbuf, sizeof(pidbuf) - 1, 1, pidfin); + fclose(pidfin); + + if (ferror(pidfin) != 0) + errx(EXIT_FAILURE, "Can't read from pidfile."); + + if (sscanf(pidbuf, "%d", &pid) != 1) + errx(EXIT_FAILURE, "Invalid pidfile."); + LOG_MSG_1("main", "daemon PID is %d", pid); + + + memset(&connection_params, 0, + sizeof(struct cached_connection_params)); + connection_params.socket_path = DEFAULT_SOCKET_PATH; + connection = open_cached_connection(&connection_params); + if (connection == INVALID_CACHED_CONNECTION) + errx(EXIT_FAILURE, "Can't connect to the daemon."); + + if (clear_user_cache_entries != 0) { + result = cached_transform(connection, + user_config_entry_name, TT_USER); + if (result != 0) + LOG_MSG_1("main", + "user cache transformation failed"); + else + LOG_MSG_1("main", + "user cache_transformation " + "succeeded"); + } + + if (clear_all_cache_entries != 0) { + if (geteuid() != 0) + errx(EXIT_FAILURE, "Only root can initiate " + "global cache transformation."); + + result = cached_transform(connection, + global_config_entry_name, TT_ALL); + if (result != 0) + LOG_MSG_1("main", + "global cache transformation " + "failed"); + else + LOG_MSG_1("main", + "global cache transformation " + "succeeded"); + } + + close_cached_connection(connection); + + free(user_config_entry_name); + free(global_config_entry_name); + return (EXIT_SUCCESS); + } + + pidfile = pidfile_open(DEFAULT_PIDFILE_PATH, 0600, &pid); + if (pidfile == NULL) { + if (errno == EEXIST) + errx(EXIT_FAILURE, "Daemon already running, pid: %d.", + pid); + warn("Cannot open or create pidfile"); + } + if (trace_mode_enabled == 1) TRACE_ON(); @@ -694,11 +798,14 @@ if (res != 0) { LOG_ERR_1("main", "can't daemonize myself: %s", strerror(errno)); + pidfile_remove(pidfile); goto fin; } else LOG_MSG_1("main", "successfully daemonized"); } + pidfile_write(pidfile); + /* global timer initialization */ res = init_global_timer(); if (res != 0) { @@ -770,16 +877,8 @@ destroy_configuration(s_configuration); destroy_cache_(s_cache); return (-1); - } - - /* writing PID file */ - res = write_pid_file(s_configuration->pidfile_path); - if (res != 0) { - LOG_ERR_1("main", "can't write the pid file into the %s", - s_configuration->pidfile_path); - goto fin; - } - + } + if (s_configuration->threads_num > 1) { threads = (pthread_t *)malloc(sizeof(pthread_t) * s_configuration->threads_num); @@ -823,5 +922,6 @@ /* global timer destruction */ destroy_global_timer(); - return (0); + pidfile_remove(pidfile); + return (EXIT_SUCCESS); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#11 (text+ko) ==== @@ -38,10 +38,9 @@ see them below. .Pp Each line specifies either an attribute and a value, or an attribute, -a cachename and a value. Valid cachenames are passwd, groups, hosts, -services, protocols and rpc. If you need to use some other cachename for -your own needs (for example, if some third-party application uses nsswitch), -you can simply use it without any restrictions. +a cachename and a value. Usual cachenames are passwd, groups, hosts, +services, protocols and rpc. You can also use any other cachename +(for example, if some third-party application uses nsswitch). .Pp .Bl -tag -width Pair .It Sy threads [value] ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#11 (text+ko) ==== @@ -61,6 +61,7 @@ int (*)(struct cache_common_entry_ *, struct cache_policy_item_ *)); static int ht_items_cmp_func(const void *, const void *); +static int ht_items_fixed_size_left_cmp_func(const void *, const void *); static hashtable_index_t ht_item_hash_func(const void *, size_t); /* @@ -70,6 +71,8 @@ ht_items_cmp_func(const void *p1, const void *p2) { struct cache_ht_item_data_ *hp1, *hp2; + size_t min_size; + int result; hp1 = (struct cache_ht_item_data_ *)p1; hp2 = (struct cache_ht_item_data_ *)p2; @@ -77,10 +80,46 @@ assert(hp1->key != NULL); assert(hp2->key != NULL); - if (hp1->key_size != hp2->key_size) - return (-1); + if (hp1->key_size != hp2->key_size) { + min_size = (hp1->key_size < hp2->key_size) ? hp1->key_size : + hp2->key_size; + result = memcmp(hp1->key, hp2->key, min_size); + + if (result == 0) + return ((hp1->key_size < hp2->key_size) ? -1 : 1); + else + return (result); + } else + return (memcmp(hp1->key, hp2->key, hp1->key_size)); +} + +static int +ht_items_fixed_size_left_cmp_func(const void *p1, const void *p2) +{ + struct cache_ht_item_data_ *hp1, *hp2; + size_t min_size; + int result; + + hp1 = (struct cache_ht_item_data_ *)p1; + hp2 = (struct cache_ht_item_data_ *)p2; + + assert(hp1->key != NULL); + assert(hp2->key != NULL); - return (memcmp(hp1->key, hp2->key, hp1->key_size)); + if (hp1->key_size != hp2->key_size) { + min_size = (hp1->key_size < hp2->key_size) ? hp1->key_size : + hp2->key_size; + result = memcmp(hp1->key, hp2->key, min_size); + + if (result == 0) + if (min_size == hp1->key_size) + return (0); + else + return ((hp1->key_size < hp2->key_size) ? -1 : 1); + else + return (result); + } else + return (memcmp(hp1->key, hp2->key, hp1->key_size)); } static hashtable_index_t @@ -361,6 +400,7 @@ HASHTABLE_ENTRY_REMOVE(cache_ht_, ht_item, ht_item_data); free(ht_item_data->key); free(ht_item_data->value); + free(ht_item_data); --entry->items_size; policy->destroy_item_func(item); @@ -1105,44 +1145,89 @@ TRACE_OUT(close_cache_mp_read_session); } -/* - * Transforms all cache entries, by applying the specified transformation. - */ -int -transform_cache(struct cache_ *the_cache, - enum cache_transformation_t transformation) -{ - int cur_retval; - int retval; - size_t i; - - retval = 0; - for (i = 0; i < the_cache->entries_size; ++i) { - cur_retval = transform_cache_entry(the_cache->entries[i], - transformation); - if ((cur_retval != 0) && (retval == 0)) - retval = -2; - - if ((cur_retval == 0) && (retval == -2)) - retval = -1; - } - - return (retval); -} - int transform_cache_entry(struct cache_entry_ *entry, enum cache_transformation_t transformation) { + TRACE_IN(transform_cache_entry); switch (transformation) { case CTT_CLEAR: clear_cache_entry(entry); + TRACE_OUT(transform_cache_entry); return (0); case CTT_FLUSH: flush_cache_entry(entry); + TRACE_OUT(transform_cache_entry); return (0); default: + TRACE_OUT(transform_cache_entry); return (-1); + } +} + +int +transform_cache_entry_part(struct cache_entry_ *entry, + enum cache_transformation_t transformation, const char *key_part, + size_t key_part_size, enum part_position_t part_position) +{ + struct cache_common_entry_ *common_entry; + struct cache_ht_item_ *ht_item; + struct cache_ht_item_data_ *ht_item_data, ht_key; + + struct cache_policy_item_ *item, *connected_item; + + TRACE_IN(transform_cache_entry_part); + if (entry->params->entry_type != CET_COMMON) { + TRACE_OUT(transform_cache_entry_part); + return (-1); + } + + if (transformation != CTT_FLUSH) { + TRACE_OUT(transform_cache_entry_part); + return (-1); + } + + memset(&ht_key, 0, sizeof(struct cache_ht_item_data_)); + ht_key.key = (char *)key_part; /* can't avoid casting here */ + ht_key.key_size = key_part_size; + + common_entry = (struct cache_common_entry_ *)entry; + HASHTABLE_FOREACH(&(common_entry->items), ht_item) { + do { + ht_item_data = HASHTABLE_ENTRY_FIND_SPECIAL(cache_ht_, + ht_item, &ht_key, + ht_items_fixed_size_left_cmp_func); + + if (ht_item_data != NULL) { + item = ht_item_data->fifo_policy_item; + connected_item = item->connected_item; + + + common_entry->policies[0]->remove_item_func( + common_entry->policies[0], + item); + + HASHTABLE_ENTRY_REMOVE(cache_ht_, ht_item, + ht_item_data); + free(ht_item_data->key); + free(ht_item_data->value); + free(ht_item_data); + --common_entry->items_size; + + common_entry->policies[0]->destroy_item_func( + item); + if (common_entry->policies_size == 2) { + common_entry->policies[1]->remove_item_func( + common_entry->policies[1], + connected_item); + common_entry->policies[1]->destroy_item_func( + connected_item); + } + } + } while (ht_item_data != NULL); } + + TRACE_OUT(transform_cache_entry_part); + return (0); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#11 (text+ko) ==== @@ -57,6 +57,16 @@ CMPT_WRITE_SESSION }; +/* + * When doing partial transformations of entries (which are applied for + * elements with keys, that contain specified buffer in its left or + * right part), this enum will show the needed position of the key part. + */ +enum part_position_t { + KPPT_LEFT, + KPPT_RIGHT +}; + /* num_levels attribute is obsolete, i think - user can always emulate it * by using one entry. * get_time_func is needed to have the clocks-independent counter @@ -147,7 +157,7 @@ * user can specify another policy to be applied, when there are too * many elements in the entry. So policies_size can be 1 or 2. */ - struct cache_policy_ ** policies; + struct cache_policy_ **policies; size_t policies_size; void (*get_time_func)(struct timeval *); @@ -263,7 +273,8 @@ extern void close_cache_mp_read_session(cache_mp_read_session); /* transformation routines */ -extern int transform_cache(cache, enum cache_transformation_t); extern int transform_cache_entry(cache_entry, enum cache_transformation_t); +extern int transform_cache_entry_part(cache_entry, enum cache_transformation_t, + const char *, size_t, enum part_position_t); #endif ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#11 (text+ko) ==== @@ -48,6 +48,9 @@ static int configuration_entry_cmp(const void *, const void *); static int configuration_entry_sort_cmp(const void *, const void *); +static int configuration_entry_cache_mp_sort_cmp(const void *, const void *); +static int configuration_entry_cache_mp_cmp(const void *, const void *); +static int configuration_entry_cache_mp_part_cmp(const void *, const void *); static struct configuration_entry *create_configuration_entry(const char *, struct timeval const *, struct timeval const *, struct common_cache_entry_params const *, @@ -70,6 +73,31 @@ )); } +static int +configuration_entry_cache_mp_sort_cmp(const void *e1, const void *e2) +{ + return (strcmp((*((cache_entry *)e1))->params->entry_name, + (*((cache_entry *)e2))->params->entry_name + )); +} + +static int +configuration_entry_cache_mp_cmp(const void *e1, const void *e2) +{ + return (strcmp((const char *)e1, + (*((cache_entry *)e2))->params->entry_name + )); +} + +static int +configuration_entry_cache_mp_part_cmp(const void *e1, const void *e2) +{ + return (strncmp((const char *)e1, + (*((cache_entry *)e2))->params->entry_name, + strlen((const char *)e1) + )); +} + static struct configuration_entry * create_configuration_entry(const char *name, struct timeval const *common_timeout, @@ -248,7 +276,7 @@ } if (config->entries_size == config->entries_capacity) { - struct configuration_entry **new_entries; + struct configuration_entry **new_entries; config->entries_capacity *= 2; new_entries = (struct configuration_entry **)malloc( @@ -308,6 +336,108 @@ return ((retval != NULL) ? *retval : NULL); } +/* + * All multipart cache entries are stored in the configuration_entry in the + * sorted array (sorted by names). The 3 functions below manage this array. + */ + +int +configuration_entry_add_mp_cache_entry(struct configuration_entry *config_entry, + cache_entry c_entry) +{ + cache_entry *new_mp_entries, *old_mp_entries; + + TRACE_IN(configuration_entry_add_mp_cache_entry); + ++config_entry->mp_cache_entries_size; + new_mp_entries = (cache_entry *)malloc(sizeof(cache_entry) * + config_entry->mp_cache_entries_size); + assert(new_mp_entries != NULL); + new_mp_entries[0] = c_entry; + if (config_entry->mp_cache_entries_size - 1 > 0) { + memcpy(new_mp_entries + 1, + config_entry->mp_cache_entries, + config_entry->mp_cache_entries_size - 1); + } + + old_mp_entries = config_entry->mp_cache_entries; + config_entry->mp_cache_entries = new_mp_entries; + free(old_mp_entries); + + qsort(config_entry->mp_cache_entries, + config_entry->mp_cache_entries_size, + sizeof(cache_entry), + configuration_entry_cache_mp_sort_cmp); + + TRACE_OUT(configuration_entry_add_mp_cache_entry); + + return (0); +} + +cache_entry +configuration_entry_find_mp_cache_entry( + struct configuration_entry *config_entry, const char *mp_name) +{ + cache_entry *result; + + TRACE_IN(configuration_entry_find_mp_cache_entry); + result = bsearch(mp_name, config_entry->mp_cache_entries, + config_entry->mp_cache_entries_size, + sizeof(cache_entry), configuration_entry_cache_mp_cmp); + + if (result == NULL) { + TRACE_OUT(configuration_entry_find_mp_cache_entry); + return (NULL); + } else { + TRACE_OUT(configuration_entry_find_mp_cache_entry); + return (*result); + } +} + +/* + * Searches for all multipart entries with names starting with mp_name. + * Needed for cache flushing. + */ +int +configuration_entry_find_mp_cache_entries( + struct configuration_entry *config_entry, const char *mp_name, + cache_entry **start, cache_entry **finish) +{ + cache_entry *result; + + TRACE_IN(configuration_entry_find_mp_cache_entries); + result = bsearch(mp_name, config_entry->mp_cache_entries, + config_entry->mp_cache_entries_size, + sizeof(cache_entry), configuration_entry_cache_mp_part_cmp); + + if (result == NULL) { + TRACE_OUT(configuration_entry_find_mp_cache_entries); + return (-1); + } + + *start = result; + *finish = result + 1; + + while (*start != config_entry->mp_cache_entries) { + if (configuration_entry_cache_mp_part_cmp(mp_name, *start - 1) == 0) + *start = *start - 1; + else + break; + } + + while (*finish != config_entry->mp_cache_entries + + config_entry->mp_cache_entries_size) { + + if (configuration_entry_cache_mp_part_cmp( + mp_name, *finish) == 0) + *finish = *finish + 1; + else + break; + } + + TRACE_OUT(configuration_entry_find_mp_cache_entries); + return (0); +} + /* * Configuration entry uses rwlock to handle access to its fields. */ ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#11 (text+ko) ==== @@ -133,6 +133,15 @@ struct configuration *, size_t); extern struct configuration_entry *configuration_find_entry( struct configuration *, const char *); + +extern int configuration_entry_add_mp_cache_entry(struct configuration_entry *, + cache_entry); +extern cache_entry configuration_entry_find_mp_cache_entry( + struct configuration_entry *, + const char *); +extern int configuration_entry_find_mp_cache_entries( + struct configuration_entry *, const char *, cache_entry **, + cache_entry **); extern void configuration_lock_rdlock(struct configuration *config); extern void configuration_lock_wrlock(struct configuration *config); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#11 (text+ko) ==== @@ -145,7 +145,9 @@ hashtable_index_t name##_CALCULATE_HASH(struct name *, type *); \ void name##_ENTRY_STORE(struct entry_*, type *); \ type *name##_ENTRY_FIND(struct entry_*, type *); \ -void name##_ENTRY_REMOVE(struct entry_*, type *); \ +type *name##_ENTRY_FIND_SPECIAL(struct entry_ *, type *, \ + int (*) (const void *, const void *)); \ +void name##_ENTRY_REMOVE(struct entry_*, type *); /* * Generates implementations of the hash table functions @@ -177,6 +179,13 @@ the_entry->field.size, sizeof(type), CMP)); \ } \ \ +type *name##_ENTRY_FIND_SPECIAL(struct entry_ *the_entry, type *key, \ + int (*compar) (const void *, const void *)) \ +{ \ + return ((type *)bsearch(key, the_entry->field.values, \ + the_entry->field.size, sizeof(type), compar)); \ +} \ + \ void name##_ENTRY_REMOVE(struct entry_ *the_entry, type *del_elm) \ { \ \ @@ -199,6 +208,9 @@ #define HASHTABLE_ENTRY_FIND(name, entry, key) \ (name##_ENTRY_FIND((entry), (key))) +#define HASHTABLE_ENTRY_FIND_SPECIAL(name, entry, key, cmp) \ + (name##_ENTRY_FIND_SPECIAL((entry), (key), (cmp))) + #define HASHTABLE_ENTRY_REMOVE(name, entry, del_elm) \ name##_ENTRY_REMOVE((entry), (del_elm)) ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#11 (text+ko) ==== @@ -499,7 +499,7 @@ cache_entry register_new_mp_cache_entry(struct query_state *qstate, const char *dec_cache_entry_name) { - cache_entry c_entry, *new_mp_entries, *old_mp_entries; + cache_entry c_entry; char *en_bkp; TRACE_IN(register_new_mp_cache_entry); @@ -520,21 +520,9 @@ dec_cache_entry_name); configuration_unlock(s_configuration); - ++qstate->config_entry->mp_cache_entries_size; - new_mp_entries = (cache_entry *)malloc(sizeof(cache_entry) * - qstate->config_entry->mp_cache_entries_size); - assert(new_mp_entries != NULL); - new_mp_entries[0] = c_entry; - if (qstate->config_entry->mp_cache_entries_size -1 > 0) { - memcpy(new_mp_entries + 1, - qstate->config_entry->mp_cache_entries, - qstate->config_entry->mp_cache_entries_size - 1); - } - - old_mp_entries = qstate->config_entry->mp_cache_entries; - qstate->config_entry->mp_cache_entries = new_mp_entries; - free(old_mp_entries); - + configuration_entry_add_mp_cache_entry(qstate->config_entry, + c_entry); + configuration_unlock_entry(qstate->config_entry, CELT_MULTIPART); ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#11 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#11 (text+ko) ==== @@ -38,6 +38,7 @@ void init_comm_element(struct comm_element *element, enum comm_element_t type) { + TRACE_IN(init_comm_element); memset(element, 0, sizeof(struct comm_element)); @@ -84,6 +85,8 @@ init_cache_mp_read_session_read_response( &element->c_mp_rs_read_response); break; + case CET_UNDEFINED: + break; default: LOG_ERR_2("init_comm_element", "invalid communication element"); TRACE_OUT(init_comm_element); @@ -97,6 +100,7 @@ void finalize_comm_element(struct comm_element *element) { + TRACE_IN(finalize_comm_element); switch (element->type) { case CET_WRITE_REQUEST: @@ -146,6 +150,8 @@ finalize_cache_mp_read_session_read_response( &element->c_mp_rs_read_response); break; + case CET_UNDEFINED: + break; default: break; } @@ -157,6 +163,7 @@ void init_cache_write_request(struct cache_write_request *write_request) { + TRACE_IN(init_cache_write_request); memset(write_request, 0, sizeof(struct cache_write_request)); TRACE_OUT(init_cache_write_request); @@ -165,6 +172,7 @@ void finalize_cache_write_request(struct cache_write_request *write_request) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 18 14:19:17 2005 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 9B2CF16A421; Fri, 18 Nov 2005 14:19:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71D7216A41F for ; Fri, 18 Nov 2005 14:19:16 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C0D643D4C for ; Fri, 18 Nov 2005 14:19:16 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAIEJF4I003708 for ; Fri, 18 Nov 2005 14:19:15 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAIEJFFP003705 for perforce@freebsd.org; Fri, 18 Nov 2005 14:19:15 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 18 Nov 2005 14:19:15 GMT Message-Id: <200511181419.jAIEJFFP003705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 86906 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, 18 Nov 2005 14:19:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=86906 Change 86906 by soc-bushman@soc-bushman_stinger on 2005/11/18 14:18:51 huge bugfix in the caching library and some minor bugfixes Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#5 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#8 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#12 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#7 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#5 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#8 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#12 (text+ko) ==== @@ -381,6 +381,7 @@ item = policy->get_first_item_func(policy); while ((item != NULL) && (continue_func(entry, item) == 1)) { next_item = policy->get_next_item_func(policy, item); + TRACE_PTR(next_item); connected_item = item->connected_item; policy->remove_item_func(policy, item); @@ -389,20 +390,30 @@ ht_key.key = item->key; ht_key.key_size = item->key_size; + TRACE_POINT(); hash = HASHTABLE_CALCULATE_HASH(cache_ht_, &entry->items, &ht_key); assert(hash >= 0); assert(hash < HASHTABLE_ENTRIES_COUNT(&entry->items)); - + + TRACE_POINT(); ht_item = HASHTABLE_GET_ENTRY(&(entry->items), hash); - ht_item_data = HASHTABLE_ENTRY_FIND(cache_ht_, ht_item, &ht_key); + TRACE_POINT(); + ht_item_data = HASHTABLE_ENTRY_FIND(cache_ht_, ht_item, + &ht_key); assert(ht_item_data != NULL); - HASHTABLE_ENTRY_REMOVE(cache_ht_, ht_item, ht_item_data); + TRACE_POINT(); + TRACE_POINT(); + TRACE_PTR(ht_item_data->key); + TRACE_INT(ht_item_data->key_size); free(ht_item_data->key); + TRACE_POINT(); free(ht_item_data->value); - free(ht_item_data); + TRACE_POINT(); + HASHTABLE_ENTRY_REMOVE(cache_ht_, ht_item, ht_item_data); --entry->items_size; + TRACE_POINT(); policy->destroy_item_func(item); if (connected_item != NULL) { @@ -743,9 +754,9 @@ find_res->fifo_policy_item->creation_time.tv_sec > common_entry->common_params.max_lifetime.tv_sec) { - HASHTABLE_ENTRY_REMOVE(cache_ht_, item, find_res); free(find_res->key); free(find_res->value); + HASHTABLE_ENTRY_REMOVE(cache_ht_, item, find_res); connected_item = find_res->fifo_policy_item->connected_item; @@ -1208,11 +1219,10 @@ common_entry->policies[0], item); + free(ht_item_data->key); + free(ht_item_data->value); HASHTABLE_ENTRY_REMOVE(cache_ht_, ht_item, ht_item_data); - free(ht_item_data->key); - free(ht_item_data->value); - free(ht_item_data); --common_entry->items_size; common_entry->policies[0]->destroy_item_func( ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#12 (text+ko) ==== @@ -40,16 +40,16 @@ #define DEFAULT_COMMON_ENTRY_TIMEOUT 10 #define DEFAULT_MP_ENTRY_TIMEOUT 60 -#define DEFAULT_CACHE_HT_SIZE 257 +#define DEFAULT_CACHE_HT_SIZE 1 //257 #define INITIAL_ENTRIES_CAPACITY 8 #define DEFAULT_SOCKET_PATH "/var/run/cached" #define DEFAULT_PIDFILE_PATH "/var/run/cached.pid" -#define DEFAULT_POSITIVE_ELEMENTS_SIZE (2048) +#define DEFAULT_POSITIVE_ELEMENTS_SIZE 1//(2048) #define DEFAULT_POSITIVE_LIFETIME (60 * 60 * 12) -#define DEFAULT_NEGATIVE_ELEMENTS_SIZE (512) +#define DEFAULT_NEGATIVE_ELEMENTS_SIZE 1//(512) #define DEFAULT_NEGATIVE_LIFETIME (60 * 60) #define DEFAULT_MULTIPART_ELEMENTS_SIZE (1024 * 8) ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#12 (text+ko) ==== @@ -940,7 +940,6 @@ { struct cache_transform_request *transform_request; struct cache_transform_response *transform_response; - struct configuration_entry *config_entry; size_t i, size; TRACE_IN(on_transform_request_process); @@ -976,7 +975,7 @@ goto fin; } - clear_config_entry_part(config_entry, + clear_config_entry_part(qstate->config_entry, qstate->eid_str, qstate->eid_str_length); } break; ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#12 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Nov 18 14:23:23 2005 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 4E15E16A421; Fri, 18 Nov 2005 14:23:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 286BE16A41F for ; Fri, 18 Nov 2005 14:23:23 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAB0D43D45 for ; Fri, 18 Nov 2005 14:23:22 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAIENMk5004142 for ; Fri, 18 Nov 2005 14:23:22 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAIENMGX004139 for perforce@freebsd.org; Fri, 18 Nov 2005 14:23:22 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 18 Nov 2005 14:23:22 GMT Message-Id: <200511181423.jAIENMGX004139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 86909 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, 18 Nov 2005 14:23:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=86909 Change 86909 by soc-bushman@soc-bushman_stinger on 2005/11/18 14:23:03 tcache transformations are in the working condition but still require testing :) Affected files ... .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#14 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#6 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#9 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#13 edit .. //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#8 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/Makefile#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/Makefile#14 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.c#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agent.h#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/Makefile.inc#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.c#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/group.h#6 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/hosts.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/passwd.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.c#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/agents/services.h#9 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.8#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cached.conf.5#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.c#13 (text+ko) ==== @@ -1194,7 +1194,7 @@ return (-1); } - if (transformation != CTT_FLUSH) { + if (transformation != CTT_CLEAR) { TRACE_OUT(transform_cache_entry_part); return (-1); } ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cachelib.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/cacheplcs.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/config.h#13 (text+ko) ==== @@ -46,10 +46,10 @@ #define DEFAULT_SOCKET_PATH "/var/run/cached" #define DEFAULT_PIDFILE_PATH "/var/run/cached.pid" -#define DEFAULT_POSITIVE_ELEMENTS_SIZE 1//(2048) +#define DEFAULT_POSITIVE_ELEMENTS_SIZE 1 // (2048) #define DEFAULT_POSITIVE_LIFETIME (60 * 60 * 12) -#define DEFAULT_NEGATIVE_ELEMENTS_SIZE 1//(512) +#define DEFAULT_NEGATIVE_ELEMENTS_SIZE 2 // (512) #define DEFAULT_NEGATIVE_LIFETIME (60 * 60) #define DEFAULT_MULTIPART_ELEMENTS_SIZE (1024 * 8) ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/debug.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/hashtable.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/log.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_rs_query.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/mp_ws_query.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/parser.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/protocol.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/query.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.c#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/cached/singletons.h#13 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/release/cached-0.2/startup/cached#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Nov 18 22:45:13 2005 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 D61B416A421; Fri, 18 Nov 2005 22:45:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACB3416A41F for ; Fri, 18 Nov 2005 22:45:12 +0000 (GMT) (envelope-from anholt@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F5E843D45 for ; Fri, 18 Nov 2005 22:45:12 +0000 (GMT) (envelope-from anholt@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAIMjCsg042910 for ; Fri, 18 Nov 2005 22:45:12 GMT (envelope-from anholt@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAIMjBxE042907 for perforce@freebsd.org; Fri, 18 Nov 2005 22:45:11 GMT (envelope-from anholt@freebsd.org) Date: Fri, 18 Nov 2005 22:45:11 GMT Message-Id: <200511182245.jAIMjBxE042907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anholt@freebsd.org using -f From: Eric Anholt To: Perforce Change Reviews Cc: Subject: PERFORCE change 86943 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, 18 Nov 2005 22:45:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=86943 Change 86943 by anholt@anholt_leguin on 2005/11/18 22:44:58 MF DRI CVS Affected files ... .. //depot/projects/drm-merge-vendor/sys/dev/drm/ati_pcigart.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drmP.h#6 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_agpsupport.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_bufs.c#6 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#6 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_memory.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pciids.h#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_vm.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/i810_dma.c#1 add .. //depot/projects/drm-merge-vendor/sys/dev/drm/i810_drv.c#1 add .. //depot/projects/drm-merge-vendor/sys/dev/drm/i810_drv.h#1 add .. //depot/projects/drm-merge-vendor/sys/dev/drm/i915_dma.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/i915_drv.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/i915_drv.h#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/i915_mem.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/imagine_drv.h#1 add .. //depot/projects/drm-merge-vendor/sys/dev/drm/mach64_drv.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mach64_drv.h#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mach64_state.c#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mga_dma.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mga_drv.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mga_drv.h#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/mga_state.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/r128_cce.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/r128_drv.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/r128_drv.h#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/r128_state.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_cp.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_drm.h#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_drv.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_drv.h#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_irq.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/radeon_state.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/savage_bci.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/savage_drv.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/savage_drv.h#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/savage_state.c#4 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/sis_drv.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/sis_drv.h#3 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/sis_mm.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/tdfx_drv.c#5 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_dma.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_drm.h#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_drv.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_drv.h#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_irq.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_map.c#2 edit .. //depot/projects/drm-merge-vendor/sys/dev/drm/via_mm.c#2 edit Differences ... ==== //depot/projects/drm-merge-vendor/sys/dev/drm/ati_pcigart.c#5 (text+ko) ==== @@ -35,32 +35,34 @@ #define ATI_MAX_PCIGART_PAGES 8192 /* 32 MB aperture, 4K pages */ #define ATI_PCIGART_TABLE_SIZE 32768 -int drm_ati_pcigart_init(drm_device_t *dev, unsigned long *addr, - dma_addr_t *bus_addr, int is_pcie) +int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { unsigned long pages; - u32 *pci_gart = 0, page_base; + u32 *pci_gart = NULL, page_base; int i, j; - *addr = 0; - *bus_addr = 0; - if (dev->sg == NULL) { DRM_ERROR( "no scatter/gather memory!\n" ); return 0; } - dev->sg->dmah = drm_pci_alloc(dev, ATI_PCIGART_TABLE_SIZE, 0, - 0xfffffffful); - if (dev->sg->dmah == NULL) { - DRM_ERROR("cannot allocate PCI GART table!\n"); - return 0; + if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) { + /* GART table in system memory */ + dev->sg->dmah = drm_pci_alloc(dev, ATI_PCIGART_TABLE_SIZE, 0, + 0xfffffffful); + if (dev->sg->dmah == NULL) { + DRM_ERROR("cannot allocate PCI GART table!\n"); + return 0; + } + + gart_info->addr = (void *)dev->sg->dmah->vaddr; + gart_info->bus_addr = dev->sg->dmah->busaddr; + pci_gart = (u32 *)dev->sg->dmah->vaddr; + } else { + /* GART table in framebuffer memory */ + pci_gart = gart_info->addr; } - - *addr = (long)dev->sg->dmah->vaddr; - *bus_addr = dev->sg->dmah->busaddr; - pci_gart = (u32 *)dev->sg->dmah->vaddr; - + pages = DRM_MIN(dev->sg->pages, ATI_MAX_PCIGART_PAGES); bzero(pci_gart, ATI_PCIGART_TABLE_SIZE); @@ -71,12 +73,9 @@ page_base = (u32) dev->sg->busaddr[i]; for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { - if (is_pcie) { - *pci_gart = (cpu_to_le32(page_base)>>8) | 0xc; - DRM_DEBUG("PCIE: %d %08X %08X to %p\n", i, - page_base, (cpu_to_le32(page_base)>>8)|0xc, - pci_gart); - } else + if (gart_info->is_pcie) + *pci_gart = (cpu_to_le32(page_base) >> 8) | 0xc; + else *pci_gart = cpu_to_le32(page_base); pci_gart++; page_base += ATI_PCIGART_PAGE_SIZE; @@ -88,8 +87,7 @@ return 1; } -int drm_ati_pcigart_cleanup(drm_device_t *dev, unsigned long addr, - dma_addr_t bus_addr) +int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { if (dev->sg == NULL) { DRM_ERROR( "no scatter/gather memory!\n" ); ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drmP.h#6 (text+ko) ==== @@ -448,11 +448,12 @@ char *name; } drm_pci_id_list_t; +#define DRM_AUTH 0x1 +#define DRM_MASTER 0x2 +#define DRM_ROOT_ONLY 0x4 typedef struct drm_ioctl_desc { int (*func)(DRM_IOCTL_ARGS); - int auth_needed; - int master; - int root_only; + int flags; } drm_ioctl_desc_t; typedef struct drm_magic_entry { @@ -621,6 +622,18 @@ int pid; } drm_vbl_sig_t; +/* location of GART table */ +#define DRM_ATI_GART_MAIN 1 +#define DRM_ATI_GART_FB 2 + +typedef struct ati_pcigart_info { + int gart_table_location; + int is_pcie; + void *addr; + dma_addr_t bus_addr; + drm_local_map_t mapping; +} drm_ati_pcigart_info; + struct drm_driver_info { int (*load)(struct drm_device *, unsigned long flags); int (*firstopen)(struct drm_device *); @@ -830,7 +843,7 @@ void *drm_ioremap(drm_device_t *dev, drm_local_map_t *map); void drm_ioremapfree(drm_local_map_t *map); int drm_mtrr_add(unsigned long offset, size_t size, int flags); -int drm_mtrr_del(unsigned long offset, size_t size, int flags); +int drm_mtrr_del(int handle, unsigned long offset, size_t size, int flags); int drm_context_switch(drm_device_t *dev, int old, int new); int drm_context_switch_complete(drm_device_t *dev, int new); @@ -867,6 +880,7 @@ void drm_dma_takedown(drm_device_t *dev); void drm_free_buffer(drm_device_t *dev, drm_buf_t *buf); void drm_reclaim_buffers(drm_device_t *dev, DRMFILE filp); +#define drm_core_reclaim_buffers drm_reclaim_buffers /* IRQ support (drm_irq.c) */ int drm_irq_install(drm_device_t *dev); @@ -882,7 +896,6 @@ int drm_device_is_agp(drm_device_t *dev); int drm_device_is_pcie(drm_device_t *dev); drm_agp_head_t *drm_agp_init(void); -void drm_agp_uninit(void); int drm_agp_acquire(drm_device_t *dev); int drm_agp_release(drm_device_t *dev); int drm_agp_info(drm_device_t * dev, drm_agp_info_t *info); @@ -891,10 +904,10 @@ int drm_agp_free_memory(void *handle); int drm_agp_bind_memory(void *handle, off_t start); int drm_agp_unbind_memory(void *handle); -#define drm_alloc_agp(dev, pages, type) drm_agp_allocate_memory(pages, type) -#define drm_free_agp(handle, pages) drm_agp_free_memory(handle) -#define drm_bind_agp(handle, start) drm_agp_bind_memory(handle, start) -#define drm_unbind_agp(handle) drm_agp_unbind_memory(handle) +int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request); +int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request); +int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request); +int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request); /* Scatter Gather Support (drm_scatter.c) */ void drm_sg_cleanup(drm_sg_mem_t *entry); @@ -906,10 +919,10 @@ #endif /* __FreeBSD__ */ /* ATI PCIGART support (ati_pcigart.c) */ -int drm_ati_pcigart_init(drm_device_t *dev, unsigned long *addr, - dma_addr_t *bus_addr, int is_pcie); -int drm_ati_pcigart_cleanup(drm_device_t *dev, unsigned long addr, - dma_addr_t bus_addr); +int drm_ati_pcigart_init(drm_device_t *dev, + drm_ati_pcigart_info *gart_info); +int drm_ati_pcigart_cleanup(drm_device_t *dev, + drm_ati_pcigart_info *gart_info); /* Locking IOCTL support (drm_drv.c) */ int drm_lock(DRM_IOCTL_ARGS); @@ -966,10 +979,10 @@ int drm_agp_release_ioctl(DRM_IOCTL_ARGS); int drm_agp_enable_ioctl(DRM_IOCTL_ARGS); int drm_agp_info_ioctl(DRM_IOCTL_ARGS); -int drm_agp_alloc(DRM_IOCTL_ARGS); -int drm_agp_free(DRM_IOCTL_ARGS); -int drm_agp_unbind(DRM_IOCTL_ARGS); -int drm_agp_bind(DRM_IOCTL_ARGS); +int drm_agp_alloc_ioctl(DRM_IOCTL_ARGS); +int drm_agp_free_ioctl(DRM_IOCTL_ARGS); +int drm_agp_unbind_ioctl(DRM_IOCTL_ARGS); +int drm_agp_bind_ioctl(DRM_IOCTL_ARGS); /* Scatter Gather Support (drm_scatter.c) */ int drm_sg_alloc(DRM_IOCTL_ARGS); ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_agpsupport.c#4 (text+ko) ==== @@ -194,10 +194,8 @@ return drm_agp_enable(dev, mode); } -int drm_agp_alloc(DRM_IOCTL_ARGS) +int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request) { - DRM_DEVICE; - drm_agp_buffer_t request; drm_agp_mem_t *entry; void *handle; unsigned long pages; @@ -207,16 +205,17 @@ if (!dev->agp || !dev->agp->acquired) return EINVAL; - request = *(drm_agp_buffer_t *) data; - entry = malloc(sizeof(*entry), M_DRM, M_NOWAIT | M_ZERO); if (entry == NULL) return ENOMEM; - pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE; - type = (u_int32_t) request.type; + pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE; + type = (u_int32_t) request->type; - if (!(handle = drm_agp_allocate_memory(pages, type))) { + DRM_UNLOCK(); + handle = drm_agp_allocate_memory(pages, type); + DRM_LOCK(); + if (handle == NULL) { free(entry, M_DRM); return ENOMEM; } @@ -232,12 +231,27 @@ agp_memory_info(dev->agp->agpdev, entry->handle, &info); - request.handle = (unsigned long) entry->handle; - request.physical = info.ami_physical; + request->handle = (unsigned long) entry->handle; + request->physical = info.ami_physical; + + return 0; +} + +int drm_agp_alloc_ioctl(DRM_IOCTL_ARGS) +{ + DRM_DEVICE; + drm_agp_buffer_t request; + int retcode; + + request = *(drm_agp_buffer_t *) data; + + DRM_LOCK(); + retcode = drm_agp_alloc(dev, &request); + DRM_UNLOCK(); *(drm_agp_buffer_t *) data = request; - return 0; + return retcode; } static drm_agp_mem_t * drm_agp_lookup_entry(drm_device_t *dev, void *handle) @@ -250,64 +264,94 @@ return NULL; } -int drm_agp_unbind(DRM_IOCTL_ARGS) +int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request) { - DRM_DEVICE; - drm_agp_binding_t request; drm_agp_mem_t *entry; int retcode; if (!dev->agp || !dev->agp->acquired) return EINVAL; - request = *(drm_agp_binding_t *) data; - if (!(entry = drm_agp_lookup_entry(dev, (void *)request.handle))) + + entry = drm_agp_lookup_entry(dev, (void *)request->handle); + if (entry == NULL || !entry->bound) return EINVAL; - if (!entry->bound) return EINVAL; + + DRM_UNLOCK(); retcode = drm_agp_unbind_memory(entry->handle); - if (!retcode) - { - entry->bound=0; - return 0; - } - else - return retcode; + DRM_LOCK(); + + if (retcode == 0) + entry->bound = 0; + + return retcode; } -int drm_agp_bind(DRM_IOCTL_ARGS) +int drm_agp_unbind_ioctl(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_agp_binding_t request; + int retcode; + + request = *(drm_agp_binding_t *) data; + + DRM_LOCK(); + retcode = drm_agp_unbind(dev, &request); + DRM_UNLOCK(); + + return retcode; +} + +int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request) +{ drm_agp_mem_t *entry; int retcode; int page; - DRM_DEBUG("agp_bind, page_size=%x\n", PAGE_SIZE); if (!dev->agp || !dev->agp->acquired) return EINVAL; - request = *(drm_agp_binding_t *) data; - if (!(entry = drm_agp_lookup_entry(dev, (void *)request.handle))) + + DRM_DEBUG("agp_bind, page_size=%x\n", PAGE_SIZE); + + entry = drm_agp_lookup_entry(dev, (void *)request->handle); + if (entry == NULL || entry->bound) return EINVAL; - if (entry->bound) return EINVAL; - page = (request.offset + PAGE_SIZE - 1) / PAGE_SIZE; - if ((retcode = drm_agp_bind_memory(entry->handle, page))) - return retcode; - entry->bound = dev->agp->base + (page << PAGE_SHIFT); - return 0; + + page = (request->offset + PAGE_SIZE - 1) / PAGE_SIZE; + + DRM_UNLOCK(); + retcode = drm_agp_bind_memory(entry->handle, page); + DRM_LOCK(); + if (retcode == 0) + entry->bound = dev->agp->base + (page << PAGE_SHIFT); + + return retcode; } -int drm_agp_free(DRM_IOCTL_ARGS) +int drm_agp_bind_ioctl(DRM_IOCTL_ARGS) { DRM_DEVICE; - drm_agp_buffer_t request; + drm_agp_binding_t request; + int retcode; + + request = *(drm_agp_binding_t *) data; + + DRM_LOCK(); + retcode = drm_agp_bind(dev, &request); + DRM_UNLOCK(); + + return retcode; +} + +int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request) +{ drm_agp_mem_t *entry; if (!dev->agp || !dev->agp->acquired) return EINVAL; - request = *(drm_agp_buffer_t *) data; - if (!(entry = drm_agp_lookup_entry(dev, (void*)request.handle))) + + entry = drm_agp_lookup_entry(dev, (void*)request->handle); + if (entry == NULL) return EINVAL; - if (entry->bound) - drm_agp_unbind_memory(entry->handle); if (entry->prev) entry->prev->next = entry->next; @@ -315,9 +359,32 @@ dev->agp->memory = entry->next; if (entry->next) entry->next->prev = entry->prev; + + DRM_UNLOCK(); + if (entry->bound) + drm_agp_unbind_memory(entry->handle); drm_agp_free_memory(entry->handle); + DRM_LOCK(); + free(entry, M_DRM); + return 0; + +} + +int drm_agp_free_ioctl(DRM_IOCTL_ARGS) +{ + DRM_DEVICE; + drm_agp_buffer_t request; + int retcode; + + request = *(drm_agp_buffer_t *) data; + + DRM_LOCK(); + retcode = drm_agp_free(dev, &request); + DRM_UNLOCK(); + + return retcode; } drm_agp_head_t *drm_agp_init(void) @@ -346,12 +413,6 @@ return head; } -void drm_agp_uninit(void) -{ -/* FIXME: What goes here */ -} - - void *drm_agp_allocate_memory(size_t pages, u32 type) { device_t agpdev; ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_bufs.c#6 (text+ko) ==== @@ -53,7 +53,7 @@ /* Allocation of PCI memory resources (framebuffer, registers, etc.) for * drm_get_resource_*. Note that they are not RF_ACTIVE, so there's no virtual - * address for accessing them. Cleaned up at lastclose. + * address for accessing them. Cleaned up at unload. */ static int drm_alloc_resource(drm_device_t *dev, int resource) { @@ -61,12 +61,17 @@ DRM_ERROR("Resource %d too large\n", resource); return 1; } - if (dev->pcir[resource] != NULL) + + DRM_UNLOCK(); + if (dev->pcir[resource] != NULL) { + DRM_LOCK(); return 0; + } dev->pcirid[resource] = PCIR_BAR(resource); dev->pcir[resource] = bus_alloc_resource_any(dev->device, SYS_RES_MEMORY, &dev->pcirid[resource], RF_SHAREABLE); + DRM_LOCK(); if (dev->pcir[resource] == NULL) { DRM_ERROR("Couldn't find resource 0x%x\n", resource); @@ -127,17 +132,17 @@ */ if (type == _DRM_REGISTERS || type == _DRM_FRAME_BUFFER || type == _DRM_SHM) { - DRM_LOCK(); TAILQ_FOREACH(map, &dev->maplist, link) { - if (map->type == type && - (map->offset == offset || map->type == _DRM_SHM)) { + if (map->type == type && (map->offset == offset || + (map->type == _DRM_SHM && + map->flags == _DRM_CONTAINS_LOCK))) { map->size = size; DRM_DEBUG("Found kernel map %d\n", type); goto done; } } - DRM_UNLOCK(); } + DRM_UNLOCK(); /* Allocate a new map structure, fill it in, and do any type-specific * initialization necessary. @@ -236,7 +241,6 @@ done: /* Jumped to, with lock held, when a kernel map is found. */ - DRM_UNLOCK(); DRM_DEBUG("Added map %d 0x%lx/0x%lx\n", map->type, map->offset, map->size); @@ -261,8 +265,10 @@ if (!DRM_SUSER(p) && request.type != _DRM_AGP) return DRM_ERR(EACCES); + DRM_LOCK(); err = drm_addmap(dev, request.offset, request.size, request.type, request.flags, &map); + DRM_UNLOCK(); if (err != 0) return err; @@ -296,7 +302,7 @@ if (map->mtrr) { int __unused retcode; - retcode = drm_mtrr_del(map->offset, map->size, + retcode = drm_mtrr_del(0, map->offset, map->size, DRM_MTRR_WC); DRM_DEBUG("mtrr_del = %d\n", retcode); } ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#6 (text+ko) ==== @@ -60,63 +60,63 @@ #endif /* __NetBSD__ || __OpenBSD__ */ static drm_ioctl_desc_t drm_ioctls[256] = { - [DRM_IOCTL_NR(DRM_IOCTL_VERSION)] = { drm_version, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)] = { drm_getunique, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)] = { drm_getmagic, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)] = { drm_irq_by_busid, 0, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP)] = { drm_getmap, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT)] = { drm_getclient, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_STATS)] = { drm_getstats, 0, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_SET_VERSION)] = { drm_setversion, 0, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_VERSION)] = { drm_version, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE)] = { drm_getunique, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_MAGIC)] = { drm_getmagic, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_IRQ_BUSID)] = { drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY}, + [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP)] = { drm_getmap, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_CLIENT)] = { drm_getclient, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_STATS)] = { drm_getstats, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_SET_VERSION)] = { drm_setversion, DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)] = { drm_setunique, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_BLOCK)] = { drm_noop, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)] = { drm_noop, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)] = { drm_authmagic, 1, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_SET_UNIQUE)] = { drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_BLOCK)] = { drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)] = { drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)] = { drm_authmagic, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)] = { drm_addmap_ioctl, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP)] = { drm_rmmap_ioctl, 1, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)] = { drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP)] = { drm_rmmap_ioctl, DRM_AUTH }, - [DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)] = { drm_setsareactx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)] = { drm_getsareactx, 1, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)] = { drm_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)] = { drm_getsareactx, DRM_AUTH }, - [DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)] = { drm_addctx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)] = { drm_rmctx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)] = { drm_modctx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)] = { drm_getctx, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)] = { drm_switchctx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)] = { drm_newctx, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)] = { drm_resctx, 1, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_ADD_CTX)] = { drm_addctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_RM_CTX)] = { drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_MOD_CTX)] = { drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_GET_CTX)] = { drm_getctx, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_SWITCH_CTX)] = { drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_NEW_CTX)] = { drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_RES_CTX)] = { drm_resctx, DRM_AUTH }, - [DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)] = { drm_adddraw, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)] = { drm_rmdraw, 1, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_ADD_DRAW)] = { drm_adddraw, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_RM_DRAW)] = { drm_rmdraw, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_LOCK)] = { drm_lock, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)] = { drm_unlock, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_FINISH)] = { drm_noop, 1, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_LOCK)] = { drm_lock, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)] = { drm_unlock, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_FINISH)] = { drm_noop, DRM_AUTH }, - [DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)] = { drm_addbufs_ioctl, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)] = { drm_markbufs, 1, 1, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)] = { drm_infobufs, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)] = { drm_mapbufs, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)] = { drm_freebufs, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { drm_dma, 1, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_ADD_BUFS)] = { drm_addbufs_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_MARK_BUFS)] = { drm_markbufs, DRM_AUTH|DRM_MASTER }, + [DRM_IOCTL_NR(DRM_IOCTL_INFO_BUFS)] = { drm_infobufs, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_MAP_BUFS)] = { drm_mapbufs, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_FREE_BUFS)] = { drm_freebufs, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_DMA)] = { drm_dma, DRM_AUTH }, - [DRM_IOCTL_NR(DRM_IOCTL_CONTROL)] = { drm_control, 1, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_CONTROL)] = { drm_control, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)] = { drm_agp_acquire_ioctl, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)] = { drm_agp_release_ioctl, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)] = { drm_agp_enable_ioctl, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)] = { drm_agp_info_ioctl, 1, 0, 0 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)] = { drm_agp_alloc, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)] = { drm_agp_free, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)] = { drm_agp_bind, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)] = { drm_agp_unbind, 1, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)] = { drm_agp_acquire_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)] = { drm_agp_release_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)] = { drm_agp_enable_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)] = { drm_agp_info_ioctl, DRM_AUTH }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)] = { drm_agp_alloc_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)] = { drm_agp_free_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)] = { drm_agp_bind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)] = { drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)] = { drm_sg_alloc, 1, 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)] = { drm_sg_free, 1, 1, 1 }, + [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)] = { drm_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, + [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)] = { drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }, - [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)] = { drm_wait_vblank, 0, 0, 0 }, + [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK)] = { drm_wait_vblank, 0 }, }; #ifdef __FreeBSD__ @@ -474,13 +474,7 @@ TAILQ_FOREACH_SAFE(map, &dev->maplist, link, mapsave) { drm_rmmap(dev, map); } - for (i = 0; i < DRM_MAX_PCI_RESOURCE; i++) { - if (dev->pcir[i] == NULL) - continue; - bus_release_resource(dev->device, SYS_RES_MEMORY, - dev->pcirid[i], dev->pcir[i]); - dev->pcir[i] = NULL; - } + drm_dma_takedown(dev); if ( dev->lock.hw_lock ) { @@ -514,7 +508,9 @@ TAILQ_INIT(&dev->files); if (dev->driver.load != NULL) { + DRM_LOCK(); retcode = dev->driver.load(dev, dev->id_entry->driver_private); + DRM_UNLOCK(); if (retcode != 0) goto error; } @@ -568,6 +564,8 @@ static void drm_unload(drm_device_t *dev) { + int i; + DRM_DEBUG( "\n" ); #ifdef __FreeBSD__ @@ -580,7 +578,7 @@ if (dev->agp && dev->agp->mtrr) { int __unused retcode; - retcode = drm_mtrr_del(dev->agp->info.ai_aperture_base, + retcode = drm_mtrr_del(0, dev->agp->info.ai_aperture_base, dev->agp->info.ai_aperture_size, DRM_MTRR_WC); DRM_DEBUG("mtrr_del = %d", retcode); } @@ -589,8 +587,20 @@ drm_lastclose(dev); DRM_UNLOCK(); + /* Clean up PCI resources allocated by drm_bufs.c. We're not really + * worried about resource consumption while the DRM is inactive (between + * lastclose and firstopen or unload) because these aren't actually + * taking up KVA, just keeping the PCI resource allocated. + */ + for (i = 0; i < DRM_MAX_PCI_RESOURCE; i++) { + if (dev->pcir[i] == NULL) + continue; + bus_release_resource(dev->device, SYS_RES_MEMORY, + dev->pcirid[i], dev->pcir[i]); + dev->pcir[i] = NULL; + } + if ( dev->agp ) { - drm_agp_uninit(); free(dev->agp, M_DRM); dev->agp = NULL; } @@ -865,9 +875,9 @@ /* ioctl->master check should be against something in the filp set up * for the first opener, but it doesn't matter yet. */ - if ((ioctl->root_only && !DRM_SUSER(p)) || - (ioctl->auth_needed && !priv->authenticated) || - (ioctl->master && !priv->master)) + if (((ioctl->flags & DRM_ROOT_ONLY) && !DRM_SUSER(p)) || + ((ioctl->flags & DRM_AUTH) && !priv->authenticated) || + ((ioctl->flags & DRM_MASTER) && !priv->master)) return EACCES; if (is_driver_ioctl) ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_memory.c#3 (text+ko) ==== @@ -113,7 +113,7 @@ } int -drm_mtrr_del(unsigned long offset, size_t size, int flags) +drm_mtrr_del(int __unused handle, unsigned long offset, size_t size, int flags) { int act; struct mem_range_desc mrdesc; ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pciids.h#5 (text+ko) ==== @@ -46,6 +46,7 @@ {0x1002, 0x4E50, CHIP_RV350|CHIP_IS_MOBILITY, "ATI Radeon RV300 Mobility 9600 M10"}, \ {0x1002, 0x4E51, CHIP_RV350|CHIP_IS_MOBILITY, "ATI Radeon RV350 Mobility 9600 M10 NQ"}, \ {0x1002, 0x4E54, CHIP_RV350|CHIP_IS_MOBILITY, "ATI Radeon FireGL T2 128"}, \ + {0x1002, 0x4E56, CHIP_RV350|CHIP_IS_MOBILITY, "ATI Radeon FireGL Mobility T2e"}, \ {0x1002, 0x5144, CHIP_R100|CHIP_SINGLE_CRTC, "ATI Radeon QD R100"}, \ {0x1002, 0x5145, CHIP_R100|CHIP_SINGLE_CRTC, "ATI Radeon QE R100"}, \ {0x1002, 0x5146, CHIP_R100|CHIP_SINGLE_CRTC, "ATI Radeon QF R100"}, \ @@ -69,6 +70,7 @@ {0x1002, 0x516B, CHIP_R200, "ATI Radeon Qk R200"}, \ {0x1002, 0x516C, CHIP_R200, "ATI Radeon Ql R200"}, \ {0x1002, 0x5460, CHIP_RV350, "ATI Radeon X300"}, \ + {0x1002, 0x554F, CHIP_R350, "ATI Radeon X800"}, \ {0x1002, 0x5834, CHIP_RS300|CHIP_IS_IGP, "ATI Radeon RS300 IGP"}, \ {0x1002, 0x5835, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY, "ATI Radeon RS300 Mobility IGP"}, \ {0x1002, 0x5836, CHIP_RS300|CHIP_IS_IGP, "ATI Radeon RS300 IGP"}, \ @@ -82,10 +84,12 @@ {0x1002, 0x5969, CHIP_RV100, "ATI ES1000 RN50"}, \ {0x1002, 0x596A, CHIP_RV280, "ATI Radeon RV280 9200"}, \ {0x1002, 0x596B, CHIP_RV280, "ATI Radeon RV280 9200"}, \ + {0x1002, 0x5b60, CHIP_RV350, "ATI Radeon RV370 X300SE"}, \ {0x1002, 0x5c61, CHIP_RV280|CHIP_IS_MOBILITY, "ATI Radeon RV280 Mobility"}, \ {0x1002, 0x5c62, CHIP_RV280, "ATI Radeon RV280"}, \ {0x1002, 0x5c63, CHIP_RV280|CHIP_IS_MOBILITY, "ATI Radeon RV280 Mobility"}, \ {0x1002, 0x5c64, CHIP_RV280, "ATI Radeon RV280"}, \ + {0x1002, 0x5d4d, CHIP_R350, "ATI Radeon R480"}, \ {0, 0, 0, NULL} #define r128_PCI_IDS \ @@ -245,3 +249,184 @@ {0x105d, 0x493d, IMAGINE_T2R, "Ticket to Ride"}, \ {0x105d, 0x5348, IMAGINE_REV4, "Revolution IV"}, \ {0, 0, 0, NULL} + +#define nv_PCI_IDS \ + {0x10DE, 0x0020, NV04, "NVidia RIVA TNT"}, \ + {0x10DE, 0x0028, NV04, "NVidia RIVA TNT2"}, \ + {0x10DE, 0x002A, NV04, "NVidia Unknown TNT2"}, \ + {0x10DE, 0x002C, NV04, "NVidia Vanta"}, \ + {0x10DE, 0x0029, NV04, "NVidia RIVA TNT2 Ultra"}, \ + {0x10DE, 0x002D, NV04, "NVidia RIVA TNT2 Model 64"}, \ + {0x10DE, 0x00A0, NV04, "NVidia Aladdin TNT2"}, \ + {0x10DE, 0x0100, NV10, "NVidia GeForce 256"}, \ + {0x10DE, 0x0101, NV10, "NVidia GeForce DDR"}, \ + {0x10DE, 0x0103, NV10, "NVidia Quadro"}, \ + {0x10DE, 0x0110, NV10, "NVidia GeForce2 MX/MX 400"}, \ + {0x10DE, 0x0111, NV10, "NVidia GeForce2 MX 100/200"}, \ + {0x10DE, 0x0112, NV10, "NVidia GeForce2 Go"}, \ + {0x10DE, 0x0113, NV10, "NVidia Quadro2 MXR/EX/Go"}, \ + {0x10DE, 0x0150, NV10, "NVidia GeForce2 GTS"}, \ + {0x10DE, 0x0151, NV10, "NVidia GeForce2 Ti"}, \ + {0x10DE, 0x0152, NV10, "NVidia GeForce2 Ultra"}, \ + {0x10DE, 0x0153, NV10, "NVidia Quadro2 Pro"}, \ + {0x10DE, 0x0170, NV10, "NVidia GeForce4 MX 460"}, \ + {0x10DE, 0x0171, NV10, "NVidia GeForce4 MX 440"}, \ + {0x10DE, 0x0172, NV10, "NVidia GeForce4 MX 420"}, \ + {0x10DE, 0x0173, NV10, "NVidia GeForce4 MX 440-SE"}, \ + {0x10DE, 0x0174, NV10, "NVidia GeForce4 440 Go"}, \ + {0x10DE, 0x0175, NV10, "NVidia GeForce4 420 Go"}, \ + {0x10DE, 0x0176, NV10, "NVidia GeForce4 420 Go 32M"}, \ + {0x10DE, 0x0177, NV10, "NVidia GeForce4 460 Go"}, \ + {0x10DE, 0x0178, NV10, "NVidia Quadro4 550 XGL"}, \ + {0x10DE, 0x0179, NV10, "NVidia GeForce4"}, \ + {0x10DE, 0x017A, NV10, "NVidia Quadro4 NVS"}, \ + {0x10DE, 0x017C, NV10, "NVidia Quadro4 500 GoGL"}, \ + {0x10DE, 0x017D, NV10, "NVidia GeForce4 410 Go 16M"}, \ + {0x10DE, 0x0181, NV10, "NVidia GeForce4 MX 440 with AGP8X"}, \ + {0x10DE, 0x0182, NV10, "NVidia GeForce4 MX 440SE with AGP8X"}, \ + {0x10DE, 0x0183, NV10, "NVidia GeForce4 MX 420 with AGP8X"}, \ + {0x10DE, 0x0185, NV10, "NVidia GeForce4 MX 4000"}, \ + {0x10DE, 0x0186, NV10, "NVidia GeForce4 448 Go"}, \ + {0x10DE, 0x0187, NV10, "NVidia GeForce4 488 Go"}, \ + {0x10DE, 0x0188, NV10, "NVidia Quadro4 580 XGL"}, \ + {0x10DE, 0x0189, NV10, "NVidia GeForce4 MX with AGP8X (Mac)"}, \ + {0x10DE, 0x018A, NV10, "NVidia Quadro4 280 NVS"}, \ + {0x10DE, 0x018B, NV10, "NVidia Quadro4 380 XGL"}, \ + {0x10DE, 0x018C, NV10, "NVidia Quadro NVS 50 PCI"}, \ + {0x10DE, 0x018D, NV10, "NVidia GeForce4 448 Go"}, \ + {0x10DE, 0x01A0, NV10, "NVidia GeForce2 Integrated GPU"}, \ + {0x10DE, 0x01F0, NV10, "NVidia GeForce4 MX Integrated GPU"}, \ + {0x10DE, 0x0200, NV20, "NVidia GeForce3"}, \ + {0x10DE, 0x0201, NV20, "NVidia GeForce3 Ti 200"}, \ + {0x10DE, 0x0202, NV20, "NVidia GeForce3 Ti 500"}, \ + {0x10DE, 0x0203, NV20, "NVidia Quadro DCC"}, \ + {0x10DE, 0x0250, NV20, "NVidia GeForce4 Ti 4600"}, \ + {0x10DE, 0x0251, NV20, "NVidia GeForce4 Ti 4400"}, \ + {0x10DE, 0x0252, NV20, "NVidia 0x0252"}, \ + {0x10DE, 0x0253, NV20, "NVidia GeForce4 Ti 4200"}, \ + {0x10DE, 0x0258, NV20, "NVidia Quadro4 900 XGL"}, \ + {0x10DE, 0x0259, NV20, "NVidia Quadro4 750 XGL"}, \ + {0x10DE, 0x025B, NV20, "NVidia Quadro4 700 XGL"}, \ + {0x10DE, 0x0280, NV20, "NVidia GeForce4 Ti 4800"}, \ + {0x10DE, 0x0281, NV20, "NVidia GeForce4 Ti 4200 with AGP8X"}, \ + {0x10DE, 0x0282, NV20, "NVidia GeForce4 Ti 4800 SE"}, \ + {0x10DE, 0x0286, NV20, "NVidia GeForce4 4200 Go"}, \ + {0x10DE, 0x028C, NV20, "NVidia Quadro4 700 GoGL"}, \ + {0x10DE, 0x0288, NV20, "NVidia Quadro4 980 XGL"}, \ + {0x10DE, 0x0289, NV20, "NVidia Quadro4 780 XGL"}, \ + {0x10DE, 0x0301, NV30, "NVidia GeForce FX 5800 Ultra"}, \ + {0x10DE, 0x0302, NV30, "NVidia GeForce FX 5800"}, \ + {0x10DE, 0x0308, NV30, "NVidia Quadro FX 2000"}, \ + {0x10DE, 0x0309, NV30, "NVidia Quadro FX 1000"}, \ + {0x10DE, 0x0311, NV30, "NVidia GeForce FX 5600 Ultra"}, \ + {0x10DE, 0x0312, NV30, "NVidia GeForce FX 5600"}, \ + {0x10DE, 0x0313, NV30, "NVidia 0x0313"},}, \ + {0x10DE, 0x0314, NV30, "NVidia GeForce FX 5600SE"}, \ + {0x10DE, 0x0316, NV30, "NVidia 0x0316"}, \ + {0x10DE, 0x0317, NV30, "NVidia 0x0317"}, \ + {0x10DE, 0x031A, NV30, "NVidia GeForce FX Go5600"}, \ + {0x10DE, 0x031B, NV30, "NVidia GeForce FX Go5650"}, \ + {0x10DE, 0x031C, NV30, "NVidia Quadro FX Go700"}, \ + {0x10DE, 0x031D, NV30, "NVidia 0x031D"}, \ + {0x10DE, 0x031E, NV30, "NVidia 0x031E"}, \ + {0x10DE, 0x031F, NV30, "NVidia 0x031F"}, \ + {0x10DE, 0x0320, NV30, "NVidia GeForce FX 5200"}, \ + {0x10DE, 0x0321, NV30, "NVidia GeForce FX 5200 Ultra"}, \ + {0x10DE, 0x0322, NV30, "NVidia GeForce FX 5200"}, \ + {0x10DE, 0x0323, NV30, "NVidia GeForce FX 5200SE"}, \ + {0x10DE, 0x0324, NV30, "NVidia GeForce FX Go5200"}, \ + {0x10DE, 0x0325, NV30, "NVidia GeForce FX Go5250"}, \ + {0x10DE, 0x0326, NV30, "NVidia GeForce FX 5500"}, \ + {0x10DE, 0x0327, NV30, "NVidia GeForce FX 5100"}, \ + {0x10DE, 0x0328, NV30, "NVidia GeForce FX Go5200 32M/64M"}, \ + {0x10DE, 0x0329, NV30, "NVidia GeForce FX 5200 (Mac)"}, \ + {0x10DE, 0x032A, NV30, "NVidia Quadro NVS 280 PCI"}, \ + {0x10DE, 0x032B, NV30, "NVidia Quadro FX 500/600 PCI"}, \ + {0x10DE, 0x032C, NV30, "NVidia GeForce FX Go53xx Series"}, \ + {0x10DE, 0x032D, NV30, "NVidia GeForce FX Go5100"}, \ + {0x10DE, 0x032F, NV30, "NVidia 0x032F"}, \ + {0x10DE, 0x0330, NV30, "NVidia GeForce FX 5900 Ultra"}, \ + {0x10DE, 0x0331, NV30, "NVidia GeForce FX 5900"}, \ + {0x10DE, 0x0332, NV30, "NVidia GeForce FX 5900XT"}, \ + {0x10DE, 0x0333, NV30, "NVidia GeForce FX 5950 Ultra"}, \ + {0x10DE, 0x033F, NV30, "NVidia Quadro FX 700"}, \ + {0x10DE, 0x0334, NV30, "NVidia GeForce FX 5900ZT"}, \ + {0x10DE, 0x0338, NV30, "NVidia Quadro FX 3000"}, \ + {0x10DE, 0x0341, NV30, "NVidia GeForce FX 5700 Ultra"}, \ + {0x10DE, 0x0342, NV30, "NVidia GeForce FX 5700"}, \ + {0x10DE, 0x0343, NV30, "NVidia GeForce FX 5700LE"}, \ + {0x10DE, 0x0344, NV30, "NVidia GeForce FX 5700VE"}, \ + {0x10DE, 0x0345, NV30, "NVidia 0x0345"}, \ + {0x10DE, 0x0347, NV30, "NVidia GeForce FX Go5700"}, \ + {0x10DE, 0x0348, NV30, "NVidia GeForce FX Go5700"}, \ + {0x10DE, 0x0349, NV30, "NVidia 0x0349"}, \ + {0x10DE, 0x034B, NV30, "NVidia 0x034B"}, \ + {0x10DE, 0x034C, NV30, "NVidia Quadro FX Go1000"}, \ + {0x10DE, 0x034E, NV30, "NVidia Quadro FX 1100"}, \ + {0x10DE, 0x034F, NV30, "NVidia 0x034F"}, \ + {0x10DE, 0x0040, NV40, "NVidia GeForce 6800 Ultra"}, \ + {0x10DE, 0x0041, NV40, "NVidia GeForce 6800"}, \ + {0x10DE, 0x0042, NV40, "NVidia GeForce 6800 LE"}, \ + {0x10DE, 0x0043, NV40, "NVidia 0x0043"}, \ + {0x10DE, 0x0045, NV40, "NVidia GeForce 6800 GT"}, \ + {0x10DE, 0x0046, NV40, "NVidia GeForce 6800 GT"}, \ + {0x10DE, 0x0049, NV40, "NVidia 0x0049"}, \ + {0x10DE, 0x004E, NV40, "NVidia Quadro FX 4000"}, \ + {0x10DE, 0x00C0, NV40, "NVidia 0x00C0"}, \ + {0x10DE, 0x00C1, NV40, "NVidia GeForce 6800"}, \ + {0x10DE, 0x00C2, NV40, "NVidia GeForce 6800 LE"}, \ + {0x10DE, 0x00C8, NV40, "NVidia GeForce Go 6800"}, \ + {0x10DE, 0x00C9, NV40, "NVidia GeForce Go 6800 Ultra"}, \ + {0x10DE, 0x00CC, NV40, "NVidia Quadro FX Go1400"}, \ + {0x10DE, 0x00CD, NV40, "NVidia Quadro FX 3450/4000 SDI"}, \ + {0x10DE, 0x00CE, NV40, "NVidia Quadro FX 1400"}, \ + {0x10de, 0x00f0, NV40, "Nvidia GeForce 6600 GT"}, \ + {0x10de, 0x00f1, NV40, "Nvidia GeForce 6600 GT"}, \ + {0x10DE, 0x0140, NV40, "NVidia GeForce 6600 GT"}, \ + {0x10DE, 0x0141, NV40, "NVidia GeForce 6600"}, \ + {0x10DE, 0x0142, NV40, "NVidia GeForce 6600 LE"}, \ + {0x10DE, 0x0143, NV40, "NVidia 0x0143"}, \ + {0x10DE, 0x0144, NV40, "NVidia GeForce Go 6600"}, \ + {0x10DE, 0x0145, NV40, "NVidia GeForce 6610 XL"}, \ + {0x10DE, 0x0146, NV40, "NVidia GeForce Go 6600 TE/6200 TE"}, \ + {0x10DE, 0x0147, NV40, "NVidia GeForce 6700 XL"}, \ + {0x10DE, 0x0148, NV40, "NVidia GeForce Go 6600"}, \ + {0x10DE, 0x0149, NV40, "NVidia GeForce Go 6600 GT"}, \ + {0x10DE, 0x014B, NV40, "NVidia 0x014B"}, \ + {0x10DE, 0x014C, NV40, "NVidia 0x014C"}, \ + {0x10DE, 0x014D, NV40, "NVidia 0x014D"}, \ + {0x10DE, 0x014E, NV40, "NVidia Quadro FX 540"}, \ + {0x10DE, 0x014F, NV40, "NVidia GeForce 6200"}, \ + {0x10DE, 0x0160, NV40, "NVidia 0x0160"}, \ + {0x10DE, 0x0161, NV40, "NVidia GeForce 6200 TurboCache(TM)"}, \ + {0x10DE, 0x0162, NV40, "NVidia GeForce 6200SE TurboCache(TM)"}, \ + {0x10DE, 0x0163, NV40, "NVidia 0x0163"}, \ + {0x10DE, 0x0164, NV40, "NVidia GeForce Go 6200"}, \ + {0x10DE, 0x0165, NV40, "NVidia Quadro NVS 285"}, \ + {0x10DE, 0x0166, NV40, "NVidia GeForce Go 6400"}, \ + {0x10DE, 0x0167, NV40, "NVidia GeForce Go 6200"}, \ + {0x10DE, 0x0168, NV40, "NVidia GeForce Go 6400"}, \ + {0x10DE, 0x0169, NV40, "NVidia 0x0169"}, \ + {0x10DE, 0x016B, NV40, "NVidia 0x016B"}, \ + {0x10DE, 0x016C, NV40, "NVidia 0x016C"}, \ + {0x10DE, 0x016D, NV40, "NVidia 0x016D"}, \ + {0x10DE, 0x016E, NV40, "NVidia 0x016E"}, \ + {0x10DE, 0x0210, NV40, "NVidia 0x0210"}, \ + {0x10DE, 0x0211, NV40, "NVidia GeForce 6800"}, \ + {0x10DE, 0x0212, NV40, "NVidia GeForce 6800 LE"}, \ + {0x10DE, 0x0215, NV40, "NVidia GeForce 6800 GT"}, \ + {0x10DE, 0x0220, NV40, "NVidia 0x0220"}, \ + {0x10DE, 0x0221, NV40, "NVidia GeForce 6200"}, \ + {0x10DE, 0x0222, NV40, "NVidia 0x0222"}, \ + {0x10DE, 0x0228, NV40, "NVidia 0x0228"}, \ + {0x10DE, 0x0090, NV40, "NVidia 0x0090"}, \ + {0x10DE, 0x0091, NV40, "NVidia GeForce 7800 GTX"}, \ + {0x10DE, 0x0092, NV40, "NVidia 0x0092"}, \ + {0x10DE, 0x0093, NV40, "NVidia 0x0093"}, \ + {0x10DE, 0x0094, NV40, "NVidia 0x0094"}, \ + {0x10DE, 0x0098, NV40, "NVidia 0x0098"}, \ + {0x10DE, 0x0099, NV40, "NVidia GeForce Go 7800 GTX"}, \ + {0x10DE, 0x009C, NV40, "NVidia 0x009C"}, \ + {0x10DE, 0x009D, NV40, "NVidia Quadro FX 4500"}, \ + {0x10DE, 0x009E, NV40, "NVidia 0x009E"}, \ + {0, 0, 0, NULL} ==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_vm.c#4 (text+ko) ==== @@ -37,6 +37,11 @@ drm_local_map_t *map; drm_file_t *priv; drm_map_type_t type; +#ifdef __FreeBSD__ + vm_paddr_t phys; +#else + paddr_t phys; +#endif DRM_LOCK(); priv = drm_find_file_by_proc(dev, DRM_CURPROC); @@ -102,25 +107,25 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 19 12:28:58 2005 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 E3EF916A421; Sat, 19 Nov 2005 12:28:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 742A716A41F for ; Sat, 19 Nov 2005 12:28:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1292543D45 for ; Sat, 19 Nov 2005 12:28:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJCSu94097674 for ; Sat, 19 Nov 2005 12:28:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJCSugA097671 for perforce@freebsd.org; Sat, 19 Nov 2005 12:28:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 12:28:56 GMT Message-Id: <200511191228.jAJCSugA097671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86950 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, 19 Nov 2005 12:28:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=86950 Change 86950 by rwatson@rwatson_peppercorn on 2005/11/19 12:27:59 Re-license Apple copyright OpenBSM bsm/ include files under BSD license rather than APSL. Submitted by: Kevin Van Vechten Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#11 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#24 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#11 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#5 (text+ko) ==== @@ -1,29 +1,38 @@ /* - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2004 Apple Computer, Inc. + * Copyright (c) 2005 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. - * All Rights Reserved. + * All rights reserved. * * This code was developed in part by Robert N. M. Watson, Senior Principal * Scientist, SPARTA, Inc. * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * @APPLE_BSD_LICENSE_HEADER_START@ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _LIBBSM_INTERNAL_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#24 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#12 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_RECORD_H_ From owner-p4-projects@FreeBSD.ORG Sat Nov 19 12:29:59 2005 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 471D616A421; Sat, 19 Nov 2005 12:29:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09D4416A41F for ; Sat, 19 Nov 2005 12:29:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4E7C43D45 for ; Sat, 19 Nov 2005 12:29:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJCTw1X097707 for ; Sat, 19 Nov 2005 12:29:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJCTwIG097704 for perforce@freebsd.org; Sat, 19 Nov 2005 12:29:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 12:29:58 GMT Message-Id: <200511191229.jAJCTwIG097704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86951 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, 19 Nov 2005 12:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=86951 Change 86951 by rwatson@rwatson_peppercorn on 2005/11/19 12:29:08 Annotate two cases where additional argument auditing may be desired for process group and session identifier information. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_prot.c#5 (text+ko) ==== @@ -351,6 +351,10 @@ newsess = NULL; } + /* + * XXXAUDIT: Audit the new session and process group ID's? + */ + sx_xunlock(&proctree_lock); if (newpgrp != NULL) @@ -396,6 +400,10 @@ if (uap->pgid < 0) return (EINVAL); + /* + * XXXAUDIT: Audit the joined process group ID? + */ + error = 0; MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); From owner-p4-projects@FreeBSD.ORG Sat Nov 19 12:30:00 2005 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 ED01D16A45F; Sat, 19 Nov 2005 12:29:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60A6216A42C for ; Sat, 19 Nov 2005 12:29:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EC4243D45 for ; Sat, 19 Nov 2005 12:29:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJCTxYS097713 for ; Sat, 19 Nov 2005 12:29:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJCTwsT097710 for perforce@freebsd.org; Sat, 19 Nov 2005 12:29:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 12:29:58 GMT Message-Id: <200511191229.jAJCTwsT097710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86952 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, 19 Nov 2005 12:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=86952 Change 86952 by rwatson@rwatson_peppercorn on 2005/11/19 12:29:41 Annotate need to audit additional mmap() arguments. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#6 (text+ko) ==== @@ -212,6 +212,10 @@ off_t pos; struct vmspace *vms = td->td_proc->p_vmspace; + /* + * XXXAUDIT: Need to audit addr, len, and vnode information. + */ + addr = (vm_offset_t) uap->addr; size = uap->len; prot = uap->prot & VM_PROT_ALL; From owner-p4-projects@FreeBSD.ORG Sat Nov 19 12:36:21 2005 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 9D32F16A421; Sat, 19 Nov 2005 12:36:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CDAA16A420 for ; Sat, 19 Nov 2005 12:36:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 053A943D5A for ; Sat, 19 Nov 2005 12:36:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJCa6Wc098044 for ; Sat, 19 Nov 2005 12:36:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJCa60N098041 for perforce@freebsd.org; Sat, 19 Nov 2005 12:36:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 12:36:06 GMT Message-Id: <200511191236.jAJCa60N098041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86953 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, 19 Nov 2005 12:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=86953 Change 86953 by rwatson@rwatson_peppercorn on 2005/11/19 12:35:25 Integrate OpenBSM branch into Audit3 branch: - BSD license updates from Apple. - AU_IPv4, AU_IPv6 definitions, use for address tokens. - Additional generation and parsing of token types header32_ex, au_header64_ex. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#4 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_H @@ -157,6 +167,13 @@ #define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * Type definitions used indicating the length of variable length addresses + * in tokens containing addresses, such as header fields. + */ +#define AU_IPv4 4 +#define AU_IPv6 16 + __BEGIN_DECLS typedef uid_t au_id_t; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#3 (text+ko) ==== @@ -1,29 +1,38 @@ /* - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2004 Apple Computer, Inc. + * Copyright (c) 2005 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. - * All Rights Reserved. + * All rights reserved. * * This code was developed in part by Robert N. M. Watson, Senior Principal * Scientist, SPARTA, Inc. * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * @APPLE_BSD_LICENSE_HEADER_START@ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _LIBBSM_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#10 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#3 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#2 (text+ko) ==== @@ -332,6 +332,29 @@ } au_header32_t; +/* + * record byte count 4 bytes + * version # 1 byte [2] + * event type 2 bytes + * event modifier 2 bytes + * address type/length 1 byte (XXX: actually, 4 bytes) + * machine address 4 bytes/16 bytes (IPv4/IPv6 address) + * seconds of time 4 bytes/8 bytes (32/64-bits) + * nanoseconds of time 4 bytes/8 bytes (32/64-bits) + */ +typedef struct { + + u_int32_t size; + u_char version; + u_int16_t e_type; + u_int16_t e_mod; + u_int32_t ad_type; + u_int32_t addr[4]; + u_int32_t s; + u_int32_t ms; + +} au_header32_ex_t; + typedef struct { u_int32_t size; @@ -343,7 +366,20 @@ } au_header64_t; +typedef struct { + u_int32_t size; + u_char version; + u_int16_t e_type; + u_int16_t e_mod; + u_int32_t ad_type; + u_int32_t addr[4]; + u_int64_t s; + u_int64_t ms; + +} au_header64_ex_t; + + /* * internet address 4 bytes */ @@ -740,7 +776,9 @@ au_file_t file; au_groups_t grps; au_header32_t hdr32; + au_header32_ex_t hdr32_ex; au_header64_t hdr64; + au_header64_ex_t hdr64_ex; au_inaddr_t inaddr; au_inaddr_ex_t inaddr_ex; au_ip_t ip; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#4 (text+ko) ==== @@ -366,15 +366,19 @@ char dst[INET6_ADDRSTRLEN]; const char *ret = NULL; - if (type == AF_INET) { + switch (type) { + case AU_IPv4: ipv4.s_addr = (in_addr_t)(ipaddr[0]); - ret = inet_ntop(type, &ipv4, dst, INET6_ADDRSTRLEN); - } else if (type == AF_INET6) { + ret = inet_ntop(AF_INET, &ipv4, dst, INET6_ADDRSTRLEN); + break; + + case AU_IPv6: ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; - ret = inet_ntop(type, &ipv6, dst, INET6_ADDRSTRLEN); + ret = inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN); + break; } if (ret != NULL) { @@ -489,9 +493,101 @@ } /* + * The Solaris specifications for AUE_HEADER32_EX seem to differ a bit + * depending on the bit of the specifications found. The OpenSolaris source + * code uses a 4-byte address length, followed by some number of bytes of + * address data. This contrasts with the Solaris audit.log.5 man page, which + * specifies a 1-byte length field. We use the Solaris 10 definition so that + * we can parse audit trails from that system. + * * record byte count 4 bytes + * version # 1 byte [2] * event type 2 bytes * event modifier 2 bytes + * address type/length 4 bytes + * [ Solaris man page: address type/length 1 byte] + * machine address 4 bytes/16 bytes (IPv4/IPv6 address) + * seconds of time 4 bytes/8 bytes (32/64-bits) + * nanoseconds of time 4 bytes/8 bytes (32/64-bits) + */ +static int +fetch_header32_ex_tok(tokenstr_t *tok, char *buf, int len) +{ + int err = 0; + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32_ex.size, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_CHAR(buf, len, tok->tt.hdr32_ex.version, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32_ex.e_type, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32_ex.e_mod, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32_ex.ad_type, tok->len, err); + if (err) + return (-1); + + bzero(tok->tt.hdr32_ex.addr, sizeof(tok->tt.hdr32_ex.addr)); + switch (tok->tt.hdr32_ex.ad_type) { + case AU_IPv4: + READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32_ex.addr[0], + sizeof(tok->tt.hdr32_ex.addr[0]), tok->len, err); + if (err) + return (-1); + break; + + case AU_IPv6: + READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32_ex.addr, + sizeof(tok->tt.hdr32_ex.addr), tok->len, err); + break; + } + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32_ex.s, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32_ex.ms, tok->len, err); + if (err) + return (-1); + + return (0); +} + +static void +print_header32_ex_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, + char sfrm) +{ + + print_tok_type(fp, tok->id, "header_ex", raw); + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr32_ex.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr32_ex.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr32_ex.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr32_ex.e_mod, raw); + print_delim(fp, del); + print_ip_ex_address(fp, tok->tt.hdr32_ex.ad_type, + tok->tt.hdr32_ex.addr); + print_delim(fp, del); + print_sec32(fp, tok->tt.hdr32_ex.s, raw); + print_delim(fp, del); + print_msec32(fp, tok->tt.hdr32_ex.ms, raw); +} + +/* + * record byte count 4 bytes + * event type 2 bytes + * event modifier 2 bytes * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) * version # @@ -546,6 +642,92 @@ print_delim(fp, del); print_msec64(fp, tok->tt.hdr64.ms, raw); } +/* + * record byte count 4 bytes + * version # 1 byte [2] + * event type 2 bytes + * event modifier 2 bytes + * address type/length 4 bytes + * [ Solaris man page: address type/length 1 byte] + * machine address 4 bytes/16 bytes (IPv4/IPv6 address) + * seconds of time 4 bytes/8 bytes (32/64-bits) + * nanoseconds of time 4 bytes/8 bytes (32/64-bits) + * + * XXXAUDIT: See comment by fetch_header32_ex_tok() for details on the + * accuracy of the BSM spec. + */ +static int +fetch_header64_ex_tok(tokenstr_t *tok, char *buf, int len) +{ + int err = 0; + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr64_ex.size, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_CHAR(buf, len, tok->tt.hdr64_ex.version, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr64_ex.e_type, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr64_ex.e_mod, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr64_ex.ad_type, tok->len, err); + if (err) + return (-1); + + bzero(tok->tt.hdr64_ex.addr, sizeof(tok->tt.hdr64_ex.addr)); + switch (tok->tt.hdr64_ex.ad_type) { + case AU_IPv4: + READ_TOKEN_BYTES(buf, len, &tok->tt.hdr64_ex.addr[0], + sizeof(tok->tt.hdr64_ex.addr[0]), tok->len, err); + if (err) + return (-1); + break; + + case AU_IPv6: + READ_TOKEN_BYTES(buf, len, &tok->tt.hdr64_ex.addr, + sizeof(tok->tt.hdr64_ex.addr), tok->len, err); + break; + } + + READ_TOKEN_U_INT64(buf, len, tok->tt.hdr64_ex.s, tok->len, err); + if (err) + return (-1); + + READ_TOKEN_U_INT64(buf, len, tok->tt.hdr64_ex.ms, tok->len, err); + if (err) + return (-1); + + return (0); +} + +static void +print_header64_ex_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +{ + + print_tok_type(fp, tok->id, "header_ex", raw); + print_delim(fp, del); + print_4_bytes(fp, tok->tt.hdr64_ex.size, "%u"); + print_delim(fp, del); + print_1_byte(fp, tok->tt.hdr64_ex.version, "%u"); + print_delim(fp, del); + print_event(fp, tok->tt.hdr64_ex.e_type, raw, sfrm); + print_delim(fp, del); + print_evmod(fp, tok->tt.hdr64_ex.e_mod, raw); + print_delim(fp, del); + print_ip_ex_address(fp, tok->tt.hdr64_ex.ad_type, + tok->tt.hdr64_ex.addr); + print_delim(fp, del); + print_sec64(fp, tok->tt.hdr64_ex.s, raw); + print_delim(fp, del); + print_msec64(fp, tok->tt.hdr64_ex.ms, raw); +} /* * trailer magic 2 bytes @@ -1151,12 +1333,12 @@ if (err) return (-1); - if (tok->tt.inaddr_ex.type == AF_INET) { + if (tok->tt.inaddr_ex.type == AU_IPv4) { READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr_ex.addr[0], sizeof(tok->tt.inaddr_ex.addr[0]), tok->len, err); if (err) return (-1); - } else if (tok->tt.inaddr_ex.type == AF_INET6) { + } else if (tok->tt.inaddr_ex.type == AU_IPv6) { READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr_ex.addr, sizeof(tok->tt.inaddr_ex.addr), tok->len, err); if (err) @@ -1564,12 +1746,12 @@ if (err) return (-1); - if (tok->tt.proc32_ex.tid.type == AF_INET) { + if (tok->tt.proc32_ex.tid.type == AU_IPv4) { READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.addr[0], sizeof(tok->tt.proc32_ex.tid.addr[0]), tok->len, err); if (err) return (-1); - } else if (tok->tt.proc32_ex.tid.type == AF_INET6) { + } else if (tok->tt.proc32_ex.tid.type == AU_IPv6) { READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.addr, sizeof(tok->tt.proc32_ex.tid.addr), tok->len, err); if (err) @@ -2036,12 +2218,12 @@ if (err) return (-1); - if (tok->tt.subj32_ex.tid.type == AF_INET) { + if (tok->tt.subj32_ex.tid.type == AU_IPv4) { READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.tid.addr[0], sizeof(tok->tt.subj32_ex.tid.addr[0]), tok->len, err); if (err) return (-1); - } else if (tok->tt.subj32_ex.tid.type == AF_INET6) { + } else if (tok->tt.subj32_ex.tid.type == AU_IPv6) { READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.tid.addr, sizeof(tok->tt.subj32_ex.tid.addr), tok->len, err); if (err) @@ -2211,7 +2393,8 @@ /* * Reads the token beginning at buf into tok. */ -int au_fetch_tok(tokenstr_t *tok, u_char *buf, int len) +int +au_fetch_tok(tokenstr_t *tok, u_char *buf, int len) { if (len <= 0) @@ -2225,9 +2408,15 @@ case AUT_HEADER32: return (fetch_header32_tok(tok, buf, len)); + case AUT_HEADER32_EX: + return (fetch_header32_ex_tok(tok, buf, len)); + case AUT_HEADER64: return (fetch_header64_tok(tok, buf, len)); + case AUT_HEADER64_EX: + return (fetch_header64_ex_tok(tok, buf, len)); + case AUT_TRAILER: return (fetch_trailer_tok(tok, buf, len)); @@ -2340,9 +2529,15 @@ case AUT_HEADER32: return (print_header32_tok(outfp, tok, del, raw, sfrm)); + case AUT_HEADER32_EX: + return (print_header32_ex_tok(outfp, tok, del, raw, sfrm)); + case AUT_HEADER64: return (print_header64_tok(outfp, tok, del, raw, sfrm)); + case AUT_HEADER64_EX: + return (print_header64_ex_tok(outfp, tok, del, raw, sfrm)); + case AUT_TRAILER: return (print_trailer_tok(outfp, tok, del, raw, sfrm)); From owner-p4-projects@FreeBSD.ORG Sat Nov 19 12:38:28 2005 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 784B116A422; Sat, 19 Nov 2005 12:38:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 234B416A41F for ; Sat, 19 Nov 2005 12:38:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6351943D7F for ; Sat, 19 Nov 2005 12:38:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJCc96K098176 for ; Sat, 19 Nov 2005 12:38:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJCc9UO098173 for perforce@freebsd.org; Sat, 19 Nov 2005 12:38:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 12:38:09 GMT Message-Id: <200511191238.jAJCc9UO098173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86954 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, 19 Nov 2005 12:38:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=86954 Change 86954 by rwatson@rwatson_peppercorn on 2005/11/19 12:37:22 Integrate audit3 src/contrib/openbsm include files to src/sys/bsm: - BSD license updates from Apple. - Definitions of AU_IPv4 and AU_IPv6. Support for AU_IPv4 and AU_IPv6 will need to be separately merged into kernel BSM generation. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#17 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#17 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_H @@ -176,6 +186,13 @@ #define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * Type definitions used indicating the length of variable length addresses + * in tokens containing addresses, such as header fields. + */ +#define AU_IPv4 4 +#define AU_IPv6 16 + __BEGIN_DECLS typedef uid_t au_id_t; ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#3 (text+ko) ==== @@ -1,29 +1,38 @@ /* - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2004 Apple Computer, Inc. + * Copyright (c) 2005 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. - * All Rights Reserved. + * All rights reserved. * * This code was developed in part by Robert N. M. Watson, Senior Principal * Scientist, SPARTA, Inc. * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * @APPLE_BSD_LICENSE_HEADER_START@ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _LIBBSM_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#11 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#6 (text+ko) ==== @@ -1,24 +1,34 @@ /* - * @APPLE_LICENSE_HEADER_START@ + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. + * + * @APPLE_BSD_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * This file contains Original Code and/or Modifications of Original Code - * as defined in and that are subject to the Apple Public Source License - * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. - * Please see the License for the specific language governing rights and - * limitations under the License. + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 APPLE OR ITS CONTRIBUTORS 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. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_RECORD_H_ From owner-p4-projects@FreeBSD.ORG Sat Nov 19 15:09:26 2005 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 D5B9516A434; Sat, 19 Nov 2005 15:09:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EEED16A427 for ; Sat, 19 Nov 2005 15:09:25 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5047143D67 for ; Sat, 19 Nov 2005 15:09:23 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJF9Nrx011307 for ; Sat, 19 Nov 2005 15:09:23 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJF9Mu1011304 for perforce@freebsd.org; Sat, 19 Nov 2005 15:09:22 GMT (envelope-from cognet@freebsd.org) Date: Sat, 19 Nov 2005 15:09:22 GMT Message-Id: <200511191509.jAJF9Mu1011304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 86959 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, 19 Nov 2005 15:09:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=86959 Change 86959 by cognet@cognet on 2005/11/19 15:08:54 Oooops. Unbreak the build. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#3 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#3 (text+ko) ==== @@ -198,8 +198,8 @@ sc->dev = dev; sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; - if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_IC_BASE, - AT91RM92_IC_SIZE, &sc->sc_sys_sh) != 0) + if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_SYS_BASE, + AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0) panic("Enable to map IRQ registers"); if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#3 (text+ko) ==== @@ -165,7 +165,7 @@ #define PIOA_PPUSR (AT91RM92_SYS_BASE + 0x400 + 104) /* Pad pull-up status register */ #define PIOA_ASR (AT91RM92_SYS_BASE + 0x400 + 112) /* Select A register */ #define PIOA_BSR (AT91RM92_SYS_BASE + 0x400 + 116) /* Select B register */ -#define PIOA_BSR (AT91RM92_SYS_BASE + 0x400 + 120) /* AB Select status register */ +#define PIOA_ABSR (AT91RM92_SYS_BASE + 0x400 + 120) /* AB Select status register */ #define PIOA_OWER (AT91RM92_SYS_BASE + 0x400 + 160) /* Output Write enable register */ #define PIOA_OWDR (AT91RM92_SYS_BASE + 0x400 + 164) /* Output write disable register */ #define PIOA_OWSR (AT91RM92_SYS_BASE + 0x400 + 168) /* Output write status register */ @@ -194,7 +194,7 @@ #define PIOB_PPUSR (AT91RM92_SYS_BASE + 0x600 + 104) /* Pad pull-up status register */ #define PIOB_ASR (AT91RM92_SYS_BASE + 0x600 + 112) /* Select A register */ #define PIOB_BSR (AT91RM92_SYS_BASE + 0x600 + 116) /* Select B register */ -#define PIOB_BSR (AT91RM92_SYS_BASE + 0x600 + 120) /* AB Select status register */ +#define PIOB_ABSR (AT91RM92_SYS_BASE + 0x600 + 120) /* AB Select status register */ #define PIOB_OWER (AT91RM92_SYS_BASE + 0x600 + 160) /* Output Write enable register */ #define PIOB_OWDR (AT91RM92_SYS_BASE + 0x600 + 164) /* Output write disable register */ #define PIOB_OWSR (AT91RM92_SYS_BASE + 0x600 + 168) /* Output write status register */ @@ -223,7 +223,7 @@ #define PIOC_PPUSR (AT91RM92_SYS_BASE + 0x800 + 104) /* Pad pull-up status register */ #define PIOC_ASR (AT91RM92_SYS_BASE + 0x800 + 112) /* Select A register */ #define PIOC_BSR (AT91RM92_SYS_BASE + 0x800 + 116) /* Select B register */ -#define PIOC_BSR (AT91RM92_SYS_BASE + 0x800 + 120) /* AB Select status register */ +#define PIOC_ABSR (AT91RM92_SYS_BASE + 0x800 + 120) /* AB Select status register */ #define PIOC_OWER (AT91RM92_SYS_BASE + 0x800 + 160) /* Output Write enable register */ #define PIOC_OWDR (AT91RM92_SYS_BASE + 0x800 + 164) /* Output write disable register */ #define PIOC_OWSR (AT91RM92_SYS_BASE + 0x800 + 168) /* Output write status register */ @@ -252,7 +252,7 @@ #define PIOD_PPUSR (AT91RM92_SYS_BASE + 0xa00 + 104) /* Pad pull-up status register */ #define PIOD_ASR (AT91RM92_SYS_BASE + 0xa00 + 112) /* Select A register */ #define PIOD_BSR (AT91RM92_SYS_BASE + 0xa00 + 116) /* Select B register */ -#define PIOD_BSR (AT91RM92_SYS_BASE + 0xa00 + 120) /* AB Select status register */ +#define PIOD_ABSR (AT91RM92_SYS_BASE + 0xa00 + 120) /* AB Select status register */ #define PIOD_OWER (AT91RM92_SYS_BASE + 0xa00 + 160) /* Output Write enable register */ #define PIOD_OWDR (AT91RM92_SYS_BASE + 0xa00 + 164) /* Output write disable register */ #define PIOD_OWSR (AT91RM92_SYS_BASE + 0xa00 + 168) /* Output write status register */ From owner-p4-projects@FreeBSD.ORG Sat Nov 19 18:08:03 2005 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 E897416A421; Sat, 19 Nov 2005 18:08:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF7B616A41F for ; Sat, 19 Nov 2005 18:08:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F26043D58 for ; Sat, 19 Nov 2005 18:08:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJI82el027799 for ; Sat, 19 Nov 2005 18:08:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJI82OJ027796 for perforce@freebsd.org; Sat, 19 Nov 2005 18:08:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 18:08:02 GMT Message-Id: <200511191808.jAJI82OJ027796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86967 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, 19 Nov 2005 18:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=86967 Change 86967 by rwatson@rwatson_peppercorn on 2005/11/19 18:07:39 Interate user space bsm_token.c into kern_bsm_token.c, adding it to the userspace openbsm -> kernel branch. Minor white space tweaks. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#13 (text+ko) ==== @@ -152,7 +152,6 @@ if (vni == NULL) return (NULL); - GET_TOKEN_AREA(t, dptr, 29); if (t == NULL) return (NULL); @@ -1216,7 +1215,7 @@ token_t * #if defined(KERNEL) || defined(_KERNEL) au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, - struct timeval tm) + struct timeval tm) #else au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) #endif From owner-p4-projects@FreeBSD.ORG Sat Nov 19 19:26:39 2005 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 3944116A423; Sat, 19 Nov 2005 19:26:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E859316A421 for ; Sat, 19 Nov 2005 19:26:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 614A343D62 for ; Sat, 19 Nov 2005 19:26:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAJJQabx030566 for ; Sat, 19 Nov 2005 19:26:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAJJQau3030563 for perforce@freebsd.org; Sat, 19 Nov 2005 19:26:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 19 Nov 2005 19:26:36 GMT Message-Id: <200511191926.jAJJQau3030563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 86968 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, 19 Nov 2005 19:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=86968 Change 86968 by rwatson@rwatson_peppercorn on 2005/11/19 19:25:44 Minor white space tweak to match style(9), and hence FreeBSD kernel version of this file. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#21 (text+ko) ==== @@ -1108,8 +1108,8 @@ } token_t * -au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, - pid_t pid, au_asid_t sid, au_tid_addr_t *tid) +au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { return (au_to_subject32_ex(auid, euid, egid, ruid, rgid, pid, sid,