From owner-p4-projects@FreeBSD.ORG Mon Aug 9 11:18:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60F6E16A4D2; Mon, 9 Aug 2004 11:18:14 +0000 (GMT) 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 395B016A4CE for ; Mon, 9 Aug 2004 11:18:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A74143D2D for ; Mon, 9 Aug 2004 11:18:14 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i79BIE3Z054879 for ; Mon, 9 Aug 2004 11:18:14 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i79BIBlO054874 for perforce@freebsd.org; Mon, 9 Aug 2004 11:18:11 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 9 Aug 2004 11:18:11 GMT Message-Id: <200408091118.i79BIBlO054874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 59236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 11:18:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=59236 Change 59236 by davidxu@davidxu_alona on 2004/08/09 11:17:13 IFC @59230 Affected files ... .. //depot/projects/davidxu_ksedbg/src/UPDATING#7 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/.cvsignore#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/ChangeLog#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Localstuff#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/MAINT#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/apple#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/archive#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/bFLT#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/bout#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/c64#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/cad#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/chord#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/claris#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/commands#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/communications#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/console#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/dact#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/diff#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/fcs#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/flash#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/games#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/gcc#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/geos#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/human68k#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ibm6000#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/iff#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/intel#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mach#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/maple#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/matroska#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/misctools#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/motorola#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/netbsd#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/netscape#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ocaml#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/os2#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/palm#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/plan9#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/psion#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/python#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/revision#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/riff#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sinclair#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sniffer#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/spec#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sun#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/ti-8x#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/unknown#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/varied.script#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/wordprocessors#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/xwindows#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/apptype.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/compress.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/config.h.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/configure#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/configure.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/file.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/file.man#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/funcs.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/libmagic.man#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.man#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/magic.mime#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/magic2mime#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/names.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/print.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/readelf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/readelf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/tar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/file/test.c#1 branch .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/init.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#6 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#18 integrate .. //depot/projects/davidxu_ksedbg/src/include/Makefile#7 integrate .. //depot/projects/davidxu_ksedbg/src/include/tgmath.h#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/COPYING#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/INSTALL#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile.am#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.3#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/configure.ac.in#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/tar.5#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libfetch/http.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libmagic/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libmagic/config.h#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#10 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#10 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/Makefile#5 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/cimag.3#1 branch .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/i386/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/mk/doc.relnotes.mk#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/sgml/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/scripts/doFS.sh#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/scripts/print-cdrom-packages.sh#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/add.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/create.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/destroy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/map.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/map.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/migrate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/recover.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/remove.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/show.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/adv.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/amd.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/bt.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ida.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/iir.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ips.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/nsp.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ohci.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/stg.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/umct.4#4 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/development.7#5 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/firewall.7#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/security.7#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man7/tuning.7#5 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man9/altq.9#1 branch .. //depot/projects/davidxu_ksedbg/src/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/davidxu_ksedbg/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/md/md.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umct.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_aes.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_apple.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_fox.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/isa/psm.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#15 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#14 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#16 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/md/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_var.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#7 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/mdioctl.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#10 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/swap_pager.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_init.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/nanobsd/make.conf#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/file/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/file/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/last/last.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/quota/quota.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/COPYING#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/Makefile#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/Makefile.am#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar_platform.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/configure.ac.in#1 branch .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#6 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/util.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/write.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/IPXrouted/af.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chown.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/chown/chown.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/chroot/chroot.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/chroot/chroot.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/lang.l#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkheaders.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkoptions.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/edquota.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/edquota/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/inetd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/inetd/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/kernbb/kernbb.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/kgmon/kgmon.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/kgmon/kgmon.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/mount_portalfs.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/portald.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_conf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/netgroup.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mountd/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mtree/mtree.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/mtree/specspec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/named.reload/named.reload.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/named.restart/named.restart.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/nfsd/nfsd.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/nologin/nologin.5#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/nologin/nologin.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pstat/pstat.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pwd_mkdb/pwd_mkdb.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/quotaon/quotaon.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rarpd/rarpd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rarpd/rarpd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/repquota/repquota.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rmt/rmt.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rtadvd/advcap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rwhod/rwhod.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/rwhod/rwhod.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sicontrol/sicontrol.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.8#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sliplogin/sliplogin.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/slstat/slstat.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/sysinstall/label.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/pathnames.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslog.conf.5#4 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslogd.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/trpt/trpt.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/vipw/vipw.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/vipw/vipw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ypbind/ypbind.8#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/yppush/yppush.8#3 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/UPDATING#7 (text+ko) ==== @@ -21,6 +21,11 @@ developers choose to disable these features on build machines to maximize performance. +20040807: + The size of 'struct ifnet' has changed due to the addition of the + if_carp placeholder. All kernel modules implementing network + interfaces must be recompiled as a result. + 20040802: making /dev/(null|zero) into a module proved to be too unpopular, so this bit has been revoked from the previous (20040801) entry. @@ -41,6 +46,11 @@ breakages with non-default CFLAGS where optimization level is set to -O2 or higher. + With the upgrade of the system compiler, the kernel has been upgraded + to match the new system compiler. This makes it impossible to build + a new kernel with the old compiler. Upgrade your system via + make buildworld and make kernel (see below) to fix this problem. + 20040727: The size of 'struct ifnet' has changed due to the addition of the IFF_NEEDSGIANT flag (and what it implies). All kernel @@ -1749,4 +1759,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.336 2004/08/03 19:29:48 markm Exp $ +$FreeBSD: src/UPDATING,v 1.338 2004/08/07 09:41:30 mlaier Exp $ ==== //depot/projects/davidxu_ksedbg/src/contrib/file/.cvsignore#2 (text+ko) ==== @@ -1,12 +1,1 @@ -Makefile -config.cache -config.h -config.log -config.status -stamp-h -file -file.1 -magic.4 -magic -magic.mgc -magic.mime.mgc +autom4te.cache ==== //depot/projects/davidxu_ksedbg/src/contrib/file/LEGAL.NOTICE#2 (text+ko) ==== @@ -1,7 +1,7 @@ -$Id: LEGAL.NOTICE,v 1.11 1999/01/14 16:30:12 christos Exp $ +$Id: LEGAL.NOTICE,v 1.13 2003/03/23 22:23:30 christos Exp $ Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. Software written by Ian F. Darwin and others; -maintained 1994-1999 Christos Zoulas. +maintained 1994-2003 Christos Zoulas. This software is not subject to any export provision of the United States Department of Commerce, and may be exported to any country or planet. ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Localstuff#2 (text+ko) ==== @@ -2,6 +2,6 @@ #------------------------------------------------------------------------------ # Localstuff: file(1) magic for locally observed files # -# $Id: Localstuff,v 1.3 1995/01/21 21:09:00 christos Exp $ +# $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: # text if readable, executable if runnable binary, data if unreadable. ==== //depot/projects/davidxu_ksedbg/src/contrib/file/MAINT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$Id: MAINT,v 1.4 2000/04/11 02:43:51 christos Exp $ +$Id: MAINT,v 1.5 2003/03/23 04:36:37 christos Exp $ Maintenance notes: ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/adventure#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Infocom # (Note: to avoid false matches Z-machine version 1 and 2 are not # recognized since only the oldest Zork I and II used them. Similarly -# there are 4 Infocom games that use verion 4 that are not recognized.) +# there are 4 Infocom games that use version 4 that are not recognized.) #0 byte 3 Infocom game data (Z-machine 3, #>2 beshort <0x7fff Release %3d, #>26 beshort >0 Size %d*2 ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/amigaos#2 (text+ko) ==== @@ -3,9 +3,8 @@ # # From ignatios@cs.uni-bonn.de (Ignatios Souvatzis) -# Some formats are still missing: AmigaOS special IFF's, e.g.: FORM....CTLG -# (the others should be separate, anyway) # +0 belong 0x000003fa AmigaOS shared library 0 belong 0x000003f3 AmigaOS loadseg()ble executable/binary 0 belong 0x000003e7 AmigaOS object/library data # @@ -33,7 +32,25 @@ 0 string ARP. The Holy Noise Module sound file 0 string BeEp\0 JamCracker Module sound file 0 string COSO\0 Hippel-COSO Module sound file -26 string V.3 Brian Postma's Soundmon Module sound file v3 -26 string BPSM Brian Postma's Soundmon Module sound file v3 -26 string V.2 Brian Postma's Soundmon Module sound file v2 +# Too simple (short, pure ASCII, deep), MPi +#26 string V.3 Brian Postma's Soundmon Module sound file v3 +#26 string BPSM Brian Postma's Soundmon Module sound file v3 +#26 string V.2 Brian Postma's Soundmon Module sound file v2 + +# The following are from: "Stefan A. Haubenthal" +0 beshort 0x0f00 AmigaOS bitmap font +0 beshort 0x0f03 AmigaOS outline font +0 belong 0x80001001 AmigaOS outline tag +0 string ##\ version catalog translation +# Amiga disk types +# +0 string RDSK Rigid Disk Block +>160 string x on %.24s +0 string DOS\0 Amiga DOS disk +0 string DOS\1 Amiga FFS disk +0 string DOS\2 Amiga Inter DOS disk +0 string DOS\3 Amiga Inter FFS disk +0 string DOS\4 Amiga Fastdir DOS disk +0 string DOS\5 Amiga Fastdir FFS disk +0 string KICK Kickstart disk ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/animation#2 (text+ko) ==== @@ -118,6 +118,12 @@ #>3 byte&0x03 1 \b, Emphasis 5 #>3 byte&0x03 3 \b, Emphasis c +#From: Johan Gade + +# MPEG-4 Advanced Audio Coding (AAC) file (perhaps also MPEG-2 ACC?) +16 string M4A MPEG-4 Advanced Audio Coding file (AAC) + + # FLI animation format 4 leshort 0xAF11 FLI file >6 leshort x - %d frames, @@ -157,10 +163,19 @@ # \003. Most of them start with non-null values at hex offset 0x34 or so. #0 string \3\0\0\0\0\0\0\0\0\0\0\0 DL version 3 -# SGI and Apple formats +# SGI formats 0 string MOVI Silicon Graphics movie file + +# Apple Quicktime: Scan for all known top-level QT atom markers 4 string moov Apple QuickTime movie file (moov) 4 string mdat Apple QuickTime movie file (mdat) +4 string ftyp Apple QuickTime movie file (ftyp) +4 string free Apple QuickTime movie file (free) +4 string junk Apple QuickTime movie file (junk) +4 string pnot Apple QuickTime movie file (pnot) +4 string skip Apple QuickTime movie file (skip) +4 string wide Apple QuickTime movie file (wide) +4 string pict Apple QuickTime movie file (pict) # iso 13818 transport stream # @@ -194,3 +209,32 @@ 0 string \x8aMNG MNG video data, >4 belong !0x0d0a1a0a CORRUPTED, >4 belong 0x0d0a1a0a +>>16 belong x %ld x +>>20 belong x %ld + +# JNG Video Format, +0 string \x8bJNG JNG video data, +>4 belong !0x0d0a1a0a CORRUPTED, +>4 belong 0x0d0a1a0a +>>16 belong x %ld x +>>20 belong x %ld + +# Vivo video (Wolfram Kleff) +3 string \x0D\x0AVersion:Vivo Vivo video data + +# VRML (Virtual Reality Modelling Language) +0 string/b #VRML\ V1.0\ ascii VRML 1 file +0 string/b #VRML\ V2.0\ utf8 ISO/IEC 14772 VRML 97 file + +#--------------------------------------------------------------------------- +# HVQM4: compressed movie format designed by Hudson for Nintendo GameCube +# From Mark Sheppard , 2002-10-03 +# +0 string HVQM4 %s +>6 string >\0 v%s +>0 byte x GameCube movie, +>0x34 ubeshort x %d x +>0x36 ubeshort x %d, +>0x26 ubeshort x %dµs, +>0x42 ubeshort 0 no audio +>0x42 ubeshort >0 %dHz audio ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/apple#2 (text+ko) ==== @@ -28,6 +28,13 @@ >12 belong &0x02000000 UseFasterCompression, >16 belong x version %d +0 string package4 Newton package, +>8 byte 8 NOS 1.x, +>8 byte 9 NOS 2.x, +>12 belong &0x80000000 AutoRemove, +>12 belong &0x40000000 CopyProtect, +>12 belong &0x10000000 NoCompression, + # The following entries for the Apple II are for files that have # been transferred as raw binary data from an Apple, without having # been encapsulated by any of the above archivers. @@ -120,3 +127,24 @@ # Beagle Bros. Apple Mechanic fonts 0 belong&0xFF00FFFF 0x6400D000 Apple Mechanic font + +# Apple Universal Disk Image Format (UDIF) - dmg files. +# From Johan Gade. +# These entries are disabled for now until we fix the following issues. +# +# Note there might be some problems with the "VAX COFF executable" +# entry. Note this entry should be placed before the mac filesystem section, +# particularly the "Apple Partition data" entry. +# +# The intended meaning of these tests is, that the file is only of the +# specified type if both of the lines are correct - i.e. if the first +# line matches and the second doesn't then it is not of that type. +# +#0 long 0x7801730d +#>4 long 0x62626060 UDIF read-only zlib-compressed image (UDZO) +# +# Note that this entry is recognized correctly by the "Apple Partition +# data" entry - however since this entry is more specific - this +# information seems to be more useful. +#0 long 0x45520200 +#>0x410 string disk\ image UDIF read/write image (UDRW) ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/archive#2 (text+ko) ==== @@ -32,8 +32,10 @@ 0 string !\ndebian >8 string debian-split part of multipart Debian package >8 string debian-binary Debian binary package ->68 string >\n (format %s) ->136 ledate x created: %s +>68 string >\0 (format %s) +>81 string bz2 \b, uses bzip2 compression +>84 string gz \b, uses gzip compression +#>136 ledate x created: %s # other archives 0 long 0177555 very old archive @@ -187,7 +189,12 @@ >20 byte x - header level %d # RAR archiver (Greg Roelofs, newt@uchicago.edu) -0 string Rar! RAR archive data +0 string Rar! RAR archive data, +>44 byte x v%0x, +>35 byte 0 os: MS-DOS +>35 byte 1 os: OS/2 +>35 byte 2 os: Win32 +>35 byte 3 os: Unix # SQUISH archiver (Greg Roelofs, newt@uchicago.edu) 0 string SQSH squished archive data (Acorn RISCOS) @@ -239,9 +246,11 @@ # Microsoft cabinets # by David Necas (Yeti) -0 string MSCF\0\0\0\0 Microsoft cabinet file data, ->25 byte x v%d ->24 byte x \b.%d +#0 string MSCF\0\0\0\0 Microsoft cabinet file data, +#>25 byte x v%d +#>24 byte x \b.%d +# MPi: All CABs have version 1.3, so this is pointless. +# Better magic in debian-additions. # GTKtalog catalogs # by David Necas (Yeti) @@ -256,3 +265,56 @@ 0 string PAR\0 PARity archive data >48 leshort =0 - Index file >48 leshort >0 - file number %d + +# Felix von Leitner +0 string d8:announce BitTorrent file + +# Atari MSA archive - Teemu Hukkanen +0 beshort 0x0e0f Atari MSA archive data +>2 beshort x \b, %d sectors per track +>4 beshort 0 \b, 1 sided +>4 beshort 1 \b, 2 sided +>6 beshort x \b, starting track: %d +>8 beshort x \b, ending track: %d + +# Alternate ZIP string (amc@arwen.cs.berkeley.edu) +0 string PK00PK\003\004 Zip archive data + +# ACE archive (from http://www.wotsit.org/download.asp?f=ace) +# by Stefan `Sec` Zehl +7 string **ACE** ACE compressed archive +>15 byte >0 version %d +>16 byte =0x00 \b, from MS-DOS +>16 byte =0x01 \b, from OS/2 +>16 byte =0x02 \b, from Win/32 +>16 byte =0x03 \b, from Unix +>16 byte =0x04 \b, from MacOS +>16 byte =0x05 \b, from WinNT +>16 byte =0x06 \b, from Primos +>16 byte =0x07 \b, from AppleGS +>16 byte =0x08 \b, from Atari +>16 byte =0x09 \b, from Vax/VMS +>16 byte =0x0A \b, from Amiga +>16 byte =0x0B \b, from Next +>14 byte x \b, version %d to extract +>5 leshort &0x0080 \b, multiple volumes, +>>17 byte x \b (part %d), +>5 leshort &0x0002 \b, contains comment +>5 leshort &0x0200 \b, sfx +>5 leshort &0x0400 \b, small dictionary +>5 leshort &0x0800 \b, multi-volume +>5 leshort &0x1000 \b, contains AV-String +>>30 string\x16*UNREGISTERED\x20VERSION* (unregistered) +>5 leshort &0x2000 \b, with recovery record +>5 leshort &0x4000 \b, locked +>5 leshort &0x8000 \b, solid +# Date in MS-DOS format (whatever that is) +#>18 lelong x Created on + +# sfArk : compression program for Soundfonts (sf2) by Dirk Jagdmann +# +0x1A string sfArk sfArk compressed Soundfont +>0x15 string 2 +>>0x1 string >\0 Version %s +>>0x2A string >\0 : %s + ==== //depot/projects/davidxu_ksedbg/src/contrib/file/Magdir/audio#2 (text+ko) ==== @@ -8,18 +8,28 @@ # Sun/NeXT audio data 0 string .snd Sun/NeXT audio data: ->12 belong 1 8-bit ISDN u-law, +>12 belong 1 8-bit ISDN mu-law, >12 belong 2 8-bit linear PCM [REF-PCM], >12 belong 3 16-bit linear PCM, >12 belong 4 24-bit linear PCM, >12 belong 5 32-bit linear PCM, >12 belong 6 32-bit IEEE floating point, >12 belong 7 64-bit IEEE floating point, ->12 belong 23 8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding), ->12 belong 24 compressed (8-bit G.722 ADPCM) ->12 belong 25 compressed (3-bit G.723 ADPCM), ->12 belong 26 compressed (5-bit G.723 ADPCM), ->12 belong 27 8-bit A-law, +>12 belong 8 Fragmented sample data, +>12 belong 10 DSP program, +>12 belong 11 8-bit fixed point, +>12 belong 12 16-bit fixed point, +>12 belong 13 24-bit fixed point, +>12 belong 14 32-bit fixed point, +>12 belong 18 16-bit linear with emphasis, +>12 belong 19 16-bit linear compressed, +>12 belong 20 16-bit linear with emphasis and compression, +>12 belong 21 Music kit DSP commands, +>12 belong 23 8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice data encoding), +>12 belong 24 compressed (8-bit CCITT G.722 ADPCM) +>12 belong 25 compressed (3-bit CCITT G.723.3 ADPCM), +>12 belong 26 compressed (5-bit CCITT G.723.5 ADPCM), +>12 belong 27 8-bit A-law (CCITT G.711), >20 belong 1 mono, >20 belong 2 stereo, >20 belong 4 quad, @@ -28,14 +38,28 @@ # DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format # that uses little-endian encoding and has a different magic number 0 lelong 0x0064732E DEC audio data: ->12 lelong 1 8-bit ISDN u-law, +>12 lelong 1 8-bit ISDN mu-law, >12 lelong 2 8-bit linear PCM [REF-PCM], >12 lelong 3 16-bit linear PCM, >12 lelong 4 24-bit linear PCM, >12 lelong 5 32-bit linear PCM, >12 lelong 6 32-bit IEEE floating point, >12 lelong 7 64-bit IEEE floating point, ->12 lelong 23 8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding), +>12 belong 8 Fragmented sample data, +>12 belong 10 DSP program, +>12 belong 11 8-bit fixed point, +>12 belong 12 16-bit fixed point, +>12 belong 13 24-bit fixed point, +>12 belong 14 32-bit fixed point, +>12 belong 18 16-bit linear with emphasis, +>12 belong 19 16-bit linear compressed, +>12 belong 20 16-bit linear with emphasis and compression, +>12 belong 21 Music kit DSP commands, +>12 lelong 23 8-bit ISDN mu-law compressed (CCITT G.721 ADPCM voice data encoding), +>12 belong 24 compressed (8-bit CCITT G.722 ADPCM) +>12 belong 25 compressed (3-bit CCITT G.723.3 ADPCM), +>12 belong 26 compressed (5-bit CCITT G.723.5 ADPCM), +>12 belong 27 8-bit A-law (CCITT G.711), >20 lelong 1 mono, >20 lelong 2 stereo, >20 lelong 4 quad, @@ -43,8 +67,12 @@ # Creative Labs AUDIO stuff 0 string MThd Standard MIDI data ->9 byte >0 (format %d) ->11 byte >1 using %d tracks +>8 beshort x (format %d) +>10 beshort x using %d track +>10 beshort >1 \bs +>12 beshort&0x7fff x at 1/%d +>12 beshort&0x8000 >0 SMPTE + 0 string CTMF Creative Music (CMF) data 0 string SBI SoundBlaster instrument data 0 string Creative\ Voice\ File Creative Labs voice data @@ -72,12 +100,18 @@ # MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@dialin.ind.net] # Oct 31, 1995 -0 string MTM MultiTracker Module sound file +# fixed by 2003-06-24 +# Too short... +#0 string MTM MultiTracker Module sound file #0 string if Composer 669 Module sound data -0 string FAR Module sound data +#0 string JN Composer 669 Module sound data (extended format) 0 string MAS_U ULT(imate) Module sound data + +#0 string FAR Module sound data +#>4 string >\15 Title: "%s" + 0x2c string SCRM ScreamTracker III Module sound data -0 string Extended Module Extended Module sound data +>0 string >\0 Title: "%s" # Gravis UltraSound patches # From @@ -88,37 +122,68 @@ # # Taken from loader code from mikmod version 2.14 # by Steve McIntyre (stevem@chiark.greenend.org.uk) -0 string JN extended 669 module data +# added title printing on 2003-06-24 0 string MAS_UTrack_V00 >14 string >/0 ultratracker V1.%.1s module sound data + 0 string UN05 MikMod UNI format module sound data + 0 string Extended\ Module: Fasttracker II module sound data -21 string !SCREAM! Screamtracker 2 module sound data +>17 string >\0 Title: "%s" + +21 string/c !SCREAM! Screamtracker 2 module sound data +21 string BMOD2STM Screamtracker 2 module sound data 1080 string M.K. 4-channel Protracker module sound data +>0 string >\0 Title: "%s" 1080 string M!K! 4-channel Protracker module sound data +>0 string >\0 Title: "%s" 1080 string FLT4 4-channel Startracker module sound data +>0 string >\0 Title: "%s" +1080 string FLT8 8-channel Startracker module sound data +>0 string >\0 Title: "%s" 1080 string 4CHN 4-channel Fasttracker module sound data +>0 string >\0 Title: "%s" 1080 string 6CHN 6-channel Fasttracker module sound data +>0 string >\0 Title: "%s" 1080 string 8CHN 8-channel Fasttracker module sound data -1080 string CD81 8-channel Oktalyzer module sound data +>0 string >\0 Title: "%s" +1080 string CD81 8-channel Octalyser module sound data +>0 string >\0 Title: "%s" 1080 string OKTA 8-channel Oktalyzer module sound data +>0 string >\0 Title: "%s" # Not good enough. #1082 string CH #>1080 string >/0 %.2s-channel Fasttracker "oktalyzer" module sound data 1080 string 16CN 16-channel Taketracker module sound data +>0 string >\0 Title: "%s" 1080 string 32CN 32-channel Taketracker module sound data +>0 string >\0 Title: "%s" # TOC sound files -Trevor Johnson # 0 string TOC TOC sound file # sidfiles +# added name,author,(c) and new RSID type by 2003-06-24 0 string SIDPLAY\ INFOFILE Sidplay info file + 0 string PSID PlaySID v2.2+ (AMIGA) sidtune >4 beshort >0 w/ header v%d, >14 beshort =1 single song, >14 beshort >1 %d songs, >16 beshort >0 default song: %d +>0x16 string >\0 name: "%s" +>0x36 string >\0 author: "%s" +>0x56 string >\0 copyright: "%s" + +0 string RSID RSID sidtune PlaySID compatible +>4 beshort >0 w/ header v%d, +>14 beshort =1 single song, +>14 beshort >1 %d songs, +>16 beshort >0 default song: %d +>0x16 string >\0 name: "%s" +>0x36 string >\0 author: "%s" +>0x56 string >\0 copyright: "%s" # IRCAM # VAX and MIPS files are little-endian; Sun and NeXT are big-endian @@ -133,8 +198,25 @@ # Sample Vision 0 string SOUND\ SAMPLE\ DATA\ Sample Vision file -# Audio Visual Research -0 string 2BIT Audio Visual Research file +# Audio Visual Research +0 string 2BIT Audio Visual Research file, +>12 beshort =0 mono, +>12 beshort =-1 stereo, +>14 beshort x %d bits +>16 beshort =0 unsigned, +>16 beshort =-1 signed, +>22 belong&0x00ffffff x %d Hz, +>18 beshort =0 no loop, +>18 beshort =-1 loop, +>21 ubyte <=127 note %d, +>22 byte =0 replay 5.485 KHz +>22 byte =1 replay 8.084 KHz +>22 byte =2 replay 10.971 Khz +>22 byte =3 replay 16.168 Khz +>22 byte =4 replay 21.942 KHz +>22 byte =5 replay 32.336 KHz +>22 byte =6 replay 43.885 KHz +>22 byte =7 replay 47.261 KHz # SGI SoundTrack 0 string _SGI_SoundTrack SGI SoundTrack project file @@ -230,6 +312,29 @@ 0 string FTMN FaceTheMusic module >16 string >\0d \b, "%s" +# From: 2003-06-24 +0 string AMShdr\32 Velvet Studio AMS Module v2.2 +0 string Extreme Extreme Tracker AMS Module v1.3 +0 string DDMF Xtracker DMF Module +>4 byte x v%i +>0xD string >\0 Title: "%s" +>0x2B string >\0 Composer: "%s" +0 string DSM\32 Dynamic Studio Module DSM +0 string SONG DigiTrekker DTM Module +0 string DMDL DigiTrakker MDL Module +0 string PSM\32 Protracker Studio PSM Module +44 string PTMF Poly Tracker PTM Module +>0 string >\32 Title: "%s" +0 string MT20 MadTracker 2.0 Module MT2 +0 string RAD\40by\40REALiTY!! RAD Adlib Tracker Module RAD +0 string RTMM RTM Module +0x426 string MaDoKaN96 XMS Adlib Module +>0 string >\0 Composer: "%s" +0 string AMF AMF Module +>4 string >\0 Title: "%s" +0 string MODINFO1 Open Cubic Player Module Inforation MDZ +0 string Extended\40Instrument: Fast Tracker II Instrument + # From: Takeshi Hamasaki # NOA Nancy Codec file 0 string \210NOA\015\012\032 NOA Nancy Codec Movie file @@ -240,7 +345,56 @@ >20 string Ver01.00 Ver. 1.00 >>32 byte x , %d tracks -# FLAC audio stream -# From: Dan Fandrich -0 string fLaC FLAC audio stream data +# Free lossless audio codec +# From: Przemyslaw Augustyniak >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 9 18:36:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9999316A4D0; Mon, 9 Aug 2004 18:36:09 +0000 (GMT) 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 749E616A4CE for ; Mon, 9 Aug 2004 18:36:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 562A443D55 for ; Mon, 9 Aug 2004 18:36:09 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i79Ia94k073491 for ; Mon, 9 Aug 2004 18:36:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i79Ia9VN073488 for perforce@freebsd.org; Mon, 9 Aug 2004 18:36:09 GMT (envelope-from jhb@freebsd.org) Date: Mon, 9 Aug 2004 18:36:09 GMT Message-Id: <200408091836.i79Ia9VN073488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 59258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2004 18:36:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=59258 Change 59258 by jhb@jhb_slimer on 2004/08/09 18:35:43 Fix all the ABIs to use kern_fcntl() and mark them as MP safe so Robert can re-add his Giant assertion to kern_fcntl(). Affected files ... .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#13 edit .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#28 edit .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#7 edit .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#18 edit .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#15 edit .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#18 edit .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#6 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#8 edit .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#7 edit .. //depot/projects/smpng/sys/i386/linux/syscalls.master#16 edit Differences ... ==== //depot/projects/smpng/sys/alpha/linux/syscalls.master#13 (text+ko) ==== @@ -133,7 +133,7 @@ 89 STD { int linux_getdtablesize(void); } 90 MNOPROTO { int dup2(u_int from, u_int to); } 91 STD { int linux_newfstat(l_uint fd, struct l_newstat *buf); } -92 STD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } +92 MSTD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } 93 STD { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } 94 NOPROTO { int poll(struct pollfd*, unsigned int nfds, long timeout); } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#28 (text+ko) ==== @@ -758,19 +758,14 @@ { int error; long tmp; - caddr_t oarg, sg; - struct fcntl_args a; struct osf1_flock osf_flock; struct flock bsd_flock; - struct flock *nflock; error = 0; switch (uap->cmd) { case F_SETFL: - a.fd = uap->fd; - a.cmd = F_SETFL; /* need to translate flags here */ tmp = 0; if ((long)uap->arg & OSF1_FNONBLOCK) @@ -791,8 +786,7 @@ tmp |= FNDELAY; if ((long)uap->arg & OSF1_FSYNC) tmp |= FFSYNC; - a.arg = tmp; - error = fcntl(td, &a); + error = kern_fcntl(td, uap->fd, F_SETFL, tmp); break; case F_SETLK: @@ -803,20 +797,15 @@ * the BSD one, but all else is the same. We must * reorder the one we've gotten so that flock() groks it. */ - if ((error = copyin(uap->arg, &osf_flock, sizeof(osf_flock)))) - return error; + error = copyin(uap->arg, &osf_flock, sizeof(osf_flock)); + if (error) + return (error); bsd_flock.l_type = osf_flock.l_type; bsd_flock.l_whence = osf_flock.l_whence; bsd_flock.l_start = osf_flock.l_start; bsd_flock.l_len = osf_flock.l_len; bsd_flock.l_pid = osf_flock.l_pid; - sg = stackgap_init(); - nflock = stackgap_alloc(&sg, sizeof(struct flock)); - if ((error = copyout(&bsd_flock, nflock, sizeof(bsd_flock))) != 0) - return error; - oarg = uap->arg; - uap->arg = nflock; - error = fcntl(td, (struct fcntl_args *) uap); + error = kern_fcntl(td, uap->fd, uap->cmd, (intptr_t)&bsd_flock); /* if (error) { printf("fcntl called with cmd=%d, args=0x%lx\n returns %d\n",uap->cmd,(long)uap->arg,error); printf("bsd_flock.l_type = 0x%x\n", bsd_flock.l_type); @@ -827,14 +816,17 @@ } */ if ((uap->cmd == F_GETLK) && !error) { + /* + * XXX: Why are we hardcoding F_UNLCK here instead of + * copying the structure members from bsd_flock? + */ osf_flock.l_type = F_UNLCK; - if ((error = copyout(&osf_flock, oarg, - sizeof(osf_flock)))) - return error; + error = copyout(&osf_flock, uap->arg, + sizeof(osf_flock)); } break; default: - error = fcntl(td, (struct fcntl_args *) uap); + error = kern_fcntl(td, uap->fd, uap->cmd, uap->arg); if ((uap->cmd == OSF1_F_GETFL) && !error ) { tmp = td->td_retval[0] & O_ACCMODE; ==== //depot/projects/smpng/sys/alpha/osf1/syscalls.master#7 (text+ko) ==== @@ -135,7 +135,7 @@ 89 MNOPROTO { int getdtablesize(void); } 90 MNOPROTO { int dup2(u_int from, u_int to); } 91 STD { int osf1_fstat(int fd, void *sb); } -92 STD { int osf1_fcntl(int fd, int cmd, void *arg); } +92 MSTD { int osf1_fcntl(int fd, int cmd, void *arg); } 93 STD { int osf1_select(u_int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } 94 NOPROTO { int poll(struct pollfd *fds, u_int nfds, int timeout); } ==== //depot/projects/smpng/sys/compat/linux/linux_socket.c#18 (text+ko) ==== @@ -663,12 +663,7 @@ struct close_args /* { int fd; } */ c_args; - struct fcntl_args /* { - int fd; - int cmd; - long arg; - } */ f_args; - int error; + int error, fd; if ((error = copyin(args, &linux_args, sizeof(linux_args)))) return (error); @@ -694,11 +689,9 @@ * accepted one, so we must clear the flags in the new descriptor. * Ignore any errors, because we already have an open fd. */ - f_args.fd = td->td_retval[0]; - f_args.cmd = F_SETFL; - f_args.arg = 0; - (void)fcntl(td, &f_args); - td->td_retval[0] = f_args.fd; + fd = td->td_retval[0]; + (void)kern_fcntl(td, fd, F_SETFL, 0); + td->td_retval[0] = fd; return (0); } ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#15 (text+ko) ==== @@ -580,29 +580,24 @@ register struct thread *td; struct svr4_sys_fcntl_args *uap; { - int error; - struct fcntl_args fa; - int *retval; + int cmd, error, *retval; retval = td->td_retval; - fa.fd = uap->fd; - fa.cmd = svr4_to_bsd_cmd(uap->cmd); + cmd = svr4_to_bsd_cmd(uap->cmd); - switch (fa.cmd) { + switch (cmd) { case F_DUPFD: case F_GETFD: case F_SETFD: - fa.arg = (long) uap->arg; - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, cmd, uap->arg)); case F_GETFL: - fa.arg = (long) uap->arg; - error = fcntl(td, &fa); + error = kern_fcntl(td, uap->fd, cmd, uap->arg); if (error) - return error; + return (error); *retval = bsd_to_svr4_flags(*retval); - return error; + return (error); case F_SETFL: { @@ -610,55 +605,42 @@ * we must save the O_ASYNC flag, as that is * handled by ioctl(_, I_SETSIG, _) emulation. */ - long cmd; int flags; DPRINTF(("Setting flags %p\n", uap->arg)); - cmd = fa.cmd; /* save it for a while */ - fa.cmd = F_GETFL; - if ((error = fcntl(td, &fa)) != 0) - return error; + error = kern_fcntl(td, uap->fd, F_GETFL, 0); + if (error) + return (error); flags = *retval; flags &= O_ASYNC; flags |= svr4_to_bsd_flags((u_long) uap->arg); - fa.cmd = cmd; - fa.arg = (long) flags; - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, F_SETFL, flags); } case F_GETLK: case F_SETLK: case F_SETLKW: { - struct svr4_flock ifl; - struct flock *flp, fl; - caddr_t sg = stackgap_init(); + struct svr4_flock ifl; + struct flock fl; flp = stackgap_alloc(&sg, sizeof(struct flock)); fa.arg = (long) flp; - error = copyin(uap->arg, &ifl, sizeof ifl); + error = copyin(uap->arg, &ifl, sizeof (ifl)); if (error) - return error; + return (error); svr4_to_bsd_flock(&ifl, &fl); - error = copyout(&fl, flp, sizeof fl); - if (error) - return error; - - error = fcntl(td, &fa); - if (error || fa.cmd != F_GETLK) - return error; + error = kern_fcntl(td, uap->fd, cmd, (intptr_t)&fl); + if (error || cmd != F_GETLK) + return (error); - error = copyin(flp, &fl, sizeof fl); - if (error) - return error; - bsd_to_svr4_flock(&fl, &ifl); - return copyout(&ifl, uap->arg, sizeof ifl); + return (copyout(&ifl, uap->arg, sizeof (ifl))); } case -1: switch (uap->cmd) { @@ -692,36 +674,36 @@ case SVR4_F_SETLK64: case SVR4_F_SETLKW64: { - struct svr4_flock64 ifl; - struct flock *flp, fl; - caddr_t sg = stackgap_init(); + struct svr4_flock64 ifl; + struct flock fl; - flp = stackgap_alloc(&sg, sizeof(struct flock)); - fa.arg = (long) flp; - + switch (uap->cmd) { + case SVR4_F_GETLK64: + cmd = F_GETLK; + break; + case SVR4_F_SETLK64: + cmd = F_SETLK; + break; + case SVR4_F_SETLKW64: + cmd = F_SETLKW; + break; + } error = copyin(uap->arg, &ifl, - sizeof ifl); + sizeof (ifl)); if (error) - return error; + return (error); svr4_to_bsd_flock64(&ifl, &fl); - error = copyout(&fl, flp, sizeof fl); - if (error) - return error; + error = kern_fcntl(td, uap->fd, cmd, + (intptr_t)&fl); + if (error || cmd != F_GETLK) + return (error); - error = fcntl(td, &fa); - if (error || fa.cmd != F_GETLK) - return error; - - error = copyin(flp, &fl, sizeof fl); - if (error) - return error; - bsd_to_svr4_flock64(&fl, &ifl); - return copyout(&ifl, uap->arg, - sizeof ifl); + return (copyout(&ifl, uap->arg, + sizeof (ifl))); } case SVR4_F_FREESP64: ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#18 (text+ko) ==== @@ -1473,7 +1473,6 @@ * We alse have to fix the O_ASYNC fcntl bit, so the * process will get SIGPOLLs. */ - struct fcntl_args fa; int error; register_t oflags, flags; struct svr4_strm *st = svr4_stream_get(fp); @@ -1483,10 +1482,9 @@ return EINVAL; } /* get old status flags */ - fa.fd = fd; - fa.cmd = F_GETFL; - if ((error = fcntl(td, &fa)) != 0) - return error; + error = kern_fcntl(td, fd, F_GETFL, 0); + if (error) + return (error); oflags = td->td_retval[0]; @@ -1512,19 +1510,15 @@ /* set the new flags, if changed */ if (flags != oflags) { - fa.cmd = F_SETFL; - fa.arg = (long) flags; - if ((error = fcntl(td, &fa)) != 0) - return error; + error = kern_fcntl(td, fd, F_SETFL, flags); + if (error) + return (error); flags = td->td_retval[0]; } /* set up SIGIO receiver if needed */ - if (dat != NULL) { - fa.cmd = F_SETOWN; - fa.arg = (long) td->td_proc->p_pid; - return fcntl(td, &fa); - } + if (dat != NULL) + return (kern_fcntl(td, fd, F_SETOWN, td->td_proc->p_pid); return 0; } ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#6 (text+ko) ==== @@ -100,7 +100,7 @@ 59 STD { int svr4_sys_execve(char *path, char **argp, char **envp); } 60 MNOPROTO { int umask(int newmask); } 61 NOPROTO { int chroot(char *path); } -62 STD { int svr4_sys_fcntl(int fd, int cmd, char *arg); } +62 MSTD { int svr4_sys_fcntl(int fd, int cmd, char *arg); } 63 MSTD { int svr4_sys_ulimit(int cmd, long newlimit); } 64 UNIMPL reserved 65 UNIMPL reserved ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#8 (text+ko) ==== @@ -247,91 +247,59 @@ struct ibcs2_fcntl_args *uap; { int error; - struct fcntl_args fa; - struct flock *flp; + struct flock fl; struct ibcs2_flock ifl; switch(uap->cmd) { case IBCS2_F_DUPFD: - fa.fd = uap->fd; - fa.cmd = F_DUPFD; - fa.arg = (/* XXX */ int)uap->arg; - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, F_DUPFD, uap->arg)); case IBCS2_F_GETFD: - fa.fd = uap->fd; - fa.cmd = F_GETFD; - fa.arg = (/* XXX */ int)uap->arg; - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, F_GETFD, uap->arg)); case IBCS2_F_SETFD: - fa.fd = uap->fd; - fa.cmd = F_SETFD; - fa.arg = (/* XXX */ int)uap->arg; - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, F_SETFD, uap->arg)); case IBCS2_F_GETFL: - fa.fd = uap->fd; - fa.cmd = F_GETFL; - fa.arg = (/* XXX */ int)uap->arg; - error = fcntl(td, &fa); + error = kern_fcntl(td, uap->fd, F_GETFL, uap->arg); if (error) return error; td->td_retval[0] = oflags2ioflags(td->td_retval[0]); return error; case IBCS2_F_SETFL: - fa.fd = uap->fd; - fa.cmd = F_SETFL; - fa.arg = (/* XXX */ int) - ioflags2oflags((int)uap->arg); - return fcntl(td, &fa); + return (kern_fcntl(td, uap->fd, F_SETFL, + ioflags2oflags((int)uap->arg))); case IBCS2_F_GETLK: { - caddr_t sg = stackgap_init(); - flp = stackgap_alloc(&sg, sizeof(*flp)); error = copyin((caddr_t)uap->arg, (caddr_t)&ifl, ibcs2_flock_len); if (error) return error; - cvt_iflock2flock(&ifl, flp); - fa.fd = uap->fd; - fa.cmd = F_GETLK; - fa.arg = (/* XXX */ int)flp; - error = fcntl(td, &fa); + cvt_iflock2flock(&ifl, &fl); + error = kern_fcntl(td, uap->fd, F_GETLK, &fl); if (error) return error; - cvt_flock2iflock(flp, &ifl); + cvt_flock2iflock(&fl, &ifl); return copyout((caddr_t)&ifl, (caddr_t)uap->arg, ibcs2_flock_len); } case IBCS2_F_SETLK: { - caddr_t sg = stackgap_init(); - flp = stackgap_alloc(&sg, sizeof(*flp)); error = copyin((caddr_t)uap->arg, (caddr_t)&ifl, ibcs2_flock_len); if (error) return error; - cvt_iflock2flock(&ifl, flp); - fa.fd = uap->fd; - fa.cmd = F_SETLK; - fa.arg = (/* XXX */ int)flp; - - return fcntl(td, &fa); + cvt_iflock2flock(&ifl, &fl); + return (kern_fcntl(td, uap->fd, F_SETLK, &fl)); } case IBCS2_F_SETLKW: { - caddr_t sg = stackgap_init(); - flp = stackgap_alloc(&sg, sizeof(*flp)); error = copyin((caddr_t)uap->arg, (caddr_t)&ifl, ibcs2_flock_len); if (error) return error; - cvt_iflock2flock(&ifl, flp); - fa.fd = uap->fd; - fa.cmd = F_SETLKW; - fa.arg = (/* XXX */ int)flp; - return fcntl(td, &fa); + cvt_iflock2flock(&ifl, &fl); + return (kern_fcntl(td, uap->fd, F_SETLKW, &fl)); } } return ENOSYS; ==== //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#7 (text+ko) ==== @@ -98,7 +98,7 @@ 59 STD { int ibcs2_execve(char *path, char **argp, char **envp); } 60 MNOPROTO { int umask(int newmask); } 61 NOPROTO { int chroot(char *path); } -62 STD { int ibcs2_fcntl(int fd, int cmd, char *arg); } +62 MSTD { int ibcs2_fcntl(int fd, int cmd, char *arg); } 63 MSTD { long ibcs2_ulimit(int cmd, int newlimit); } 64 UNIMPL reserved for unix/pc 65 UNIMPL reserved for unix/pc ==== //depot/projects/smpng/sys/i386/linux/syscalls.master#16 (text+ko) ==== @@ -89,7 +89,7 @@ 52 STD { int linux_umount(char *path, l_int flags); } 53 UNIMPL lock 54 STD { int linux_ioctl(l_uint fd, l_uint cmd, l_ulong arg); } -55 STD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } +55 MSTD { int linux_fcntl(l_uint fd, l_uint cmd, l_ulong arg); } 56 UNIMPL mpx 57 MNOPROTO { int setpgid(int pid, int pgid); } 58 UNIMPL ulimit @@ -294,7 +294,7 @@ 218 STD { int linux_mincore(l_ulong start, l_size_t len, u_char *vec); } 219 MNOPROTO { int madvise(void *addr, size_t len, int behav); } 220 STD { int linux_getdents64(l_uint fd, void *dirent, l_uint count); } -221 STD { int linux_fcntl64(l_uint fd, l_uint cmd, l_ulong arg); } +221 MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, l_ulong arg); } 222 UNIMPL 223 UNIMPL 224 UNIMPL linux_gettid From owner-p4-projects@FreeBSD.ORG Tue Aug 10 18:03:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C8A016A4D0; Tue, 10 Aug 2004 18:03:53 +0000 (GMT) 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 D289A16A4CE for ; Tue, 10 Aug 2004 18:03:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2E6843D41 for ; Tue, 10 Aug 2004 18:03:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7AI3q8N019562 for ; Tue, 10 Aug 2004 18:03:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7AI3p9Z019559 for perforce@freebsd.org; Tue, 10 Aug 2004 18:03:51 GMT (envelope-from jhb@freebsd.org) Date: Tue, 10 Aug 2004 18:03:51 GMT Message-Id: <200408101803.i7AI3p9Z019559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 59319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 18:03:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=59319 Change 59319 by jhb@jhb_slimer on 2004/08/10 18:03:16 IFC @59317. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#61 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#39 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#11 integrate .. //depot/projects/smpng/sys/alpha/include/memdev.h#1 branch .. //depot/projects/smpng/sys/alpha/include/param.h#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/io.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#29 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#20 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/iodev.h#1 branch .. //depot/projects/smpng/sys/amd64/include/memdev.h#1 branch .. //depot/projects/smpng/sys/amd64/include/param.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/profile.h#6 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#2 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#4 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/smpng/sys/boot/common/help.common#12 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#12 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#28 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#23 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/btxcsu.s#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.h#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#7 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/io.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#5 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#53 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#16 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#17 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#13 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#10 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#5 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#18 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#18 integrate .. //depot/projects/smpng/sys/conf/NOTES#76 integrate .. //depot/projects/smpng/sys/conf/files#116 integrate .. //depot/projects/smpng/sys/conf/files.alpha#31 integrate .. //depot/projects/smpng/sys/conf/files.amd64#20 integrate .. //depot/projects/smpng/sys/conf/files.i386#66 integrate .. //depot/projects/smpng/sys/conf/files.ia64#43 integrate .. //depot/projects/smpng/sys/conf/files.pc98#62 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#41 integrate .. //depot/projects/smpng/sys/conf/options#83 integrate .. //depot/projects/smpng/sys/contrib/pf/netinet/in4_cksum.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#70 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#45 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#40 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#6 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#5 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#55 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#42 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#28 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#4 integrate .. //depot/projects/smpng/sys/dev/ciss/cissio.h#4 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#9 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#25 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#19 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#8 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#24 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/smpng/sys/dev/esp/lsi64854.c#2 integrate .. //depot/projects/smpng/sys/dev/esp/lsi64854var.h#2 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/smpng/sys/dev/fb/splash_bmp.c#1 branch .. //depot/projects/smpng/sys/dev/fb/splash_pcx.c#1 branch .. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#31 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#16 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#17 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#9 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#6 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#18 integrate .. //depot/projects/smpng/sys/dev/io/iodev.c#1 branch .. //depot/projects/smpng/sys/dev/md/md.c#52 integrate .. //depot/projects/smpng/sys/dev/mem/memdev.c#1 branch .. //depot/projects/smpng/sys/dev/mem/memutil.c#1 branch .. //depot/projects/smpng/sys/dev/null/null.c#18 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#19 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#27 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#42 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#58 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#64 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#21 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#19 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#21 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#24 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#35 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#16 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#18 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#20 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#14 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#7 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/smpng/sys/geom/geom.h#38 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#35 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#36 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#39 integrate .. //depot/projects/smpng/sys/geom/geom_fox.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#26 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#9 delete .. //depot/projects/smpng/sys/geom/geom_pc98.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#8 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#4 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#1 branch .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#1 branch .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/projects/smpng/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#4 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#35 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#5 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#28 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#53 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#86 integrate .. //depot/projects/smpng/sys/i386/i386/autoconf.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/io.c#1 branch .. //depot/projects/smpng/sys/i386/i386/io_apic.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#78 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#65 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#67 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#71 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#12 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#7 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/smpng/sys/i386/include/iodev.h#1 branch .. //depot/projects/smpng/sys/i386/include/memdev.h#1 branch .. //depot/projects/smpng/sys/i386/include/param.h#13 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#10 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#39 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/autoconf.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#82 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#60 integrate .. //depot/projects/smpng/sys/ia64/ia64/syscall.S#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#66 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#22 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#21 integrate .. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/memdev.h#1 branch .. //depot/projects/smpng/sys/ia64/include/pte.h#3 integrate .. //depot/projects/smpng/sys/isa/psm.c#27 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#29 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#38 integrate .. //depot/projects/smpng/sys/kern/init_main.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#80 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#94 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#20 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#26 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#32 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#37 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#68 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#119 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#46 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#78 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#48 integrate .. //depot/projects/smpng/sys/modules/Makefile#79 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/geom/geom_mirror/Makefile#1 branch .. //depot/projects/smpng/sys/modules/io/Makefile#1 branch .. //depot/projects/smpng/sys/modules/md/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/mem/Makefile#1 branch .. //depot/projects/smpng/sys/modules/null/Makefile#3 delete .. //depot/projects/smpng/sys/modules/splash/bmp/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/splash/bmp/splash_bmp.c#5 delete .. //depot/projects/smpng/sys/modules/splash/pcx/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/splash/pcx/splash_pcx.c#4 delete .. //depot/projects/smpng/sys/net/bpf.c#38 integrate .. //depot/projects/smpng/sys/net/if.c#51 integrate .. //depot/projects/smpng/sys/net/if_gre.c#20 integrate .. //depot/projects/smpng/sys/net/if_sl.c#23 integrate .. //depot/projects/smpng/sys/net/if_var.h#29 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#15 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#23 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#31 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#35 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#21 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#55 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#52 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#46 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#32 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#10 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#27 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#30 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#27 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#39 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#14 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#46 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#30 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#69 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#12 integrate .. //depot/projects/smpng/sys/pci/agpreg.h#10 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#52 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#29 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#48 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#22 integrate .. //depot/projects/smpng/sys/powerpc/include/cpu.h#16 integrate .. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#18 integrate .. //depot/projects/smpng/sys/powerpc/include/critical.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/reg.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#53 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#44 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#38 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#2 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#43 integrate .. //depot/projects/smpng/sys/sparc64/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/memdev.h#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#51 integrate .. //depot/projects/smpng/sys/sys/bio.h#20 integrate .. //depot/projects/smpng/sys/sys/gpt.h#4 integrate .. //depot/projects/smpng/sys/sys/kse.h#17 integrate .. //depot/projects/smpng/sys/sys/ktr.h#15 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#41 integrate .. //depot/projects/smpng/sys/sys/mdioctl.h#9 integrate .. //depot/projects/smpng/sys/sys/memrange.h#4 integrate .. //depot/projects/smpng/sys/sys/mount.h#32 integrate .. //depot/projects/smpng/sys/sys/mouse.h#3 integrate .. //depot/projects/smpng/sys/sys/mutex.h#44 integrate .. //depot/projects/smpng/sys/sys/param.h#67 integrate .. //depot/projects/smpng/sys/sys/proc.h#122 integrate .. //depot/projects/smpng/sys/sys/ptrace.h#13 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#22 integrate .. //depot/projects/smpng/sys/sys/systm.h#54 integrate .. //depot/projects/smpng/sys/sys/taskqueue.h#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#57 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#17 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#48 integrate .. //depot/projects/smpng/sys/vm/uma.h#12 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#47 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#9 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.h#3 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#21 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#37 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#47 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#30 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#65 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#31 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#47 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#55 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#13 (text+ko) ==== @@ -25,12 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.59 2004/07/08 22:35:33 brian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.60 2004/07/28 21:54:56 phk Exp $"); #include "opt_bootp.h" #include "opt_isa.h" -#include "opt_nfs.h" -#include "opt_nfsroot.h" #include #include @@ -67,8 +65,6 @@ device_t isa_bus_device = 0; #endif -extern int nfs_diskless_valid; /* XXX use include file */ - static void configure_start() { @@ -194,20 +190,3 @@ cold = 0; } - -/* - * Do legacy root filesystem discovery. This isn't really - * needed on the Alpha, which has always used the loader. - */ -void -cpu_rootconf() -{ -#if defined(NFSCLIENT) && defined(NFS_ROOT) - int order = 0; -#if !defined(BOOTP_NFSROOT) - if (nfs_diskless_valid) -#endif - rootdevnames[order++] = "nfs:"; -#endif -} -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.50 2004/06/16 09:46:26 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.51 2004/08/01 11:40:50 markm Exp $"); /* * Memory special file @@ -59,85 +59,19 @@ #include #include -#ifdef PERFMON -#include -#endif #include #include #include -static struct cdev *memdev, *kmemdev; -#ifdef PERFMON -static struct cdev *perfdev; -#endif /* PERFMON */ - -static d_open_t mmopen; -static d_close_t mmclose; -static d_read_t mmrw; -static d_ioctl_t mmioctl; -static d_mmap_t memmmap; +#include -#define CDEV_MAJOR 2 -static struct cdevsw mem_cdevsw = { - .d_version = D_VERSION, - .d_open = mmopen, - .d_close = mmclose, - .d_read = mmrw, - .d_write = mmrw, - .d_ioctl = mmioctl, - .d_mmap = memmmap, - .d_name = "mem", - .d_maj = CDEV_MAJOR, - .d_flags = D_MEM | D_NEEDGIANT, -}; - struct mem_range_softc mem_range_softc; -static int -mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) +/* ARGSUSED */ +int +memrw(struct cdev *dev, struct uio *uio, int flags) { - switch (minor(dev)) { -#ifdef PERFMON - case 32: - return perfmon_close(dev, flags, fmt, td); -#endif - default: - break; - } - return (0); -} - -static int -mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) -{ - int error; - - switch (minor(dev)) { - case 0: - case 1: - if (flags & FWRITE) { - error = securelevel_gt(td->td_ucred, 0); - if (error) - return (error); - } - break; - case 32: -#ifdef PERFMON - return perfmon_open(dev, flags, fmt, td); -#else - return ENODEV; -#endif - default: - break; - } - return (0); -} - -/*ARGSUSED*/ -static int -mmrw(struct cdev *dev, struct uio *uio, int flags) -{ vm_offset_t o, v; int c = 0; struct iovec *iov; @@ -152,13 +86,10 @@ uio->uio_iov++; uio->uio_iovcnt--; if (uio->uio_iovcnt < 0) - panic("mmrw"); + panic("memrw"); continue; } - switch (minor(dev)) { - -/* minor device 0 is physical memory */ - case 0: + if (minor(dev) == CDEV_MINOR_MEM) { v = uio->uio_offset; kmemphys: /* Allow reads only in RAM. */ @@ -174,9 +105,8 @@ error = uiomove((caddr_t)ALPHA_PHYS_TO_K0SEG(v), c, uio); continue; - -/* minor device 1 is kernel memory */ - case 1: + } + else if (minor(dev) == CDEV_MINOR_KMEM) { v = uio->uio_offset; if (v >= ALPHA_K0SEG_BASE && v <= ALPHA_K0SEG_END) { @@ -186,8 +116,9 @@ c = min(iov->iov_len, MAXPHYS); /* - * Make sure that all of the pages are currently resident so - * that we don't create any zero-fill pages. + * Make sure that all of the pages are currently + * resident so that we don't create any zero-fill + * pages. */ addr = trunc_page(v); eaddr = round_page(v + c); @@ -203,22 +134,16 @@ error = uiomove((caddr_t)v, c, uio); continue; } - - if (error) - break; - iov->iov_base = (char *)iov->iov_base + c; - iov->iov_len -= c; - uio->uio_offset += c; - uio->uio_resid -= c; + /* else panic! */ } return (error); } -/*******************************************************\ -* allow user processes to MMAP some memory sections * -* instead of going through read/write * -\*******************************************************/ -static int +/* + * allow user processes to MMAP some memory sections + * instead of going through read/write + */ +int memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* @@ -227,7 +152,7 @@ * could be transient and hence incorrect or invalid at * a later time. */ - if (minor(dev) != 0) + if (minor(dev) != CDEV_MINOR_MEM) return (-1); /* @@ -239,59 +164,7 @@ return (0); } -static int -mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) -{ - switch(minor(dev)) { -#ifdef PERFMON - case 32: - return perfmon_ioctl(dev, cmd, cmdarg, flags, td); -#endif - default: - return ENODEV; - } - - return (0); -} - -static int -mem_modevent(module_t mod, int type, void *data) +void +dev_mem_md_init(void) { - switch(type) { - case MOD_LOAD: - if (bootverbose) - printf("mem: \n"); -/* XXX - ??? */ -#if 0 - /* Initialise memory range handling */ - if (mem_range_softc.mr_op != NULL) - mem_range_softc.mr_op->init(&mem_range_softc); -#endif - - memdev = make_dev(&mem_cdevsw, 0, UID_ROOT, GID_KMEM, - 0640, "mem"); - kmemdev = make_dev(&mem_cdevsw, 1, UID_ROOT, GID_KMEM, - 0640, "kmem"); -#ifdef PERFMON - perfdev = make_dev(&mem_cdevsw, 32, UID_ROOT, GID_KMEM, - 0640, "perfmon"); -#endif /* PERFMON */ - return 0; - - case MOD_UNLOAD: - destroy_dev(memdev); - destroy_dev(kmemdev); -#ifdef PERFMON - destroy_dev(perfdev); -#endif /* PERFMON */ - return 0; - - case MOD_SHUTDOWN: - return 0; - - default: - return EOPNOTSUPP; - } } - -DEV_MODULE(mem, mem_modevent, NULL); ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#61 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.163 2004/07/21 03:38:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.165 2004/08/04 18:04:43 alc Exp $"); #include #include @@ -336,6 +336,7 @@ static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP static void pmap_invalidate_page_action(void *arg); @@ -894,74 +895,65 @@ * This routine unholds page table pages, and if the hold count * drops to zero, then it decrements the wire count. */ +static PMAP_INLINE int +pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + + vm_page_unhold(m); + if (m->hold_count == 0) + return _pmap_unwire_pte_hold(pmap, va, m); + else + return 0; +} + static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) { + vm_offset_t pteva; + pt_entry_t* pte; - while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt")) - vm_page_lock_queues(); + /* + * unmap the page table page + */ + if (m->pindex >= NUSERLEV3MAPS) { + /* Level 2 page table */ + pte = pmap_lev1pte(pmap, va); + pteva = (vm_offset_t) PTlev2 + alpha_ptob(m->pindex - NUSERLEV3MAPS); + } else { + /* Level 3 page table */ + pte = pmap_lev2pte(pmap, va); + pteva = (vm_offset_t) PTmap + alpha_ptob(m->pindex); + } - if (m->hold_count == 0) { - vm_offset_t pteva; - pt_entry_t* pte; + *pte = 0; - /* - * unmap the page table page - */ - if (m->pindex >= NUSERLEV3MAPS) { - /* Level 2 page table */ - pte = pmap_lev1pte(pmap, va); - pteva = (vm_offset_t) PTlev2 + alpha_ptob(m->pindex - NUSERLEV3MAPS); - } else { - /* Level 3 page table */ - pte = pmap_lev2pte(pmap, va); - pteva = (vm_offset_t) PTmap + alpha_ptob(m->pindex); - } + if (m->pindex < NUSERLEV3MAPS) { + /* unhold the level 2 page table */ + vm_page_t lev2pg; - *pte = 0; + lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va))); + pmap_unwire_pte_hold(pmap, va, lev2pg); + } - if (m->pindex < NUSERLEV3MAPS) { - /* unhold the level 2 page table */ - vm_page_t lev2pg; + --pmap->pm_stats.resident_count; + /* + * Do a invltlb to make the invalidated mapping + * take effect immediately. + */ + pmap_invalidate_page(pmap, pteva); - lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va))); - vm_page_unhold(lev2pg); - if (lev2pg->hold_count == 0) - _pmap_unwire_pte_hold(pmap, va, lev2pg); - } + if (pmap->pm_ptphint == m) + pmap->pm_ptphint = NULL; - --pmap->pm_stats.resident_count; - /* - * Do a invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - - if (pmap->pm_ptphint == m) - pmap->pm_ptphint = NULL; - - /* - * If the page is finally unwired, simply free it. - */ - --m->wire_count; - if (m->wire_count == 0) { - vm_page_busy(m); - vm_page_free_zero(m); - atomic_subtract_int(&cnt.v_wire_count, 1); - } - return 1; + /* + * If the page is finally unwired, simply free it. + */ + --m->wire_count; + if (m->wire_count == 0) { + vm_page_free_zero(m); + atomic_subtract_int(&cnt.v_wire_count, 1); } - return 0; -} - -static PMAP_INLINE int -pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m) -{ - vm_page_unhold(m); - if (m->hold_count == 0) - return _pmap_unwire_pte_hold(pmap, va, m); - else - return 0; + return 1; } /* @@ -1070,7 +1062,11 @@ */ if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + PMAP_UNLOCK(pmap); + vm_page_unlock_queues(); VM_WAIT; + vm_page_lock_queues(); + PMAP_LOCK(pmap); /* * Indicate the need to retry. While waiting, the page table @@ -1107,10 +1103,8 @@ pt_entry_t* l2map; if (!pmap_pte_v(l1pte)) { if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) { - vm_page_lock_queues(); vm_page_unhold(m); vm_page_free(m); - vm_page_unlock_queues(); return (NULL); } } else { @@ -1402,11 +1396,11 @@ pv->pv_pmap = pmap; pv->pv_ptem = mpte; - vm_page_lock_queues(); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); m->md.pv_list_count++; - vm_page_unlock_queues(); } /* @@ -1697,6 +1691,10 @@ #endif mpte = NULL; + + vm_page_lock_queues(); + PMAP_LOCK(pmap); + /* * In the case that a page table page is not * resident, we are creating it here. @@ -1762,11 +1760,7 @@ */ if (opa) { int err; - vm_page_lock_queues(); - PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); - PMAP_UNLOCK(pmap); - vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); } @@ -1820,6 +1814,8 @@ if (prot & VM_PROT_EXECUTE) alpha_pal_imb(); } + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); } /* @@ -1839,6 +1835,9 @@ register pt_entry_t *pte; int managed; + vm_page_lock_queues(); + PMAP_LOCK(pmap); + /* * In the case that a page table page is not * resident, we are creating it here. @@ -1892,12 +1891,10 @@ pte = vtopte(va); if (*pte) { if (mpte != NULL) { - vm_page_lock_queues(); pmap_unwire_pte_hold(pmap, va, mpte); - vm_page_unlock_queues(); + mpte = NULL; } - alpha_pal_imb(); /* XXX overkill? */ - return 0; + goto out; } /* @@ -1920,8 +1917,10 @@ * Now validate mapping with RO protection */ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; - +out: alpha_pal_imb(); /* XXX overkill? */ + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#39 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.172 2004/07/18 09:03:11 maxim Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.174 2004/08/03 19:24:52 markm Exp $ machine alpha cpu EV4 @@ -171,8 +171,9 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # Pseudo devices. +device loop # Network loopback +device mem # Memory and kernel memory devices device random # Entropy device -device loop # Network loopback device ether # Ethernet support device sl # Kernel SLIP device ppp # Kernel PPP ==== //depot/projects/smpng/sys/alpha/include/cpu.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.40 2004/08/03 18:44:26 mux Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -93,6 +93,7 @@ #ifdef _KERNEL #define cpu_getstack(td) (alpha_pal_rdusp()) +#define cpu_spinwait() /* nothing */ #define get_cyclecount alpha_rpcc void cpu_halt(void); ==== //depot/projects/smpng/sys/alpha/include/param.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.34 2004/07/02 20:21:41 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.35 2004/08/01 14:31:45 scottl Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -113,7 +113,10 @@ #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ +/* PREEMPTION exposes scheduler bugs that need to be fixed. */ +#if 0 #define PREEMPTION +#endif #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ ==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); #include #include @@ -112,6 +112,11 @@ #define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) +/* + * Used in /dev/mem drivers and elsewhere + */ +MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); + static int amd64_mtrr2mrt(int val) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 10 23:04:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79A3E16A4D0; Tue, 10 Aug 2004 23:04:18 +0000 (GMT) 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 4C3FF16A4CE for ; Tue, 10 Aug 2004 23:04:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26F7A43D49 for ; Tue, 10 Aug 2004 23:04:18 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7AN4IUQ038136 for ; Tue, 10 Aug 2004 23:04:18 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7AN4Hg6038133 for perforce@freebsd.org; Tue, 10 Aug 2004 23:04:17 GMT (envelope-from scottl@freebsd.org) Date: Tue, 10 Aug 2004 23:04:17 GMT Message-Id: <200408102304.i7AN4Hg6038133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2004 23:04:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=59352 Change 59352 by scottl@scottl-wv1u on 2004/08/10 23:03:41 Revert the driver interrupt prototype change. That work is not going to happen in this branch, if at all. Affected files ... .. //depot/projects/newint/sys/sys/bus.h#3 edit Differences ... ==== //depot/projects/newint/sys/sys/bus.h#3 (text+ko) ==== @@ -88,14 +88,7 @@ typedef struct devclass *devclass_t; #define device_method_t kobj_method_t -enum intr_rtn { - INTR_RTN_NONE = 0, /* No action. Default compat for now */ - INTR_RTN_OWNER = 1, /* Driver hardware generated the interrupt */ - INTR_RTN_HANDLED = 2, /* Driver acknowledged the interrupt */ - INTR_RTN_ITHREAD = 4 /* Driver wants to run its ithread */ -}; - -typedef int driver_intr_t(void*); +typedef void driver_intr_t(void*); /* * Interrupt type bits. These flags are used both by newbus interrupt From owner-p4-projects@FreeBSD.ORG Wed Aug 11 00:22:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7CB16A4D0; Wed, 11 Aug 2004 00:21:59 +0000 (GMT) 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 5F8C616A4CE for ; Wed, 11 Aug 2004 00:21:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4130343D41 for ; Wed, 11 Aug 2004 00:21:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B0LxSX040232 for ; Wed, 11 Aug 2004 00:21:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B0LrbM040226 for perforce@freebsd.org; Wed, 11 Aug 2004 00:21:53 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 00:21:53 GMT Message-Id: <200408110021.i7B0LrbM040226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 00:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=59356 Change 59356 by scottl@scottl-wv1u on 2004/08/11 00:21:01 IFC Affected files ... .. //depot/projects/newint/sys/Makefile#2 integrate .. //depot/projects/newint/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/newint/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/newint/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/newint/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/timerreg.h#2 integrate .. //depot/projects/newint/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/newint/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/newint/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/newint/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/newint/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/newint/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/newint/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/newint/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/newint/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/newint/sys/alpha/include/_types.h#2 integrate .. //depot/projects/newint/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/newint/sys/alpha/include/critical.h#2 integrate .. //depot/projects/newint/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/newint/sys/alpha/include/endian.h#2 integrate .. //depot/projects/newint/sys/alpha/include/float.h#2 integrate .. //depot/projects/newint/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/newint/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/newint/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/newint/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/newint/sys/alpha/include/kdb.h#1 branch .. //depot/projects/newint/sys/alpha/include/limits.h#2 integrate .. //depot/projects/newint/sys/alpha/include/memdev.h#1 branch .. //depot/projects/newint/sys/alpha/include/param.h#2 integrate .. //depot/projects/newint/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/newint/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/newint/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/newint/sys/alpha/include/profile.h#2 integrate .. //depot/projects/newint/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/newint/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/newint/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/newint/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/newint/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/newint/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/newint/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/newint/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/newint/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/newint/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/newint/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/newint/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/newint/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/newint/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/newint/sys/alpha/osf1/osf1_proto.h#2 integrate .. //depot/projects/newint/sys/alpha/osf1/osf1_syscall.h#2 integrate .. //depot/projects/newint/sys/alpha/osf1/osf1_sysent.c#2 integrate .. //depot/projects/newint/sys/alpha/osf1/syscalls.master#2 integrate .. //depot/projects/newint/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/newint/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/newint/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/newint/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/newint/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/newint/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/newint/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/newint/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/newint/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/newint/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/amd64-gdbstub.c#2 delete .. //depot/projects/newint/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/newint/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/newint/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/newint/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/newint/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/io.c#1 branch .. //depot/projects/newint/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/newint/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/newint/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/newint/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/newint/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/newint/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/newint/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/newint/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/newint/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/newint/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/newint/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/newint/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/newint/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/newint/sys/amd64/include/_types.h#2 integrate .. //depot/projects/newint/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/newint/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/newint/sys/amd64/include/asm.h#2 integrate .. //depot/projects/newint/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/newint/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/newint/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/newint/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/newint/sys/amd64/include/critical.h#2 integrate .. //depot/projects/newint/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/newint/sys/amd64/include/elf.h#2 integrate .. //depot/projects/newint/sys/amd64/include/endian.h#2 integrate .. //depot/projects/newint/sys/amd64/include/exec.h#2 integrate .. //depot/projects/newint/sys/amd64/include/float.h#2 integrate .. //depot/projects/newint/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/newint/sys/amd64/include/frame.h#2 integrate .. //depot/projects/newint/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/newint/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/newint/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/newint/sys/amd64/include/iodev.h#1 branch .. //depot/projects/newint/sys/amd64/include/kdb.h#1 branch .. //depot/projects/newint/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/newint/sys/amd64/include/limits.h#2 integrate .. //depot/projects/newint/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/newint/sys/amd64/include/memdev.h#1 branch .. //depot/projects/newint/sys/amd64/include/param.h#2 integrate .. //depot/projects/newint/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/newint/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/newint/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/newint/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/newint/sys/amd64/include/proc.h#2 integrate .. //depot/projects/newint/sys/amd64/include/profile.h#2 integrate .. //depot/projects/newint/sys/amd64/include/psl.h#2 integrate .. //depot/projects/newint/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/newint/sys/amd64/include/reg.h#2 integrate .. //depot/projects/newint/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/newint/sys/amd64/include/segments.h#2 integrate .. //depot/projects/newint/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/newint/sys/amd64/include/signal.h#2 integrate .. //depot/projects/newint/sys/amd64/include/smp.h#2 integrate .. //depot/projects/newint/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/newint/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/newint/sys/amd64/include/trap.h#2 integrate .. //depot/projects/newint/sys/amd64/include/tss.h#2 integrate .. //depot/projects/newint/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/newint/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/newint/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/newint/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/newint/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/newint/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/newint/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/newint/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/newint/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/newint/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/newint/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/newint/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/newint/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/newint/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/newint/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/newint/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/newint/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/newint/sys/arm/arm/blockio.S#1 branch .. //depot/projects/newint/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/newint/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/newint/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/copystr.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/newint/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/newint/sys/arm/arm/critical.c#1 branch .. //depot/projects/newint/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/newint/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/newint/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/newint/sys/arm/arm/disassem.c#1 branch .. //depot/projects/newint/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/exception.S#1 branch .. //depot/projects/newint/sys/arm/arm/fiq.c#1 branch .. //depot/projects/newint/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/newint/sys/arm/arm/fusu.S#1 branch .. //depot/projects/newint/sys/arm/arm/genassym.c#1 branch .. //depot/projects/newint/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/newint/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/newint/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/newint/sys/arm/arm/intr.c#1 branch .. //depot/projects/newint/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/newint/sys/arm/arm/locore.S#1 branch .. //depot/projects/newint/sys/arm/arm/machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/nexus.c#1 branch .. //depot/projects/newint/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/newint/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/newint/sys/arm/arm/pmap.c#1 branch .. //depot/projects/newint/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/newint/sys/arm/arm/setstack.s#1 branch .. //depot/projects/newint/sys/arm/arm/support.S#1 branch .. //depot/projects/newint/sys/arm/arm/swtch.S#1 branch .. //depot/projects/newint/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/trap.c#1 branch .. //depot/projects/newint/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/newint/sys/arm/arm/undefined.c#1 branch .. //depot/projects/newint/sys/arm/arm/vectors.S#1 branch .. //depot/projects/newint/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/newint/sys/arm/conf/SIMICS#1 branch .. //depot/projects/newint/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/newint/sys/arm/include/_limits.h#2 integrate .. //depot/projects/newint/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/newint/sys/arm/include/_types.h#2 integrate .. //depot/projects/newint/sys/arm/include/armreg.h#1 branch .. //depot/projects/newint/sys/arm/include/asm.h#1 branch .. //depot/projects/newint/sys/arm/include/asmacros.h#1 branch .. //depot/projects/newint/sys/arm/include/atomic.h#1 branch .. //depot/projects/newint/sys/arm/include/blockio.h#1 branch .. //depot/projects/newint/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/newint/sys/arm/include/bus.h#1 branch .. //depot/projects/newint/sys/arm/include/bus_memio.h#1 branch .. //depot/projects/newint/sys/arm/include/bus_pio.h#1 branch .. //depot/projects/newint/sys/arm/include/clock.h#1 branch .. //depot/projects/newint/sys/arm/include/cpu.h#1 branch .. //depot/projects/newint/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/newint/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/newint/sys/arm/include/critical.h#1 branch .. //depot/projects/newint/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/newint/sys/arm/include/disassem.h#1 branch .. //depot/projects/newint/sys/arm/include/elf.h#2 integrate .. //depot/projects/newint/sys/arm/include/endian.h#2 integrate .. //depot/projects/newint/sys/arm/include/fiq.h#1 branch .. //depot/projects/newint/sys/arm/include/float.h#1 branch .. //depot/projects/newint/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/newint/sys/arm/include/fp.h#1 branch .. //depot/projects/newint/sys/arm/include/frame.h#1 branch .. //depot/projects/newint/sys/arm/include/ieee.h#1 branch .. //depot/projects/newint/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/newint/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/newint/sys/arm/include/intr.h#1 branch .. //depot/projects/newint/sys/arm/include/katelib.h#1 branch .. //depot/projects/newint/sys/arm/include/kdb.h#1 branch .. //depot/projects/newint/sys/arm/include/limits.h#2 integrate .. //depot/projects/newint/sys/arm/include/machdep.h#1 branch .. //depot/projects/newint/sys/arm/include/md_var.h#1 branch .. //depot/projects/newint/sys/arm/include/metadata.h#1 branch .. //depot/projects/newint/sys/arm/include/mutex.h#1 branch .. //depot/projects/newint/sys/arm/include/param.h#2 integrate .. //depot/projects/newint/sys/arm/include/pcb.h#1 branch .. //depot/projects/newint/sys/arm/include/pcpu.h#1 branch .. //depot/projects/newint/sys/arm/include/pmap.h#1 branch .. //depot/projects/newint/sys/arm/include/proc.h#1 branch .. //depot/projects/newint/sys/arm/include/profile.h#1 branch .. //depot/projects/newint/sys/arm/include/psl.h#1 branch .. //depot/projects/newint/sys/arm/include/pte.h#1 branch .. //depot/projects/newint/sys/arm/include/ptrace.h#1 branch .. //depot/projects/newint/sys/arm/include/reg.h#1 branch .. //depot/projects/newint/sys/arm/include/reloc.h#1 branch .. //depot/projects/newint/sys/arm/include/resource.h#1 branch .. //depot/projects/newint/sys/arm/include/runq.h#1 branch .. //depot/projects/newint/sys/arm/include/setjmp.h#1 branch .. //depot/projects/newint/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/newint/sys/arm/include/sigframe.h#1 branch .. //depot/projects/newint/sys/arm/include/signal.h#2 integrate .. //depot/projects/newint/sys/arm/include/smp.h#1 branch .. //depot/projects/newint/sys/arm/include/stdarg.h#1 branch .. //depot/projects/newint/sys/arm/include/swi.h#1 branch .. //depot/projects/newint/sys/arm/include/trap.h#1 branch .. //depot/projects/newint/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/newint/sys/arm/include/undefined.h#1 branch .. //depot/projects/newint/sys/arm/include/utrap.h#1 branch .. //depot/projects/newint/sys/arm/include/vmparam.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/newint/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/newint/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/newint/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/newint/sys/boot/Makefile#2 integrate .. //depot/projects/newint/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/newint/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/newint/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/newint/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/newint/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/newint/sys/boot/common/help.common#2 integrate .. //depot/projects/newint/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/newint/sys/boot/common/loader.8#2 integrate .. //depot/projects/newint/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/newint/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/newint/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/newint/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/newint/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/newint/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/newint/sys/boot/efi/loader/Makefile#3 integrate .. //depot/projects/newint/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/newint/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/newint/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/newint/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/newint/sys/boot/i386/boot0/boot0.s#2 delete .. //depot/projects/newint/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/newint/sys/boot/i386/boot0/boot0sio.s#2 delete .. //depot/projects/newint/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/newint/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/newint/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/newint/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/newint/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/newint/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/newint/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/newint/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/newint/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/newint/sys/boot/i386/btx/lib/btxcsu.s#2 integrate .. //depot/projects/newint/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/newint/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/newint/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/newint/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/newint/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/newint/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/newint/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/newint/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/newint/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/newint/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/newint/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/newint/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/newint/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/newint/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/newint/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/newint/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/newint/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/newint/sys/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/newint/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/newint/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/newint/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/newint/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/newint/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/newint/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/newint/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/newint/sys/boot/powerpc/loader/start.c#2 integrate .. //depot/projects/newint/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/newint/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/newint/sys/cam/cam_periph.h#2 integrate .. //depot/projects/newint/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/newint/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/newint/sys/coda/cnode.h#2 integrate .. //depot/projects/newint/sys/coda/coda.h#2 integrate .. //depot/projects/newint/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/newint/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/newint/sys/coda/coda_psdev.h#2 integrate .. //depot/projects/newint/sys/coda/coda_subr.c#2 integrate .. //depot/projects/newint/sys/coda/coda_venus.c#2 integrate .. //depot/projects/newint/sys/coda/coda_venus.h#2 integrate .. //depot/projects/newint/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/newint/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/newint/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/newint/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/newint/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/newint/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/newint/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/newint/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/newint/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/newint/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/newint/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/newint/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/newint/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/newint/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/newint/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/newint/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/newint/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/newint/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/newint/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/newint/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/newint/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/newint/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/newint/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/newint/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/newint/sys/conf/Makefile.arm#1 branch .. //depot/projects/newint/sys/conf/Makefile.i386#2 integrate .. //depot/projects/newint/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/newint/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/newint/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/newint/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/newint/sys/conf/NOTES#2 integrate .. //depot/projects/newint/sys/conf/files#3 integrate .. //depot/projects/newint/sys/conf/files.alpha#2 integrate .. //depot/projects/newint/sys/conf/files.amd64#2 integrate .. //depot/projects/newint/sys/conf/files.arm#1 branch .. //depot/projects/newint/sys/conf/files.i386#3 integrate .. //depot/projects/newint/sys/conf/files.ia64#2 integrate .. //depot/projects/newint/sys/conf/files.pc98#3 integrate .. //depot/projects/newint/sys/conf/files.powerpc#3 integrate .. //depot/projects/newint/sys/conf/files.sparc64#2 integrate .. //depot/projects/newint/sys/conf/kern.mk#2 integrate .. //depot/projects/newint/sys/conf/kern.post.mk#3 integrate .. //depot/projects/newint/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/newint/sys/conf/kmod.mk#3 integrate .. //depot/projects/newint/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/newint/sys/conf/ldscript.arm#1 branch .. //depot/projects/newint/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/newint/sys/conf/majors#3 integrate .. //depot/projects/newint/sys/conf/newvers.sh#2 integrate .. //depot/projects/newint/sys/conf/options#3 integrate .. //depot/projects/newint/sys/conf/options.alpha#2 integrate .. //depot/projects/newint/sys/conf/options.amd64#2 integrate .. //depot/projects/newint/sys/conf/options.arm#1 branch .. //depot/projects/newint/sys/conf/options.i386#2 integrate .. //depot/projects/newint/sys/conf/options.pc98#2 integrate .. //depot/projects/newint/sys/conf/options.powerpc#2 integrate .. //depot/projects/newint/sys/conf/options.sparc64#2 integrate .. //depot/projects/newint/sys/conf/systags.sh#2 integrate .. //depot/projects/newint/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/newint/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/newint/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/newint/sys/contrib/dev/fla/COPYRIGHT#2 delete .. //depot/projects/newint/sys/contrib/dev/fla/README#2 delete .. //depot/projects/newint/sys/contrib/dev/fla/fla.c#3 delete .. //depot/projects/newint/sys/contrib/dev/fla/i386/msysosak.o.uu#2 delete .. //depot/projects/newint/sys/contrib/dev/fla/msysosak.h#2 delete .. //depot/projects/newint/sys/contrib/dev/fla/patch.00#2 delete .. //depot/projects/newint/sys/contrib/dev/fla/prep.fla.sh#2 delete .. //depot/projects/newint/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/newint/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/newint/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/addr.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/atmapi.h#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_conn.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_data.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_dump.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_port.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_sig.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/cc_user.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/ccatm.h#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/ccpriv.h#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/unisap.c#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/api/unisap.h#1 branch .. //depot/projects/newint/sys/contrib/ngatm/netnatm/genfiles#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/misc/straddr.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/geniec.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/genieh.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/ie.def#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/msg.def#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/parseie.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/priv.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/traffic.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/uni_config.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/unimsglib.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/uniprint.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/msg/unistruct.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscfu.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscfudef.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscop.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscopdef.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_coord.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_party.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_print.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/sig_verify.c#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/uni.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/unidef.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/unimkmsg.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/unipriv.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/sig/unisig.h#2 integrate .. //depot/projects/newint/sys/contrib/ngatm/netnatm/unimsg.h#2 integrate .. //depot/projects/newint/sys/contrib/pf/net/if_pflog.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/if_pflog.h#1 branch .. //depot/projects/newint/sys/contrib/pf/net/if_pfsync.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/if_pfsync.h#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_ioctl.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_norm.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_osfp.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pf_table.c#1 branch .. //depot/projects/newint/sys/contrib/pf/net/pfvar.h#1 branch .. //depot/projects/newint/sys/contrib/pf/netinet/in4_cksum.c#1 branch .. //depot/projects/newint/sys/crypto/des/des_ecb.c#2 integrate .. //depot/projects/newint/sys/crypto/des/des_enc.c#2 integrate .. //depot/projects/newint/sys/crypto/des/des_setkey.c#2 integrate .. //depot/projects/newint/sys/ddb/db_access.c#2 integrate .. //depot/projects/newint/sys/ddb/db_break.c#2 integrate .. //depot/projects/newint/sys/ddb/db_command.c#2 integrate .. //depot/projects/newint/sys/ddb/db_elf.c#2 delete .. //depot/projects/newint/sys/ddb/db_kld.c#2 delete .. //depot/projects/newint/sys/ddb/db_main.c#1 branch .. //depot/projects/newint/sys/ddb/db_output.c#2 integrate .. //depot/projects/newint/sys/ddb/db_print.c#2 integrate .. //depot/projects/newint/sys/ddb/db_ps.c#2 integrate .. //depot/projects/newint/sys/ddb/db_run.c#2 integrate .. //depot/projects/newint/sys/ddb/db_sym.c#2 integrate .. //depot/projects/newint/sys/ddb/db_sysctl.c#2 delete .. //depot/projects/newint/sys/ddb/db_thread.c#1 branch .. //depot/projects/newint/sys/ddb/db_trap.c#2 delete .. //depot/projects/newint/sys/ddb/db_variables.c#2 integrate .. //depot/projects/newint/sys/ddb/db_variables.h#2 integrate .. //depot/projects/newint/sys/ddb/ddb.h#2 integrate .. //depot/projects/newint/sys/dev/aac/aac.c#3 integrate .. //depot/projects/newint/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/newint/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/newint/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/newint/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_button.c#3 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/newint/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/newint/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/newint/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpi_video.c#1 branch .. //depot/projects/newint/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/newint/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/newint/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/newint/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/newint/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/newint/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/newint/sys/dev/advansys/advmcode.h#2 integrate .. //depot/projects/newint/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/newint/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/newint/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/newint/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/newint/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/newint/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/newint/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/newint/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/newint/sys/dev/amd/amd.c#2 integrate .. //depot/projects/newint/sys/dev/amr/amr.c#2 integrate .. //depot/projects/newint/sys/dev/amr/amr_disk.c#3 integrate .. //depot/projects/newint/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/newint/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/newint/sys/dev/an/if_an.c#2 integrate .. //depot/projects/newint/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/newint/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/newint/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/newint/sys/dev/arl/if_arl.c#1 branch .. //depot/projects/newint/sys/dev/arl/if_arl_isa.c#1 branch .. //depot/projects/newint/sys/dev/arl/if_arlreg.h#1 branch .. //depot/projects/newint/sys/dev/asr/asr.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/newint/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/newint/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/newint/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/newint/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/newint/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/newint/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/newint/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/newint/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/newint/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/newint/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/newint/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/newint/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/newint/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/newint/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/newint/sys/dev/awi/awi.c#2 integrate .. //depot/projects/newint/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/newint/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/newint/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/newint/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/newint/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_core.h#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/newint/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/newint/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/newint/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/newint/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/newint/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/newint/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/newint/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/newint/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/newint/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/newint/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/newint/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/newint/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/newint/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/newint/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/newint/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/newint/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/newint/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/newint/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/newint/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/newint/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/newint/sys/dev/ct/ct.c#2 integrate .. //depot/projects/newint/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/newint/sys/dev/ctau/am8530.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctau.c#1 branch .. //depot/projects/newint/sys/dev/ctau/ctau2fw.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctaue1fw.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctaufw.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctaug7fw.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctaureg.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ctddk.c#1 branch .. //depot/projects/newint/sys/dev/ctau/ctddk.h#1 branch .. //depot/projects/newint/sys/dev/ctau/ds2153.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 11 00:25:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0709616A4D3; Wed, 11 Aug 2004 00:25:26 +0000 (GMT) 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 B25FA16A4CF for ; Wed, 11 Aug 2004 00:25:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F12F43D41 for ; Wed, 11 Aug 2004 00:25:04 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B0P41o040324 for ; Wed, 11 Aug 2004 00:25:04 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B0P46S040321 for perforce@freebsd.org; Wed, 11 Aug 2004 00:25:04 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 00:25:04 GMT Message-Id: <200408110025.i7B0P46S040321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 00:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=59359 Change 59359 by scottl@scottl-wv1u on 2004/08/11 00:24:57 Add initial starting point for MSI. Affected files ... .. //depot/projects/newint/sys/i386/i386/msi.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 11 00:39:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8640216A4D1; Wed, 11 Aug 2004 00:39:22 +0000 (GMT) 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 4AE8416A4CE for ; Wed, 11 Aug 2004 00:39:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27F6543D4C for ; Wed, 11 Aug 2004 00:39:22 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B0dMHY041677 for ; Wed, 11 Aug 2004 00:39:22 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B0dLbT041674 for perforce@freebsd.org; Wed, 11 Aug 2004 00:39:21 GMT (envelope-from wsalamon@computer.org) Date: Wed, 11 Aug 2004 00:39:21 GMT Message-Id: <200408110039.i7B0dLbT041674@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 Subject: PERFORCE change 59360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 00:39:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=59360 Change 59360 by wsalamon@wsalamon_epi on 2004/08/11 00:38:27 Fix the usage of vn_getpath(). Test that the path is written to the audit log by auditing the fchdir() system call. Add a needed include to audit_kernel.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#7 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#5 (text+ko) ==== @@ -28,6 +28,7 @@ #include +#include #include #include ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -40,6 +40,9 @@ #include "opt_compat.h" #include "opt_mac.h" +#include +#include + #include #include #include @@ -679,6 +682,9 @@ VREF(vp); fdrop(fp, td); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + + AUDIT_ARG(vnpath, vp, ARG_VNODE1); + if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ * volume, it should be left off unless you want your system * to churn a lot whenever the audit record flow gets high. */ -/* #define AUDIT_EXCESSIVELY_VERBOSE */ +#define AUDIT_EXCESSIVELY_VERBOSE #ifdef AUDIT_EXCESSIVELY_VERBOSE #define AUDIT_PRINTF(x) printf x #else @@ -2027,7 +2027,7 @@ struct kaudit_record *ar; struct vattr vattr; int error; - char **pathp, **retbuf, **freebuf; + char **pathp, *retbuf, *freebuf; struct vnode_au_info *vnp; struct thread *td; @@ -2069,10 +2069,9 @@ * it fails, we just have a zero-length string. Perhaps instead * we should not include a path token...? */ - retbuf = freebuf = NULL; - if (vn_fullpath(td, vp, retbuf, freebuf) == 0) { + if (vn_fullpath(td, vp, &retbuf, &freebuf) == 0) { /* Copy and free buffer allocated by vn_fullpath() */ - bcopy(*retbuf, *pathp, MAXPATHLEN); + bcopy(retbuf, *pathp, MAXPATHLEN); free(freebuf, M_TEMP); } else { (*pathp)[0] = '\0'; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#5 (text+ko) ==== @@ -814,7 +814,7 @@ void canon_path(struct thread *td, char *path, char *cpath) { char *bufp; - char **retbuf, **freebuf; + char *retbuf, *freebuf; int len; struct vnode *vnp; struct filedesc *fdp; @@ -855,11 +855,10 @@ * string bounding here seems a bit questionable and * will also require attention. */ - retbuf = freebuf = NULL; vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td); - if (vn_fullpath(td, vnp, retbuf, freebuf) == 0) { + if (vn_fullpath(td, vnp, &retbuf, &freebuf) == 0) { /* Copy and free buffer allocated by vn_fullpath() */ - bcopy(*retbuf, cpath, MAXPATHLEN); + bcopy(retbuf, cpath, MAXPATHLEN); free(freebuf, M_TEMP); } else { From owner-p4-projects@FreeBSD.ORG Wed Aug 11 02:26:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1783816A4D0; Wed, 11 Aug 2004 02:26:33 +0000 (GMT) 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 D826C16A4CE for ; Wed, 11 Aug 2004 02:26:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBBB343D1D for ; Wed, 11 Aug 2004 02:26:32 +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.12.11/8.12.11) with ESMTP id i7B2QWNs047157 for ; Wed, 11 Aug 2004 02:26:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B2QVH0047154 for perforce@freebsd.org; Wed, 11 Aug 2004 02:26:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 11 Aug 2004 02:26:31 GMT Message-Id: <200408110226.i7B2QVH0047154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 59364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 02:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=59364 Change 59364 by rwatson@rwatson_paprika on 2004/08/11 02:25:53 Integrate netperf_socket from FreeBSD CVS: - More /dev/mem fixage. - More VM lockage. physio Giant-free. - ath now holds Giant calling into net80211 when !debug_mpsafenet. - A variety of GEOM cleanup, buf cleanup, md cleanup, etc. - ADAPTIVE_GIANT now the default for i386 GENERIC. - More synaptics mouse pad fixup. - Condvar signal bits sync'd to msleep signal bits for KSE. - MA_NOTOWNED assertions in fcntl() disabled due to ABI wrapping. - A bunch of KSE-related debugging stuff, etc. - Core dumps can now be created UF_NODUMP. - More KTR tracing for KTR_RUNQ, KTR_PROC, etc. - Can now specify additional taskqueue threads. - Now a thread_user_entry() - GIANT_REQUIRED removed from netatalk. - O_ANTISPOOF added to ipfw2. - Giant removed from crypto_fclose(). Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#36 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umct.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#12 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#9 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom.h#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_aes.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_apple.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/geom_fox.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/geom_sunlabel.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_vol_ffs.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#5 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/gdb_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/syscall.S#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#7 integrate .. //depot/projects/netperf_socket/sys/ia64/include/gdb_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pte.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_physio.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#7 integrate .. //depot/projects/netperf_socket/sys/modules/md/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#9 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#18 integrate .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#10 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#14 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_via.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agpreg.h#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#14 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#12 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pmap.h#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/kse.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/mdioctl.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#23 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#21 integrate .. //depot/projects/netperf_socket/sys/sys/ptrace.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/taskqueue.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#9 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_init.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#18 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); #include #include @@ -112,6 +112,11 @@ #define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) +/* + * Used in /dev/mem drivers and elsewhere + */ +MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); + static int amd64_mtrr2mrt(int val) { ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.616 2004/08/06 07:20:32 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.617 2004/08/10 12:15:27 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1348,10 +1348,11 @@ { struct pcb *pcb; struct trapframe *tp; + register_t rflags; tp = td->td_frame; - if (!EFL_SECURE(regs->r_rflags, tp->tf_rflags) || - !CS_SECURE(regs->r_cs)) + rflags = regs->r_rflags & 0xffffffff; + if (!EFL_SECURE(rflags, tp->tf_rflags) || !CS_SECURE(regs->r_cs)) return (EINVAL); tp->tf_r15 = regs->r_r15; tp->tf_r14 = regs->r_r14; @@ -1370,7 +1371,7 @@ tp->tf_rax = regs->r_rax; tp->tf_rip = regs->r_rip; tp->tf_cs = regs->r_cs; - tp->tf_rflags = regs->r_rflags; + tp->tf_rflags = rflags; tp->tf_rsp = regs->r_rsp; tp->tf_ss = regs->r_ss; pcb = td->td_pcb; ==== //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.120 2004/08/04 18:30:31 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.121 2004/08/07 06:21:37 scottl Exp $"); /* * Memory special file @@ -67,11 +67,6 @@ #include -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); - /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#24 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.489 2004/08/04 18:04:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.491 2004/08/08 00:31:58 alc Exp $"); /* * Manages physical address maps. @@ -2265,10 +2265,9 @@ pml4_entry_t *pml4e; pdp_entry_t *pdpe; pd_entry_t srcptepaddr, *pde; - vm_pindex_t ptepindex; if (addr >= UPT_MIN_ADDRESS) - panic("pmap_copy: invalid to pmap_copy page tables\n"); + panic("pmap_copy: invalid to pmap_copy page tables"); /* * Don't let optional prefaulting of pages make us go @@ -2292,7 +2291,6 @@ } va_next = (addr + NBPDR) & ~PDRMASK; - ptepindex = pmap_pde_pindex(addr); pde = pmap_pde(src_pmap, addr); if (pde) @@ -2320,8 +2318,8 @@ } srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); - if (srcmpte->hold_count == 0 || (srcmpte->flags & PG_BUSY)) - continue; + if (srcmpte->hold_count == 0) + panic("pmap_copy: source page table page is unused"); if (va_next > end_addr) va_next = end_addr; ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.277 2004/07/10 22:39:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.278 2004/08/09 23:57:59 davidxu Exp $"); /* * AMD64 Trap and System call handling @@ -729,21 +729,18 @@ /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware */ - if (narg <= regcnt) { - argp = &frame.tf_rdi; - argp += reg; - error = 0; - } else { - KASSERT(narg <= sizeof(args) / sizeof(args[0]), - ("Too many syscall arguments!")); + KASSERT(narg <= sizeof(args) / sizeof(args[0]), + ("Too many syscall arguments!")); + error = 0; + argp = &frame.tf_rdi; + argp += reg; + bcopy(argp, args, sizeof(args[0]) * regcnt); + if (narg > regcnt) { KASSERT(params != NULL, ("copyin args with no params!")); - argp = &frame.tf_rdi; - argp += reg; - bcopy(argp, args, sizeof(args[0]) * regcnt); error = copyin(params, &args[regcnt], - (narg - regcnt) * sizeof(args[0])); - argp = &args[0]; + (narg - regcnt) * sizeof(args[0])); } + argp = &args[0]; #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) ==== //depot/projects/netperf_socket/sys/arm/arm/pmap.c#9 (text+ko) ==== @@ -144,7 +144,7 @@ */ /* Include header files */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.11 2004/08/06 22:32:53 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.12 2004/08/10 21:43:40 alc Exp $"); #include #include #include @@ -3546,6 +3546,13 @@ return (pa); } +/* + * Atomically extract and hold the physical page with the given + * pmap and virtual address pair if that mapping permits the given + * protection. + * + * XXX Need to implement the protection check. + */ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { ==== //depot/projects/netperf_socket/sys/boot/efi/loader/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.20 2003/08/02 08:22:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.21 2004/08/10 02:08:57 marcel Exp $"); #include #include @@ -384,15 +384,15 @@ int print_trs(int type) { - struct ia64_pal_result res; - int i, maxtr; + struct ia64_pal_result res; + int i, maxtr; struct { struct ia64_pte pte; struct ia64_itir itir; - struct ia64_ifa ifa; + uint64_t ifa; struct ia64_rr rr; - } buf; - static const char* psnames[] = { + } buf; + static const char *psnames[] = { "1B", "2B", "4B", "8B", "16B", "32B", "64B", "128B", "256B", "512B", "1K", "2K", @@ -402,10 +402,9 @@ "16M", "32M", "64M", "128M", "256M", "512M", "1G", "2G" }; - static const char* manames[] = { + static const char *manames[] = { "WB", "bad", "bad", "bad", "UC", "UCE", "WC", "NaT", - }; res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0); @@ -433,7 +432,7 @@ break; /* Only display valid translations */ - if ((buf.ifa.ifa_ig & 1) == 0) + if ((buf.ifa & 1) == 0) continue; if (!(res.pal_result[0] & 1)) @@ -448,7 +447,7 @@ "%03d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", i, buf.rr.rr_rid, - buf.ifa.ifa_vpn, + buf.ifa >> 12, buf.pte.pte_ppn, psnames[buf.itir.itir_ps], buf.pte.pte_ed, ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.169 2004/07/18 05:39:14 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.170 2004/08/08 09:08:37 sanpei Exp $"); #ifdef _KERNEL #include "opt_hw_wdog.h" @@ -302,6 +302,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "SEAGRAND", "NP-900*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT }, + { + /* + * iRiver iFP MP3 player (with UMS Firmware) + * PR: kern/54881, i386/63941, kern/66124 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "iRiver", "iFP*", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE + } }; static disk_strategy_t dastrategy; ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#36 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.183 2004/08/06 00:38:50 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.184 2004/08/10 22:02:52 njl Exp $ */ #include "opt_acpi.h" @@ -1750,18 +1750,16 @@ /* Enable any GPEs as appropriate and requested by the user. */ acpi_wake_prep_walk(state); - /* Inform all devices that we are going to sleep. */ - if (DEVICE_SUSPEND(root_bus) != 0) { - /* - * Re-wake the system. - * - * XXX note that a better two-pass approach with a 'veto' pass - * followed by a "real thing" pass would be better, but the - * current bus interface does not provide for this. - */ - DEVICE_RESUME(root_bus); + /* + * Inform all devices that we are going to sleep. If at least one + * device fails, DEVICE_SUSPEND() automatically resumes the tree. + * + * XXX Note that a better two-pass approach with a 'veto' pass + * followed by a "real thing" pass would be better, but the current + * bus interface does not provide for this. + */ + if (DEVICE_SUSPEND(root_bus) != 0) return_ACPI_STATUS (AE_ERROR); - } status = AcpiEnterSleepStatePrep(state); if (ACPI_FAILURE(status)) { @@ -1780,6 +1778,7 @@ if (state == ACPI_STATE_S4) AcpiEnable(); } else { + ACPI_DISABLE_IRQS(); status = AcpiEnterSleepState((UINT8)state); if (ACPI_FAILURE(status)) { device_printf(sc->acpi_dev, "AcpiEnterSleepState failed - %s\n", ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.218 2004/08/05 21:13:40 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.220 2004/08/09 12:02:32 sos Exp $"); #include "opt_ata.h" #include @@ -190,6 +190,11 @@ /* fail outstanding requests on this channel */ ata_fail_requests(ch, NULL); + /* unlock the channel */ + ch->running = NULL; + ATA_UNLOCK_CH(ch); + ch->locking(ch, ATA_LF_UNLOCK); + /* detach devices on this channel */ if (ch->device[MASTER].detach) ch->device[MASTER].detach(&ch->device[MASTER]); @@ -265,8 +270,10 @@ } } + /* unlock the channel */ ch->running = NULL; ATA_UNLOCK_CH(ch); + ch->locking(ch, ATA_LF_UNLOCK); /* identify what is present on the channel now */ ata_identify_devices(ch); @@ -353,6 +360,9 @@ caddr_t buf; int error = ENOTTY; + if (cmd != IOCATA) + return error; + DROP_GIANT(); switch (iocmd->cmd) { case ATAGMAXCHANNEL: ==== //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.42 2004/08/06 22:23:53 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.43 2004/08/07 12:49:28 sos Exp $"); #include "opt_ata.h" #include @@ -295,7 +295,7 @@ } /* request finish here */ - if (request->flags & ATA_R_DMA && ch->dma->flags & ATA_DMA_LOADED) + if (ch->dma && ch->dma->flags & ATA_DMA_LOADED) ch->dma->unload(ch); return ATA_OP_FINISHED; } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.30 2004/08/05 21:13:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.31 2004/08/09 12:02:32 sos Exp $"); #include "opt_ata.h" #include @@ -483,9 +483,6 @@ /* if we have a request "in flight" fail it as well */ if ((request = ch->running) && (!device || request->device == device)) { untimeout((timeout_t *)ata_timeout, request, request->timeout_handle); - ATA_UNLOCK_CH(request->device->channel); - request->device->channel->locking(request->device->channel, - ATA_LF_UNLOCK); request->result = ENXIO; if (request->callback) (request->callback)(request); ==== //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.80 2004/06/30 09:22:47 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.81 2004/08/09 14:22:58 sos Exp $"); #include "opt_ata.h" #include @@ -1340,7 +1340,8 @@ return -1; } } - free(config, M_AR); + else + free(config, M_AR); } return 0; } @@ -1512,6 +1513,7 @@ break; default: + free(config, M_AR); return -1; } @@ -1548,9 +1550,12 @@ sizeof(struct lsi_raid_conf), (caddr_t)config, AR_WRITE)) { printf("ar%d: LSI write conf failed\n", rdp->lun); + free(config, M_AR); return -1; } } + else + free(config, M_AR); } return 0; } @@ -1849,7 +1854,8 @@ return -1; } } - free(config, M_AR); + else + free(config, M_AR); } return 0; } ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.169 2004/08/05 21:11:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.170 2004/08/08 07:57:50 phk Exp $"); #include "opt_ata.h" #include @@ -98,6 +98,10 @@ static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); static struct g_class acd_class = { .name = "ACD", + .version = G_VERSION, + .access = acd_geom_access, + .ioctl = acd_geom_ioctl, + .start = acd_geom_start, }; DECLARE_GEOM_CLASS(acd_class, acd); @@ -249,9 +253,6 @@ cdp = arg; g_topology_assert(); gp = g_new_geomf(&acd_class, "acd%d", cdp->lun); - gp->access = acd_geom_access; - gp->ioctl = acd_geom_ioctl; - gp->start = acd_geom_start; gp->softc = cdp; cdp->gp = gp; pp = g_new_providerf(gp, "acd%d", cdp->lun); ==== //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.56 2004/08/07 00:45:05 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.57 2004/08/08 17:10:54 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -262,7 +262,7 @@ if_printf(ifp, "failed to allocate descriptors: %d\n", error); goto bad; } - callout_init(&sc->sc_scan_ch, CALLOUT_MPSAFE); + callout_init(&sc->sc_scan_ch, debug_mpsafenet ? CALLOUT_MPSAFE : 0); callout_init(&sc->sc_cal_ch, CALLOUT_MPSAFE); ATH_TXBUF_LOCK_INIT(sc); ==== //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.14 2004/07/02 12:16:01 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.15 2004/08/07 20:55:53 des Exp $"); #include #include @@ -111,7 +111,7 @@ static int bfe_miibus_readreg (device_t, int, int); static int bfe_miibus_writereg (device_t, int, int, int); static void bfe_miibus_statchg (device_t); -static int bfe_wait_bit (struct bfe_softc *, u_int32_t, u_int32_t, +static int bfe_wait_bit (struct bfe_softc *, u_int32_t, u_int32_t, u_long, const int); static void bfe_get_config (struct bfe_softc *sc); static void bfe_read_eeprom (struct bfe_softc *, u_int8_t *); @@ -161,7 +161,7 @@ DRIVER_MODULE(miibus, bfe, miibus_driver, miibus_devclass, 0, 0); /* - * Probe for a Broadcom 4401 chip. + * Probe for a Broadcom 4401 chip. */ static int bfe_probe(device_t dev) @@ -180,12 +180,12 @@ if ((pci_get_vendor(dev) == t->bfe_vid) && (pci_get_device(dev) == t->bfe_did)) { device_set_desc_copy(dev, t->bfe_name); - return(0); + return (0); } t++; } - return(ENXIO); + return (ENXIO); } static int @@ -199,7 +199,7 @@ /* parent tag */ error = bus_dma_tag_create(NULL, /* parent */ PAGE_SIZE, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR_32BIT, /* highaddr */ NULL, NULL, /* filter, filterarg */ MAXBSIZE, /* maxsize */ @@ -213,7 +213,7 @@ error = bus_dma_tag_create(sc->bfe_parent_tag, BFE_TX_LIST_SIZE, BFE_TX_LIST_SIZE, BUS_SPACE_MAXADDR, - BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, NULL, NULL, BFE_TX_LIST_SIZE, 1, @@ -224,7 +224,7 @@ if (error) { device_printf(dev, "could not allocate dma tag\n"); - return(ENOMEM); + return (ENOMEM); } /* tag for RX ring */ @@ -242,7 +242,7 @@ if (error) { device_printf(dev, "could not allocate dma tag\n"); - return(ENOMEM); + return (ENOMEM); } /* tag for mbufs */ @@ -260,7 +260,7 @@ if (error) { device_printf(dev, "could not allocate dma tag\n"); - return(ENOMEM); + return (ENOMEM); } /* pre allocate dmamaps for RX list */ @@ -269,7 +269,7 @@ &sc->bfe_rx_ring[i].bfe_map); if (error) { device_printf(dev, "cannot create DMA map for RX\n"); - return(ENOMEM); + return (ENOMEM); } } @@ -279,7 +279,7 @@ &sc->bfe_tx_ring[i].bfe_map); if (error) { device_printf(dev, "cannot create DMA map for TX\n"); - return(ENOMEM); + return (ENOMEM); } } @@ -288,7 +288,7 @@ BUS_DMA_NOWAIT, &sc->bfe_rx_map); if(error) - return(ENOMEM); + return (ENOMEM); bzero(sc->bfe_rx_list, BFE_RX_LIST_SIZE); error = bus_dmamap_load(sc->bfe_rx_tag, sc->bfe_rx_map, @@ -296,26 +296,26 @@ bfe_dma_map, &sc->bfe_rx_dma, 0); if(error) - return(ENOMEM); + return (ENOMEM); bus_dmamap_sync(sc->bfe_rx_tag, sc->bfe_rx_map, BUS_DMASYNC_PREREAD); - error = bus_dmamem_alloc(sc->bfe_tx_tag, (void *)&sc->bfe_tx_list, + error = bus_dmamem_alloc(sc->bfe_tx_tag, (void *)&sc->bfe_tx_list, BUS_DMA_NOWAIT, &sc->bfe_tx_map); - if (error) - return(ENOMEM); + if (error) + return (ENOMEM); - error = bus_dmamap_load(sc->bfe_tx_tag, sc->bfe_tx_map, - sc->bfe_tx_list, sizeof(struct bfe_desc), + error = bus_dmamap_load(sc->bfe_tx_tag, sc->bfe_tx_map, + sc->bfe_tx_list, sizeof(struct bfe_desc), bfe_dma_map, &sc->bfe_tx_dma, 0); if(error) - return(ENOMEM); + return (ENOMEM); bzero(sc->bfe_tx_list, BFE_TX_LIST_SIZE); bus_dmamap_sync(sc->bfe_tx_tag, sc->bfe_tx_map, BUS_DMASYNC_PREREAD); - return(0); + return (0); } static int @@ -442,7 +442,7 @@ fail: if(error) bfe_release_resources(sc); - return(error); + return (error); } static int @@ -473,7 +473,7 @@ BFE_UNLOCK(sc); mtx_destroy(&sc->bfe_mtx); - return(0); + return (0); } /* @@ -487,7 +487,7 @@ sc = device_get_softc(dev); BFE_LOCK(sc); - bfe_stop(sc); + bfe_stop(sc); BFE_UNLOCK(sc); return; @@ -501,10 +501,10 @@ sc = device_get_softc(dev); if(phy != sc->bfe_phyaddr) - return(0); + return (0); bfe_readphy(sc, reg, &ret); - return(ret); + return (ret); } static int @@ -514,10 +514,10 @@ sc = device_get_softc(dev); if(phy != sc->bfe_phyaddr) - return(0); - bfe_writephy(sc, reg, val); + return (0); + bfe_writephy(sc, reg, val); - return(0); + return (0); } static void @@ -530,7 +530,7 @@ bfe_tx_ring_free(struct bfe_softc *sc) { int i; - + for(i = 0; i < BFE_TX_LIST_CNT; i++) { if(sc->bfe_tx_ring[i].bfe_mbuf != NULL) { m_freem(sc->bfe_tx_ring[i].bfe_mbuf); @@ -565,14 +565,14 @@ } -static int +static int bfe_list_rx_init(struct bfe_softc *sc) { int i; for(i = 0; i < BFE_RX_LIST_CNT; i++) { - if(bfe_list_newbuf(sc, i, NULL) == ENOBUFS) - return ENOBUFS; + if(bfe_list_newbuf(sc, i, NULL) == ENOBUFS) + return (ENOBUFS); } bus_dmamap_sync(sc->bfe_rx_tag, sc->bfe_rx_map, BUS_DMASYNC_PREREAD); @@ -580,7 +580,7 @@ sc->bfe_rx_cons = 0; - return(0); + return (0); } static int @@ -592,12 +592,12 @@ u_int32_t ctrl; if ((c < 0) || (c >= BFE_RX_LIST_CNT)) - return(EINVAL); + return (EINVAL); if(m == NULL) { m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if(m == NULL) - return(ENOBUFS); + return (ENOBUFS); m->m_len = m->m_pkthdr.len = MCLBYTES; } else @@ -611,7 +611,7 @@ sc->bfe_rx_cnt = c; d = &sc->bfe_rx_list[c]; r = &sc->bfe_rx_ring[c]; - bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *), + bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *), MCLBYTES, bfe_dma_map_desc, d, 0); bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE); @@ -623,7 +623,7 @@ d->bfe_ctrl = ctrl; r->bfe_mbuf = m; bus_dmamap_sync(sc->bfe_rx_tag, sc->bfe_rx_map, BUS_DMASYNC_PREREAD); - return(0); + return (0); } static void @@ -643,7 +643,7 @@ sc->bfe_phyaddr = eeprom[90] & 0x1f; sc->bfe_mdc_port = (eeprom[90] >> 14) & 0x1; - sc->bfe_core_unit = 0; + sc->bfe_core_unit = 0; sc->bfe_dma_offset = BFE_PCI_DMA; } @@ -667,7 +667,7 @@ pci_write_config(sc->bfe_dev, BFE_BAR0_WIN, bar_orig, 4); } -static void +static void bfe_clear_stats(struct bfe_softc *sc) { u_long reg; @@ -683,7 +683,7 @@ BFE_UNLOCK(sc); } -static int +static int bfe_resetphy(struct bfe_softc *sc) { u_int32_t val; @@ -695,10 +695,10 @@ if (val & BMCR_RESET) { printf("bfe%d: PHY Reset would not complete.\n", sc->bfe_unit); BFE_UNLOCK(sc); - return ENXIO; + return (ENXIO); } BFE_UNLOCK(sc); - return 0; + return (0); } static void @@ -722,7 +722,7 @@ static void bfe_chip_reset(struct bfe_softc *sc) { - u_int32_t val; + u_int32_t val; BFE_LOCK(sc); @@ -739,7 +739,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 11 02:30:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4163716A4D0; Wed, 11 Aug 2004 02:30:38 +0000 (GMT) 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 1D47A16A4CE for ; Wed, 11 Aug 2004 02:30:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17DF543D48 for ; Wed, 11 Aug 2004 02:30:38 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B2UbOq047252 for ; Wed, 11 Aug 2004 02:30:37 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B2UbZf047249 for perforce@freebsd.org; Wed, 11 Aug 2004 02:30:37 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 02:30:37 GMT Message-Id: <200408110230.i7B2UbZf047249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 02:30:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=59365 Change 59365 by scottl@scottl-wv1u on 2004/08/11 02:30:23 Add stub msi_init() hook Affected files ... .. //depot/projects/newint/sys/i386/i386/local_apic.c#3 edit .. //depot/projects/newint/sys/i386/i386/msi.c#2 edit .. //depot/projects/newint/sys/i386/include/msi.h#1 add Differences ... ==== //depot/projects/newint/sys/i386/i386/local_apic.c#3 (text+ko) ==== @@ -606,6 +606,9 @@ /* Last, setup the cpu topology now that we have probed CPUs */ mp_topology(); #endif + + /* Initialize the MSI subsystem */ + msi_init(); } SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL) ==== //depot/projects/newint/sys/i386/i386/msi.c#2 (text+ko) ==== @@ -160,3 +160,13 @@ { return (0); } + +void msi_init(void) +{ + + if ((cpu_id & 0xf00) != 0xf00) + return; + + if (bootverbose || 1) + printf("Initializing MSI\n"); +} From owner-p4-projects@FreeBSD.ORG Wed Aug 11 02:32:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37A8216A4D0; Wed, 11 Aug 2004 02:32:41 +0000 (GMT) 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 124A016A4CE for ; Wed, 11 Aug 2004 02:32:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D40E43D1F for ; Wed, 11 Aug 2004 02:32:41 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B2WeC1047384 for ; Wed, 11 Aug 2004 02:32:40 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B2We26047381 for perforce@freebsd.org; Wed, 11 Aug 2004 02:32:40 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 02:32:40 GMT Message-Id: <200408110232.i7B2We26047381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 02:32:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=59366 Change 59366 by scottl@scottl-wv1u on 2004/08/11 02:32:18 Hook msi.c up to the kernel build. Affected files ... .. //depot/projects/newint/sys/conf/files.i386#4 edit .. //depot/projects/newint/sys/conf/files.pc98#4 edit Differences ... ==== //depot/projects/newint/sys/conf/files.i386#4 (text+ko) ==== @@ -237,6 +237,7 @@ i386/i386/mpboot.s optional smp i386/i386/mptable.c optional apic i386/i386/mptable_pci.c optional apic pci +i386/i386/msi.c optional apic i386/i386/nexus.c standard i386/i386/p4tcc.c optional cpu_enable_tcc i386/i386/perfmon.c optional perfmon ==== //depot/projects/newint/sys/conf/files.pc98#4 (text+ko) ==== @@ -166,6 +166,7 @@ i386/i386/mpboot.s optional smp i386/i386/mptable.c optional apic i386/i386/mptable_pci.c optional apic pci +i386/i386/msi.c optional apic i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine From owner-p4-projects@FreeBSD.ORG Wed Aug 11 06:15:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5A8416A4D0; Wed, 11 Aug 2004 06:15:14 +0000 (GMT) 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 7ED2716A4CE for ; Wed, 11 Aug 2004 06:15:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64D5043D46 for ; Wed, 11 Aug 2004 06:15:14 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7B6FEek054084 for ; Wed, 11 Aug 2004 06:15:14 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7B6FDxL054081 for perforce@freebsd.org; Wed, 11 Aug 2004 06:15:13 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 06:15:13 GMT Message-Id: <200408110615.i7B6FDxL054081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 06:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=59378 Change 59378 by scottl@scottl-wv1u on 2004/08/11 06:14:31 Create all of the newbus infrastructure for bus_reserve_resource(). Make msi.c and related stuff compile. Affected files ... .. //depot/projects/newint/sys/i386/i386/legacy.c#3 edit .. //depot/projects/newint/sys/i386/i386/local_apic.c#4 edit .. //depot/projects/newint/sys/i386/i386/mptable_pci.c#3 edit .. //depot/projects/newint/sys/i386/i386/msi.c#3 edit .. //depot/projects/newint/sys/i386/i386/nexus.c#3 edit .. //depot/projects/newint/sys/i386/include/msi.h#2 edit .. //depot/projects/newint/sys/i386/include/resource.h#2 edit .. //depot/projects/newint/sys/kern/bus_if.m#3 edit .. //depot/projects/newint/sys/kern/subr_bus.c#3 edit .. //depot/projects/newint/sys/sys/bus.h#5 edit Differences ... ==== //depot/projects/newint/sys/i386/i386/legacy.c#3 (text+ko) ==== @@ -102,6 +102,7 @@ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), { 0, 0 } }; @@ -372,6 +373,7 @@ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), { 0, 0 } }; ==== //depot/projects/newint/sys/i386/i386/local_apic.c#4 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/newint/sys/i386/i386/mptable_pci.c#3 (text+ko) ==== @@ -90,6 +90,7 @@ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), /* pcib interface */ DEVMETHOD(pcib_maxslots, legacy_pcib_maxslots), @@ -145,6 +146,7 @@ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), /* pcib interface */ DEVMETHOD(pcib_maxslots, pcib_maxslots), ==== //depot/projects/newint/sys/i386/i386/msi.c#3 (text+ko) ==== @@ -35,14 +35,18 @@ #include #include +#include #include +#include +#include +#include struct msi_intsrc { - struct intsrc io_intsrc, - device_t msi_dev, - u_int msi_ctrl, - u_int msi_addr, - u_int msi_data, + struct intsrc io_intsrc; + device_t msi_dev; + u_int msi_ctrl; + u_int msi_addr; + u_int msi_data; u_int io_vector; }; @@ -156,12 +160,13 @@ static int msi_config_intr(struct intsrc *isrc, enum intr_trigger trig, - enum intr_polarity pol); + enum intr_polarity pol) { return (0); } -void msi_init(void) +void +msi_init(void) { if ((cpu_id & 0xf00) != 0xf00) @@ -170,3 +175,9 @@ if (bootverbose || 1) printf("Initializing MSI\n"); } + +int +msi_reserve_resource(device_t dev, int *start, int *size, int flags) +{ + return (0); +} ==== //depot/projects/newint/sys/i386/i386/nexus.c#3 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include +#include #ifdef DEV_ISA #include @@ -100,6 +101,7 @@ void (*)(void *), void *, void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); +static int nexus_reserve_resource(device_t, device_t, int, int *, int *, int); static int nexus_set_resource(device_t, device_t, int, int, u_long, u_long); static int nexus_get_resource(device_t, device_t, int, int, u_long *, u_long *); static void nexus_delete_resource(device_t, device_t, int, int); @@ -126,6 +128,7 @@ DEVMETHOD(bus_set_resource, nexus_set_resource), DEVMETHOD(bus_get_resource, nexus_get_resource), DEVMETHOD(bus_delete_resource, nexus_delete_resource), + DEVMETHOD(bus_reserve_resource, nexus_reserve_resource), { 0, 0 } }; @@ -512,6 +515,16 @@ } static int +nexus_reserve_resource(device_t dev, device_t child, int type, int *start, int *size, int flags) +{ + + if (type != SYS_RES_MESSAGE) + panic("nexus_reserve_resource: unhandled resource type"); + + return (msi_reserve_resource(child, start, size, flags)); +} + +static int nexus_set_resource(device_t dev, device_t child, int type, int rid, u_long start, u_long count) { struct nexus_device *ndev = DEVTONX(child); ==== //depot/projects/newint/sys/i386/include/msi.h#2 (text+ko) ==== @@ -28,3 +28,4 @@ __FBSDID("$FreeBSD$"); void msi_init(void); +int msi_reserve_resource(device_t dev, int *start, int *size, int flags); ==== //depot/projects/newint/sys/i386/include/resource.h#2 (text+ko) ==== @@ -40,5 +40,6 @@ #define SYS_RES_DRQ 2 /* isa dma lines */ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ +#define SYS_RES_MESSAGE 5 /* interrupt message */ #endif /* !_MACHINE_RESOURCE_H_ */ ==== //depot/projects/newint/sys/kern/bus_if.m#3 (text+ko) ==== @@ -353,6 +353,30 @@ }; /** + * @brief Reserve and pre-configure a range of resources. + * + * This method is used to pre-allocate and reserve bus resources. The + * primary use for it at this time is to negotiate the number of MSI + * messages that a driver is allowed to use. + * + * @param _dev the parent device of @p _child + * @param _child the device which owns the resource + * @param _type the type of resource + * @param @p _start the start of the resource range + * @param @p _count the size of the resource range + * @param _flags flags for the operation + * + */ +METHOD int reserve_resource { + device_t _dev; + device_t _child; + int _type; + int *_start; + int *_count; + int _flags; +}; + +/** * @brief Define a resource which can be allocated with * BUS_ALLOC_RESOURCE(). * ==== //depot/projects/newint/sys/kern/subr_bus.c#3 (text+ko) ==== @@ -2864,6 +2864,23 @@ } /** + * @brief Helper function for implementing BUS_TEARDOWN_INTR(). + * + * This simple implementation of BUS_TEARDOWN_INTR() simply calls the + * BUS_TEARDOWN_INTR() method of the parent of @p dev. + */ +int +bus_generic_reserve_resource(device_t dev, device_t child, int type, int *start, + int *count, int flags) +{ + /* Propagate up the bus hierarchy until someone handles it. */ + if (dev->parent) + return (BUS_RESERVE_RESOURCE(dev->parent, child, type, start, + count, flags)); + return (EINVAL); +} + +/** * @brief Helper function for implementing BUS_ALLOC_RESOURCE(). * * This simple implementation of BUS_ALLOC_RESOURCE() simply calls the @@ -3337,6 +3354,16 @@ panic("root_setup_intr"); } +static int +root_reserve_resource(device_t dev, device_t child, int type, int *start, + int *count, int flags) +{ + /* + * Should not get here. + */ + panic("root_reserve_resource"); +} + /* * If we get here, assume that the device is permanant and really is * present in the system. Removable bus drivers are expected to intercept @@ -3361,6 +3388,7 @@ KOBJMETHOD(bus_read_ivar, bus_generic_read_ivar), KOBJMETHOD(bus_write_ivar, bus_generic_write_ivar), KOBJMETHOD(bus_setup_intr, root_setup_intr), + KOBJMETHOD(bus_reserve_resource, root_reserve_resource), KOBJMETHOD(bus_child_present, root_child_present), { 0, 0 } ==== //depot/projects/newint/sys/sys/bus.h#5 (text+ko) ==== @@ -269,6 +269,8 @@ int bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_intr_t *intr, void *arg, void **cookiep); +int bus_generic_reserve_resource(device_t dev, device_t child, int type, + int *start, int *count, int flags); struct resource * bus_generic_rl_alloc_resource (device_t, device_t, int, int *, @@ -304,6 +306,8 @@ int bus_setup_intr(device_t dev, struct resource *r, int flags, driver_intr_t handler, void *arg, void **cookiep); int bus_teardown_intr(device_t dev, struct resource *r, void *cookie); +int bus_reserve_resource(device_t dev, int type, int *start, int *count, + int flags); int bus_set_resource(device_t dev, int type, int rid, u_long start, u_long count); int bus_get_resource(device_t dev, int type, int rid, From owner-p4-projects@FreeBSD.ORG Wed Aug 11 13:52:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98ECB16A4D0; Wed, 11 Aug 2004 13:52:34 +0000 (GMT) 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 736D716A4CE for ; Wed, 11 Aug 2004 13:52:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ABE443D2D for ; Wed, 11 Aug 2004 13:52:34 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7BDqYjN069227 for ; Wed, 11 Aug 2004 13:52:34 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7BDqYEQ069224 for perforce@freebsd.org; Wed, 11 Aug 2004 13:52:34 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 13:52:34 GMT Message-Id: <200408111352.i7BDqYEQ069224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 13:52:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=59403 Change 59403 by scottl@scottl-wv1u on 2004/08/11 13:51:52 Fix comment for bus_generic_reserve_resource. Affected files ... .. //depot/projects/newint/sys/kern/subr_bus.c#4 edit Differences ... ==== //depot/projects/newint/sys/kern/subr_bus.c#4 (text+ko) ==== @@ -2864,10 +2864,10 @@ } /** - * @brief Helper function for implementing BUS_TEARDOWN_INTR(). + * @brief Helper function for implementing BUS_RESERVE_RESOURCE() * - * This simple implementation of BUS_TEARDOWN_INTR() simply calls the - * BUS_TEARDOWN_INTR() method of the parent of @p dev. + * This simple implementation of BUS_RESERVE_RESOURCE() simply calls the + * BUS_RESERVE_RESOURCE() method of the parent of @p dev. */ int bus_generic_reserve_resource(device_t dev, device_t child, int type, int *start, From owner-p4-projects@FreeBSD.ORG Wed Aug 11 18:03:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C389016A4D0; Wed, 11 Aug 2004 18:03:46 +0000 (GMT) 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 7107416A4CE for ; Wed, 11 Aug 2004 18:03:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62DDD43D55 for ; Wed, 11 Aug 2004 18:03:46 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7BI3kpA080099 for ; Wed, 11 Aug 2004 18:03:46 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7BI3kbE080096 for perforce@freebsd.org; Wed, 11 Aug 2004 18:03:46 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 18:03:46 GMT Message-Id: <200408111803.i7BI3kbE080096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 18:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=59420 Change 59420 by scottl@scottl-wv1u on 2004/08/11 18:03:25 Add initial code to the AHD driver to demonstrate how MSI will work. Affected files ... .. //depot/projects/newint/sys/dev/aic7xxx/ahd_pci.c#3 edit .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.c#3 edit .. //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.h#3 edit Differences ... ==== //depot/projects/newint/sys/dev/aic7xxx/ahd_pci.c#3 (text+ko) ==== @@ -246,14 +246,42 @@ int ahd_pci_map_int(struct ahd_softc *ahd) { - int zero; + int zero, count, rid; zero = 0; - ahd->platform_data->irq = - bus_alloc_resource_any(ahd->dev_softc, SYS_RES_IRQ, &zero, - RF_ACTIVE | RF_SHAREABLE); - if (ahd->platform_data->irq == NULL) - return (ENOMEM); - ahd->platform_data->irq_res_type = SYS_RES_IRQ; - return (ahd_map_int(ahd)); + count = 2; /* Want 2 MSI messages */ + + /* See if we can use MSI for interrupts */ + if (bus_reserve_resource(ahd->dev_softc, SYS_RES_MESSAGE, &zero, + &count, 0) != 0) + count = 0; + + /* + * If both message vectors are available then use them. + * XXX Should we still try to use MSI even if only one message is + * available? That would require patching the sequencer. + */ + if (zero == 0 && count == 2) { + rid = 0; + ahd->platform_data->msi0 = + bus_alloc_resource(ahd->dev_softc, SYS_RES_MESSAGE, &rid, + 0, 0, 1, RF_ACTIVE); + rid = 1; + ahd->platform_data->msi1 = + bus_alloc_resource(ahd->dev_softc, SYS_RES_MESSAGE, &rid, + 1, 1, 1, RF_ACTIVE); + if ((ahd->platform_data->msi0 == NULL) || + (ahd->platform_data->msi1 == NULL)) + return (ENOMEM); + ahd->platform_data->irq_res_type = SYS_RES_MESSAGE; + return (ahd_map_msi(ahd)); + } else { + ahd->platform_data->irq = + bus_alloc_resource_any(ahd->dev_softc, SYS_RES_IRQ, &zero, + RF_ACTIVE | RF_SHAREABLE); + if (ahd->platform_data->irq == NULL) + return (ENOMEM); + ahd->platform_data->irq_res_type = SYS_RES_IRQ; + return (ahd_map_int(ahd)); + } } ==== //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.c#3 (text+ko) ==== @@ -103,6 +103,31 @@ return (error); } +int +ahd_map_msi(struct ahd_softc *ahd) +{ + int error; + + /* Hook up the command complete MSI message */ + error = bus_setup_intr(ahd->dev_softc, ahd->platform_data->msi0, + INTR_TYPE_CAM, ahd_platform_intr, ahd, + &ahd->platform_data->ih_cmd); + if (error != 0) { + device_printf(ahd->dev_softc, "bus_setup_intr() falied for " + "msi0: %d\n", error); + return (error); + } + + /* Hook up the SEQINT MSI message */ + error = bus_setup_intr(ahd->dev_softc, ahd->platform_data->msi1, + INTR_TYPE_CAM, ahd_platform_intr, ahd, + &ahd->platform_data->ih_seqint); + if (error != 0) + device_printf(ahd->dev_softc, "bus_setup_intr() falied for " + "msi1: %d\n", error); + return (error); +} + /* * Attach all the sub-devices we can find */ ==== //depot/projects/newint/sys/dev/aic7xxx/aic79xx_osm.h#3 (text+ko) ==== @@ -137,7 +137,11 @@ int irq_res_type; struct resource *regs[2]; struct resource *irq; + struct resource *msi0; + struct resource *msi1; void *ih; + void *ih_cmd; + void *ih_seqint; eventhandler_tag eh; struct proc *recovery_thread; }; @@ -302,6 +306,7 @@ int ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg); void ahd_platform_free(struct ahd_softc *ahd); int ahd_map_int(struct ahd_softc *ahd); +int ahd_map_msi(struct ahd_softc *ahd); int ahd_attach(struct ahd_softc *); int ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd); int ahd_detach(device_t); From owner-p4-projects@FreeBSD.ORG Wed Aug 11 18:27:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9921E16A4D0; Wed, 11 Aug 2004 18:27:15 +0000 (GMT) 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 74A7316A4CE for ; Wed, 11 Aug 2004 18:27:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BF5E43D1D for ; Wed, 11 Aug 2004 18:27:15 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7BIRFoA081150 for ; Wed, 11 Aug 2004 18:27:15 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7BIRFHB081147 for perforce@freebsd.org; Wed, 11 Aug 2004 18:27:15 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 18:27:15 GMT Message-Id: <200408111827.i7BIRFHB081147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 18:27:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=59422 Change 59422 by scottl@scottl-wv1u on 2004/08/11 18:26:19 Add the default implemetation of bus_reserve_resource(). Gah, the amount of work needed to add a single newbus method here is staggering! Affected files ... .. //depot/projects/newint/sys/kern/subr_bus.c#5 edit Differences ... ==== //depot/projects/newint/sys/kern/subr_bus.c#5 (text+ko) ==== @@ -3103,6 +3103,22 @@ */ /** + * @brief Wrapper function for BUS_RESERVE_RESOURCE(). + * + * This function simply calls the BUS_RESERVE_RESOURCE() method of the + * parent of @p dev. + */ +int +bus_reserve_resource(device_t dev, int type, int *start, int *count, + int flags) +{ + if (dev->parent == 0) + return (0); + return (BUS_RESERVE_RESOURCE(dev->parent, dev, type, start, count, + flags)); +} + +/** * @brief Wrapper function for BUS_ALLOC_RESOURCE(). * * This function simply calls the BUS_ALLOC_RESOURCE() method of the From owner-p4-projects@FreeBSD.ORG Wed Aug 11 20:00:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB3CF16A4D2; Wed, 11 Aug 2004 20:00:08 +0000 (GMT) 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 8B2CD16A4CF for ; Wed, 11 Aug 2004 20:00:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 708E143D41 for ; Wed, 11 Aug 2004 20:00:08 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7BK08Sx083683 for ; Wed, 11 Aug 2004 20:00:08 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7BK08K6083680 for perforce@freebsd.org; Wed, 11 Aug 2004 20:00:08 GMT (envelope-from scottl@freebsd.org) Date: Wed, 11 Aug 2004 20:00:08 GMT Message-Id: <200408112000.i7BK08K6083680@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 59425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2004 20:00:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=59425 Change 59425 by scottl@scottl-wv1u on 2004/08/11 19:59:38 Add more DEVMETHOD dispatches Affected files ... .. //depot/projects/newint/sys/dev/acpica/acpi_pci.c#3 edit .. //depot/projects/newint/sys/dev/acpica/acpi_pcib_acpi.c#3 edit .. //depot/projects/newint/sys/dev/acpica/acpi_pcib_pci.c#3 edit .. //depot/projects/newint/sys/dev/pci/pci.c#3 edit .. //depot/projects/newint/sys/dev/pci/pci_pci.c#3 edit .. //depot/projects/newint/sys/i386/i386/msi.c#4 edit .. //depot/projects/newint/sys/i386/pci/pci_bus.c#4 edit Differences ... ==== //depot/projects/newint/sys/dev/acpica/acpi_pci.c#3 (text+ko) ==== @@ -88,6 +88,7 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_get_resource_list,pci_get_resource_list), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), ==== //depot/projects/newint/sys/dev/acpica/acpi_pcib_acpi.c#3 (text+ko) ==== @@ -88,6 +88,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar), DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), ==== //depot/projects/newint/sys/dev/acpica/acpi_pcib_pci.c#3 (text+ko) ==== @@ -81,6 +81,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_alloc_resource, pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), ==== //depot/projects/newint/sys/dev/pci/pci.c#3 (text+ko) ==== @@ -103,6 +103,7 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_get_resource_list,pci_get_resource_list), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), ==== //depot/projects/newint/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -66,6 +66,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_alloc_resource, pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), ==== //depot/projects/newint/sys/i386/i386/msi.c#4 (text+ko) ==== @@ -177,7 +177,10 @@ } int -msi_reserve_resource(device_t dev, int *start, int *size, int flags) +msi_reserve_resource(device_t dev, int *start, int *count, int flags) { + printf("msi_reserve_resource called\n"); + + *count = 0; return (0); } ==== //depot/projects/newint/sys/i386/pci/pci_bus.c#4 (text+ko) ==== @@ -482,6 +482,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), + DEVMETHOD(bus_reserve_resource, bus_generic_reserve_resource), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), From owner-p4-projects@FreeBSD.ORG Thu Aug 12 03:43:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A312016A4D0; Thu, 12 Aug 2004 03:43:45 +0000 (GMT) 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 7BC1C16A4CE for ; Thu, 12 Aug 2004 03:43:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A32343D39 for ; Thu, 12 Aug 2004 03:43:45 +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.12.11/8.12.11) with ESMTP id i7C3hjl8002521 for ; Thu, 12 Aug 2004 03:43:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7C3hiPk002518 for perforce@freebsd.org; Thu, 12 Aug 2004 03:43:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Aug 2004 03:43:44 GMT Message-Id: <200408120343.i7C3hiPk002518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 59468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2004 03:43:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=59468 Change 59468 by rwatson@rwatson_paprika on 2004/08/12 03:43:11 Integrate netperf_socket from CVS: if_axe added to NOTES pcic disappears ngatm updates acpi pci interrupt routing magic g_mirror, g_stripe enhancements, etc. elf64 per-thread core dumping route allocation now uses a UMA zone in_localip() now centralized ip fast forwarding speaks altq 0/NULL cleanup in TCP/IP if_vr locking fixes if_fwe now IFF_NEEDSGIANT merged from rwatson_netperf lockless check of entropy harvest fifo overflow merged from rwatson_netperf USB ethernet IFF_NEEDSGIANT merged from rwatson_netperf in_pcbconnect() and in_pcbconnect_setup() inpcb locking assertions merged from rwatson_netperf udp_usrreq free of control mbuf on udp_send() fix merged from rwatson_netperf Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#33 integrate .. //depot/projects/netperf_socket/sys/conf/files#44 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/FREEBSD-Xlist#1 branch .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_dump.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_user.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/msg/unistruct.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_call.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_coord.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_party.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_print.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_reset.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_uni.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcibvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcfvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/pcic/i82365.c#3 delete .. //depot/projects/netperf_socket/sys/dev/pcic/i82365_isa.c#3 delete .. //depot/projects/netperf_socket/sys/dev/pcic/i82365reg.h#2 delete .. //depot/projects/netperf_socket/sys/dev/pcic/i82365var.h#2 delete .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#5 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/netperf_socket/sys/net/route.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#18 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#13 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/grackle.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/iobus.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.18 2004/05/16 20:00:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $"); #include #include @@ -106,6 +106,13 @@ &freebsd_brand_oinfo); +void +elf64_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/netperf_socket/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.21 2004/05/17 21:16:49 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.22 2004/08/11 02:35:04 marcel Exp $"); #include #include @@ -102,6 +102,14 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_oinfo); + +void +elf64_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.235 2004/05/26 12:09:36 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.236 2004/08/11 23:23:05 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -317,6 +317,7 @@ td->td_frame->tf_rsp = ((register_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~0x0f; td->td_frame->tf_rsp -= 8; + td->td_frame->tf_rbp = 0; td->td_frame->tf_rip = (register_t)ku->ku_func; /* ==== //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.2 2004/05/16 20:00:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.3 2004/08/11 02:35:04 marcel Exp $"); #include #include @@ -102,6 +102,14 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_oinfo); + +void +elf32_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, ==== //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.18 2004/07/16 20:53:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.19 2004/08/11 02:35:05 marcel Exp $"); #include "opt_compat.h" @@ -157,6 +157,14 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &ia32_brand_oinfo); + +void +elf32_dump_thread(struct thread *td __unused, void *dst __unused, + size_t *off __unused) +{ +} + + /* XXX may be freebsd32 MI */ static register_t * ia32_copyout_strings(struct image_params *imgp) ==== //depot/projects/netperf_socket/sys/conf/NOTES#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1254 2004/08/03 19:24:53 markm Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1256 2004/08/11 17:22:37 imp Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2066,9 +2066,6 @@ device cbb device pccard device cardbus -#device pcic ISA attachment currently busted -#hint.pcic.0.at="isa" -#hint.pcic.1.at="isa" # # SMB bus @@ -2274,6 +2271,12 @@ # and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus # eval board. device aue + +# ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the +# LinkSys USB200M and various other adapters. + +device axe + # # CATC USB-EL1201A USB ethernet. Supports the CATC Netmate # and Netmate II, and the Belkin F5U111. ==== //depot/projects/netperf_socket/sys/conf/files#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.936 2004/08/03 19:24:53 markm Exp $ +# $FreeBSD: src/sys/conf/files,v 1.937 2004/08/11 17:23:32 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -608,8 +608,6 @@ dev/pci/pci_pci.c optional pci dev/pci/pci_user.c optional pci dev/pci/pcib_if.m standard -dev/pcic/i82365.c optional pcic pccard -dev/pcic/i82365_isa.c optional pcic pccard isa dev/pdq/if_fea.c optional fea eisa dev/pdq/if_fpa.c optional fpa pci dev/pdq/pdq.c optional fea eisa nowerror ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/api/cc_conn.c,v 1.1 2004/07/08 08:21:49 brandt Exp $ + * $Begemot: libunimsg/netnatm/api/cc_conn.c,v 1.2 2004/07/16 18:45:11 brandt Exp $ * * ATM API as defined per af-saa-0108 * @@ -139,7 +139,7 @@ if (r == NULL) { if (msg != NULL) uni_msg_destroy(msg); - cc_conn_log(conn, "no memory for cookie"); + cc_conn_log(conn, "no memory for cookie op=%u", op); return; } ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_dump.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. * - * $Begemot: libunimsg/netnatm/api/cc_dump.c,v 1.1 2004/07/08 08:21:51 brandt Exp $ + * $Begemot: libunimsg/netnatm/api/cc_dump.c,v 1.3 2004/08/05 07:10:56 brandt Exp $ * * ATM API as defined per af-saa-0108 */ @@ -43,7 +43,7 @@ #ifdef _KERNEL #ifdef __FreeBSD__ -#include +#include #endif #else /* !_KERNEL */ #include @@ -84,7 +84,7 @@ va_end(ap); if (n < 0) { - d->ret = errno; + d->ret = CCGETERRNO(); return; } if ((size_t)n < d->maxsiz - d->len) { @@ -105,7 +105,7 @@ va_end(ap); if (n < 0) { - d->ret = errno; + d->ret = CCGETERRNO(); return; } if ((size_t)n >= d->maxsiz) { @@ -123,18 +123,18 @@ cc_dump_sap(struct dump *d, const struct uni_sap *sap) { static const char *const tagtab[] = { - [UNISVE_ABSENT] "absent", - [UNISVE_ANY] "any", - [UNISVE_PRESENT]"present" + [UNISVE_ABSENT] = "absent", + [UNISVE_ANY] = "any", + [UNISVE_PRESENT] = "present" }; static const char *const plantab[] = { - [UNI_ADDR_E164] "E164", - [UNI_ADDR_ATME] "ATME", + [UNI_ADDR_E164] = "E164", + [UNI_ADDR_ATME] = "ATME", }; static const char *const hlitab[] = { - [UNI_BHLI_ISO] "ISO", - [UNI_BHLI_VENDOR] "VENDOR", - [UNI_BHLI_USER] "USER" + [UNI_BHLI_ISO] = "ISO", + [UNI_BHLI_VENDOR] = "VENDOR", + [UNI_BHLI_USER] = "USER" }; u_int i; ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/cc_user.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/api/cc_user.c,v 1.2 2004/07/08 09:17:18 brandt Exp $ + * $Begemot: libunimsg/netnatm/api/cc_user.c,v 1.3 2004/07/16 18:46:55 brandt Exp $ * * ATM API as defined per af-saa-0108 * @@ -1297,6 +1297,7 @@ /* connection has disappeared. Send an ok * to the user and lock whether there is another * connection at this endpoint */ + uni_msg_destroy(msg); cc_user_ok(user, ATMRESP_NONE, NULL, 0); set_state(user, USER_IN_WAITING); @@ -1359,6 +1360,7 @@ /* connection has disappeared. Send an error * to the user and lock whether there is another * connection at this endpoint */ + uni_msg_destroy(msg); cc_user_err(user, ATMERR_PREVIOUSLY_ABORTED); set_state(user, USER_IN_WAITING); @@ -1370,15 +1372,14 @@ LIST_FOREACH(newep, &user->cc->user_list, node_link) if (strcmp(acc->newep, newep->name) == 0) break; + uni_msg_destroy(msg); if (newep == NULL) { - uni_msg_destroy(msg); cc_user_err(user, ATMERR_BAD_ENDPOINT); return; } if (newep->state != USER_NULL || newep->accepted != NULL) { - uni_msg_destroy(msg); cc_user_err(user, ATMERR_BAD_STATE); return; } ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.14 2004/07/08 08:22:06 brandt Exp $ + * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.15 2004/08/05 07:10:59 brandt Exp $ * * Private definitions for the IE code file. * @@ -792,11 +792,11 @@ }; static const char *errtab[] = { - [UNI_IERR_UNK] "unk", /* unknown IE */ - [UNI_IERR_LEN] "len", /* length error */ - [UNI_IERR_BAD] "bad", /* content error */ - [UNI_IERR_ACC] "acc", /* access element discarded */ - [UNI_IERR_MIS] "mis", /* missing IE */ + [UNI_IERR_UNK] = "unk", /* unknown IE */ + [UNI_IERR_LEN] = "len", /* length error */ + [UNI_IERR_BAD] = "bad", /* content error */ + [UNI_IERR_ACC] = "acc", /* access element discarded */ + [UNI_IERR_MIS] = "mis", /* missing IE */ }; u_int i; @@ -844,7 +844,7 @@ enum uni_diag diag; } itu_causes[128] = { -#define D(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] { STR, UNI_DIAG_##DIAG }, +#define D(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG }, #define N(NAME,VAL,DIAG,STD,STR) UNI_DECLARE_CAUSE_VALUES @@ -855,7 +855,7 @@ }, net_causes[128] = { #define D(NAME,VAL,DIAG,STD,STR) -#define N(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] { STR, UNI_DIAG_##DIAG }, +#define N(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG }, UNI_DECLARE_CAUSE_VALUES ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/msg/unistruct.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.6 2004/07/08 08:22:08 brandt Exp $ + * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.7 2004/07/16 18:42:22 brandt Exp $ * * This file defines all structures that are used by * API users. @@ -206,10 +206,11 @@ UNI_ADDR_SCREEN_NET = 0x3, }; +/* don't use bitfields to get a defined structure layout */ struct uni_addr { - enum uni_addr_type type; - enum uni_addr_plan plan; - u_int len; + uint8_t type; + uint8_t plan; + uint8_t len; u_char addr[UNI_ADDR_MAXLEN]; }; struct uni_subaddr { ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_call.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/netnatm/sig/sig_call.c,v 1.64 2004/07/08 08:22:19 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_call.c,v 1.65 2004/08/05 07:11:00 brandt Exp $ * * Call instance handling * @@ -51,7 +51,7 @@ static void respond_drop_party_ack(struct call *, struct uni_ie_epref *, u_int); -#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] "SIG"#NAME, +#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] = "SIG"#NAME, static const char *const call_sigs[] = { DEF_CALL_SIGS }; @@ -65,27 +65,27 @@ TIMER_FUNC_CALL(t322, t322_func) const struct callstates callstates[] = { - [CALLST_NULL] { "NU0", UNI_CALLSTATE_U0 }, - [CALLST_U1] { "U1", UNI_CALLSTATE_U1 }, - [CALLST_U3] { "U3", UNI_CALLSTATE_U3 }, - [CALLST_U4] { "U4", UNI_CALLSTATE_U4 }, - [CALLST_U6] { "U6", UNI_CALLSTATE_U6 }, - [CALLST_U7] { "U7", UNI_CALLSTATE_U7 }, - [CALLST_U8] { "U8", UNI_CALLSTATE_U8 }, - [CALLST_U9] { "U9", UNI_CALLSTATE_U9 }, - [CALLST_U10] { "U10", UNI_CALLSTATE_U10 }, - [CALLST_U11] { "U11", UNI_CALLSTATE_U11 }, - [CALLST_U12] { "U12", UNI_CALLSTATE_U12 }, - [CALLST_N1] { "N1", UNI_CALLSTATE_N1 }, - [CALLST_N3] { "N3", UNI_CALLSTATE_N3 }, - [CALLST_N4] { "N4", UNI_CALLSTATE_N4 }, - [CALLST_N6] { "N6", UNI_CALLSTATE_N6 }, - [CALLST_N7] { "N7", UNI_CALLSTATE_N7 }, - [CALLST_N8] { "N8", UNI_CALLSTATE_N8 }, - [CALLST_N9] { "N9", UNI_CALLSTATE_N9 }, - [CALLST_N10] { "N10", UNI_CALLSTATE_N10 }, - [CALLST_N11] { "N11", UNI_CALLSTATE_N11 }, - [CALLST_N12] { "N12", UNI_CALLSTATE_N12 }, + [CALLST_NULL] = { "NU0", UNI_CALLSTATE_U0 }, + [CALLST_U1] = { "U1", UNI_CALLSTATE_U1 }, + [CALLST_U3] = { "U3", UNI_CALLSTATE_U3 }, + [CALLST_U4] = { "U4", UNI_CALLSTATE_U4 }, + [CALLST_U6] = { "U6", UNI_CALLSTATE_U6 }, + [CALLST_U7] = { "U7", UNI_CALLSTATE_U7 }, + [CALLST_U8] = { "U8", UNI_CALLSTATE_U8 }, + [CALLST_U9] = { "U9", UNI_CALLSTATE_U9 }, + [CALLST_U10] = { "U10", UNI_CALLSTATE_U10 }, + [CALLST_U11] = { "U11", UNI_CALLSTATE_U11 }, + [CALLST_U12] = { "U12", UNI_CALLSTATE_U12 }, + [CALLST_N1] = { "N1", UNI_CALLSTATE_N1 }, + [CALLST_N3] = { "N3", UNI_CALLSTATE_N3 }, + [CALLST_N4] = { "N4", UNI_CALLSTATE_N4 }, + [CALLST_N6] = { "N6", UNI_CALLSTATE_N6 }, + [CALLST_N7] = { "N7", UNI_CALLSTATE_N7 }, + [CALLST_N8] = { "N8", UNI_CALLSTATE_N8 }, + [CALLST_N9] = { "N9", UNI_CALLSTATE_N9 }, + [CALLST_N10] = { "N10", UNI_CALLSTATE_N10 }, + [CALLST_N11] = { "N11", UNI_CALLSTATE_N11 }, + [CALLST_N12] = { "N12", UNI_CALLSTATE_N12 }, }; static void unx_send_add_party_rej(struct call *c, struct uni_all *u); ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_coord.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/netnatm/sig/sig_coord.c,v 1.11 2004/07/08 08:22:20 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_coord.c,v 1.12 2004/08/05 07:11:01 brandt Exp $ * * Coordinator */ @@ -40,7 +40,7 @@ #include #include -#define STR(S) [S] #S +#define STR(S) [S] = #S static const char *const cunames[] = { STR(CU_STAT0), STR(CU_STAT1), @@ -48,7 +48,7 @@ STR(CU_STAT3), }; -#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] "SIG"#NAME, +#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] = "SIG"#NAME, static const char *const coord_sigs[] = { DEF_COORD_SIGS }; ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_party.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/netnatm/sig/sig_party.c,v 1.17 2004/07/08 08:22:21 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_party.c,v 1.18 2004/08/05 07:11:01 brandt Exp $ * * Party instance handling */ @@ -44,7 +44,7 @@ static void drop_partyE(struct party *p); static int epstate_compat(struct party *, enum uni_epstate); -#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] "SIG"#NAME, +#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] = "SIG"#NAME, static const char *const party_sigs[] = { DEF_PARTY_SIGS }; ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_print.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * Author: Hartmut Brandt * Kendy Kutzner * - * $Begemot: libunimsg/netnatm/sig/sig_print.c,v 1.5 2004/07/08 08:22:22 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_print.c,v 1.6 2004/08/05 07:11:02 brandt Exp $ */ #include @@ -56,7 +56,7 @@ uni_strerr(u_int err) { static const char *const errstr[] = { -#define DEF(NAME, VAL, STR) [UNIAPI_##NAME] STR, +#define DEF(NAME, VAL, STR) [UNIAPI_##NAME] = STR, UNIAPI_DEF_ERRORS(DEF) #undef DEF }; @@ -69,7 +69,7 @@ return (errstr[err]); } -#define D(M) [M] #M +#define D(M) [M] = #M static const char *const msgs[] = { D(UNIAPI_ERROR), D(UNIAPI_CALL_CREATED), ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_reset.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/sig/sig_reset.c,v 1.10 2004/07/08 08:22:22 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_reset.c,v 1.11 2004/08/05 07:11:03 brandt Exp $ * * Reset-start and reset-respond */ @@ -60,13 +60,13 @@ static int restart_forward(struct uni *, const struct uni_all *); -#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] "SIG"#NAME, +#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] = "SIG"#NAME, static const char *const start_sigs[] = { DEF_START_SIGS }; #undef DEF_PRIV_SIG -#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] "SIG"#NAME, +#define DEF_PRIV_SIG(NAME, FROM) [SIG##NAME] = "SIG"#NAME, static const char *const respond_sigs[] = { DEF_RESPOND_SIGS }; ==== //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/sig/sig_uni.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * Author: Hartmut Brandt * - * $Begemot: libunimsg/netnatm/sig/sig_uni.c,v 1.10 2004/07/08 08:22:23 brandt Exp $ + * $Begemot: libunimsg/netnatm/sig/sig_uni.c,v 1.11 2004/08/05 07:11:03 brandt Exp $ * * Instance handling */ @@ -45,7 +45,7 @@ UNICORE #endif -#define STR(S) [S] #S +#define STR(S) [S] = #S static const char *custat_names[] = { STR(CU_STAT0), STR(CU_STAT1), ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#8 (text+ko) ==== @@ -24,11 +24,8 @@ * SUCH DAMAGE. */ -/* XXX Uncomment this if you have new PCI IRQ problems starting 2004/8/5. */ -/* #define ACPI_OLD_PCI_LINK 1 */ - #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.18 2004/08/06 04:50:56 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.21 2004/08/12 02:06:19 njl Exp $"); #include "opt_acpi.h" #include @@ -39,43 +36,27 @@ #include #include +#include +#include "pcib_if.h" + /* Hooks for the ACPI CA debugging infrastructure. */ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("PCI_LINK") -#define MAX_POSSIBLE_INTERRUPTS 16 -#define MAX_ISA_INTERRUPTS 16 -#define MAX_ACPI_INTERRUPTS 255 - -struct acpi_pci_link_entry { - TAILQ_ENTRY(acpi_pci_link_entry) links; - ACPI_HANDLE handle; - UINT8 current_irq; - UINT8 initial_irq; - ACPI_RESOURCE possible_resources; - UINT8 number_of_interrupts; - UINT8 interrupts[MAX_POSSIBLE_INTERRUPTS]; - UINT8 sorted_irq[MAX_POSSIBLE_INTERRUPTS]; - int references; - int priority; -}; - TAILQ_HEAD(acpi_pci_link_entries, acpi_pci_link_entry); static struct acpi_pci_link_entries acpi_pci_link_entries; -struct acpi_prt_entry { - TAILQ_ENTRY(acpi_prt_entry) links; - device_t pcidev; - int busno; - ACPI_PCI_ROUTING_TABLE prt; - struct acpi_pci_link_entry *pci_link; -}; - TAILQ_HEAD(acpi_prt_entries, acpi_prt_entry); static struct acpi_prt_entries acpi_prt_entries; static int irq_penalty[MAX_ACPI_INTERRUPTS]; +static int acpi_pci_link_is_valid_irq(struct acpi_pci_link_entry *link, + UINT8 irq); +static void acpi_pci_link_update_irq_penalty(device_t dev, int busno); +static void acpi_pci_link_set_bootdisabled_priority(void); +static void acpi_pci_link_fixup_bootdisabled_link(void); + /* * PCI link object management */ @@ -137,27 +118,31 @@ UINT8 i; ACPI_RESOURCE_IRQ *Irq; ACPI_RESOURCE_EXT_IRQ *ExtIrq; + struct acpi_pci_link_entry *link; if (entry == NULL || entry->pci_link == NULL) return; + link = entry->pci_link; - printf("%s irq %3d: ", acpi_name(entry->pci_link->handle), - entry->pci_link->current_irq); + printf("%s irq%c%2d: ", acpi_name(link->handle), + (link->flags & ACPI_LINK_ROUTED) ? '*' : ' ', link->current_irq); printf("["); - for (i = 0; i < entry->pci_link->number_of_interrupts; i++) - printf("%3d", entry->pci_link->interrupts[i]); - printf("] "); + if (link->number_of_interrupts) + printf("%2d", link->interrupts[0]); + for (i = 1; i < link->number_of_interrupts; i++) + printf("%3d", link->interrupts[i]); + printf("] %2d+ ", link->initial_irq); - switch (entry->pci_link->possible_resources.Id) { + switch (link->possible_resources.Id) { case ACPI_RSTYPE_IRQ: - Irq = &entry->pci_link->possible_resources.Data.Irq; + Irq = &link->possible_resources.Data.Irq; acpi_pci_link_dump_polarity(Irq->ActiveHighLow); acpi_pci_link_dump_trigger(Irq->EdgeLevel); acpi_pci_link_dump_sharemode(Irq->SharedExclusive); break; case ACPI_RSTYPE_EXT_IRQ: - ExtIrq = &entry->pci_link->possible_resources.Data.ExtendedIrq; + ExtIrq = &link->possible_resources.Data.ExtendedIrq; acpi_pci_link_dump_polarity(ExtIrq->ActiveHighLow); acpi_pci_link_dump_trigger(ExtIrq->EdgeLevel); acpi_pci_link_dump_sharemode(ExtIrq->SharedExclusive); @@ -370,17 +355,33 @@ buf.Length = ACPI_ALLOCATE_BUFFER; bzero(link, sizeof(struct acpi_pci_link_entry)); - link->handle = handle; + /* + * Get the IRQ configured at boot-time. If successful, set this + * as the initial IRQ. + */ error = acpi_pci_link_get_current_irq(link, &link->current_irq); - if (ACPI_FAILURE(error)) { + if (ACPI_SUCCESS(error)) { + link->initial_irq = link->current_irq; + } else { ACPI_DEBUG_PRINT((ACPI_DB_WARN, "couldn't get current IRQ from interrupt link %s - %s\n", acpi_name(handle), AcpiFormatException(error))); + link->initial_irq = 0; } - link->initial_irq = link->current_irq; + /* + * Try to disable this link. If successful, set the current IRQ to + * zero and flags to indicate this link is not routed. If we can't + * run _DIS (i.e., the method doesn't exist), assume the initial + * IRQ was routed by the BIOS. + */ + if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_DIS", NULL, NULL))) { + link->current_irq = 0; + link->flags = ACPI_LINK_NONE; + } else + link->flags = ACPI_LINK_ROUTED; error = AcpiGetPossibleResources(handle, &buf); if (ACPI_FAILURE(error)) { @@ -396,6 +397,7 @@ goto out; } + /* XXX This only handles one resource, ignoring SourceIndex. */ resources = (ACPI_RESOURCE *) buf.Pointer; bcopy(resources, &link->possible_resources, sizeof(link->possible_resources)); @@ -417,6 +419,19 @@ goto out; } + /* + * If the initial IRQ is invalid (not in _PRS), set it to 0 and + * mark this link as not routed. We won't use it as the preferred + * interrupt later when we route. + */ + if (!acpi_pci_link_is_valid_irq(link, link->initial_irq) && + link->initial_irq != 0) { + printf("ACPI link %s has invalid initial irq %d, ignoring\n", + acpi_name(handle), link->initial_irq); + link->initial_irq = 0; + link->flags = ACPI_LINK_NONE; + } + link->references++; TAILQ_INSERT_TAIL(&acpi_pci_link_entries, link, links); @@ -442,73 +457,75 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (prt == NULL || prt->Source == NULL || prt->Source[0] == '\0') { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "couldn't handle this routing table - hardwired\n")); + if (prt == NULL) { + device_printf(pcidev, "NULL PRT entry\n"); return_ACPI_STATUS (AE_BAD_PARAMETER); } - error = AcpiGetHandle(acpi_get_handle(pcidev), prt->Source, &handle); - if (ACPI_FAILURE(error)) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "couldn't get handle - %s\n", - AcpiFormatException(error))); - return_ACPI_STATUS (error); - } - - error = acpi_pci_link_get_object_status(handle, &sta); - if (ACPI_FAILURE(error)) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "couldn't get object status %s - %s\n", - acpi_name(handle), AcpiFormatException(error))); - return_ACPI_STATUS (error); - } - - /* - * PCI link status (_STA) is unreliable. Many systems return - * erroneous values so we ignore it. - */ - if ((sta & (ACPI_STA_PRESENT | ACPI_STA_FUNCTIONAL)) == 0) { -#ifndef ACPI_OLD_PCI_LINK - device_printf(pcidev, "acpi PRT ignoring status for %s\n", - acpi_name(handle)); -#else - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "interrupt link is not functional - %s\n", - acpi_name(handle))); - return_ACPI_STATUS (AE_ERROR); -#endif /* !ACPI_OLD_PCI_LINK */ - } - + /* Bail out if attempting to add a duplicate PRT entry. */ TAILQ_FOREACH(entry, &acpi_prt_entries, links) { if (entry->busno == busno && entry->prt.Address == prt->Address && entry->prt.Pin == prt->Pin) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "interrupt link entry already exists - %s\n", - acpi_name(handle))); + "PRT entry already exists\n")); return_ACPI_STATUS (AE_ALREADY_EXISTS); } } + /* Allocate and initialize our new PRT entry. */ entry = AcpiOsAllocate(sizeof(struct acpi_prt_entry)); if (entry == NULL) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "couldn't allocate memory - %s\n", acpi_name(handle))); + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "can't allocate memory\n")); return_ACPI_STATUS (AE_NO_MEMORY); } bzero(entry, sizeof(struct acpi_prt_entry)); + /* + * If the source link is NULL, then this IRQ is hardwired so skip + * initializing the link but still add it to the list. + */ + if (prt->Source[0] != '\0') { + /* Get a handle for the link source. */ + error = AcpiGetHandle(acpi_get_handle(pcidev), prt->Source, + &handle); + if (ACPI_FAILURE(error)) { + device_printf(pcidev, "get handle for %s - %s\n", + prt->Source, AcpiFormatException(error)); + goto out; + } + + error = acpi_pci_link_get_object_status(handle, &sta); + if (ACPI_FAILURE(error)) { + device_printf(pcidev, "can't get status for %s - %s\n", + acpi_name(handle), AcpiFormatException(error)); + goto out; + } + + /* Probe/initialize the link. */ + error = acpi_pci_link_add_link(handle, entry); + if (ACPI_FAILURE(error)) { + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "couldn't add _PRT entry to link %s - %s\n", + acpi_name(handle), AcpiFormatException(error))); + goto out; + } + } + entry->pcidev = pcidev; entry->busno = busno; bcopy(prt, &entry->prt, sizeof(entry->prt)); - error = acpi_pci_link_add_link(handle, entry); - if (ACPI_FAILURE(error)) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "couldn't add _PRT entry to link %s - %s\n", - acpi_name(handle), AcpiFormatException(error))); - goto out; - } + /* + * Make sure the Source value is null-terminated. It is really a + * variable-length string (with a fixed size in the struct) so when + * we copy the entire struct, we truncate the string. Instead of + * trying to make a variable-sized PRT object to handle the string, + * we store its handle in prt_source. Callers should use that to + * look up the link object. + */ + entry->prt.Source[sizeof(prt->Source) - 1] = '\0'; + entry->prt_source = handle; TAILQ_INSERT_TAIL(&acpi_prt_entries, entry, links); error = AE_OK; @@ -520,6 +537,12 @@ return_ACPI_STATUS (error); } +/* + * Look up the given interrupt in the list of possible settings for + * this link. We don't special-case the initial link setting. Some + * systems return current settings that are outside the list of valid + * settings so only allow choices explicitly specified in _PRS. + */ static int acpi_pci_link_is_valid_irq(struct acpi_pci_link_entry *link, UINT8 irq) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 12 14:53:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A1ED16A4D0; Thu, 12 Aug 2004 14:53:25 +0000 (GMT) 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 709BF16A4CE for ; Thu, 12 Aug 2004 14:53:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E5E243D41 for ; Thu, 12 Aug 2004 14:53:25 +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.12.11/8.12.11) with ESMTP id i7CErPcx027006 for ; Thu, 12 Aug 2004 14:53:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7CErPoT027003 for perforce@freebsd.org; Thu, 12 Aug 2004 14:53:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Aug 2004 14:53:25 GMT Message-Id: <200408121453.i7CErPoT027003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 59502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2004 14:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=59502 Change 59502 by rwatson@rwatson_paprika on 2004/08/12 14:52:40 Integrate netperf_socket from CVS: Newcard pccbb pci attachments broken out, isa attachments. pf upgrade/fixes. A number of sched_ule changes. IP fragment fix. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files#45 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#18 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ccatm/ng_ccatm.c#1 branch .. //depot/projects/netperf_socket/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#1 branch .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_ccatm.h#1 branch .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#19 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.937 2004/08/11 17:23:32 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.938 2004/08/12 06:50:28 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -599,6 +599,8 @@ dev/pccard/pccard_cis_quirks.c optional pccard dev/pccard/power_if.m standard dev/pccbb/pccbb.c optional cbb +dev/pccbb/pccbb_isa.c optional cbb isa +dev/pccbb/pccbb_pci.c optional cbb pci dev/pci/eisa_pci.c optional pci eisa dev/pci/fixup_pci.c optional pci dev/pci/ignore_pci.c optional pci ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#13 (text+ko) ==== @@ -1,5 +1,6 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.17 2004/07/28 06:14:44 kan Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.18 2004/08/12 13:59:44 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.433.2.2 2004/07/17 03:22:34 brad Exp $ */ +/* add $OpenBSD: pf.c,v 1.448 2004/05/11 07:34:11 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -155,8 +156,6 @@ void pf_print_state(struct pf_state *); void pf_print_flags(u_int8_t); -u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t, - u_int8_t); void pf_change_ap(struct pf_addr *, u_int16_t *, u_int16_t *, u_int16_t *, struct pf_addr *, u_int16_t, u_int8_t, sa_family_t); ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.3 2004/07/23 03:37:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.4 2004/08/12 13:54:50 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ +/* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -53,6 +54,7 @@ #include #include +#include #include #include @@ -636,6 +638,8 @@ af = ia->ifa_addr->sa_family; if (af != AF_INET && af != AF_INET6) continue; + if (!(ia->ifa_flags & IFA_ROUTE)) + continue; if ((flags & PFI_AFLAG_BROADCAST) && af == AF_INET6) continue; if ((flags & PFI_AFLAG_BROADCAST) && ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.11 2004/06/17 16:59:47 mlaier Exp $ */ -/* $OpenBSD: pf_ioctl.c,v 1.112.2.1 2004/04/30 21:43:30 brad Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.12 2004/08/12 14:15:42 mlaier Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.112.2.2 2004/07/24 18:28:12 brad Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1503,7 +1503,8 @@ while ((oldrule != NULL) && (oldrule->nr != pcr->nr)) oldrule = TAILQ_NEXT(oldrule, entries); if (oldrule == NULL) { - pf_rm_rule(NULL, newrule); + if (newrule != NULL) + pf_rm_rule(NULL, newrule); error = EINVAL; splx(s); break; ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#7 (text+ko) ==== @@ -1,5 +1,6 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.8 2004/07/28 06:14:44 kan Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.9 2004/08/12 13:59:44 mlaier Exp $ */ /* $OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */ +/* add $OpenBSD: pf_norm.c,v 1.87 2004/05/11 07:34:11 dhartmei Exp $ */ /* * Copyright 2001 Niels Provos @@ -179,7 +180,6 @@ struct pf_frent *, int); struct mbuf *pf_fragcache(struct mbuf **, struct ip*, struct pf_fragment **, int, int, int *); -u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t); int pf_normalize_tcpopt(struct pf_rule *, struct mbuf *, struct tcphdr *, int); @@ -1157,8 +1157,12 @@ if (r->min_ttl && h->ip_ttl < r->min_ttl) h->ip_ttl = r->min_ttl; - if (r->rule_flag & PFRULE_RANDOMID) + if (r->rule_flag & PFRULE_RANDOMID) { + u_int16_t ip_id = h->ip_id; + h->ip_id = ip_randomid(); + h->ip_sum = pf_cksum_fixup(h->ip_sum, ip_id, h->ip_id, 0); + } return (PF_PASS); @@ -1454,13 +1458,13 @@ th->th_x2 = 0; nv = *(u_int16_t *)(&th->th_ack + 1); - th->th_sum = pf_cksum_fixup(th->th_sum, ov, nv); + th->th_sum = pf_cksum_fixup(th->th_sum, ov, nv, 0); rewrite = 1; } /* Remove urgent pointer, if TH_URG is not set */ if (!(flags & TH_URG) && th->th_urp) { - th->th_sum = pf_cksum_fixup(th->th_sum, th->th_urp, 0); + th->th_sum = pf_cksum_fixup(th->th_sum, th->th_urp, 0, 0); th->th_urp = 0; rewrite = 1; } @@ -1714,7 +1718,7 @@ mss = (u_int16_t *)(optp + 2); if ((ntohs(*mss)) > r->max_mss) { th->th_sum = pf_cksum_fixup(th->th_sum, - *mss, htons(r->max_mss)); + *mss, htons(r->max_mss), 0); *mss = htons(r->max_mss); rewrite = 1; } ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#6 (text+ko) ==== @@ -1,5 +1,6 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.7 2004/06/22 20:13:25 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.8 2004/08/12 13:59:44 mlaier Exp $ */ /* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */ +/* add $OpenBSD: pfvar.h,v 1.194 2004/05/11 07:34:11 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1442,6 +1443,8 @@ char[PF_RULESET_NAME_SIZE]); extern void pf_remove_if_empty_ruleset( struct pf_ruleset *); +extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t, + u_int8_t); extern struct ifnet *sync_ifp; extern struct pf_rule pf_default_rule; ==== //depot/projects/netperf_socket/sys/dev/aac/aac.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.96 2004/07/28 06:17:49 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.100 2004/08/12 05:31:17 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -236,9 +236,9 @@ /* * Initialize locks */ - AAC_LOCK_INIT(&sc->aac_aifq_lock, "AAC AIF lock"); - AAC_LOCK_INIT(&sc->aac_io_lock, "AAC I/O lock"); - AAC_LOCK_INIT(&sc->aac_container_lock, "AAC container lock"); + mtx_init(&sc->aac_aifq_lock, "AAC AIF lock", NULL, MTX_DEF); + mtx_init(&sc->aac_io_lock, "AAC I/O lock", NULL, MTX_DEF); + mtx_init(&sc->aac_container_lock, "AAC container lock", NULL, MTX_DEF); TAILQ_INIT(&sc->aac_container_tqh); /* Initialize the local AIF queue pointers */ @@ -384,9 +384,9 @@ co->co_found = f; bcopy(&mir->MntTable[0], &co->co_mntobj, sizeof(struct aac_mntobj)); - AAC_LOCK_ACQUIRE(&sc->aac_container_lock); + mtx_lock(&sc->aac_container_lock); TAILQ_INSERT_TAIL(&sc->aac_container_tqh, co, co_link); - AAC_LOCK_RELEASE(&sc->aac_container_lock); + mtx_unlock(&sc->aac_container_lock); } } @@ -494,6 +494,10 @@ aac_free(sc); + mtx_destroy(&sc->aac_aifq_lock); + mtx_destroy(&sc->aac_io_lock); + mtx_destroy(&sc->aac_container_lock); + return(0); } @@ -555,6 +559,7 @@ #endif AAC_MASK_INTERRUPTS(sc); + aac_release_sync_fib(sc); return(0); } @@ -719,7 +724,7 @@ debug_called(2); - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); sc->aifflags = AAC_AIFFLAGS_RUNNING; while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) { @@ -735,9 +740,9 @@ * will grab Giant, and would result in an LOR. */ if ((sc->aifflags & AAC_AIFFLAGS_ALLOCFIBS) != 0) { - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); aac_alloc_commands(sc); - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); sc->aifflags &= ~AAC_AIFFLAGS_ALLOCFIBS; aac_startio(sc); } @@ -797,7 +802,7 @@ } } sc->aifflags &= ~AAC_AIFFLAGS_RUNNING; - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); wakeup(sc->aac_dev); kthread_exit(0); @@ -818,7 +823,7 @@ sc = (struct aac_softc *)context; - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); /* pull completed commands off the queue */ for (;;) { @@ -851,7 +856,7 @@ sc->flags &= ~AAC_QUEUE_FRZN; aac_startio(sc); - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); } /* @@ -1150,7 +1155,7 @@ aac_map_command_helper, &fibphys, 0); /* initialise constant fields in the command structure */ - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); bzero(fm->aac_fibs, AAC_FIB_COUNT * sizeof(struct aac_fib)); for (i = 0; i < AAC_FIB_COUNT; i++) { cm = sc->aac_commands + sc->total_fibs; @@ -1171,11 +1176,11 @@ if (i > 0) { TAILQ_INSERT_TAIL(&sc->aac_fibmap_tqh, fm, fm_link); debug(1, "total_fibs= %d\n", sc->total_fibs); - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); return (0); } - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); bus_dmamap_unload(sc->aac_fib_dmat, fm->aac_fibmap); bus_dmamem_free(sc->aac_fib_dmat, fm->aac_fibs, fm->aac_fibmap); free(fm, M_AACBUF); @@ -2442,12 +2447,12 @@ sc = dev->si_drv1; revents = 0; - AAC_LOCK_ACQUIRE(&sc->aac_aifq_lock); + mtx_lock(&sc->aac_aifq_lock); if ((poll_events & (POLLRDNORM | POLLIN)) != 0) { if (sc->aac_aifq_tail != sc->aac_aifq_head) revents |= poll_events & (POLLIN | POLLRDNORM); } - AAC_LOCK_RELEASE(&sc->aac_aifq_lock); + mtx_unlock(&sc->aac_aifq_lock); if (revents == 0) { if (poll_events & (POLLIN | POLLRDNORM)) @@ -2473,7 +2478,7 @@ /* * Get a command */ - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); if (aac_alloc_command(sc, &cm)) { error = EBUSY; goto out; @@ -2521,7 +2526,7 @@ aac_release_command(cm); } - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); return(error); } @@ -2631,13 +2636,11 @@ device_delete_child(sc->aac_dev, co->co_disk); co_next = TAILQ_NEXT(co, co_link); - AAC_LOCK_ACQUIRE(&sc-> - aac_container_lock); + mtx_lock(&sc->aac_container_lock); TAILQ_REMOVE(&sc->aac_container_tqh, co, co_link); - AAC_LOCK_RELEASE(&sc-> - aac_container_lock); - FREE(co, M_AACBUF); + mtx_unlock(&sc->aac_container_lock); + free(co, M_AACBUF); co = co_next; } else { co->co_found = 0; @@ -2660,7 +2663,7 @@ } /* Copy the AIF data to the AIF queue for ioctl retrieval */ - AAC_LOCK_ACQUIRE(&sc->aac_aifq_lock); + mtx_lock(&sc->aac_aifq_lock); next = (sc->aac_aifq_head + 1) % AAC_AIFQ_LENGTH; if (next != sc->aac_aifq_tail) { bcopy(aif, &sc->aac_aifq[next], sizeof(struct aac_aif_command)); @@ -2672,7 +2675,7 @@ /* Wakeup any poll()ers */ selwakeuppri(&sc->rcv_select, PRIBIO); } - AAC_LOCK_RELEASE(&sc->aac_aifq_lock); + mtx_unlock(&sc->aac_aifq_lock); return; } @@ -2762,9 +2765,9 @@ debug_called(2); - AAC_LOCK_ACQUIRE(&sc->aac_aifq_lock); + mtx_lock(&sc->aac_aifq_lock); if (sc->aac_aifq_tail == sc->aac_aifq_head) { - AAC_LOCK_RELEASE(&sc->aac_aifq_lock); + mtx_unlock(&sc->aac_aifq_lock); return (EAGAIN); } @@ -2777,7 +2780,7 @@ else sc->aac_aifq_tail = next; - AAC_LOCK_RELEASE(&sc->aac_aifq_lock); + mtx_unlock(&sc->aac_aifq_lock); return(error); } @@ -2807,7 +2810,7 @@ if (id == -1) return (EINVAL); - AAC_LOCK_ACQUIRE(&sc->aac_container_lock); + mtx_lock(&sc->aac_container_lock); TAILQ_FOREACH(co, &sc->aac_container_tqh, co_link) { if (co->co_mntobj.ObjectId == id) break; @@ -2830,7 +2833,7 @@ sprintf(&query_disk.diskDeviceName[0], "%s%d", disk->ad_disk->d_name, disk->ad_disk->d_unit); } - AAC_LOCK_RELEASE(&sc->aac_container_lock); + mtx_unlock(&sc->aac_container_lock); error = copyout((caddr_t)&query_disk, uptr, sizeof(struct aac_query_disk)); ==== //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.16 2004/06/02 18:15:48 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.17 2004/08/12 05:05:06 scottl Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -290,9 +290,9 @@ /* Async ops that require communcation with the controller */ - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); if (aac_alloc_command(sc, &cm)) { - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); xpt_freeze_simq(sim, 1); ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_done(ccb); @@ -413,7 +413,7 @@ aac_enqueue_ready(cm); aac_startio(cm->cm_sc); - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); return; } @@ -496,11 +496,11 @@ aac_release_command(cm); - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); mtx_lock(&Giant); xpt_done(ccb); mtx_unlock(&Giant); - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); return; } ==== //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.40 2004/07/28 06:17:49 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.41 2004/08/12 05:05:06 scottl Exp $"); #include "opt_aac.h" @@ -175,9 +175,9 @@ /* perform accounting */ /* pass the bio to the controller - it can work out who we are */ - AAC_LOCK_ACQUIRE(&sc->ad_controller->aac_io_lock); + mtx_lock(&sc->ad_controller->aac_io_lock); aac_submit_bio(bp); - AAC_LOCK_RELEASE(&sc->ad_controller->aac_io_lock); + mtx_unlock(&sc->ad_controller->aac_io_lock); return; } ==== //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.44 2004/06/16 09:46:35 phk Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.45 2004/08/12 05:05:06 scottl Exp $ */ #include @@ -261,13 +261,6 @@ #define AAC_GETREG1(sc, reg) bus_space_read_1 (sc->aac_btag, \ sc->aac_bhandle, reg) -/* Define the OS version specific locks */ -typedef struct mtx aac_lock_t; -#define AAC_LOCK_INIT(l, s) mtx_init(l, s, NULL, MTX_DEF) -#define AAC_LOCK_ACQUIRE(l) mtx_lock(l) -#define AAC_LOCK_RELEASE(l) mtx_unlock(l) - - /* * Per-controller structure. */ @@ -330,13 +323,13 @@ /* connected containters */ TAILQ_HEAD(,aac_container) aac_container_tqh; - aac_lock_t aac_container_lock; + struct mtx aac_container_lock; /* * The general I/O lock. This protects the sync fib, the lists, the * queues, and the registers. */ - aac_lock_t aac_io_lock; + struct mtx aac_io_lock; /* delayed activity infrastructure */ struct task aac_task_complete; /* deferred-completion @@ -345,7 +338,7 @@ /* management interface */ struct cdev *aac_dev_t; - aac_lock_t aac_aifq_lock; + struct mtx aac_aifq_lock; struct aac_aif_command aac_aifq[AAC_AIFQ_LENGTH]; int aac_aifq_head; int aac_aifq_tail; @@ -576,7 +569,7 @@ aac_alloc_sync_fib(struct aac_softc *sc, struct aac_fib **fib) { - AAC_LOCK_ACQUIRE(&sc->aac_io_lock); + mtx_lock(&sc->aac_io_lock); *fib = &sc->aac_common->ac_sync_fib; return (0); } @@ -585,6 +578,6 @@ aac_release_sync_fib(struct aac_softc *sc) { - AAC_LOCK_RELEASE(&sc->aac_io_lock); + mtx_unlock(&sc->aac_io_lock); } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.220 2004/08/09 12:02:32 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.221 2004/08/12 08:20:36 sos Exp $"); #include "opt_ata.h" #include @@ -112,6 +112,19 @@ if (ch->r_irq) return EEXIST; + return 0; +} + + +int +ata_attach(device_t dev) +{ + struct ata_channel *ch; + int error, rid; + + if (!dev || !(ch = device_get_softc(dev))) + return ENXIO; + /* initialize the softc basics */ ch->device[MASTER].channel = ch; ch->device[MASTER].unit = ATA_MASTER; @@ -126,18 +139,7 @@ ch->locking(ch, ATA_LF_LOCK); ch->hw.reset(ch); ch->locking(ch, ATA_LF_UNLOCK); - return 0; -} -int -ata_attach(device_t dev) -{ - struct ata_channel *ch; - int error, rid; - - if (!dev || !(ch = device_get_softc(dev))) - return ENXIO; - rid = ATA_IRQ_RID; ch->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); @@ -151,9 +153,6 @@ return error; } - if (ch->dma) - ch->dma->alloc(ch); - /* initialize queue and associated lock */ bzero(&ch->queue_mtx, sizeof(struct mtx)); mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); @@ -223,9 +222,6 @@ ch->device[SLAVE].mode = ATA_PIO; ch->devices = 0; - if (ch->dma) - ch->dma->free(ch); - bus_teardown_intr(dev, ch->r_irq, ch->ih); bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq); ch->r_irq = NULL; @@ -306,6 +302,7 @@ if (!dev || !(ch = device_get_softc(dev))) return ENXIO; + ch->locking(ch, ATA_LF_LOCK); ATA_SLEEPLOCK_CH(ch); return 0; ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.78 2004/08/05 21:13:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.79 2004/08/12 08:20:36 sos Exp $"); #include "opt_ata.h" #include @@ -185,7 +185,7 @@ * if we detect that the device isn't a real SATA device we limit * the transfer mode to UDMA5/ATA100. * this works around the problems some devices has with the - * Marvell SATA->PATA converters and UDMA6/ATA133. + * Marvell 88SX8030 SATA->PATA converters and UDMA6/ATA133. */ if (atadev->param->satacapabilities != 0x0000 && atadev->param->satacapabilities != 0xffff) @@ -1365,7 +1365,6 @@ ch->r_io[ATA_IDX_ADDR].res = ctlr->r_res2; ch->flags |= ATA_USE_16BIT; - ctlr->dmainit(ch); ata_generic_hw(ch); if (ctlr->chip->cfg2 & PRSX4X) ch->hw.command = ata_promise_sx4_command; @@ -2141,8 +2140,7 @@ if (ctlr->chip->max_dma >= ATA_SA150) ch->flags |= ATA_NO_SLAVE; - ctlr->dmainit(ch); - if (ctlr->chip->cfg2 & SIIBUG) + if ((ctlr->chip->cfg2 & SIIBUG) && ch->dma) ch->dma->boundary = 8 * 1024; ata_generic_hw(ch); ==== //depot/projects/netperf_socket/sys/dev/ata/ata-dma.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.127 2004/08/05 21:13:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.128 2004/08/12 08:20:36 sos Exp $"); #include #include @@ -59,7 +59,7 @@ /* misc defines */ #define MAXSEGSZ PAGE_SIZE #define MAXTABSZ PAGE_SIZE -#define MAXWSPCSZ 256 +#define MAXWSPCSZ PAGE_SIZE #define MAXCTLDMASZ (2 * (MAXTABSZ + MAXPHYS)) struct ata_dc_cb_args { ==== //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.86 2004/08/05 21:13:41 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.87 2004/08/12 08:20:36 sos Exp $"); #include "opt_ata.h" #include @@ -241,13 +241,8 @@ int retval = 0; retval += bus_print_child_header(dev, child); - retval += printf(": at 0x%lx", rman_get_start(ch->r_io[ATA_IDX_ADDR].res)); - - if (ata_legacy(dev)) - retval += printf(" irq %d", 14 + ch->unit); - + retval += printf(": channel #%d", ch->unit); retval += bus_print_child_footer(dev, child); - return retval; } @@ -428,15 +423,6 @@ ch->r_io[i].res = ctlr->r_res1; ch->r_io[i].offset = (i - ATA_BMCMD_PORT)+(ch->unit * ATA_BMIOSIZE); } - - /* if simplex controller, only allow DMA on primary channel */ - ATA_IDX_OUTB(ch, ATA_BMSTAT_PORT, ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & - (ATA_BMSTAT_DMA_MASTER | ATA_BMSTAT_DMA_SLAVE)); - if (ch->unit > 0 && - (ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & ATA_BMSTAT_DMA_SIMPLEX)) - device_printf(dev, "simplex device, DMA on primary only\n"); - else - ctlr->dmainit(ch); } ata_generic_hw(ch); @@ -517,12 +503,11 @@ DRIVER_MODULE(atapci, pci, ata_pci_driver, ata_pci_devclass, 0, 0); static int -ata_pcisub_probe(device_t dev) +ata_channel_probe(device_t dev) { - struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); device_t *children; - int count, error, i; + int count, i; /* take care of green memory */ bzero(ch, sizeof(struct ata_channel)); @@ -535,31 +520,60 @@ } free(children, M_TEMP); + return ata_probe(dev); +} + +static int +ata_channel_attach(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + struct ata_channel *ch = device_get_softc(dev); + int error; + ch->device[MASTER].setmode = ctlr->setmode; ch->device[SLAVE].setmode = ctlr->setmode; ch->locking = ctlr->locking; ch->reset = ctlr->reset; + ctlr->dmainit(ch); + if (ch->dma) + ch->dma->alloc(ch); + if ((error = ctlr->allocate(dev, ch))) return error; - return ata_probe(dev); + return ata_attach(dev); +} + +static int +ata_channel_detach(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + int error; + + if ((error = ata_detach(dev))) + return error; + + if (ch->dma) + ch->dma->free(ch); + + return 0; } -static device_method_t ata_pcisub_methods[] = { +static device_method_t ata_channel_methods[] = { /* device interface */ - DEVMETHOD(device_probe, ata_pcisub_probe), - DEVMETHOD(device_attach, ata_attach), - DEVMETHOD(device_detach, ata_detach), + DEVMETHOD(device_probe, ata_channel_probe), + DEVMETHOD(device_attach, ata_channel_attach), + DEVMETHOD(device_detach, ata_channel_detach), DEVMETHOD(device_suspend, ata_suspend), DEVMETHOD(device_resume, ata_resume), { 0, 0 } }; -static driver_t ata_pcisub_driver = { +static driver_t ata_channel_driver = { "ata", - ata_pcisub_methods, + ata_channel_methods, sizeof(struct ata_channel), }; -DRIVER_MODULE(ata, atapci, ata_pcisub_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, atapci, ata_channel_driver, ata_devclass, 0, 0); ==== //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#13 (text+ko) ==== @@ -59,6 +59,9 @@ /* * Driver for PCI to CardBus Bridge chips + * and PCI to PCMCIA Bridge chips + * and ISA to PCMCIA host adapters + * and C Bus to PCMCIA host adapters * * References: * TI Datasheets: @@ -73,23 +76,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.116 2004/07/22 20:19:57 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.117 2004/08/12 06:50:29 imp Exp $"); #include -#include -#include +#include #include #include #include #include +#include #include #include #include +#include +#include #include -#include -#include +#include #include -#include #include #include @@ -124,91 +127,8 @@ #define CBB_START_32_IO 0x1000 #define CBB_START_16_IO 0x100 -struct yenta_chipinfo { - uint32_t yc_id; - const char *yc_name; - int yc_chiptype; -} yc_chipsets[] = { - /* Texas Instruments chips */ - {PCIC_ID_TI1031, "TI1031 PCI-PC Card Bridge", CB_TI113X}, - {PCIC_ID_TI1130, "TI1130 PCI-CardBus Bridge", CB_TI113X}, - {PCIC_ID_TI1131, "TI1131 PCI-CardBus Bridge", CB_TI113X}, - - {PCIC_ID_TI1210, "TI1210 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1211, "TI1211 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1220, "TI1220 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1221, "TI1221 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1225, "TI1225 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1250, "TI1250 PCI-CardBus Bridge", CB_TI125X}, - {PCIC_ID_TI1251, "TI1251 PCI-CardBus Bridge", CB_TI125X}, - {PCIC_ID_TI1251B,"TI1251B PCI-CardBus Bridge",CB_TI125X}, - {PCIC_ID_TI1260, "TI1260 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1260B,"TI1260B PCI-CardBus Bridge",CB_TI12XX}, - {PCIC_ID_TI1410, "TI1410 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1420, "TI1420 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1421, "TI1421 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1450, "TI1450 PCI-CardBus Bridge", CB_TI125X}, /*SIC!*/ - {PCIC_ID_TI1451, "TI1451 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1510, "TI1510 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1515, "TI1515 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1520, "TI1520 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1530, "TI1530 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI1620, "TI1620 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI4410, "TI4410 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI4450, "TI4450 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI4451, "TI4451 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI4510, "TI4510 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI4520, "TI4520 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI6411, "TI[67]x[12]1 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI6420, "TI[67]x20 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI6420SC, "TI[67]x20 (SC) PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7410, "TI7410 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7510, "TI7510 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7610, "TI7610 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7610M, "TI7610 (M) PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7610SD, "TI7610 (SD) PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_TI7610MS, "TI7610 (MS) PCI-CardBus Bridge", CB_TI12XX}, - - /* ENE */ - {PCIC_ID_ENE_CB710, "ENE CB710 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_ENE_CB720, "ENE CB720 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_ENE_CB1211, "ENE CB1211 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_ENE_CB1225, "ENE CB1225 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_ENE_CB1410, "ENE CB1410 PCI-CardBus Bridge", CB_TI12XX}, - {PCIC_ID_ENE_CB1420, "ENE CB1420 PCI-CardBus Bridge", CB_TI12XX}, - - /* Ricoh chips */ - {PCIC_ID_RICOH_RL5C465, "RF5C465 PCI-CardBus Bridge", CB_RF5C46X}, - {PCIC_ID_RICOH_RL5C466, "RF5C466 PCI-CardBus Bridge", CB_RF5C46X}, - {PCIC_ID_RICOH_RL5C475, "RF5C475 PCI-CardBus Bridge", CB_RF5C47X}, - {PCIC_ID_RICOH_RL5C476, "RF5C476 PCI-CardBus Bridge", CB_RF5C47X}, - {PCIC_ID_RICOH_RL5C477, "RF5C477 PCI-CardBus Bridge", CB_RF5C47X}, - {PCIC_ID_RICOH_RL5C478, "RF5C478 PCI-CardBus Bridge", CB_RF5C47X}, - - /* Toshiba products */ - {PCIC_ID_TOPIC95, "ToPIC95 PCI-CardBus Bridge", CB_TOPIC95}, - {PCIC_ID_TOPIC95B, "ToPIC95B PCI-CardBus Bridge", CB_TOPIC95}, - {PCIC_ID_TOPIC97, "ToPIC97 PCI-CardBus Bridge", CB_TOPIC97}, - {PCIC_ID_TOPIC100, "ToPIC100 PCI-CardBus Bridge", CB_TOPIC97}, - - /* Cirrus Logic */ - {PCIC_ID_CLPD6832, "CLPD6832 PCI-CardBus Bridge", CB_CIRRUS}, - {PCIC_ID_CLPD6833, "CLPD6833 PCI-CardBus Bridge", CB_CIRRUS}, - {PCIC_ID_CLPD6834, "CLPD6834 PCI-CardBus Bridge", CB_CIRRUS}, - - /* 02Micro */ - {PCIC_ID_OZ6832, "O2Micro OZ6832/6833 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ6860, "O2Micro OZ6836/6860 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ6872, "O2Micro OZ6812/6872 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ6912, "O2Micro OZ6912/6972 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ6922, "O2Micro OZ6922 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ6933, "O2Micro OZ6933 PCI-CardBus Bridge", CB_O2MICRO}, - {PCIC_ID_OZ711E1, "O2Micro OZ711E1 PCI-CardBus Bridge", CB_O2MICRO}, +devclass_t cbb_devclass; - /* sentinel */ - {0 /* null id */, "unknown", CB_UNKNOWN}, -}; - /* sysctl vars */ SYSCTL_NODE(_hw, OID_AUTO, cbb, CTLFLAG_RD, 0, "CBB parameters"); @@ -236,25 +156,10 @@ SYSCTL_ULONG(_hw_cbb, OID_AUTO, debug, CTLFLAG_RW, &cbb_debug, 0, "Verbose cardbus bridge debugging"); -static int cbb_chipset(uint32_t pci_id, const char **namep); -static int cbb_probe(device_t brdev); -static void cbb_chipinit(struct cbb_softc *sc); -static int cbb_attach(device_t brdev); -static int cbb_detach(device_t brdev); -static int cbb_shutdown(device_t brdev); -static void cbb_driver_added(device_t brdev, driver_t *driver); -static void cbb_child_detached(device_t brdev, device_t child); -static void cbb_event_thread(void *arg); static void cbb_insert(struct cbb_softc *sc); static void cbb_removal(struct cbb_softc *sc); -static void cbb_intr(void *arg); static int cbb_detect_voltage(device_t brdev); -static int cbb_power(device_t brdev, int volts); static void cbb_cardbus_reset(device_t brdev); -static int cbb_cardbus_power_enable_socket(device_t brdev, - device_t child); -static void cbb_cardbus_power_disable_socket(device_t brdev, - device_t child); static int cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 13 22:06:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F1FB16A4D0; Fri, 13 Aug 2004 22:06:43 +0000 (GMT) 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 27F8D16A4CE for ; Fri, 13 Aug 2004 22:06:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0491743D1D for ; Fri, 13 Aug 2004 22:06:43 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7DM6gsx006442 for ; Fri, 13 Aug 2004 22:06:42 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7DM6gpM006439 for perforce@freebsd.org; Fri, 13 Aug 2004 22:06:42 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 13 Aug 2004 22:06:42 GMT Message-Id: <200408132206.i7DM6gpM006439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 59594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2004 22:06:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=59594 Change 59594 by davidxu@davidxu_alona on 2004/08/13 22:06:25 Call _set_curthread in _thread_start to set arch dependent environment for current thread, this is needed on AMD64. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#5 edit .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_private.h#5 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#5 (text+ko) ==== @@ -99,9 +99,10 @@ /* Initialise the machine context: */ getcontext(&new_thread->ctx); + new_thread->savedsig = new_thread->ctx.uc_sigmask; new_thread->ctx.uc_stack.ss_sp = new_thread->stack; new_thread->ctx.uc_stack.ss_size = pattr->stacksize_attr; - makecontext(&new_thread->ctx, _thread_start, 0); + makecontext(&new_thread->ctx, (void (*)(void))_thread_start, 1, new_thread); new_thread->arch_id = _set_curthread(&new_thread->ctx, new_thread, &ret); if (ret != 0) { if (pattr->stackaddr_attr == NULL) { @@ -145,7 +146,11 @@ */ if (pattr->suspend == PTHREAD_CREATE_SUSPENDED) new_thread->flags |= PTHREAD_FLAGS_SUSPENDED; + /* new thread inherits signal mask in kernel */ + _thread_sigblock(); ret = thr_create(&new_thread->ctx, &new_thread->thr_id, flags); + /* restore my signal mask */ + _thread_sigunblock(); if (ret != 0) { _thread_printf(STDERR_FILENO, "thr_create() == %d\n", ret); PANIC("thr_create"); @@ -160,10 +165,15 @@ } void -_thread_start(void) +_thread_start(pthread_t td) { + int ret; + + _set_curthread(NULL, td, &ret); + __sys_sigprocmask(SIG_SETMASK, &td->savedsig, NULL); if ((curthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) _thread_suspend(curthread, NULL); + pthread_exit(curthread->start_routine(curthread->arg)); /* This point should never be reached. */ ==== //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_private.h#5 (text+ko) ==== @@ -797,7 +797,7 @@ void _thread_dump_info(void); void _thread_init(void); void _thread_printf(int fd, const char *, ...); -void _thread_start(void); +void _thread_start(pthread_t); void _thread_seterrno(pthread_t, int); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); From owner-p4-projects@FreeBSD.ORG Fri Aug 13 22:07:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F08716A4D0; Fri, 13 Aug 2004 22:07:45 +0000 (GMT) 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 DCC7716A4CE for ; Fri, 13 Aug 2004 22:07:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B623343D2D for ; Fri, 13 Aug 2004 22:07:44 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7DM7imA006467 for ; Fri, 13 Aug 2004 22:07:44 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7DM7iHt006464 for perforce@freebsd.org; Fri, 13 Aug 2004 22:07:44 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 13 Aug 2004 22:07:44 GMT Message-Id: <200408132207.i7DM7iHt006464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 59595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2004 22:07:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=59595 Change 59595 by davidxu@davidxu_alona on 2004/08/13 22:07:09 Fix ldt entry leak bug, remember ldt index, so we can free idt entry in retire_thread. Allow a thread allocated a ltd entry to set its gs. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/i386/i386/_setcurthread.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -41,12 +41,15 @@ #define MAXTHR 8192 -#define LDT_INDEX(x) (((long)(x) - (long)ldt_entries) / sizeof(ldt_entries[0])) +struct ldt_entry { + void *ptr; + int ldt; +}; -void **ldt_free = NULL; -void *ldt_entries[MAXTHR]; -static int ldt_inited = 0; -static spinlock_t ldt_lock = _SPINLOCK_INITIALIZER; +struct ldt_entry *ldt_free = NULL; +struct ldt_entry ldt_entries[MAXTHR]; +static int ldt_inited = 0; +static spinlock_t ldt_lock = _SPINLOCK_INITIALIZER; static void ldt_init(void); @@ -62,25 +65,28 @@ { int i; - ldt_free = &ldt_entries[NLDT]; - - for (i = 0; i < MAXTHR - 1; i++) - ldt_entries[i] = (void *)&ldt_entries[i + 1]; - - ldt_entries[MAXTHR - 1] = NULL; - + ldt_free = &ldt_entries[0]; + for (i = 0; i < MAXTHR - 1; i++) { + ldt_entries[i].ptr = &ldt_entries[i + 1]; + ldt_entries[i].ldt = -1; + } + ldt_entries[MAXTHR - 1].ptr = NULL; + ldt_entries[MAXTHR - 1].ldt = -1; ldt_inited = 1; } void _retire_thread(void *entry) { + struct ldt_entry *le = (struct ldt_entry *)entry; + _spinlock(&ldt_lock); - if (ldt_free == NULL) - *(void **)entry = NULL; - else - *(void **)entry = *ldt_free; - ldt_free = entry; + le->ptr = ldt_free; + ldt_free = le; + if (le->ldt != -1) { + i386_set_ldt(le->ldt, NULL, 1); + le->ldt = -1; + } _spinunlock(&ldt_lock); } @@ -88,11 +94,16 @@ _set_curthread(ucontext_t *uc, struct pthread *thr, int *err) { union descriptor desc; - void **ldt_entry; + struct ldt_entry *ldt_entry; int ldt_index; *err = 0; + if (thr->arch_id != NULL) { + ldt_entry = thr->arch_id; + ldt_index = ldt_entry->ldt; + goto set_seg; + } /* * If we are setting up the initial thread, the gs register * won't be setup for the current thread. In any case, we @@ -117,7 +128,7 @@ * Pull one off of the free list and update the free list pointer. */ ldt_entry = ldt_free; - ldt_free = (void **)*ldt_entry; + ldt_free = ldt_entry->ptr; if (thr != _thread_initial) _SPINUNLOCK(&ldt_lock); @@ -126,7 +137,7 @@ * Cache the address of the thread structure here. This is * what the gs register will point to. */ - *ldt_entry = (void *)thr; + ldt_entry->ptr = (void *)thr; bzero(&desc, sizeof(desc)); @@ -149,7 +160,9 @@ ldt_index = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1); if (ldt_index == -1) abort(); + ldt_entry->ldt = ldt_index; +set_seg: /* * Set up our gs with the index into the ldt for this entry. */ From owner-p4-projects@FreeBSD.ORG Fri Aug 13 22:12:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E84316A4D0; Fri, 13 Aug 2004 22:12:51 +0000 (GMT) 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 792B516A4CE for ; Fri, 13 Aug 2004 22:12:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 592AE43D1F for ; Fri, 13 Aug 2004 22:12:51 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7DMCpNT006591 for ; Fri, 13 Aug 2004 22:12:51 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7DMCpmx006588 for perforce@freebsd.org; Fri, 13 Aug 2004 22:12:51 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 13 Aug 2004 22:12:51 GMT Message-Id: <200408132212.i7DMCpmx006588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 59596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2004 22:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=59596 Change 59596 by davidxu@davidxu_alona on 2004/08/13 22:12:10 Port libthr to AMD64. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/amd64/Makefile.inc#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthr/arch/amd64/amd64/_setcurthread.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 14 15:57:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A38F916A4D0; Sat, 14 Aug 2004 15:57:08 +0000 (GMT) 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 6638F16A4CE for ; Sat, 14 Aug 2004 15:57:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47AC043D1D for ; Sat, 14 Aug 2004 15:57:08 +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.12.11/8.12.11) with ESMTP id i7EFv8HH044600 for ; Sat, 14 Aug 2004 15:57:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7EFv7oi044597 for perforce@freebsd.org; Sat, 14 Aug 2004 15:57:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 14 Aug 2004 15:57:07 GMT Message-Id: <200408141557.i7EFv7oi044597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 59638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2004 15:57:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=59638 Change 59638 by rwatson@rwatson_paprika on 2004/08/14 15:56:23 Integrate netperf_socket from CVS: RANDOM_IP_ID is now a sysctl not a compile-time option. geom_uzip ngatm update ACPI mpsafety/unifdefs ipfw now supports prison ids Netperf related: IFF_NEEDSGIANT now sprinkled over many non-MPSAFE device drivers. UNIX domain socke race catching for race in connect() due to blocking namei(). INP_INFO_WLOCK() around syncache_unreach() for IPv6. IPv6 raw IP non-blocking mbuf allocate while holding inpcb mutex. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#34 integrate .. //depot/projects/netperf_socket/sys/conf/files#46 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#8 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#12 integrate .. //depot/projects/netperf_socket/sys/conf/options#24 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#10 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#37 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_lid.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#20 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/awi/awi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_bus.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_bus_if.m#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/envctrl.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_ebus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_macio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_sbus.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_state.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_panasonic.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#10 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/bus_if.m#3 integrate .. //depot/projects/netperf_socket/sys/kern/device_if.m#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_tc.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#23 integrate .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/netperf_socket/sys/modules/esp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#8 integrate .. //depot/projects/netperf_socket/sys/modules/geom/geom_uzip/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/hme/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/isp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/atm/ccatm/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/pf/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/net/if_media.h#4 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_id.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#20 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#7 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet6/frag6.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/netperf_socket/sys/pccard/i82365.h#2 integrate .. //depot/projects/netperf_socket/sys/pccard/pcic.c#2 integrate .. //depot/projects/netperf_socket/sys/pccard/pcic_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#9 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/maciovar.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/central/central.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/central/centralvar.h#2 delete .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebusvar.h#2 delete .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_central.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhcvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/eeprom.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci_if.m#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/sbus/sbus.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sbus/sbusvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_ebus.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_fhc.c#5 delete .. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_sbus.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#13 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#19 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#10 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.241 2004/08/06 07:22:36 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.242 2004/08/13 22:30:55 ambrisko Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -198,7 +198,7 @@ bootMP_size = mptramp_end - mptramp_start; boot_address = trunc_page(basemem * 1024); /* round down to 4k boundary */ - if ((basemem - boot_address) < bootMP_size) + if (((basemem * 1024) - boot_address) < bootMP_size) boot_address -= PAGE_SIZE; /* not enough, lower by 4k */ /* 3 levels of page table pages */ mptramp_pagetables = boot_address - (PAGE_SIZE * 3); ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.44 2003/12/01 10:13:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.45 2004/08/13 18:45:04 mjacob Exp $"); #include @@ -2103,9 +2103,7 @@ } default: - sbuf_printf(sb, "error code %d", - sense->error_code & SSD_ERRCODE); - + sbuf_printf(sb, "Sense Error Code 0x%x", sense->error_code); if (sense->error_code & SSD_ERRCODE_VALID) { sbuf_printf(sb, " at block no. %d (decimal)", info = scsi_4btoul(sense->info)); ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.170 2004/08/08 09:08:37 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.171 2004/08/12 23:17:09 sanpei Exp $"); #ifdef _KERNEL #include "opt_hw_wdog.h" @@ -309,7 +309,15 @@ */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "iRiver", "iFP*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE - } + }, + { + /* + * Frontier Labs NEX IA+ Digital Audio Player, rev 1.10/0.01 + * PR: kern/70158 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "FL" , "NexIA+*", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.60 2004/06/17 17:16:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.61 2004/08/14 08:38:17 phk Exp $"); #include "opt_mac.h" @@ -364,6 +364,12 @@ * struct cdev *. The struct cdev *that is used now may as well be a truncated * struct cdev *returned from previous syscalls. Just return a bzeroed * ustat in that case. + * + * XXX: findcdev() SHALL not be used this way. Somebody (TM) will + * have to find a better way. It may be that we should stick + * a dev_t into struct mount, and walk the mountlist for a + * perfect match and failing that try again looking for a + * minor-truncated match. */ dev = findcdev(makedev(args->dev >> 8, args->dev & 0xFF)); if (dev != NULL && vfinddev(dev, &vp)) { ==== //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.269 2004/05/09 22:29:38 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.270 2004/08/13 14:30:26 ru Exp $ # # Makefile for FreeBSD # @@ -33,7 +33,7 @@ .endif .include "$S/conf/kern.pre.mk" -COPTS+= -msoft-float +CFLAGS+= -msoft-float %BEFORE_DEPEND ==== //depot/projects/netperf_socket/sys/conf/NOTES#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1256 2004/08/11 17:22:37 imp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1259 2004/08/14 15:32:18 dwmalone Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -132,6 +132,7 @@ options GEOM_PC98 # NEC PC9800 partitioning options GEOM_STRIPE # Disk striping. options GEOM_SUNLABEL # Sun/Solaris partitioning +options GEOM_UZIP # Read-only compressed disks options GEOM_VOL # Volume names from UFS superblock # @@ -491,6 +492,7 @@ options NGATM_SSCOP options NGATM_SSCFU options NGATM_UNI +options NGATM_CCATM device mn # Munich32x/Falc54 Nx64kbit/sec cards. device musycc # LMC/SBE LMC1504 quad T1/E1 @@ -537,7 +539,7 @@ # The `pflog' device provides the pflog0 interface which logs packets. # The `pfsync' device provides the pfsync0 interface used for # synchronization of firewall state tables (over the net). -# Requires option PFIL_HOOKS and (when used as a module) option RANDOM_IP_ID +# Requires option PFIL_HOOKS # # The PPP_BSDCOMP option enables support for compress(1) style entire # packet compression, the PPP_DEFLATE is for zlib/gzip style compression. @@ -645,13 +647,6 @@ # functions. See mbuf(9) for a list of available test cases. options MBUF_STRESS_TEST -# RANDOM_IP_ID causes the ID field in IP packets to be randomized -# instead of incremented by 1 with each packet generated. This -# option closes a minor information leak which allows remote -# observers to determine the rate of packet generation on the -# machine by watching the counter. -options RANDOM_IP_ID - # Statically Link in accept filters options ACCEPT_FILTER_DATA options ACCEPT_FILTER_HTTP ==== //depot/projects/netperf_socket/sys/conf/files#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.938 2004/08/12 06:50:28 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.940 2004/08/13 09:40:57 fjoe Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -949,6 +949,7 @@ geom/mirror/g_mirror_ctl.c optional geom_mirror geom/nop/g_nop.c optional geom_nop geom/stripe/g_stripe.c optional geom_stripe +geom/uzip/g_uzip.c optional geom_uzip geom/geom_aes.c optional geom_aes geom/geom_apple.c optional geom_apple geom/geom_bsd.c optional geom_bsd @@ -1274,6 +1275,7 @@ net/zlib.c optional ppp_deflate net/zlib.c optional ipsec net/zlib.c optional crypto +net/zlib.c optional geom_uzip net80211/ieee80211.c optional wlan net80211/ieee80211_crypto.c optional wlan net80211/ieee80211_input.c optional wlan @@ -1378,6 +1380,14 @@ contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase netgraph/atm/ng_atm.c optional ngatm_atm +netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm +contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop ==== //depot/projects/netperf_socket/sys/conf/files.powerpc#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.39 2004/07/12 22:13:27 grehan Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.40 2004/08/12 17:41:29 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -72,6 +72,7 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/ofw/openfirm.c standard +dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_console.c standard dev/ofw/ofw_disk.c optional ofwd ==== //depot/projects/netperf_socket/sys/conf/files.sparc64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.56 2004/08/01 11:40:51 markm Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.57 2004/08/12 17:41:29 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,6 +18,7 @@ dev/fb/fb.c optional sc dev/fb/splash.c optional splash dev/kbd/kbd.c optional sc +dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard @@ -78,7 +79,7 @@ sparc64/sparc64/exception.S standard no-obj sparc64/sparc64/eeprom.c optional eeprom sparc64/sparc64/eeprom_ebus.c optional eeprom ebus -sparc64/sparc64/eeprom_fhc.c optional eeprom fhc +sparc64/sparc64/eeprom_sbus.c optional eeprom fhc sparc64/sparc64/eeprom_sbus.c optional eeprom sbus sparc64/sparc64/gdb_machdep.c optional gdb sparc64/sparc64/identcpu.c standard ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.55 2004/07/28 06:07:02 kan Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.56 2004/08/13 14:30:26 ru Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -66,8 +66,8 @@ # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm -COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h -CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} +CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#12 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.163 2004/06/29 18:56:14 njl Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.165 2004/08/13 14:30:26 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -73,7 +73,7 @@ .if ${CC} == "icc" CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif -CFLAGS+= ${COPTS} -D_KERNEL +CFLAGS+= -D_KERNEL CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. @@ -294,6 +294,7 @@ dev/iicbus/iicbus_if.m isa/isa_if.m \ libkern/iconv_converter_if.m \ dev/acpica/acpi_if.m dev/eisa/eisa_if.m dev/mii/miibus_if.m \ + dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/netperf_socket/sys/conf/options#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.470 2004/07/30 23:18:53 pjd Exp $ +# $FreeBSD: src/sys/conf/options,v 1.473 2004/08/14 15:32:19 dwmalone Exp $ # # On the handling of kernel options # @@ -82,6 +82,7 @@ GEOM_PC98 opt_geom.h GEOM_STRIPE opt_geom.h GEOM_SUNLABEL opt_geom.h +GEOM_UZIP opt_geom.h GEOM_VOL opt_geom.h HW_WDOG KSTACK_MAX_PAGES @@ -360,7 +361,6 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h -RANDOM_IP_ID SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h @@ -423,6 +423,7 @@ NGATM_SSCOP opt_netgraph.h NGATM_SSCFU opt_netgraph.h NGATM_UNI opt_netgraph.h +NGATM_CCATM opt_netgraph.h # DRM options DRM_DEBUG opt_drm.h ==== //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.34 2004/05/30 20:34:56 phk Exp $ + * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.35 2004/08/14 00:19:07 rwatson Exp $ */ #include @@ -391,7 +391,7 @@ ifp->if_init = oltr_init; ifp->if_start = oltr_start; ifp->if_ioctl = oltr_ioctl; - ifp->if_flags = IFF_BROADCAST; + ifp->if_flags = IFF_BROADCAST | IFF_NEEDSGIANT; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; bcopy(sc->config.macaddress, sc->arpcom.ac_enaddr, sizeof(sc->config.macaddress)); ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.10 2004/07/28 06:14:44 kan Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.11 2004/08/14 15:32:40 dwmalone Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -30,7 +30,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_random_ip_id.h" #endif #ifndef __FreeBSD__ @@ -107,10 +106,6 @@ int pfsync_sync_ok; struct pfsyncstats pfsyncstats; -#ifndef RANDOM_IP_ID -extern u_int16_t ip_randomid(void); -#endif - #ifdef __FreeBSD__ /* ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.9 2004/08/12 13:59:44 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.10 2004/08/14 15:32:40 dwmalone Exp $ */ /* $OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */ /* add $OpenBSD: pf_norm.c,v 1.87 2004/05/11 07:34:11 dhartmei Exp $ */ @@ -30,7 +30,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_random_ip_id.h" /* or ip_var does not export it */ #include "opt_pf.h" #define NPFLOG DEV_PFLOG #else @@ -168,9 +167,6 @@ RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare); /* Private prototypes */ -#ifndef RANDOM_IP_ID -extern u_int16_t ip_randomid(void); -#endif void pf_ip2key(struct pf_fragment *, struct ip *); void pf_remove_fragment(struct pf_fragment *); void pf_flush_fragments(void); ==== //depot/projects/netperf_socket/sys/dev/aac/aac.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.100 2004/08/12 05:31:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.101 2004/08/13 01:44:09 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -161,6 +161,27 @@ aac_rx_set_interrupts }; +/* Rocket/MIPS interface */ +static int aac_rkt_get_fwstatus(struct aac_softc *sc); +static void aac_rkt_qnotify(struct aac_softc *sc, int qbit); +static int aac_rkt_get_istatus(struct aac_softc *sc); +static void aac_rkt_clear_istatus(struct aac_softc *sc, int mask); +static void aac_rkt_set_mailbox(struct aac_softc *sc, u_int32_t command, + u_int32_t arg0, u_int32_t arg1, + u_int32_t arg2, u_int32_t arg3); +static int aac_rkt_get_mailbox(struct aac_softc *sc, int mb); +static void aac_rkt_set_interrupts(struct aac_softc *sc, int enable); + +struct aac_interface aac_rkt_interface = { + aac_rkt_get_fwstatus, + aac_rkt_qnotify, + aac_rkt_get_istatus, + aac_rkt_clear_istatus, + aac_rkt_set_mailbox, + aac_rkt_get_mailbox, + aac_rkt_set_interrupts +}; + /* Debugging and Diagnostics */ static void aac_describe_controller(struct aac_softc *sc); static char *aac_describe_code(struct aac_code_lookup *table, @@ -1634,6 +1655,11 @@ case AAC_HWIF_I960RX: AAC_SETREG4(sc, AAC_RX_ODBR, ~0); break; + case AAC_HWIF_RKT: + AAC_SETREG4(sc, AAC_RKT_ODBR, ~0); + break; + default: + break; } /* @@ -2020,6 +2046,14 @@ return (val); } +static int +aac_rkt_get_fwstatus(struct aac_softc *sc) +{ + debug_called(3); + + return(AAC_GETREG4(sc, AAC_RKT_FWSTATUS)); +} + /* * Notify the controller of a change in a given queue */ @@ -2049,6 +2083,14 @@ AAC_FA_HACK(sc); } +static void +aac_rkt_qnotify(struct aac_softc *sc, int qbit) +{ + debug_called(3); + + AAC_SETREG4(sc, AAC_RKT_IDBR, qbit); +} + /* * Get the interrupt reason bits */ @@ -2079,6 +2121,14 @@ return (val); } +static int +aac_rkt_get_istatus(struct aac_softc *sc) +{ + debug_called(3); + + return(AAC_GETREG4(sc, AAC_RKT_ODBR)); +} + /* * Clear some interrupt reason bits */ @@ -2107,6 +2157,14 @@ AAC_FA_HACK(sc); } +static void +aac_rkt_clear_istatus(struct aac_softc *sc, int mask) +{ + debug_called(3); + + AAC_SETREG4(sc, AAC_RKT_ODBR, mask); +} + /* * Populate the mailbox and set the command word */ @@ -2154,6 +2212,19 @@ AAC_FA_HACK(sc); } +static void +aac_rkt_set_mailbox(struct aac_softc *sc, u_int32_t command, u_int32_t arg0, + u_int32_t arg1, u_int32_t arg2, u_int32_t arg3) +{ + debug_called(4); + + AAC_SETREG4(sc, AAC_RKT_MAILBOX, command); + AAC_SETREG4(sc, AAC_RKT_MAILBOX + 4, arg0); + AAC_SETREG4(sc, AAC_RKT_MAILBOX + 8, arg1); + AAC_SETREG4(sc, AAC_RKT_MAILBOX + 12, arg2); + AAC_SETREG4(sc, AAC_RKT_MAILBOX + 16, arg3); +} + /* * Fetch the immediate command status word */ @@ -2184,6 +2255,14 @@ return (val); } +static int +aac_rkt_get_mailbox(struct aac_softc *sc, int mb) +{ + debug_called(4); + + return(AAC_GETREG4(sc, AAC_RKT_MAILBOX + (mb * 4))); +} + /* * Set/clear interrupt masks */ @@ -2225,6 +2304,18 @@ } } +static void +aac_rkt_set_interrupts(struct aac_softc *sc, int enable) +{ + debug(2, "%sable interrupts", enable ? "en" : "dis"); + + if (enable) { + AAC_SETREG4(sc, AAC_RKT_OIMR, ~AAC_DB_INTERRUPTS); + } else { + AAC_SETREG4(sc, AAC_RKT_OIMR, ~0); + } +} + /* * Debugging and Diagnostics */ ==== //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.47 2004/05/30 20:08:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.48 2004/08/13 01:44:09 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -132,6 +132,8 @@ "Dell CERC SATA RAID 2"}, {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, "Adaptec SCSI RAID 2810SA"}, + {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0, + "Adaptec SCSI RAID 2130S"}, {0, 0, 0, 0, 0, 0, 0} }; @@ -265,7 +267,6 @@ * Detect the hardware interface version, set up the bus interface * indirection. */ - sc->aac_hwif = AAC_HWIF_UNKNOWN; for (i = 0; aac_identifiers[i].vendor != 0; i++) { if ((aac_identifiers[i].vendor == pci_get_vendor(dev)) && (aac_identifiers[i].device == pci_get_device(dev)) && @@ -277,7 +278,6 @@ debug(2, "set hardware up for i960Rx"); sc->aac_if = aac_rx_interface; break; - case AAC_HWIF_STRONGARM: debug(2, "set hardware up for StrongARM"); sc->aac_if = aac_sa_interface; @@ -286,6 +286,13 @@ debug(2, "set hardware up for Falcon/PPC"); sc->aac_if = aac_fa_interface; break; + case AAC_HWIF_RKT: + debug(2, "setu hardware up for Rocket/MIPS"); + sc->aac_if = aac_rkt_interface; + break; + default: + sc->aac_hwif = AAC_HWIF_UNKNOWN; + break; } /* Set up quirks */ ==== //depot/projects/netperf_socket/sys/dev/aac/aacreg.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.17 2003/10/17 21:44:06 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.18 2004/08/13 01:44:09 scottl Exp $ */ /* @@ -1337,6 +1337,21 @@ #define AAC_RX_FWSTATUS 0x6c /* + * Register definitions for the Adaptec 'Rocket' RAID-On-Chip adapters. + * Unsurprisingly, it's quite similar to the i960! + */ + +#define AAC_RKT_IDBR 0x20 /* inbound doorbell register */ +#define AAC_RKT_IISR 0x24 /* inbound interrupt status register */ +#define AAC_RKT_IIMR 0x28 /* inbound interrupt mask register */ +#define AAC_RKT_ODBR 0x2c /* outbound doorbell register */ +#define AAC_RKT_OISR 0x30 /* outbound interrupt status register */ +#define AAC_RKT_OIMR 0x34 /* outbound interrupt mask register */ + +#define AAC_RKT_MAILBOX 0x1000 /* mailbox */ +#define AAC_RKT_FWSTATUS 0x101c /* Firmware Status (mailbox 7) */ + +/* * Common bit definitions for the doorbell registers. */ ==== //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.45 2004/08/12 05:05:06 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.46 2004/08/13 01:44:09 scottl Exp $ */ #include @@ -232,6 +232,7 @@ extern struct aac_interface aac_rx_interface; extern struct aac_interface aac_sa_interface; extern struct aac_interface aac_fa_interface; +extern struct aac_interface aac_rkt_interface; #define AAC_GET_FWSTATUS(sc) ((sc)->aac_if.aif_get_fwstatus((sc))) #define AAC_QNOTIFY(sc, qbit) ((sc)->aac_if.aif_qnotify((sc), (qbit))) @@ -293,7 +294,8 @@ int aac_hwif; #define AAC_HWIF_I960RX 0 #define AAC_HWIF_STRONGARM 1 -#define AAC_HWIF_FALCON 2 +#define AAC_HWIF_FALCON 2 +#define AAC_HWIF_RKT 3 #define AAC_HWIF_UNKNOWN -1 bus_dma_tag_t aac_common_dmat; /* common structure * DMA tag */ ==== //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.17 2004/04/14 03:41:06 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.18 2004/08/13 06:22:24 njl Exp $ */ /* @@ -44,9 +44,6 @@ #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("INTERRUPT") -static void InterruptWrapper(void *arg); - -static OSD_HANDLER InterruptHandler; static UINT32 InterruptOverride = 0; ACPI_STATUS @@ -66,11 +63,6 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); if (ServiceRoutine == NULL) return_ACPI_STATUS (AE_BAD_PARAMETER); - if (InterruptHandler != NULL) { - device_printf(sc->acpi_dev, "interrupt handler already installed\n"); - return_ACPI_STATUS (AE_ALREADY_EXISTS); - } - InterruptHandler = ServiceRoutine; /* * If the MADT contained an interrupt override directive for the SCI, @@ -92,8 +84,8 @@ device_printf(sc->acpi_dev, "could not allocate interrupt\n"); goto error; } - if (bus_setup_intr(sc->acpi_dev, sc->acpi_irq, INTR_TYPE_MISC, - InterruptWrapper, Context, &sc->acpi_irq_handle)) { + if (bus_setup_intr(sc->acpi_dev, sc->acpi_irq, INTR_TYPE_MISC|INTR_MPSAFE, + (driver_intr_t *)ServiceRoutine, Context, &sc->acpi_irq_handle)) { device_printf(sc->acpi_dev, "could not set up interrupt\n"); goto error; } @@ -108,7 +100,6 @@ bus_release_resource(sc->acpi_dev, SYS_RES_IRQ, 0, sc->acpi_irq); sc->acpi_irq = NULL; bus_delete_resource(sc->acpi_dev, SYS_RES_IRQ, 0); - InterruptHandler = NULL; return_ACPI_STATUS (AE_ALREADY_EXISTS); } @@ -136,7 +127,6 @@ bus_delete_resource(sc->acpi_dev, SYS_RES_IRQ, 0); sc->acpi_irq = NULL; - InterruptHandler = NULL; return_ACPI_STATUS (AE_OK); } @@ -152,13 +142,3 @@ InterruptOverride = InterruptNumber; return_ACPI_STATUS (AE_OK); } - -static void -InterruptWrapper(void *arg) -{ - ACPI_LOCK_DECL; - - ACPI_LOCK; - InterruptHandler(arg); - ACPI_UNLOCK; -} ==== //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.28 2004/05/06 02:18:58 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.29 2004/08/13 06:22:26 njl Exp $ */ /* @@ -69,7 +69,6 @@ struct acpi_task *at; }; -#if __FreeBSD_version >= 500000 /* * Private task queue definition for ACPI */ @@ -92,9 +91,8 @@ swi_add(NULL, "acpitaskq", taskqueue_acpi_run, NULL, SWI_TQ, 0, &taskqueue_acpi_ih)); -#ifdef ACPI_USE_THREADS static STAILQ_HEAD(, acpi_task_queue) acpi_task_queue; -static struct mtx acpi_task_mtx; +ACPI_LOCK_DECL(taskq, "ACPI task queue"); static void acpi_task_thread(void *arg) @@ -103,26 +101,21 @@ OSD_EXECUTION_CALLBACK Function; void *Context; >>> TRUNCATED FOR MAIL (1000 lines) <<<