From owner-p4-projects Wed Nov 27 21:53:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AADF37B404; Wed, 27 Nov 2002 21:53:21 -0800 (PST) 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 AF70637B401 for ; Wed, 27 Nov 2002 21:53:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BAB743E9C for ; Wed, 27 Nov 2002 21:53:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAS5namV036992 for ; Wed, 27 Nov 2002 21:49:36 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAS5nY2L036989 for perforce@freebsd.org; Wed, 27 Nov 2002 21:49:34 -0800 (PST) Date: Wed, 27 Nov 2002 21:49:34 -0800 (PST) Message-Id: <200211280549.gAS5nY2L036989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21624 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21624 Change 21624 by marcel@marcel_vaio on 2002/11/27 21:49:08 IFC @21623 Affected files ... .. //depot/projects/ia64/MAINTAINERS#19 integrate .. //depot/projects/ia64/bin/dd/dd.1#4 integrate .. //depot/projects/ia64/bin/expr/expr.1#8 integrate .. //depot/projects/ia64/contrib/diff/util.c#2 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/freebsd.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#13 integrate .. //depot/projects/ia64/contrib/gcc/function.c#6 integrate .. //depot/projects/ia64/contrib/gcc/gcc.1#3 integrate .. //depot/projects/ia64/contrib/gcc/gcc.c#10 integrate .. //depot/projects/ia64/contrib/libstdc++/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/contrib/libstdc++/NEWS#2 delete .. //depot/projects/ia64/contrib/libstdc++/cassert#2 delete .. //depot/projects/ia64/contrib/libstdc++/cctype#2 delete .. //depot/projects/ia64/contrib/libstdc++/cerrno#2 delete .. //depot/projects/ia64/contrib/libstdc++/cfloat#2 delete .. //depot/projects/ia64/contrib/libstdc++/cinst.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/ciso646#2 delete .. //depot/projects/ia64/contrib/libstdc++/climits#2 delete .. //depot/projects/ia64/contrib/libstdc++/clocale#2 delete .. //depot/projects/ia64/contrib/libstdc++/cmath#2 delete .. //depot/projects/ia64/contrib/libstdc++/cmathi.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/complex#2 delete .. //depot/projects/ia64/contrib/libstdc++/complex.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/aix.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/cpu/sparc/sparc32/bits/atomicity.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/cpu/sparc/sparc64/bits/atomicity.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/dec-osf.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/delta.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/elf.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/elfshlibm.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/freebsd.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/gnu.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/hpux.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/irix5.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/linux.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/linux.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/openbsd.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/openbsd.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/posix.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/sol2pth.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/sol2shm.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/sol2solth.mt#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/sunos4.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/config/x86-interix.ml#2 delete .. //depot/projects/ia64/contrib/libstdc++/csetjmp#2 delete .. //depot/projects/ia64/contrib/libstdc++/csignal#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstdarg#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstddef#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstdio#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstdlib#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstdlibi.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstring#2 delete .. //depot/projects/ia64/contrib/libstdc++/cstringi.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/ctime#2 delete .. //depot/projects/ia64/contrib/libstdc++/cwchar#2 delete .. //depot/projects/ia64/contrib/libstdc++/cwctype#2 delete .. //depot/projects/ia64/contrib/libstdc++/fstream#2 delete .. //depot/projects/ia64/contrib/libstdc++/iomanip#2 delete .. //depot/projects/ia64/contrib/libstdc++/iosfwd#2 delete .. //depot/projects/ia64/contrib/libstdc++/iostream#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/ChangeLog#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/Makefile.am#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/Makefile.in#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/_G_config.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/filedoalloc.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/fileops.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/genops.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/iofclose.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/iofopen.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/iofwide.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/iolibio.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/libio.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/libioP.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/stdfiles.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/stdio.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/wfiledoalloc.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/wfileops.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/libio/wgenops.c#2 delete .. //depot/projects/ia64/contrib/libstdc++/sinst.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/src/cmath.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/sstream#3 delete .. //depot/projects/ia64/contrib/libstdc++/std/bastring.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/bastring.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/complext.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/complext.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/dcomplex.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/fcomplex.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/gslice.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/gslice_array.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/indirect_array.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/ldcomplex.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/mask_array.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/slice.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/slice_array.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/std_valarray.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/straits.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/valarray_array.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/valarray_array.tcc#2 delete .. //depot/projects/ia64/contrib/libstdc++/std/valarray_meta.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stdexcept#2 delete .. //depot/projects/ia64/contrib/libstdc++/stdexcepti.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/ChangeLog#3 delete .. //depot/projects/ia64/contrib/libstdc++/stl/README#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/algo.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/algobase.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/algorithm#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/alloc.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/bitset#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/bvector.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/defalloc.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/deque#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/deque.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/function.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/functional#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/hash_map#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/hash_map.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/hash_set#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/hash_set.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/hashtable.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/heap.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/iterator#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/iterator.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/list#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/list.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/map#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/map.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/memory#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/multimap.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/multiset.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/numeric#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/pair.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/pthread_alloc#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/pthread_alloc.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/queue#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/rope#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/rope.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/ropeimpl.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/set#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/set.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/slist#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/slist.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stack#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stack.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_algo.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_algobase.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_alloc.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_bvector.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_config.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_construct.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_deque.h#3 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_function.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_hash_fun.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_hash_map.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_hash_set.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_hashtable.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_heap.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_iterator.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_list.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_map.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_multimap.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_multiset.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_numeric.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_pair.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_queue.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_raw_storage_iter.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_relops.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_rope.h#3 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_set.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_slist.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_stack.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_tempbuf.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_tree.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_uninitialized.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/stl_vector.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/tempbuf.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/tree.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/type_traits.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/utility#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/vector#2 delete .. //depot/projects/ia64/contrib/libstdc++/stl/vector.h#2 delete .. //depot/projects/ia64/contrib/libstdc++/stlinst.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/string#2 delete .. //depot/projects/ia64/contrib/libstdc++/strstream#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/ChangeLog#3 delete .. //depot/projects/ia64/contrib/libstdc++/tests/Makefile.in#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/configure.in#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tcomplex.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tcomplex.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tcomplex.inp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tlist.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tlist.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tmap.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tmap.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tstring.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tstring.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tstring.inp#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tvector.cc#2 delete .. //depot/projects/ia64/contrib/libstdc++/tests/tvector.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/ChangeLog#3 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/Makefile.in#3 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/config/default.exp#3 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/configure.in#2 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/lib/libstdc++.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite/libstdc++.tests/test.exp#2 delete .. //depot/projects/ia64/contrib/libstdc++/testsuite_flags.in#2 delete .. //depot/projects/ia64/contrib/libstdc++/valarray#2 delete .. //depot/projects/ia64/contrib/libstdc++/valarray.cc#2 delete .. //depot/projects/ia64/crypto/telnet/telnet/commands.c#7 integrate .. //depot/projects/ia64/etc/Makefile#18 integrate .. //depot/projects/ia64/etc/modems#3 delete .. //depot/projects/ia64/etc/namedb/named.conf#4 integrate .. //depot/projects/ia64/etc/rc#21 integrate .. //depot/projects/ia64/etc/rc.d/lomac#2 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#13 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#9 integrate .. //depot/projects/ia64/lib/libufs/sblock.c#3 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#9 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#27 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#53 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#18 integrate .. //depot/projects/ia64/sbin/badsect/badsect.c#7 integrate .. //depot/projects/ia64/sbin/clri/clri.c#9 integrate .. //depot/projects/ia64/sbin/dump/main.c#12 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/setup.c#12 integrate .. //depot/projects/ia64/sbin/fsirand/fsirand.c#5 integrate .. //depot/projects/ia64/sbin/growfs/growfs.c#7 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#18 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#9 integrate .. //depot/projects/ia64/sbin/reboot/reboot.8#8 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#8 integrate .. //depot/projects/ia64/share/examples/etc/README.examples#2 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#23 integrate .. //depot/projects/ia64/share/man/man4/lomac.4#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#23 integrate .. //depot/projects/ia64/share/man/man7/clocks.7#5 integrate .. //depot/projects/ia64/share/man/man9/style.9#17 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#11 integrate .. //depot/projects/ia64/sys/boot/alpha/boot1/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/common/help.common#5 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#12 integrate .. //depot/projects/ia64/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#7 integrate .. //depot/projects/ia64/sys/boot/efi/loader/version#4 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/ia64/sys/boot/libstand/ufs.c#2 integrate .. //depot/projects/ia64/sys/conf/NOTES#30 integrate .. //depot/projects/ia64/sys/conf/files#49 integrate .. //depot/projects/ia64/sys/conf/majors#16 integrate .. //depot/projects/ia64/sys/conf/options#36 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdispat.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acinterp.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acparser.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acstruct.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmutils.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswscope.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconvrt.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/excreate.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfield.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmutex.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exnames.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg3.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exprep.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresnte.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstoren.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstorob.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsobject.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psopcode.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxfroot.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#5 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#7 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.h#2 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/ia64/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/nsp/nsp_pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#16 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#16 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#15 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/ia64/sys/dev/stg/tmc18c30_pccard.c#6 integrate .. //depot/projects/ia64/sys/i386/include/stdarg.h#7 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#13 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/ia64/sys/modules/Makefile#28 integrate .. //depot/projects/ia64/sys/modules/mac_lomac/Makefile#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/ia64/sys/netsmb/smb_trantcp.c#10 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#12 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#20 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#1 branch .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.h#1 branch .. //depot/projects/ia64/sys/sys/ctype.h#2 integrate .. //depot/projects/ia64/sys/sys/mac.h#11 integrate .. //depot/projects/ia64/sys/sys/rman.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#23 integrate .. //depot/projects/ia64/sys/ufs/ffs/fs.h#8 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#27 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#21 integrate .. //depot/projects/ia64/usr.bin/Makefile#35 integrate .. //depot/projects/ia64/usr.bin/at/at.man#9 integrate .. //depot/projects/ia64/usr.bin/colldef/colldef.1#5 integrate .. //depot/projects/ia64/usr.bin/ctags/ctags.1#5 integrate .. //depot/projects/ia64/usr.bin/cut/cut.1#6 integrate .. //depot/projects/ia64/usr.bin/elf2aout/Makefile#3 branch .. //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#6 branch .. //depot/projects/ia64/usr.bin/expand/expand.1#4 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#13 integrate .. //depot/projects/ia64/usr.bin/find/find.1#11 integrate .. //depot/projects/ia64/usr.bin/finger/finger.1#5 integrate .. //depot/projects/ia64/usr.bin/getconf/getconf.1#3 integrate .. //depot/projects/ia64/usr.bin/gprof/gprof.1#5 integrate .. //depot/projects/ia64/usr.bin/join/join.1#6 integrate .. //depot/projects/ia64/usr.bin/limits/limits.1#5 integrate .. //depot/projects/ia64/usr.bin/minigzip/minigzip.1#4 integrate .. //depot/projects/ia64/usr.bin/mklocale/mklocale.1#4 integrate .. //depot/projects/ia64/usr.bin/objformat/objformat.1#4 integrate .. //depot/projects/ia64/usr.bin/paste/paste.1#4 integrate .. //depot/projects/ia64/usr.bin/perl/Makefile#4 delete .. //depot/projects/ia64/usr.bin/perl/pathnames.h#2 delete .. //depot/projects/ia64/usr.bin/perl/perl.c#5 delete .. //depot/projects/ia64/usr.bin/printenv/printenv.1#6 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpcgen.1#5 integrate .. //depot/projects/ia64/usr.bin/sed/sed.1#7 integrate .. //depot/projects/ia64/usr.bin/showmount/showmount.8#5 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.1#3 integrate .. //depot/projects/ia64/usr.bin/su/su.1#5 integrate .. //depot/projects/ia64/usr.bin/tabs/tabs.1#4 integrate .. //depot/projects/ia64/usr.bin/tftp/tftp.1#5 integrate .. //depot/projects/ia64/usr.bin/tip/tip/modems.5#3 delete .. //depot/projects/ia64/usr.bin/tip/tip/tip.1#5 integrate .. //depot/projects/ia64/usr.bin/tr/tr.1#4 integrate .. //depot/projects/ia64/usr.bin/truss/truss.1#4 integrate .. //depot/projects/ia64/usr.bin/uniq/uniq.1#6 integrate .. //depot/projects/ia64/usr.bin/wc/wc.1#4 integrate .. //depot/projects/ia64/usr.bin/what/what.1#3 integrate .. //depot/projects/ia64/usr.bin/whereis/whereis.1#5 integrate .. //depot/projects/ia64/usr.bin/who/who.1#5 integrate .. //depot/projects/ia64/usr.bin/whois/whois.1#5 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/lint.1#6 integrate .. //depot/projects/ia64/usr.bin/yacc/yyfix.1#4 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.8#4 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#8 integrate .. //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.1#6 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.8#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnd/isdnd.rc.5#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4b.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bing.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bipr.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bisppp.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bq921.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bq931.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4brbch.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4btel.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4btrc.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpi.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpi2.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpnp.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ihfc.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/isic.4#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/iwic.4#3 integrate .. //depot/projects/ia64/usr.sbin/kbdmap/kbdmap.1#4 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpc/lpc.8#5 integrate .. //depot/projects/ia64/usr.sbin/memcontrol/memcontrol.8#4 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.8#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp-genkeys.8#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp.conf.5#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpdate.8#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpdc.8#4 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpq.8#4 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.8#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dispatch.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#11 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#11 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/label.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#18 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#11 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#5 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.8#7 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#8 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#19 (text+ko) ==== @@ -1,10 +1,15 @@ -$FreeBSD: src/MAINTAINERS,v 1.53 2002/11/21 08:36:01 ru Exp $ +$FreeBSD: src/MAINTAINERS,v 1.54 2002/11/28 00:02:25 obrien Exp $ subsystem login notes ----------------------------- mergemaster dougb Prefers to pre-approve commits binutils obrien Insists to keep BU blocked from other's unapproved commits +file obrien Insists to keep file blocked from other's unapproved + commits +one-true-awk obrien Insists to keep one-true-awk blocked from other's + unapproved commits +lukemftpd obrien Pre-commit review requested. libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. ==== //depot/projects/ia64/bin/dd/dd.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.20 2002/05/29 14:01:27 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.21 2002/11/26 17:55:40 ru Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -378,5 +378,5 @@ and .Cm oldibm values are extensions to the -\*[Px] +.Tn POSIX standard. ==== //depot/projects/ia64/bin/expr/expr.1#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/expr/expr.1,v 1.22 2002/11/25 13:20:30 ru Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.23 2002/11/26 17:55:40 ru Exp $ .\" .Dd May 10, 2002 .Dt EXPR 1 @@ -141,7 +141,7 @@ compatibility is enabled, this version of .Nm adheres to the -\*[Px] +.Tn POSIX Utility Syntax Guidelines, which require that a leading argument beginning with a minus sign be considered an option to the program. The standard ==== //depot/projects/ia64/contrib/diff/util.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ along with GNU DIFF; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $FreeBSD: src/contrib/diff/util.c,v 1.4 2000/09/15 11:35:16 green Exp $ */ +/* $FreeBSD: src/contrib/diff/util.c,v 1.5 2002/11/25 22:59:52 gad Exp $ */ #include "diff.h" @@ -485,7 +485,7 @@ output_1_line (text, limit, flag_format, line_flag); if ((!line_flag || line_flag[0]) && limit[-1] != '\n') - fputc ('\n', out); + fprintf (out, "\n\\ No newline at end of file\n"); } /* Output a line from TEXT up to LIMIT. Without -t, output verbatim. ==== //depot/projects/ia64/contrib/gcc/config/alpha/freebsd.h#5 (text+ko) ==== @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/alpha/freebsd.h,v 1.13 2002/05/07 23:28:45 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/alpha/freebsd.h,v 1.14 2002/11/26 18:25:19 obrien Exp $ */ /* Provide a CPP_SPEC appropriate for FreeBSD/alpha. Besides the dealing with @@ -91,8 +91,6 @@ #define TARGET_VERSION fprintf (stderr, " (FreeBSD/Alpha ELF)"); #define TARGET_ELF 1 -#define TARGET_AOUT (0) -#define TARGET_UNDERSCORES (0) #undef OBJECT_FORMAT_COFF #undef EXTENDED_COFF ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#5 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.5 2002/09/12 16:10:21 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.6 2002/11/26 18:25:19 obrien Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -85,7 +85,7 @@ the final CPP_PREDEFINES value. */ #define FBSD_CPP_PREDEFINES \ - "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500004 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" + "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500005 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" #endif /* ! FREEBSD_NATIVE */ @@ -99,9 +99,6 @@ #define FBSD_CPP_SPEC " \ %(cpp_cpu) \ - %{!maout: -D__ELF__} \ - %{munderscores: -D__UNDERSCORES__} \ - %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ %{!ansi:%{!std=c89:%{!std=iso9899.1990:%{!std=iso9899.199409:-D_LONGLONG}}}} \ %{posix:-D_POSIX_SOURCE}" ==== //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#13 (text+ko) ==== @@ -1,9 +1,8 @@ -/* Definitions for Intel 386 running FreeBSD with either a.out or ELF format +/* Definitions for Intel 386 running FreeBSD with ELF format Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. - Added support for generating "old a.out gas" on the fly by Peter Wemm. Continued development by David O'Brien This file is part of GNU CC. @@ -23,15 +22,15 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.58 2002/07/12 17:44:24 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.59 2002/11/26 18:25:20 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p} \ %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \ - %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}" + " #undef ASM_SPEC -#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" +#define ASM_SPEC "%{v*: -v}" #undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" @@ -50,11 +49,6 @@ #undef LINK_SPEC #define LINK_SPEC "\ %{p:%e`-p' not supported; use `-pg' and gprof(1)} \ - %{maout: %{shared:-Bshareable} \ - %{!shared:%{!nostdlib:%{!r:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} \ - %{pg:-Bstatic} %{Z}} \ - %{assert*} %{R*}} \ - %{!maout: \ %{Wl,*:%*} \ %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ @@ -64,7 +58,7 @@ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ %{static:-Bstatic}} \ - %{symbolic:-Bsymbolic}}" + %{symbolic:-Bsymbolic}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part of the support for @@ -72,20 +66,14 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ - %{maout: %{shared:c++rt0.o%s} \ %{!shared: \ - %{pg:gcrt0.o%s}%{!pg: \ - %{static:scrt0.o%s} \ - %{!static:crt0.o%s}}}} \ - %{!maout: \ - %{!shared: \ %{pg:gcrt1.o%s} \ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ crti.o%s \ %{!shared:crtbegin.o%s} \ - %{shared:crtbeginS.o%s}}" + %{shared:crtbeginS.o%s}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our own magical crtend.o file (see crtstuff.c) which provides part of the @@ -94,9 +82,8 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC "\ - %{!maout: \ %{!shared:crtend.o%s} \ - %{shared:crtendS.o%s} crtn.o%s}" + %{shared:crtendS.o%s} crtn.o%s" /************************[ Target stuff ]***********************************/ @@ -118,22 +105,14 @@ #define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)"); #define MASK_PROFILER_EPILOGUE 010000000000 -#define MASK_AOUT 004000000000 /* a.out not elf */ -#define MASK_UNDERSCORES 002000000000 /* use leading _ */ #define TARGET_PROFILER_EPILOGUE (target_flags & MASK_PROFILER_EPILOGUE) -#define TARGET_AOUT (target_flags & MASK_AOUT) -#define TARGET_ELF ((target_flags & MASK_AOUT) == 0) -#define TARGET_UNDERSCORES ((target_flags & MASK_UNDERSCORES) != 0) +#define TARGET_ELF 1 #undef SUBTARGET_SWITCHES #define SUBTARGET_SWITCHES \ { "profiler-epilogue", MASK_PROFILER_EPILOGUE, "Function profiler epilogue"}, \ - { "no-profiler-epilogue", -MASK_PROFILER_EPILOGUE, "No function profiler epilogue"}, \ - { "aout", MASK_AOUT, "Generate an a.out (vs. ELF) binary"}, \ - { "no-aout", -MASK_AOUT, "Do not generate an a.out binary"}, \ - { "underscores", MASK_UNDERSCORES, "Add leading underscores to symbols"}, \ - { "no-underscores", -MASK_UNDERSCORES, "Do not add leading underscores to symbols"}, + { "no-profiler-epilogue", -MASK_PROFILER_EPILOGUE, "No function profiler epilogue"}, /* This goes away when the math emulator is fixed. */ #undef TARGET_SUBTARGET_DEFAULT @@ -148,27 +127,6 @@ #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 0 -/* The a.out tools do not support "linkonce" sections. */ -#undef SUPPORTS_ONE_ONLY -#define SUPPORTS_ONE_ONLY TARGET_ELF - -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") - -/* supply our own hook for calling __main() from main() */ -#undef INVOKE__main -#define INVOKE__main -#undef GEN_CALL__MAIN -#define GEN_CALL__MAIN \ - do { \ - if (!(TARGET_ELF)) \ - emit_library_call (gen_rtx (SYMBOL_REF, Pmode, NAME__MAIN), 0, \ - VOIDmode, 0); \ - } while (0) - /* Tell final.c that we don't need a label passed to mcount. */ #define NO_PROFILE_COUNTERS 1 @@ -178,11 +136,10 @@ #undef FUNCTION_PROFILER #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ - char *_name = TARGET_AOUT ? "mcount" : ".mcount"; \ if (flag_pic) \ - fprintf ((FILE), "\tcall *%s@GOT(%%ebx)\n", _name); \ + fprintf ((FILE), "\tcall *.mcount%s@GOT(%%ebx)\n"); \ else \ - fprintf ((FILE), "\tcall %s\n", _name); \ + fprintf ((FILE), "\tcall .mcount\n"); \ } while (0) /* Output assembler code to FILE to end profiling of the current function. */ @@ -202,35 +159,7 @@ #undef ASM_APP_OFF #define ASM_APP_OFF "#NO_APP\n" -/* Override the default string pseudo-op of "\t.string\t" from ../elfos.h. - ".string" doesn't work for the aout case. */ -#undef STRING_ASM_OP -#define STRING_ASM_OP (TARGET_AOUT ? "\t.asciz\t" : "\t.string\t") - -/* Override the use of "\t.section\t.rodata" from ../elfos.h. Neither - ".section" nor "rodata" works for the aout case. This forces a fallback - to ".text". */ -#undef USE_CONST_SECTION -#define USE_CONST_SECTION TARGET_ELF - -/* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. - This is suitable for output with `assemble_name'. */ -#undef ASM_GENERATE_INTERNAL_LABEL -#define ASM_GENERATE_INTERNAL_LABEL(LABEL, PREFIX, NUM) \ - sprintf ((LABEL), "*%s%s%u", (TARGET_UNDERSCORES) ? "" : ".", \ - (PREFIX), (unsigned) (NUM)) - -/* This is how to output an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. - For most svr4/ELF systems, the convention is that any symbol which begins - with a period is not put into the linker symbol table by the assembler. */ -#undef ASM_OUTPUT_INTERNAL_LABEL -#define ASM_OUTPUT_INTERNAL_LABEL(FILE, PREFIX, NUM) \ - fprintf ((FILE), "%s%s%u:\n", (TARGET_UNDERSCORES) ? "" : ".", \ - (PREFIX), (unsigned) (NUM)) - +/* XXX:DEO do we still need this override to defaults.h ?? */ /* This is how to output a reference to a user-level label named NAME. */ #undef ASM_OUTPUT_LABELREF #define ASM_OUTPUT_LABELREF(FILE, NAME) \ @@ -240,15 +169,13 @@ FUNCTION_PROFILER_EPILOGUE (). */ \ if (*_name == '.' && strcmp(_name + 1, "mexitcount") == 0) \ { \ - if (TARGET_AOUT) \ - _name++; \ if (flag_pic) \ fprintf ((FILE), "*%s@GOT(%%ebx)", _name); \ else \ fprintf ((FILE), "%s", _name); \ } \ else \ - fprintf (FILE, "%s%s", TARGET_UNDERSCORES ? "_" : "", _name); \ + fprintf (FILE, "%s", _name); \ } while (0) /* This is how to hack on the symbol code of certain relcalcitrant @@ -267,89 +194,6 @@ } \ } while (0) -#undef ASM_OUTPUT_ALIGNED_COMMON -#define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ - do { \ - if (TARGET_ELF) \ - { \ - fprintf ((FILE), "%s", COMMON_ASM_OP); \ - assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), ",%u,%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT); \ - } \ - else \ - { \ - int alignbytes = ((ALIGN) + BITS_PER_UNIT - 1) / BITS_PER_UNIT; \ - int rounded = (SIZE); \ - rounded += alignbytes - 1; \ - rounded = (rounded / alignbytes) * alignbytes; \ - fprintf ((FILE), "%s ", COMMON_ASM_OP); \ - assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), ",%u\n", (rounded)); \ - } \ - } while (0) - -/* This says how to output assembler code to declare an - uninitialized internal linkage data object. Under SVR4, - the linker seems to want the alignment of data objects - to depend on their types. We do exactly that here. */ - -#undef ASM_OUTPUT_ALIGNED_LOCAL -#define ASM_OUTPUT_ALIGNED_LOCAL(FILE, NAME, SIZE, ALIGN) \ - do { \ - if (TARGET_ELF) \ - { \ - fprintf ((FILE), "%s", LOCAL_ASM_OP); \ - assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), "\n"); \ - ASM_OUTPUT_ALIGNED_COMMON ((FILE), (NAME), (SIZE), (ALIGN)); \ - } \ - else \ - { \ - int rounded = (SIZE); \ - if (rounded == 0) rounded = 1; \ - rounded += (BIGGEST_ALIGNMENT / BITS_PER_UNIT) - 1; \ - rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT) \ - * (BIGGEST_ALIGNMENT / BITS_PER_UNIT)); \ - fputs ("\t.lcomm\t", (FILE)); \ - assemble_name ((FILE), (NAME)); \ - fprintf ((FILE), ",%u\n", (rounded)); \ - } \ - } while (0) - -/* How to output some space. The rules are different depending on the - object format. */ -#undef ASM_OUTPUT_SKIP -#define ASM_OUTPUT_SKIP(FILE, SIZE) \ - do { \ - if (TARGET_ELF) \ - { \ - fprintf ((FILE), "%s%u\n", SKIP_ASM_OP, (SIZE)); \ - } \ - else \ - { \ - fprintf ((FILE), "\t.space\t%u\n", (SIZE)); \ - } \ - } while (0) - -#undef ASM_OUTPUT_SOURCE_LINE -#define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ - do { \ - static int sym_lineno = 1; \ - if (TARGET_ELF) \ - { \ - fprintf ((FILE), ".stabn 68,0,%d,.LM%d-", (LINE), sym_lineno); \ - assemble_name ((FILE), \ - XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \ - fprintf ((FILE), "\n.LM%d:\n", sym_lineno); \ - sym_lineno += 1; \ - } \ - else \ - { \ - fprintf ((FILE), "\t%s %d,0,%d\n", ASM_STABD_OP, N_SLINE, \ - lineno); \ - } \ - } while (0) - /* A C statement to output to the stdio stream FILE an assembler command to advance the location counter to a multiple of 1<>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 10:57:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A73ED37B404; Thu, 28 Nov 2002 10:57:15 -0800 (PST) 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 40D0C37B401 for ; Thu, 28 Nov 2002 10:57:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFF3843E9C for ; Thu, 28 Nov 2002 10:57:14 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASIrTmV091365 for ; Thu, 28 Nov 2002 10:53:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASIrTnp091362 for perforce@freebsd.org; Thu, 28 Nov 2002 10:53:29 -0800 (PST) Date: Thu, 28 Nov 2002 10:53:29 -0800 (PST) Message-Id: <200211281853.gASIrTnp091362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21638 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21638 Change 21638 by marcel@marcel_nfs on 2002/11/28 10:52:55 Don't use the difference between avail_start and avail_end as a measure for memory size. Memory descriptors allow for sparse address spaces, and often enough this is the case. Instead use the previously determined Maxmem. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#49 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#49 (text+ko) ==== @@ -363,9 +363,12 @@ * physical memory and try to locate a region which is large * enough to contain the VHPT (which must be a power of two in * size and aligned to a natural boundary). + * Don't use the the difference between avail_start and avail_end + * as a measure for memory size. The address space is not often + * enough sparse, causing us to (try to) create a huge VHPT. */ vhpt_size = 15; - while ((1<; Thu, 28 Nov 2002 11:03:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E11CF43ECD for ; Thu, 28 Nov 2002 11:03:23 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASIxcmV091895 for ; Thu, 28 Nov 2002 10:59:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASIxcRV091892 for perforce@freebsd.org; Thu, 28 Nov 2002 10:59:38 -0800 (PST) Date: Thu, 28 Nov 2002 10:59:38 -0800 (PST) Message-Id: <200211281859.gASIxcRV091892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21640 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21640 Change 21640 by marcel@marcel_nfs on 2002/11/28 10:59:22 Conditionally compile-out references to non-newbus compatible fields in the adapter and adapter_info structs on ia64. This is only in userland interfaces (ioctl). Affected files ... .. //depot/projects/ia64/sys/dev/fb/fb.c#3 edit Differences ... ==== //depot/projects/ia64/sys/dev/fb/fb.c#3 (text+ko) ==== @@ -637,10 +637,11 @@ printf("%s%d: %s%d, %s, type:%s (%d), flags:0x%x\n", FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name, adapter_name(adp->va_type), adp->va_type, adp->va_flags); +#if !defined(__ia64__) printf("%s%d: port:0x%lx-0x%lx, crtc:0x%lx, mem:0x%lx 0x%x\n", - FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, + FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, (u_long)adp->va_io_base + adp->va_io_size - 1, - (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base, + (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base, adp->va_mem_size); printf("%s%d: init mode:%d, bios mode:%d, current mode:%d\n", FB_DRIVER_NAME, adp->va_index, @@ -650,6 +651,7 @@ (void *)adp->va_window, (int)adp->va_window_size/1024, (int)adp->va_window_gran/1024, (void *)adp->va_buffer, (int)adp->va_buffer_size/1024); +#endif } void @@ -726,6 +728,7 @@ sizeof(((video_adapter_info_t *)arg)->va_name))); ((video_adapter_info_t *)arg)->va_unit = adp->va_unit; ((video_adapter_info_t *)arg)->va_flags = adp->va_flags; +#if !defined(__ia64__) ((video_adapter_info_t *)arg)->va_io_base = adp->va_io_base; ((video_adapter_info_t *)arg)->va_io_size = adp->va_io_size; ((video_adapter_info_t *)arg)->va_crtc_addr = adp->va_crtc_addr; @@ -756,6 +759,7 @@ = adp->va_initial_mode; ((video_adapter_info_t *)arg)->va_initial_bios_mode = adp->va_initial_bios_mode; +#endif ((video_adapter_info_t *)arg)->va_line_width = adp->va_line_width; ((video_adapter_info_t *)arg)->va_disp_start.x @@ -764,17 +768,18 @@ = adp->va_disp_start.y; break; +#if !defined(__ia64__) case FBIO_MODEINFO: /* get mode information */ - error = (*vidsw[adp->va_index]->get_info)(adp, + error = (*vidsw[adp->va_index]->get_info)(adp, ((video_info_t *)arg)->vi_mode, - (video_info_t *)arg); + (video_info_t *)arg); if (error) error = ENODEV; break; case FBIO_FINDMODE: /* find a matching video mode */ - error = (*vidsw[adp->va_index]->query_mode)(adp, - (video_info_t *)arg); + error = (*vidsw[adp->va_index]->query_mode)(adp, + (video_info_t *)arg); break; case FBIO_GETMODE: /* get video mode */ @@ -790,6 +795,7 @@ case FBIO_GETWINORG: /* get frame buffer window origin */ *(u_int *)arg = adp->va_window_orig; break; +#endif case FBIO_GETDISPSTART: /* get display start address */ ((video_display_start_t *)arg)->x = adp->va_disp_start.x; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11: 7:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3031B37B401; Thu, 28 Nov 2002 11:07:30 -0800 (PST) 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 D26F737B404 for ; Thu, 28 Nov 2002 11:07:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D49E43EC5 for ; Thu, 28 Nov 2002 11:07:29 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJ3imV092133 for ; Thu, 28 Nov 2002 11:03:44 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ3iGd092130 for perforce@freebsd.org; Thu, 28 Nov 2002 11:03:44 -0800 (PST) Date: Thu, 28 Nov 2002 11:03:44 -0800 (PST) Message-Id: <200211281903.gASJ3iGd092130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21641 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21641 Change 21641 by marcel@marcel_nfs on 2002/11/28 11:03:12 Don't wait for vertical retrace to avoid jitter. The renderer has no business talking to the device directly. It should have been abstracted so that we don't hardcode I/O port accesses here. Affected files ... .. //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#3 edit Differences ... ==== //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#3 (text+ko) ==== @@ -329,10 +329,11 @@ u_char font_buf[128]; u_short cursor[32]; u_char c; - int pos; + int i, pos; int xoffset, yoffset; +#if !defined(__ia64__) int crtc_addr; - int i; +#endif /* prepare mousepointer char's bitmaps */ pos = (y/scp->font_size - scp->yoff)*scp->xsize + x/8 - scp->xoff; @@ -366,7 +367,7 @@ font_buf[i + 96] = cursor[i + scp->font_size] & 0xff; } -#if 1 +#if !defined(__ia64__) /* wait for vertical retrace to avoid jitter on some videocards */ crtc_addr = scp->sc->adp->va_crtc_addr; while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11: 9:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4C5737B404; Thu, 28 Nov 2002 11:09:33 -0800 (PST) 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 352B037B43C for ; Thu, 28 Nov 2002 11:09:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C44C343EAF for ; Thu, 28 Nov 2002 11:09:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJ5lmV092265 for ; Thu, 28 Nov 2002 11:05:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ5lci092260 for perforce@freebsd.org; Thu, 28 Nov 2002 11:05:47 -0800 (PST) Date: Thu, 28 Nov 2002 11:05:47 -0800 (PST) Message-Id: <200211281905.gASJ5lci092260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21642 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21642 Change 21642 by marcel@marcel_nfs on 2002/11/28 11:05:24 Conditionally compile-out the compatibility structs on ia64. There's no compatibility to maintain and it's all non-newbus. This change breaks vidcontrol. Affected files ... .. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/syscons/scvidctl.c#4 (text+ko) ==== @@ -47,6 +47,7 @@ SET_DECLARE(scrndr_set, const sc_renderer_t); +#if !defined(__ia64__) /* for compatibility with previous versions */ /* 3.0-RELEASE used the following structure */ typedef struct old_video_adapter { @@ -126,6 +127,7 @@ #define OLD_CONS_MODEINFO _IOWR('c', 102, old_video_info_t) #define OLD_CONS_FINDMODE _IOWR('c', 103, old_video_info_t) +#endif int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize, @@ -457,7 +459,9 @@ scr_stat *scp; video_adapter_t *adp; video_info_t info; +#if !defined(__ia64__) video_adapter_info_t adp_info; +#endif int error; int s; @@ -478,6 +482,7 @@ case FBIO_ADPTYPE: return fb_ioctl(adp, FBIO_ADPTYPE, data); +#if !defined(__ia64__) case OLD_CONS_ADPINFO: /* adapter information (old interface) */ if (((old_video_adapter_t *)data)->va_index >= 0) { adp = vid_get_adapter(((old_video_adapter_t *)data)->va_index); @@ -510,6 +515,7 @@ if (error == 0) bcopy(&adp_info, data, sizeof(old_video_adapter_info_t)); return error; +#endif case CONS_ADPINFO: /* adapter information */ case FBIO_ADPINFO: @@ -539,17 +545,20 @@ return sc_set_text_mode(scp, tp, *(int *)data, 0, 0, 0); #endif /* SC_NO_MODE_CHANGE */ +#if !defined(__ia64__) case OLD_CONS_MODEINFO: /* get mode information (old infterface) */ info.vi_mode = ((old_video_info_t *)data)->vi_mode; error = fb_ioctl(adp, FBIO_MODEINFO, &info); if (error == 0) bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); return error; +#endif case CONS_MODEINFO: /* get mode information */ case FBIO_MODEINFO: return fb_ioctl(adp, FBIO_MODEINFO, data); +#if !defined(__ia64__) case OLD_CONS_FINDMODE: /* find a matching video mode (old interface) */ bzero(&info, sizeof(info)); bcopy((old_video_info_t *)data, &info, sizeof(old_video_info_t)); @@ -557,6 +566,7 @@ if (error == 0) bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); return error; +#endif case CONS_FINDMODE: /* find a matching video mode */ case FBIO_FINDMODE: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:12:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB5D737B404; Thu, 28 Nov 2002 11:12:37 -0800 (PST) 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 8225B37B401 for ; Thu, 28 Nov 2002 11:12:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38A5C43EAF for ; Thu, 28 Nov 2002 11:12:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJ8qmV092678 for ; Thu, 28 Nov 2002 11:08:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ8pFc092675 for perforce@freebsd.org; Thu, 28 Nov 2002 11:08:51 -0800 (PST) Date: Thu, 28 Nov 2002 11:08:51 -0800 (PST) Message-Id: <200211281908.gASJ8pFc092675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21643 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21643 Change 21643 by marcel@marcel_nfs on 2002/11/28 11:08:12 Conditionally compile-out I/O port addresses and memory addresses in structs. Use tags and handles instead (as much as possible). Not the final state, but compilable and useable. Affected files ... .. //depot/projects/ia64/sys/sys/fbio.h#3 edit Differences ... ==== //depot/projects/ia64/sys/sys/fbio.h#3 (text+ko) ==== @@ -42,6 +42,7 @@ #ifndef _SYS_FBIO_H_ #define _SYS_FBIO_H_ +#include #ifndef _KERNEL #include #endif @@ -331,6 +332,7 @@ #define V_ADP_INITIALIZED (1 << 17) #define V_ADP_REGISTERED (1 << 18) #define V_ADP_ATTACHED (1 << 19) +#if !defined(__ia64__) vm_offset_t va_io_base; int va_io_size; vm_offset_t va_crtc_addr; @@ -345,6 +347,13 @@ int va_initial_mode; int va_initial_bios_mode; int va_mode; +#else + bus_space_tag_t va_crtc_tag; + bus_space_handle_t va_crtc_handle; + vm_offset_t va_window; /* virtual address */ + size_t va_window_size; + int va_initial_mode; +#endif struct video_info va_info; int va_line_width; struct { @@ -356,8 +365,10 @@ int va_little_bitian; int va_little_endian; int va_buffer_alias; +#if !defined(__ia64__) vm_offset_t va_registers; /* virtual address */ vm_offset_t va_registers_size; +#endif }; typedef struct video_adapter video_adapter_t; @@ -367,6 +378,7 @@ char va_name[16]; int va_unit; int va_flags; +#if !defined(__ia64__) vm_offset_t va_io_base; int va_io_size; vm_offset_t va_crtc_addr; @@ -380,6 +392,7 @@ int va_initial_mode; int va_initial_bios_mode; int va_mode; +#endif int va_line_width; struct { int x; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:13:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEA9A37B404; Thu, 28 Nov 2002 11:13:40 -0800 (PST) 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 66DD437B401 for ; Thu, 28 Nov 2002 11:13:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3529D43EC2 for ; Thu, 28 Nov 2002 11:13:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJ9smV092762 for ; Thu, 28 Nov 2002 11:09:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ9r58092759 for perforce@freebsd.org; Thu, 28 Nov 2002 11:09:53 -0800 (PST) Date: Thu, 28 Nov 2002 11:09:53 -0800 (PST) Message-Id: <200211281909.gASJ9r58092759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21644 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21644 Change 21644 by marcel@marcel_nfs on 2002/11/28 11:09:07 Unhook vidcontrol from the ia64 build. Affected files ... .. //depot/projects/ia64/usr.sbin/Makefile#26 edit Differences ... ==== //depot/projects/ia64/usr.sbin/Makefile#26 (text+ko) ==== @@ -114,7 +114,6 @@ ugidfw \ usbd \ usbdevs \ - vidcontrol \ vipw \ vnconfig \ watch \ @@ -162,7 +161,8 @@ .if ${MACHINE_ARCH} == "alpha" SUBDIR+=elf2exe \ - pnpinfo + pnpinfo \ + vidcontrol .endif .if ${MACHINE_ARCH} == "i386" @@ -180,7 +180,8 @@ sicontrol \ spkrtest \ stallion \ - wlconfig + vidcontrol \ + wlconfig .if !defined(NO_I4B) SUBDIR+=i4b .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:15:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B91537B404; Thu, 28 Nov 2002 11:15:43 -0800 (PST) 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 ABB5C37B401 for ; Thu, 28 Nov 2002 11:15:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6724C43EA9 for ; Thu, 28 Nov 2002 11:15:42 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJBvmV092908 for ; Thu, 28 Nov 2002 11:11:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJBukU092905 for perforce@freebsd.org; Thu, 28 Nov 2002 11:11:56 -0800 (PST) Date: Thu, 28 Nov 2002 11:11:56 -0800 (PST) Message-Id: <200211281911.gASJBukU092905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21645 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21645 Change 21645 by marcel@marcel_nfs on 2002/11/28 11:11:21 Implement bus_space_subregion in the same way as done for i386. We use this in the vga(4) driver to create a handle for that part of the frame buffer that is visible. Affected files ... .. //depot/projects/ia64/sys/ia64/include/bus.h#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/bus.h#4 (text+ko) ==== @@ -131,9 +131,14 @@ * Get a new handle for a subregion of an already-mapped area of bus space. */ -int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, - bus_space_handle_t *nbshp); +static __inline int +bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size, + bus_space_handle_t *nbshp) +{ + *nbshp = bsh + offset; + return (0); +} /* * Allocate a region of memory that is accessible to devices in bus space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:24: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E094437B404; Thu, 28 Nov 2002 11:23:53 -0800 (PST) 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 8D70C37B401 for ; Thu, 28 Nov 2002 11:23:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 189DB43EAF for ; Thu, 28 Nov 2002 11:23:53 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJK7mV093497 for ; Thu, 28 Nov 2002 11:20:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJK7wI093490 for perforce@freebsd.org; Thu, 28 Nov 2002 11:20:07 -0800 (PST) Date: Thu, 28 Nov 2002 11:20:07 -0800 (PST) Message-Id: <200211281920.gASJK7wI093490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21646 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21646 Change 21646 by marcel@marcel_nfs on 2002/11/28 11:19:59 Round of fixes, changes and enhancements to make this work with syscons. Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga.c#4 edit .. //depot/projects/ia64/sys/dev/vga/vga.h#3 edit .. //depot/projects/ia64/sys/dev/vga/vga_pci.c#3 edit .. //depot/projects/ia64/sys/dev/vga/vga_vid.c#3 edit Differences ... ==== //depot/projects/ia64/sys/dev/vga/vga.c#4 (text+ko) ==== @@ -42,18 +42,15 @@ devclass_t vga_devclass; char vga_device_name[] = "vga"; -void vga_putc(struct vga_softc *, int); - static void vga_write(struct vga_softc *sc, int x, int y, int ascii, int color) { u_int32_t ofs; u_int16_t w; - ofs = (sc->vga_mono) ? 0x10000 : 0x18000; - ofs += y * 160 + x * 2; + ofs = y * 160 + x * 2; w = color * 256 + ascii; - bus_space_write_2(sc->vga_fb.tag, sc->vga_fb.handle, ofs, w); + bus_space_write_2(sc->vga_screen.tag, sc->vga_screen.handle, ofs, w); } static void @@ -62,14 +59,15 @@ u_int32_t count, ofs; u_int16_t w; - ofs = (sc->vga_mono) ? 0x10000 : 0x18000; + ofs = 0; /* Copy data on lower 24 lines 1 line up. */ count = 24*80; while (count--) { - w = bus_space_read_2(sc->vga_fb.tag, sc->vga_fb.handle, + w = bus_space_read_2(sc->vga_screen.tag, sc->vga_screen.handle, ofs + 160); - bus_space_write_2(sc->vga_fb.tag, sc->vga_fb.handle, ofs, w); + bus_space_write_2(sc->vga_screen.tag, sc->vga_screen.handle, + ofs, w); ofs += 2; } @@ -77,7 +75,8 @@ count = 80; w = (w & 0xff00) | 0x20; while (count--) { - bus_space_write_2(sc->vga_fb.tag, sc->vga_fb.handle, ofs, w); + bus_space_write_2(sc->vga_screen.tag, sc->vga_screen.handle, + ofs, w); ofs += 2; } } @@ -107,8 +106,7 @@ vga_scrollup(sc); else y++; - x = 0; - return; + /* FALLTHROUGH */ case 0x0d: /* carriage return */ x = 0; return; @@ -124,17 +122,32 @@ } } +void +vga_puts(struct vga_softc *sc, const char *s) +{ + + while (*s) + vga_putc(sc, *s++); +} + int vga_attach(device_t dev) { struct vga_softc *sc; + int error; u_int32_t x, y; sc = device_get_softc(dev); + sc->vga_screen = sc->vga_fb; + error = bus_space_subregion(sc->vga_fb.tag, sc->vga_fb.handle, + (sc->vga_mono) ? 0x10000 : 0x18000, 4096, &sc->vga_screen.handle); + if (error) + return (error); + sc->vga_enable = 1; if (sc->vga_console) - return (vga_cnattach(dev)); + return (0); for (y = 0; y < 24; y++) for (x = 0; x < 80; x++) ==== //depot/projects/ia64/sys/dev/vga/vga.h#3 (text+ko) ==== @@ -30,7 +30,6 @@ struct vga_space { - struct resource *res; bus_space_tag_t tag; bus_space_handle_t handle; }; @@ -66,4 +65,6 @@ extern char vga_device_name[]; int vga_attach(device_t); -int vga_cnattach(device_t); + +void vga_putc(struct vga_softc *, int); +void vga_puts(struct vga_softc *, const char *); ==== //depot/projects/ia64/sys/dev/vga/vga_pci.c#3 (text+ko) ==== @@ -63,15 +63,14 @@ static int vga_pci_alloc(device_t dev, struct vga_softc *sc, int type, int rid) { - struct vga_space *sp; + struct resource *res; - sp = sc->vga_space + rid; - sp->res = bus_alloc_resource(dev, type, &rid, 0, ~0, 1, RF_ACTIVE); - if (sp->res == NULL) + res = bus_alloc_resource(dev, type, &rid, 0, ~0, 1, RF_ACTIVE); + if (res == NULL) return (ENXIO); - sp->handle = rman_get_bushandle(sp->res); - sp->tag = rman_get_bustag(sp->res); + sc->vga_space[rid].handle = rman_get_bushandle(res); + sc->vga_space[rid].tag = rman_get_bustag(res); return (0); } @@ -101,6 +100,11 @@ device_printf(dev, "using legacy I/O and memory addresses.\n"); /* If VGA is the console, this device must be it. */ device_set_softc(dev, &vga_console); + /* Set the legacy resources */ + bus_set_resource(dev, SYS_RES_MEMORY, VGA_RES_FB, + 0xA0000, 0x20000); + bus_set_resource(dev, SYS_RES_IOPORT, VGA_RES_REG, + 0x3c0, 0x10); } else { device_printf(dev, "sorry; don't know what to do with it\n"); return (0); @@ -110,15 +114,9 @@ sc->vga_dev = dev; sc->vga_bustype = VGA_BUSTYPE_PCI; - /* The softc is already initialized if VGA is the console. */ - if (sc->vga_console) - return (vga_attach(dev)); - - bus_set_resource(dev, SYS_RES_MEMORY, VGA_RES_FB, 0xA0000, 0x20000); error = vga_pci_alloc(dev, sc, SYS_RES_MEMORY, VGA_RES_FB); if (error) return (error); - bus_set_resource(dev, SYS_RES_IOPORT, VGA_RES_REG, 0x3c0, 0x10); error = vga_pci_alloc(dev, sc, SYS_RES_IOPORT, VGA_RES_REG); if (error) return (error); ==== //depot/projects/ia64/sys/dev/vga/vga_vid.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -105,9 +106,12 @@ static int vga_vid_todo(const char *function, int called) { - printf("vga_vid_todo: %s() called %d times now...\n", function, + char buf[256]; + + sprintf(buf, "vga_vid_todo: %s() called %d times now...\n", function, called); - return ENODEV; + vga_puts(&vga_console, buf); + return (ENODEV); } /* @@ -119,18 +123,21 @@ static int vga_vid_config(int flags) { + static int called = 0; struct vga_softc *sc = &vga_console; u_int8_t x; - if (flags) - return (0); + if (called++ == 0) { + bzero(&vga_adapter, sizeof(vga_adapter)); + bzero(&vga_console, sizeof(vga_console)); + } /* * We actually get called more than once (twice to be exact). The * first time it's as part of console probing. The second time * it's as part of the regular syscons initialization. */ - if (sc->vga_enable == 1) + if (sc->vga_console == 1) goto adapter; /* @@ -151,23 +158,23 @@ sc->vga_crtc.tag = IA64_BUS_SPACE_IO; sc->vga_crtc.handle = (sc->vga_mono) ? 0x3b0 : 0x3d0; + sc->vga_screen.tag = sc->vga_fb.tag; + (void)bus_space_subregion(sc->vga_fb.tag, sc->vga_fb.handle, + (sc->vga_mono) ? 0x10000 : 0x18000, 4096, &sc->vga_screen.handle); + sc->vga_console = 1; - sc->vga_enable = 1; adapter: if (vga_adapter.va_flags & V_ADP_PROBED) return (1); - bzero(&vga_adapter, sizeof(vga_adapter)); vga_adapter.va_flags |= V_ADP_PROBED; vga_adapter.va_flags |= (sc->vga_mono) ? 0 : V_ADP_COLOR; vga_adapter.va_name = vga_device_name; vga_adapter.va_type = KD_VGA; - vga_adapter.va_window = sc->vga_fb.handle + - (sc->vga_mono) ? 0x10000 : 0x18000; - vga_adapter.va_window_size = 80*25*2; - vga_adapter.va_crtc_addr = sc->vga_crtc.handle; - + vga_adapter.va_crtc_tag = sc->vga_crtc.tag; + vga_adapter.va_crtc_handle = sc->vga_crtc.handle; + vga_adapter.va_window = sc->vga_screen.handle; vid_register(&vga_adapter); return (1); } @@ -216,8 +223,21 @@ static int vga_vid_get_info(video_adapter_t *adp, int mode, video_info_t *info) { - static int called = 0; - return (vga_vid_todo(__func__, ++called)); + + bzero(info, sizeof(*info)); + info->vi_mode = 3; + info->vi_flags = V_INFO_COLOR; + info->vi_width = 80; + info->vi_height = 25; + info->vi_cwidth = 8; + info->vi_cheight = 16; + info->vi_depth = 4; + info->vi_planes = 1; + info->vi_window = adp->va_window; + info->vi_window_size = 4096; + info->vi_buffer_size = info->vi_window_size; + info->vi_mem_model = V_INFO_MM_TEXT; + return (0); } static int @@ -245,8 +265,11 @@ static int vga_vid_load_palette(video_adapter_t *adp, u_char *palette) { + return (ENODEV); +#if 0 static int called = 0; return (vga_vid_todo(__func__, ++called)); +#endif } static int @@ -280,8 +303,25 @@ static int vga_vid_read_hw_cursor(video_adapter_t *adp, int *col, int *row) { - static int called = 0; - return (vga_vid_todo(__func__, ++called)); + bus_space_handle_t handle; + bus_space_tag_t tag; + int s; + uint16_t ofs; + + handle = adp->va_crtc_handle; + tag = adp->va_crtc_tag; + + s = spltty(); + bus_space_write_1(tag, handle, 0, 14); + bus_space_barrier(tag, handle, 0, 2, -1); + ofs = bus_space_read_1(tag, handle, 1) << 8; + bus_space_write_1(tag, handle, 0, 15); + bus_space_barrier(tag, handle, 0, 2, -1); + ofs |= bus_space_read_1(tag, handle, 1) & 0xff; + *row = ofs / 80; + *col = ofs % 80; + splx(s); + return (0); } static int @@ -295,8 +335,11 @@ static int vga_vid_save_palette(video_adapter_t *adp, u_char *palette) { + return (ENODEV); +#if 0 static int called = 0; return (vga_vid_todo(__func__, ++called)); +#endif } static int @@ -317,15 +360,51 @@ vga_vid_set_hw_cursor_shape(video_adapter_t *adp, int base, int height, int celsize, int blink) { - static int called = 0; - return (vga_vid_todo(__func__, ++called)); + bus_space_handle_t handle; + bus_space_tag_t tag; + int s; + + handle = adp->va_crtc_handle; + tag = adp->va_crtc_tag; + + s = spltty(); + bus_space_write_1(tag, handle, 0, 10); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 1, (height > 0) + ? celsize - base - height : 32); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 0, 11); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 1, (height > 0) + ? celsize - base - 1 : 0); + bus_space_barrier(tag, handle, 0, 2, -1); + splx(s); + return (0); } static int vga_vid_set_hw_cursor(video_adapter_t *adp, int col, int row) { - static int called = 0; - return (vga_vid_todo(__func__, ++called)); + bus_space_handle_t handle; + bus_space_tag_t tag; + int s; + uint16_t ofs; + + handle = adp->va_crtc_handle; + tag = adp->va_crtc_tag; + + s = spltty(); + ofs = (col == -1 && row == -1) ? -1 : row * 80 + col; + bus_space_write_1(tag, handle, 0, 14); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 1, ofs >> 8); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 0, 15); + bus_space_barrier(tag, handle, 0, 2, -1); + bus_space_write_1(tag, handle, 1, ofs & 0xff); + bus_space_barrier(tag, handle, 0, 2, -1); + splx(s); + return (0); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:26: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E187237B406; Thu, 28 Nov 2002 11:25:56 -0800 (PST) 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 91EF937B404 for ; Thu, 28 Nov 2002 11:25:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C77443E88 for ; Thu, 28 Nov 2002 11:25:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJMBmV093638 for ; Thu, 28 Nov 2002 11:22:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJMA5E093635 for perforce@freebsd.org; Thu, 28 Nov 2002 11:22:10 -0800 (PST) Date: Thu, 28 Nov 2002 11:22:10 -0800 (PST) Message-Id: <200211281922.gASJMA5E093635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21647 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21647 Change 21647 by marcel@marcel_nfs on 2002/11/28 11:21:42 Hook-up the newbusified vga(4) driver. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#21 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#21 (text+ko) ==== @@ -79,9 +79,8 @@ dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/fb/fb.c optional fb -dev/fb/fb.c optional vga +dev/fb/fb.c optional vga sc dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd @@ -100,16 +99,19 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/vga/vga.c optional vga +dev/vga/vga_isa.c optional vga isa +dev/vga/vga_pci.c optional vga pci +dev/vga/vga_vid.c optional vga sc geom/geom_bsd.c standard geom/geom_gpt.c standard geom/geom_mbr.c standard -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/fd.c optional fdc -isa/ppc.c optional ppc -isa/psm.c optional psm -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga +isa/atkbd_isa.c optional isa atkbd +isa/atkbdc_isa.c optional isa atkbdc +isa/fd.c optional isa fdc +isa/ppc.c optional isa ppc +isa/psm.c optional isa psm +isa/syscons_isa.c optional isa sc kern/subr_diskmbr.c standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:28: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA3A37B406; Thu, 28 Nov 2002 11:28:00 -0800 (PST) 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 A87EA37B401; Thu, 28 Nov 2002 11:27:59 -0800 (PST) Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB3A443EB2; Thu, 28 Nov 2002 11:27:58 -0800 (PST) (envelope-from jake@k6.locore.ca) Received: from k6.locore.ca (jake@localhost.locore.ca [127.0.0.1]) by k6.locore.ca (8.12.6/8.12.6) with ESMTP id gASJfRxQ015715; Thu, 28 Nov 2002 14:41:27 -0500 (EST) (envelope-from jake@k6.locore.ca) Received: (from jake@localhost) by k6.locore.ca (8.12.6/8.12.6/Submit) id gASJfR4d015714; Thu, 28 Nov 2002 14:41:27 -0500 (EST) Date: Thu, 28 Nov 2002 14:41:27 -0500 From: Jake Burkholder To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21643 for review Message-ID: <20021128144127.F4948@locore.ca> References: <200211281908.gASJ8pFc092675@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200211281908.gASJ8pFc092675@repoman.freebsd.org>; from marcel@freebsd.org on Thu, Nov 28, 2002 at 11:08:51AM -0800 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Thu, Nov 28, 2002 at 11:08:51AM -0800, Marcel Moolenaar said words to the effect of; > http://perforce.freebsd.org/chv.cgi?CH=21643 > > Change 21643 by marcel@marcel_nfs on 2002/11/28 11:08:12 > > Conditionally compile-out I/O port addresses and memory addresses > in structs. Use tags and handles instead (as much as possible). > Not the final state, but compilable and useable. Hi, It looks like we'll have to do a lot of the same stuff to get syscons to work on sparc64. It would be cool if you could take this into account when adding ifdefs not to make it so ia64 specific. Jake > > Affected files ... > > .. //depot/projects/ia64/sys/sys/fbio.h#3 edit > > Differences ... > > ==== //depot/projects/ia64/sys/sys/fbio.h#3 (text+ko) ==== > > @@ -42,6 +42,7 @@ > #ifndef _SYS_FBIO_H_ > #define _SYS_FBIO_H_ > > +#include > #ifndef _KERNEL > #include > #endif > @@ -331,6 +332,7 @@ > #define V_ADP_INITIALIZED (1 << 17) > #define V_ADP_REGISTERED (1 << 18) > #define V_ADP_ATTACHED (1 << 19) > +#if !defined(__ia64__) > vm_offset_t va_io_base; > int va_io_size; > vm_offset_t va_crtc_addr; > @@ -345,6 +347,13 @@ > int va_initial_mode; > int va_initial_bios_mode; > int va_mode; > +#else > + bus_space_tag_t va_crtc_tag; > + bus_space_handle_t va_crtc_handle; > + vm_offset_t va_window; /* virtual address */ > + size_t va_window_size; > + int va_initial_mode; > +#endif > struct video_info va_info; > int va_line_width; > struct { > @@ -356,8 +365,10 @@ > int va_little_bitian; > int va_little_endian; > int va_buffer_alias; > +#if !defined(__ia64__) > vm_offset_t va_registers; /* virtual address */ > vm_offset_t va_registers_size; > +#endif > }; > typedef struct video_adapter video_adapter_t; > > @@ -367,6 +378,7 @@ > char va_name[16]; > int va_unit; > int va_flags; > +#if !defined(__ia64__) > vm_offset_t va_io_base; > int va_io_size; > vm_offset_t va_crtc_addr; > @@ -380,6 +392,7 @@ > int va_initial_mode; > int va_initial_bios_mode; > int va_mode; > +#endif > int va_line_width; > struct { > int x; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 11:29: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8761037B404; Thu, 28 Nov 2002 11:29:01 -0800 (PST) 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 1FA4837B401 for ; Thu, 28 Nov 2002 11:29:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7CF243EAF for ; Thu, 28 Nov 2002 11:29:00 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJPFmV093756 for ; Thu, 28 Nov 2002 11:25:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJPF9x093746 for perforce@freebsd.org; Thu, 28 Nov 2002 11:25:15 -0800 (PST) Date: Thu, 28 Nov 2002 11:25:15 -0800 (PST) Message-Id: <200211281925.gASJPF9x093746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21648 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21648 Change 21648 by marcel@marcel_nfs on 2002/11/28 11:24:24 Remove the raw (low-level) code I used to allow vga be the console (output only) without syscons as a debugging aid. Now that the newbusified vga(4) driver works with syscons, there's no need to keep this. The vga_putc and vga_puts functions remain for debugging purposes only. Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga_cons.c#3 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 12:18:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F16137B404; Thu, 28 Nov 2002 12:18:35 -0800 (PST) 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 E93EF37B401 for ; Thu, 28 Nov 2002 12:18:34 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 057C343EAF for ; Thu, 28 Nov 2002 12:18:34 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gASKISrT008347; Thu, 28 Nov 2002 12:18:28 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gASKIZ6M001113; Thu, 28 Nov 2002 12:18:35 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gASKIYE1001112; Thu, 28 Nov 2002 12:18:34 -0800 (PST) Date: Thu, 28 Nov 2002 12:18:34 -0800 From: Marcel Moolenaar To: Jake Burkholder Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21643 for review Message-ID: <20021128201834.GA1060@dhcp01.pn.xcllnt.net> References: <200211281908.gASJ8pFc092675@repoman.freebsd.org> <20021128144127.F4948@locore.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021128144127.F4948@locore.ca> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Nov 28, 2002 at 02:41:27PM -0500, Jake Burkholder wrote: > Apparently, On Thu, Nov 28, 2002 at 11:08:51AM -0800, > Marcel Moolenaar said words to the effect of; > > > http://perforce.freebsd.org/chv.cgi?CH=21643 > > > > Change 21643 by marcel@marcel_nfs on 2002/11/28 11:08:12 > > > > Conditionally compile-out I/O port addresses and memory addresses > > in structs. Use tags and handles instead (as much as possible). > > Not the final state, but compilable and useable. > > Hi, > > It looks like we'll have to do a lot of the same stuff to get syscons to > work on sparc64. It would be cool if you could take this into account > when adding ifdefs not to make it so ia64 specific. If there's agreement/consensus that this code is (potentially) useful then yes. I'm mostly working with the assumption that it will not be used in the end and I'm allowing myself to take all sorts of shortcuts. If we do want to proceed in this direction, then it's probably a good idea to get more people involved. I'm in no way a vga(4), fb(4) or syscons(4) wizard and I don't intend to take this on by myself: it's just too hairy... As a start: I think we should minimize conditional compilation based on architecture. I'd rather we introduce FB_NEWBUS as an option and use that. Thoughts? Secondly: In vga_vid_config we need to actually probe for a VGA device. Can I assume that for sparc64 the legacy memory and I/O exists as well? -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 14:47: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F26A37B404; Thu, 28 Nov 2002 14:47:05 -0800 (PST) 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 8157C37B401 for ; Thu, 28 Nov 2002 14:47:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BD6E43ECD for ; Thu, 28 Nov 2002 14:47:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASMhImV006006 for ; Thu, 28 Nov 2002 14:43:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASMhHv5006003 for perforce@freebsd.org; Thu, 28 Nov 2002 14:43:17 -0800 (PST) Date: Thu, 28 Nov 2002 14:43:17 -0800 (PST) Message-Id: <200211282243.gASMhHv5006003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21655 Change 21655 by marcel@marcel_nfs on 2002/11/28 14:42:35 Better handle sparse physical memory: Don't let the size of vm_page_array[] depend on the difference between the last and the first physical address in phys_avail[]. Instead, use the previously determined total memory size. Now that a dense virtual address space is mapped onto a sparse physical address space, we cannot use a one-to-one mapping to get from the physical address to the address of the vm_page_t in the vm_page_array. Therefore, introduce vm_page_from_phys, which given a physical address and phys_avail[] determines the position of the corresponding vm_page_t in the array. It is assumed for now that performance is of lesser concern when mapping physical addresses to virtual addresses. However, to avoid pessimizing architectures that don't have sparse physical addresses (or dense enough to not care about it), it's probably best to move this to MD code. That would also address the assumptions that the largest chunk is the second one (ie typically i386 oriented) and that it's generally big enough to hold all VM structures. Affected files ... .. //depot/projects/ia64/sys/vm/vm_page.c#26 edit .. //depot/projects/ia64/sys/vm/vm_page.h#18 edit Differences ... ==== //depot/projects/ia64/sys/vm/vm_page.c#26 (text+ko) ==== @@ -151,6 +151,27 @@ } /* + * vm_page_from_phys + * + * Given a physical address, return a pointer to the vm_page in the + * vm_page array. This function deals with sparse memory addresses. + */ +vm_page_t +vm_page_from_phys(vm_offset_t pa) +{ + vm_page_t p = vm_page_array; + int i; + + for (i = 0; phys_avail[i + 1]; i += 2) { + if (pa >= phys_avail[i] && pa < phys_avail[i + 1]) + return (p + (atop(pa) - phys_avail[i] / PAGE_SIZE)); + p += (phys_avail[i + 1] - phys_avail[i]) / PAGE_SIZE; + } + panic("vm_page_from_phys: unmanaged physical address."); + return (0); +} + +/* * vm_page_startup: * * Initializes the resident memory module. @@ -188,6 +209,7 @@ phys_avail[i + 1] = trunc_page(phys_avail[i + 1]); } + /* XXX: Based on assumptions that aren't valid on all architectures.*/ for (i = 0; phys_avail[i + 1]; i += 2) { vm_size_t size = phys_avail[i + 1] - phys_avail[i]; @@ -221,8 +243,8 @@ bootpages = UMA_BOOT_PAGES * UMA_SLAB_SIZE; new_end = end - bootpages; new_end = trunc_page(new_end); - mapped = pmap_map(&vaddr, new_end, end, - VM_PROT_READ | VM_PROT_WRITE); + /* XXX: Bounds check! */ + mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); bzero((caddr_t) mapped, end - new_end); uma_startup((caddr_t)mapped); @@ -232,7 +254,12 @@ * page). */ first_page = phys_avail[0] / PAGE_SIZE; - page_range = phys_avail[(nblocks - 1) * 2 + 1] / PAGE_SIZE - first_page; + /* + * Don't use the pysical address range for the actual page range. + * On architectures with sparse memory addressing this is wrong. + * Instead, use the total memory obtained above. + */ + page_range = total / PAGE_SIZE; npages = (total - (page_range * sizeof(struct vm_page)) - (end - new_end)) / PAGE_SIZE; end = new_end; @@ -242,8 +269,8 @@ * queue. */ new_end = trunc_page(end - page_range * sizeof(struct vm_page)); - mapped = pmap_map(&vaddr, new_end, end, - VM_PROT_READ | VM_PROT_WRITE); + /* XXX: Bounds check! */ + mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); vm_page_array = (vm_page_t) mapped; /* ==== //depot/projects/ia64/sys/vm/vm_page.h#18 (text+ko) ==== @@ -293,8 +293,7 @@ #define VM_PAGE_TO_PHYS(entry) ((entry)->phys_addr) -#define PHYS_TO_VM_PAGE(pa) \ - (&vm_page_array[atop(pa) - first_page ]) +#define PHYS_TO_VM_PAGE(pa) vm_page_from_phys(pa) extern struct mtx vm_page_queue_mtx; #define vm_page_lock_queues() mtx_lock(&vm_page_queue_mtx) @@ -356,6 +355,7 @@ void vm_page_remove (vm_page_t); void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); vm_page_t vm_page_splay(vm_pindex_t, vm_page_t); +vm_page_t vm_page_from_phys(vm_offset_t); vm_offset_t vm_page_startup (vm_offset_t, vm_offset_t, vm_offset_t); void vm_page_unmanage (vm_page_t); void vm_page_unwire (vm_page_t, int); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 28 22:34:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5000B37B404; Thu, 28 Nov 2002 22:34:29 -0800 (PST) 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 F419737B401 for ; Thu, 28 Nov 2002 22:34:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF99643E4A for ; Thu, 28 Nov 2002 22:34:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAT6UfmV033468 for ; Thu, 28 Nov 2002 22:30:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAT6Ue8C033465 for perforce@freebsd.org; Thu, 28 Nov 2002 22:30:40 -0800 (PST) Date: Thu, 28 Nov 2002 22:30:40 -0800 (PST) Message-Id: <200211290630.gAT6Ue8C033465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21659 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21659 Change 21659 by marcel@marcel_nfs on 2002/11/28 22:30:11 Make sure ppc and psm appear before isa. For some reason when a device has not been mentioned as the first in the list of needed devices, it will not be registers. For both ppc and psm there's only one occurence and it's one shared with isa. Thus not having them as the first causes config to fail. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#22 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#22 (text+ko) ==== @@ -109,8 +109,8 @@ isa/atkbd_isa.c optional isa atkbd isa/atkbdc_isa.c optional isa atkbdc isa/fd.c optional isa fdc -isa/ppc.c optional isa ppc -isa/psm.c optional isa psm +isa/ppc.c optional ppc isa +isa/psm.c optional psm isa isa/syscons_isa.c optional isa sc kern/subr_diskmbr.c standard libkern/ia64/bswap16.S standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 2: 0:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE8137B404; Fri, 29 Nov 2002 02:00:34 -0800 (PST) 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 9516637B401 for ; Fri, 29 Nov 2002 02:00:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E23D643EB2 for ; Fri, 29 Nov 2002 02:00:33 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAT9ujmV045692 for ; Fri, 29 Nov 2002 01:56:45 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAT9ujqZ045684 for perforce@freebsd.org; Fri, 29 Nov 2002 01:56:45 -0800 (PST) Date: Fri, 29 Nov 2002 01:56:45 -0800 (PST) Message-Id: <200211290956.gAT9ujqZ045684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21660 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21660 Change 21660 by marcel@marcel_vaio on 2002/11/29 01:56:19 IFC @21651 Affected files ... .. //depot/projects/ia64/Makefile#16 integrate .. //depot/projects/ia64/lib/libc/net/if_nametoindex.c#2 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#3 integrate .. //depot/projects/ia64/lib/libfetch/http.c#10 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#11 integrate .. //depot/projects/ia64/sys/sys/select.h#6 integrate .. //depot/projects/ia64/sys/sys/signal.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#14 integrate Differences ... ==== //depot/projects/ia64/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.268 2002/10/02 13:52:36 phk Exp $ +# $FreeBSD: src/Makefile,v 1.269 2002/11/28 13:08:09 ru Exp $ # # The user-driven targets are: # @@ -158,39 +158,15 @@ # # Perform a few tests to determine if the installed tools are adequate -# for building the world. These are for older systems (prior to 2.2.5). +# for building the world. # -# From 2.2.5 onwards, the installed tools will pass these upgrade tests, -# so the normal make world is capable of doing what is required to update -# the system to current. -# upgrade_checks: - @cd ${.CURDIR}; \ - if ! make -m ${.CURDIR}/share/mk -Dnotdef test >/dev/null 2>&1; then \ - make make; \ - fi - @cd ${.CURDIR}; \ - if make -V .CURDIR:C/.// 2>&1 >/dev/null | \ - grep -q "Unknown modifier 'C'"; then \ - make make; \ - fi + @(cd ${.CURDIR}/tools/regression/usr.bin/make && make 2>/dev/null) || \ + (cd ${.CURDIR} && make make) # -# A simple test target used as part of the test to see if make supports -# the -m argument. Also test that make will only evaluate a conditional -# as far as is necessary to determine its value. -# -test: -.if defined(notdef) -.undef notdef -.if defined(notdef) && ${notdef:U} -.endif -.endif - -# # Upgrade the installed make to the current version using the installed -# headers, libraries and build tools. This is required on installed versions -# prior to 2.2.5 in which the installed make doesn't support the -m argument. +# headers, libraries and tools. # make: @echo ==== //depot/projects/ia64/lib/libc/net/if_nametoindex.c#2 (text+ko) ==== @@ -26,10 +26,11 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.1 2002/07/15 19:58:56 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.2 2002/11/28 17:46:40 ume Exp $"); #include #include +#include #include #include #include @@ -59,9 +60,21 @@ unsigned int if_nametoindex(const char *ifname) { + int s; + struct ifreq ifr; struct ifaddrs *ifaddrs, *ifa; unsigned int ni; + s = _socket(AF_INET, SOCK_DGRAM, 0); + if (s != -1) { + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (_ioctl(s, SIOCGIFINDEX, &ifr) != -1) { + _close(s); + return (ifr.ifr_index); + } + _close(s); + } + if (getifaddrs(&ifaddrs) < 0) return(0); ==== //depot/projects/ia64/lib/libfetch/fetch.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.48 2002/11/08 19:10:05 fenner Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.49 2002/11/28 12:07:15 des Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 @@ -511,6 +511,11 @@ This variable is used if and only if connected to an HTTP proxy, and is ignored if a user and/or a password were specified in the proxy URL. +.It Ev HTTP_REFERER +Specifies the referer URL to use for HTTP requests. +If set to +.Dq auto , +the document URL will be used as referer URL. .It Ev HTTP_USER_AGENT Specifies the User-Agent string to use for HTTP requests. This can be useful when working with HTTP origin or proxy servers that ==== //depot/projects/ia64/lib/libfetch/http.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.64 2002/10/30 15:01:29 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.65 2002/11/28 12:07:15 des Exp $"); /* * The following copyright applies to the base64 code: @@ -776,10 +776,7 @@ const char *p; FILE *f; hdr_t h; - char *host; -#ifdef INET6 - char hbuf[MAXHOSTNAMELEN + 1]; -#endif + char hbuf[MAXHOSTNAMELEN + 7], *host; direct = CHECK_FLAG('d'); noredirect = CHECK_FLAG('A'); @@ -831,24 +828,29 @@ host = hbuf; } #endif + if (url->port != _fetch_default_port(url->scheme)) { + if (host != hbuf) { + strcpy(hbuf, host); + host = hbuf; + } + snprintf(hbuf + strlen(hbuf), + sizeof(hbuf) - strlen(hbuf), ":%d", url->port); + } /* send request */ if (verbose) - _fetch_info("requesting %s://%s:%d%s", - url->scheme, host, url->port, url->doc); + _fetch_info("requesting %s://%s%s", + url->scheme, host, url->doc); if (purl) { - _http_cmd(conn, "%s %s://%s:%d%s HTTP/1.1", - op, url->scheme, host, url->port, url->doc); + _http_cmd(conn, "%s %s://%s%s HTTP/1.1", + op, url->scheme, host, url->doc); } else { _http_cmd(conn, "%s %s HTTP/1.1", op, url->doc); } /* virtual host */ - if (url->port == _fetch_default_port(url->scheme)) - _http_cmd(conn, "Host: %s", host); - else - _http_cmd(conn, "Host: %s:%d", host, url->port); + _http_cmd(conn, "Host: %s", host); /* proxy authorization */ if (purl) { @@ -874,6 +876,13 @@ } /* other headers */ + if ((p = getenv("HTTP_REFERER")) != NULL && *p != '\0') { + if (strcasecmp(p, "auto") == 0) + _http_cmd(conn, "Referer: %s://%s%s", + url->scheme, host, url->doc); + else + _http_cmd(conn, "Referer: %s", p); + } if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') _http_cmd(conn, "User-Agent: %s", p); else ==== //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.1 2002/05/28 20:52:31 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.3 2002/11/28 20:11:31 des Exp $"); #include #include @@ -58,7 +58,7 @@ char *su_principal_name; long rv; int pamret; - + pamret = pam_get_user(pamh, &user, NULL); if (pamret != PAM_SUCCESS) return (pamret); @@ -238,7 +238,7 @@ *su_principal_name = NULL; (void)asprintf(su_principal_name, "%s/%s@%s", principal_name, superuser, p); free(principal_name); - } else + } else *su_principal_name = principal_name; if (*su_principal_name == NULL) @@ -254,3 +254,5 @@ *su_principal = default_principal; return (0); } + +PAM_MODULE_ENTRY("pam_ksu"); ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 (text+ko) ==== @@ -26,7 +26,7 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.6 2002/11/25 21:14:16 keramida Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.7 2002/11/28 19:50:56 bmah Exp $ 2002 @@ -127,7 +127,7 @@ More information on &os; release engineering processes can be found on the Release - Engineering Web pages and in the &os; Release + Engineering Web pages and in the &os; Release Engineering article. @@ -164,8 +164,8 @@ - GCC: The compiler toolchain is now based on GCC - 3.X, rather than GCC + GCC: The compiler toolchain is now based on a GCC + 3.2.1 pre-release snapshot, rather than GCC 2.95.X. @@ -222,7 +222,9 @@ Because of changes in kernel data structures and ABIs/APIs, third-party binary device drivers will require - modifications to work correctly under &os; 5.0. + modifications to work correctly under &os; 5.0. There is + a possibility of more minor ABI/API changes before the + 5-STABLE branch is created. @@ -265,6 +267,14 @@ 5.2-RELEASE.) + + Documentation (such as the &os; Handbook + and FAQ) + may not reflect changes recently made to &os; 5.0. + + Because a number of these drawbacks affect system stability, the @@ -335,14 +345,17 @@ As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not - recommended. + recommended. In particular, a binary upgrade will leave + behind a number of files that are present in &os; + 4.X but not in 5.0. These obsolete + files may create some problems. On the i386 and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; 5.0, this functionality has been replaced in part by the &man.device.hints.5; mechanism (it allows specifying the same - parameters, but is not interactive). + parameters, but with a very different interface). Floppy-based binary installations may require downloading a third, new floppy image holding additional device drivers @@ -383,7 +396,15 @@ difficulties which made updates problematic. The base system utilities that used Perl have either been rewritten (if still applicable) or discarded (if - obsolete). + obsolete). + + Some scripts expect to find a Perl interpreter at + /usr/bin/perl. The + use.perl command, a part of the Perl + port, can be used to create an appropriate set of symbolic + links for them. In particular, use.perl + port will generally set things up as + expected. It is generally possible to run old 4.X executables under ==== //depot/projects/ia64/sys/kern/kern_subr.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.62 2002/10/12 05:32:23 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.63 2002/11/28 08:44:26 alc Exp $ */ #include "opt_zero.h" @@ -104,12 +104,11 @@ return(EFAULT); } if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")) - vm_page_unlock_queues(); - pmap_remove(map->pmap, uaddr, uaddr+PAGE_SIZE); - vm_page_lock_queues(); + do + vm_page_lock_queues(); + while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")); vm_page_busy(user_pg); + pmap_remove_all(user_pg); vm_page_free(user_pg); vm_page_unlock_queues(); } ==== //depot/projects/ia64/sys/sys/select.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/select.h,v 1.16 2002/11/17 16:22:18 mike Exp $ + * $FreeBSD: src/sys/sys/select.h,v 1.17 2002/11/28 15:34:32 mike Exp $ */ #ifndef _SYS_SELECT_H_ @@ -86,12 +86,12 @@ #endif #define __fdset_mask(n) ((__fd_mask)1 << ((n) % _NFDBITS)) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n)) +#define FD_CLR(n, p) ((p)->__fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n)) #if __BSD_VISIBLE #define FD_COPY(f, t) (void)(*(t) = *(f)) #endif -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) -#define FD_SET(n, p) ((p)->fds_bits[(n)/_NFDBITS] |= __fdset_mask(n)) +#define FD_ISSET(n, p) ((p)->__fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) +#define FD_SET(n, p) ((p)->__fds_bits[(n)/_NFDBITS] |= __fdset_mask(n)) #define FD_ZERO(p) do { \ fd_set *_p; \ __size_t _n; \ ==== //depot/projects/ia64/sys/sys/signal.h#9 (text+ko) ==== @@ -36,13 +36,14 @@ * SUCH DAMAGE. * * @(#)signal.h 8.4 (Berkeley) 5/4/95 - * $FreeBSD: src/sys/sys/signal.h,v 1.37 2002/10/25 19:10:58 peter Exp $ + * $FreeBSD: src/sys/sys/signal.h,v 1.38 2002/11/28 15:32:49 mike Exp $ */ #ifndef _SYS_SIGNAL_H_ #define _SYS_SIGNAL_H_ #include +#include #include #include /* sig_atomic_t; trap codes; sigcontext */ ==== //depot/projects/ia64/sys/vm/vm_mmap.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.152 2002/10/22 15:56:44 rwatson Exp $ + * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.153 2002/11/28 08:01:39 alc Exp $ */ /* @@ -883,6 +883,7 @@ pindex = OFF_TO_IDX(offset); m = vm_page_lookup(current->object.vm_object, pindex); + vm_page_lock_queues(); /* * if the page is resident, then gather information about * it. @@ -898,6 +899,7 @@ mincoreinfo |= MINCORE_REFERENCED_OTHER; } } + vm_page_unlock_queues(); } /* ==== //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/tools/regression/usr.bin/make/Makefile,v 1.8 2002/10/25 06:17:44 jmallett Exp $ +# $FreeBSD: src/tools/regression/usr.bin/make/Makefile,v 1.10 2002/11/28 13:21:32 ru Exp $ # Test for broken LHS expansion. -# This *must* case make(1) to detect a recursive variable, and fail as such. +# This *must* cause make(1) to detect a recursive variable, and fail as such. .if make(lhs_expn) FOO= ${BAR} BAR${NIL}= ${FOO} @@ -32,6 +32,15 @@ @echo "Running test lhs_expn" @! ${MAKE} lhs_expn && true || ${MAKE} failure @echo "PASS: Test lhs_expn detected no regression." + @echo "Running test notdef" + @${MAKE} notdef || ${MAKE} failure + @echo "PASS: Test notdef detected no regression." + @echo "Running test modifiers" + @${MAKE} modifiers || ${MAKE} failure + @echo "PASS: Test modifiers detected no regression." + @echo "Running test funny_targets" + @${MAKE} funny_targets || ${MAKE} failure + @echo "PASS: Test funny_targets detected no regression." .if make(double) # Doubly-defined targets. make(1) will warn, but use the "right" one. If it @@ -57,6 +66,30 @@ lhs_expn: @true +.if make(notdef) +# make(1) claims to only evaluate a conditional as far as is necessary +# to determine its value; that was not always the case. +.undef notdef +notdef: +.if defined(notdef) && ${notdef:U} +.endif +.endif + +.if make(modifiers) +# See if make(1) supports the C modifier. +modifiers: + @if ${MAKE} -V .CURDIR:C/.// 2>&1 >/dev/null | \ + grep -q "Unknown modifier 'C'"; then \ + false; \ + fi +.endif + +.if make(funny_targets) +funny_targets: colons::target exclamation!target +colons::target: +exclamation!target: +.endif + failure: @echo "FAIL: Test failed: regression detected. See above." @false ==== //depot/projects/ia64/usr.bin/make/parse.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.49 2002/10/23 01:57:33 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.50 2002/11/28 12:47:56 ru Exp $"); /*- * parse.c -- @@ -729,14 +729,15 @@ } else if (*cp == '!' || *cp == ':') { /* * We don't want to end a word on ':' or '!' if there is a - * better match later on in the string. By "better" I mean - * one that is followed by whitespace. This allows the user - * to have targets like: + * better match later on in the string (greedy matching). + * This allows the user to have targets like: * fie::fi:fo: fum - * where "fie::fi:fo" is the target. In real life this is used - * for perl5 library man pages where "::" separates an object - * from its class. Ie: "File::Spec::Unix". This behaviour - * is also consistent with other versions of make. + * foo::bar: + * where "fie::fi:fo" and "foo::bar" are the targets. In + * real life this is used for perl5 library man pages where + * "::" separates an object from its class. + * Ie: "File::Spec::Unix". This behaviour is also consistent + * with other versions of make. */ char *p = cp + 1; @@ -747,11 +748,7 @@ if (*p == '\0' || isspace(*p)) break; - do { - p += strcspn(p, "!:"); - if (*p == '\0') - break; - } while (!isspace(*++p)); + p += strcspn(p, "!:"); /* No better match later on... */ if (*p == '\0') To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 9:30:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9192837B406; Fri, 29 Nov 2002 09:30:25 -0800 (PST) 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 3588237B404 for ; Fri, 29 Nov 2002 09:30:25 -0800 (PST) Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FA0543E4A for ; Fri, 29 Nov 2002 09:30:22 -0800 (PST) (envelope-from jake@k6.locore.ca) Received: from k6.locore.ca (jake@localhost.locore.ca [127.0.0.1]) by k6.locore.ca (8.12.6/8.12.6) with ESMTP id gATHhxxQ024089; Fri, 29 Nov 2002 12:43:59 -0500 (EST) (envelope-from jake@k6.locore.ca) Received: (from jake@localhost) by k6.locore.ca (8.12.6/8.12.6/Submit) id gATHhuNL024088; Fri, 29 Nov 2002 12:43:56 -0500 (EST) Date: Fri, 29 Nov 2002 12:43:55 -0500 From: Jake Burkholder To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21643 for review Message-ID: <20021129124355.O4948@locore.ca> References: <200211281908.gASJ8pFc092675@repoman.freebsd.org> <20021128144127.F4948@locore.ca> <20021128201834.GA1060@dhcp01.pn.xcllnt.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20021128201834.GA1060@dhcp01.pn.xcllnt.net>; from marcel@xcllnt.net on Thu, Nov 28, 2002 at 12:18:34PM -0800 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Thu, Nov 28, 2002 at 12:18:34PM -0800, Marcel Moolenaar said words to the effect of; > On Thu, Nov 28, 2002 at 02:41:27PM -0500, Jake Burkholder wrote: > > Apparently, On Thu, Nov 28, 2002 at 11:08:51AM -0800, > > Marcel Moolenaar said words to the effect of; > > > > > http://perforce.freebsd.org/chv.cgi?CH=21643 > > > > > > Change 21643 by marcel@marcel_nfs on 2002/11/28 11:08:12 > > > > > > Conditionally compile-out I/O port addresses and memory addresses > > > in structs. Use tags and handles instead (as much as possible). > > > Not the final state, but compilable and useable. > > > > Hi, > > > > It looks like we'll have to do a lot of the same stuff to get syscons to > > work on sparc64. It would be cool if you could take this into account > > when adding ifdefs not to make it so ia64 specific. > > If there's agreement/consensus that this code is (potentially) useful > then yes. I'm mostly working with the assumption that it will not be > used in the end and I'm allowing myself to take all sorts of shortcuts. Ok, understood. > > If we do want to proceed in this direction, then it's probably a good > idea to get more people involved. I'm in no way a vga(4), fb(4) or > syscons(4) wizard and I don't intend to take this on by myself: it's > just too hairy... Hmm, ok. I don't really know what to suggest in that case. Kazu was the last person to do extensive work on syscons I think. It may be less work, for sparc64 at least, to look at importing wscons from netbsd or openbsd which is much more multi platform aware than syscons. > > As a start: I think we should minimize conditional compilation based > on architecture. I'd rather we introduce FB_NEWBUS as an option and > use that. Thoughts? This sounds fine. > > Secondly: In vga_vid_config we need to actually probe for a VGA device. > Can I assume that for sparc64 the legacy memory and I/O exists as well? Don't really know what you mean by legacy memory and I/O. Most sparc64 machines have UPA graphics, which I imagine is quite different from vga, I haven't looked into it, but there are some with just vga. Jake To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 10:27:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 035C937B404; Fri, 29 Nov 2002 10:27:43 -0800 (PST) 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 A2E0937B401 for ; Fri, 29 Nov 2002 10:27:42 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id D989743EB2 for ; Fri, 29 Nov 2002 10:27:41 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gATIRfrT010552; Fri, 29 Nov 2002 10:27:41 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gATIRno5000683; Fri, 29 Nov 2002 10:27:49 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gATIRnbH000682; Fri, 29 Nov 2002 10:27:49 -0800 (PST) Date: Fri, 29 Nov 2002 10:27:49 -0800 From: Marcel Moolenaar To: Jake Burkholder Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21643 for review Message-ID: <20021129182749.GB602@dhcp01.pn.xcllnt.net> References: <200211281908.gASJ8pFc092675@repoman.freebsd.org> <20021128144127.F4948@locore.ca> <20021128201834.GA1060@dhcp01.pn.xcllnt.net> <20021129124355.O4948@locore.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021129124355.O4948@locore.ca> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Nov 29, 2002 at 12:43:55PM -0500, Jake Burkholder wrote: > > > > If we do want to proceed in this direction, then it's probably a good > > idea to get more people involved. I'm in no way a vga(4), fb(4) or > > syscons(4) wizard and I don't intend to take this on by myself: it's > > just too hairy... > > Hmm, ok. I don't really know what to suggest in that case. Kazu was the > last person to do extensive work on syscons I think. It may be less work, > for sparc64 at least, to look at importing wscons from netbsd or openbsd > which is much more multi platform aware than syscons. I've been looking at that too but figured it would just be differently hairy, so I decided to stick with something I have already running on another architecture. I'm not partiticularly attached to syscons so if wscons looks more appealing without giving up too many features, then I see no reason why we cannot use it on ia64 as well. > > > > Secondly: In vga_vid_config we need to actually probe for a VGA device. > > Can I assume that for sparc64 the legacy memory and I/O exists as well? > > Don't really know what you mean by legacy memory and I/O. Most sparc64 > machines have UPA graphics, which I imagine is quite different from vga, > I haven't looked into it, but there are some with just vga. Ok. I have one more file I need to submit (unhook sc0 from isa and hook it up to nexus0) With that I have syscons working (barely). For sparc64 you should be able to use that with any non-isa display adapter driver, provided you can probe (and use) it before newbus is useable. After that it should be mostly cleaning up, fleshing out, fixing and shuffling of code to make it look like it was designed up front :-) -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 15:11:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AA3B37B404; Fri, 29 Nov 2002 15:11:22 -0800 (PST) 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 46AC037B401 for ; Fri, 29 Nov 2002 15:11:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF5D43E88 for ; Fri, 29 Nov 2002 15:11:21 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gATN7UmV094420 for ; Fri, 29 Nov 2002 15:07:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gATN7Tdm094405 for perforce@freebsd.org; Fri, 29 Nov 2002 15:07:29 -0800 (PST) Date: Fri, 29 Nov 2002 15:07:29 -0800 (PST) Message-Id: <200211292307.gATN7Tdm094405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21676 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21676 Change 21676 by marcel@marcel_vaio on 2002/11/29 15:07:22 IFC @21671 Affected files ... .. //depot/projects/ia64/games/factor/factor.6#3 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/iswalnum.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.3#5 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/mbsinit.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/towlower.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/utf8.5#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcsftime.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcstod.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstol.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wctrans.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wctype.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcwidth.3#3 integrate .. //depot/projects/ia64/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/atexit.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/insque.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/qsort.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.3#4 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#8 integrate .. //depot/projects/ia64/lib/libc/string/strsep.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/sigprocmask.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/uuidgen.2#6 integrate .. //depot/projects/ia64/lib/libcompat/4.3/rexec.3#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.8#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_wheel/pam_wheel.8#3 integrate .. //depot/projects/ia64/lib/libtacplus/libtacplus.3#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/ia64/share/man/man3/stdarg.3#4 integrate .. //depot/projects/ia64/share/man/man4/ata.4#6 integrate .. //depot/projects/ia64/share/man/man4/cardbus.4#2 integrate .. //depot/projects/ia64/share/man/man4/dummynet.4#4 integrate .. //depot/projects/ia64/share/man/man4/ipfirewall.4#3 integrate .. //depot/projects/ia64/share/man/man4/ktr.4#3 integrate .. //depot/projects/ia64/share/man/man4/pccard.4#2 integrate .. //depot/projects/ia64/share/man/man4/stf.4#5 integrate .. //depot/projects/ia64/share/man/man4/tap.4#3 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#7 integrate .. //depot/projects/ia64/share/man/man4/umass.4#4 integrate .. //depot/projects/ia64/share/man/man4/usb.4#5 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#5 integrate .. //depot/projects/ia64/share/man/man5/drivers.conf.5#6 integrate .. //depot/projects/ia64/share/man/man5/fs.5#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#24 integrate .. //depot/projects/ia64/share/man/man5/passwd.5#4 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/ia64/share/man/man5/remote.5#2 integrate .. //depot/projects/ia64/share/man/man7/clocks.7#6 integrate .. //depot/projects/ia64/share/man/man7/firewall.7#6 integrate .. //depot/projects/ia64/share/man/man7/hier.7#13 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#14 integrate .. //depot/projects/ia64/share/man/man8/rc.8#7 integrate .. //depot/projects/ia64/share/man/man8/rc.sendmail.8#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_IOCTL.9#5 integrate .. //depot/projects/ia64/share/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/ia64/share/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#5 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#4 integrate .. //depot/projects/ia64/share/man/man9/random.9#4 integrate .. //depot/projects/ia64/share/man/man9/style.9#18 integrate .. //depot/projects/ia64/share/man/man9/swi.9#4 integrate .. //depot/projects/ia64/share/man/man9/zone.9#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#50 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#24 integrate .. //depot/projects/ia64/usr.sbin/getfmac/getfmac.8#2 integrate .. //depot/projects/ia64/usr.sbin/setfmac/setfmac.8#2 integrate Differences ... ==== //depot/projects/ia64/games/factor/factor.6#3 (text+ko) ==== @@ -34,24 +34,22 @@ .\" .\" @(#)factor.6 8.1 (Berkeley) 5/31/93 .\" -.\" $FreeBSD: src/games/factor/factor.6,v 1.7 2002/10/09 20:00:25 fanf Exp $ +.\" $FreeBSD: src/games/factor/factor.6,v 1.8 2002/11/29 16:21:33 ru Exp $ .\" .\" By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo .\" .\" chongo /\oo/\ .\" -.Dd Oct 10, 2002 +.Dd October 10, 2002 .Dt FACTOR 6 .Os .Sh NAME -.Nm factor , -.Nm primes +.Nm factor , primes .Nd factor a number, generate primes .Sh SYNOPSIS .Nm .Op Fl h .Op Ar number ... -.br .Nm primes .Op Fl h .Op Ar start Op Ar stop @@ -60,7 +58,7 @@ .Nm utility will factor positive integers. When a number is factored, it is printed, followed by a -.Dq \&: , +.Ql \&: , and the list of factors on a single line. Factors are listed in ascending order, and are preceded by a space. If a factor divides a value more than once, it will be printed more than once. @@ -75,7 +73,8 @@ .Nm reads numbers, one per line, from standard input, until end of file or error. Leading white-space and empty lines are ignored. -Numbers may be preceded by a single +. +Numbers may be preceded by a single +.Ql + . Numbers are terminated by a non-digit character (such as a newline). After a number is read, it is factored. .Pp @@ -106,25 +105,22 @@ is taken to be the maximum. The .Ar start -value may be preceded by a single +. +value may be preceded by a single +.Ql + . The .Ar start value is terminated by a non-digit character (such as a newline). .Sh DIAGNOSTICS -.Bl -item -.It -negative numbers aren't permitted -.It -illegal numeric format -.It -start value must be less than stop value -.It -Result too large +.Bl -diag +.It "negative numbers aren't permitted" +.It "illegal numeric format" +.It "start value must be less than stop value" +.It "Result too large" .El .Sh BUGS .Nm cannot handle the -.Dq 10 most wanted +.Dq "10 most wanted" factor list, .Nm primes -won't get you a world record. +will not get you a world record. ==== //depot/projects/ia64/lib/libc/gen/fts.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.14 2002/09/21 01:28:38 wollman Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.15 2002/11/29 15:57:48 ru Exp $ .\" .Dd September 15, 2002 .Dt FTS 3 @@ -64,7 +64,7 @@ The .Nm functions are provided for traversing -.Tn UNIX +.Ux file hierarchies. A simple overview is that the .Fn fts_open ==== //depot/projects/ia64/lib/libc/locale/iswalnum.3#3 (text+ko) ==== @@ -36,9 +36,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)isalnum.3 5.2 (Berkeley) 6/29/91 -.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.4 2002/10/03 14:09:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.5 2002/11/29 17:35:09 ru Exp $ .\" -.Dd December 22, 2000 +.Dd October 3, 2002 .Dt ISWALNUM 3 .Os .Sh NAME @@ -107,14 +107,12 @@ .Sh DESCRIPTION The above functions are character classification utility functions, for use with wide characters -.Po -.Fa wchar_t +.Vt ( wchar_t or -.Fa wint_t -.Pc . +.Vt wint_t ) . See the description for the similarly-named single byte classification functions (like -.Xr isalnum 3 ), +.Xr isalnum 3 ) , for details. .Sh RETURN VALUES The functions return zero if the character tests false and @@ -157,6 +155,8 @@ extensions. .Sh CAVEATS The result of these functions is undefined unless -the argument is WEOF or a valid +the argument is +.Dv WEOF +or a valid .Vt wchar_t value for the current locale. ==== //depot/projects/ia64/lib/libc/locale/mbrlen.3#5 (text+ko) ==== @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.5 2002/11/09 10:21:01 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.6 2002/11/29 17:35:09 ru Exp $ +.\" .Dd November 11, 2002 .Dt MBRLEN 3 .Os @@ -38,7 +39,7 @@ .Sh DESCRIPTION The .Fn mbrlen -function determines the the number of bytes constituting the +function determines the number of bytes constituting the multibyte character sequence pointed to by .Fa s , examining at most @@ -46,7 +47,7 @@ bytes. .Pp The -.Ft mbstate_t +.Vt mbstate_t argument, .Fa ps , is used to keep track of the shift state. @@ -54,7 +55,7 @@ .Dv NULL , .Fn mbrlen uses an internal, static -.Ft mbstate_t +.Vt mbstate_t object. .Pp It is equivalent to: @@ -63,11 +64,13 @@ .Pp Except that when .Fa ps -is a NULL pointer, +is a +.Dv NULL +pointer, .Fn mbrlen uses its own static, internal -.Ft mbstate_t -object to keep track of shift state. +.Vt mbstate_t +object to keep track of the shift state. .Sh RETURN VALUES The .Fn mbrlen @@ -78,7 +81,8 @@ .Fa n or fewer bytes of .Fa s -represent the null wide character (L'\e0'). +represent the null wide character +.Pq Li "L'\e0'" . .It >0 The first .Fa n @@ -87,21 +91,13 @@ represent a valid character, .Fn mbrtowc returns the length (in bytes) of the multibyte sequence. -.It Xo -.No ( Ns -.Ft size_t Ns -.No ) Ns \&-2 -.Xc +.It Po Vt size_t Pc Ns \-2 The first .Fa n bytes of .Fa s are an incomplete multibyte sequence. -.It Xo -.No ( Ns -.Ft size_t Ns -.No ) Ns \&-1 -.Xc +.It Po Vt size_t Pc Ns \-1 The byte sequence pointed to by .Fa s is an invalid multibyte sequence. ==== //depot/projects/ia64/lib/libc/locale/mbrtowc.3#3 (text+ko) ==== @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.3 2002/11/29 17:35:09 ru Exp $ +.\" .Dd August 15, 2002 .Dt MBRTOWC 3 .Os @@ -34,7 +35,10 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbrtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n" "mbstate_t * restrict ps" +.Fo mbrtowc +.Fa "wchar_t * restrict pwc" "const char * restrict s" "size_t n" +.Fa "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn mbrtowc @@ -52,7 +56,7 @@ the multibyte character which .Fa s represents is stored in the -.Ft wchar_t +.Vt wchar_t it points to. .Pp If @@ -65,13 +69,14 @@ was .Dv NULL , .Fa s -was an empty string ("") +was an empty string +.Pq Qq and .Fa n was 1. .Pp The -.Ft mbstate_t +.Vt mbstate_t argument, .Fa ps , is used to keep track of the shift state. @@ -79,7 +84,7 @@ .Dv NULL , .Fn mbrtowc uses an internal, static -.Ft mbstate_t +.Vt mbstate_t object. .Sh RETURN VALUES The @@ -91,7 +96,8 @@ .Fa n or fewer bytes of .Fa s -represent the null wide character (L'\e0'). +represent the null wide character +.Pq Li "L'\e0'" . .It >0 The first .Fa n @@ -100,21 +106,13 @@ represent a valid character, .Fn mbrtowc returns the length (in bytes) of the multibyte sequence. -.It Xo -.No ( Ns -.Ft size_t Ns -.No ) Ns \&-2 -.Xc +.It Po Vt size_t Pc Ns \-2 The first .Fa n bytes of .Fa s are an incomplete multibyte sequence. -.It Xo -.No ( Ns -.Ft size_t Ns -.No ) Ns \&-1 -.Xc +.It Po Vt size_t Pc Ns \-1 The byte sequence pointed to by .Fa s is an invalid multibyte sequence. ==== //depot/projects/ia64/lib/libc/locale/mbsinit.3#2 (text+ko) ==== @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsinit.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsinit.3,v 1.2 2002/11/29 17:35:09 ru Exp $ +.\" .Dd August 16, 2002 .Dt MBSINIT 3 .Os @@ -39,7 +40,7 @@ The .Fn mbsinit function determines whether the -.Ft mbstate_t +.Vt mbstate_t object pointed to by .Fa ps describes an initial conversion state. ==== //depot/projects/ia64/lib/libc/locale/mbsrtowcs.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.3 2002/11/29 17:35:09 ru Exp $ .Dd August 16, 2002 .Dt MBSRTOWCS 3 .Os @@ -34,7 +34,10 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbsrtowcs "wchar_t * restrict dst" "const char ** restrict src" "size_t len" "mbstate_t * restrict ps" +.Fo mbsrtowcs +.Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t len" +.Fa "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn mbsrtowcs @@ -43,10 +46,11 @@ into a sequence of corresponding wide characters and stores at most .Fa len of them in the -.Ft wchar_t +.Vt wchar_t array pointed to by .Fa dst , -until it encounters a terminating null character ('\e0'). +until it encounters a terminating null character +.Pq Li '\e0' . .Pp If .Fa dst @@ -62,12 +66,12 @@ .Fa src is updated to point to the character after the one that conversion stopped at. If conversion stops because a null character is encountered, -.No * Ns Fa src +.Fa *src is set to .Dv NULL . .Pp The -.Ft mbstate_t +.Vt mbstate_t argument, .Fa ps , is used to keep track of the shift state. @@ -75,7 +79,7 @@ .Dv NULL , .Fn mbsrtowcs uses an internal, static -.Ft mbstate_t +.Vt mbstate_t object. .Sh RETURN VALUES The @@ -84,9 +88,7 @@ the array pointed to by .Fa dst if successful, otherwise it returns -.No ( Ns -.Ft size_t Ns -.No ) Ns -1 . +.Po Vt size_t Pc Ns \-1 . .Sh ERRORS The .Fn mbsrtowcs ==== //depot/projects/ia64/lib/libc/locale/towlower.3#3 (text+ko) ==== @@ -34,14 +34,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)tolower.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/towlower.3,v 1.4 2002/10/03 11:23:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/towlower.3,v 1.5 2002/11/29 17:35:09 ru Exp $ .\" .Dd October 3, 2002 .Dt TOWLOWER 3 .Os .Sh NAME .Nm towlower -.Nd upper case to lower case letter conversion (wide character version) +.Nd "upper case to lower case letter conversion (wide character version)" .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -50,7 +50,7 @@ .Fn towlower "wint_t wc" .Sh DESCRIPTION The -.Fn tolower +.Fn towlower function converts an upper-case letter to the corresponding lower-case letter. .Sh RETURN VALUES ==== //depot/projects/ia64/lib/libc/locale/towupper.3#2 (text+ko) ==== @@ -34,14 +34,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)toupper.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/towupper.3,v 1.1 2002/10/03 11:23:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/towupper.3,v 1.2 2002/11/29 17:35:09 ru Exp $ .\" .Dd October 3, 2002 .Dt TOWUPPER 3 .Os .Sh NAME .Nm towupper -.Nd lower case to upper case letter conversion (wide character version) +.Nd "lower case to upper case letter conversion (wide character version)" .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/ia64/lib/libc/locale/utf8.5#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utf2.4 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.2 2002/10/30 11:49:05 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.3 2002/11/29 17:35:09 ru Exp $ .\" .Dd October 30, 2002 .Dt UTF8 5 @@ -54,8 +54,8 @@ so 0x00-0x7f refer to the .Tn ASCII character set. -The multibyte encoding of non- -.Tn ASCII +The multibyte encoding of +.No non- Ns Tn ASCII characters consist entirely of bytes whose high order bit is set. The actual @@ -94,7 +94,9 @@ is limited to a 16-bit character set, and that .Xr utf2 4 -accepts redundant, non-"shortest form" representations of characters. +accepts redundant, +.No non- Ns Dq "shortest form" +representations of characters. .Sh SEE ALSO .Xr euc 4 , .Xr utf2 4 ==== //depot/projects/ia64/lib/libc/locale/wcrtomb.3#3 (text+ko) ==== @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.3 2002/11/29 17:35:09 ru Exp $ +.\" .Dd August 15, 2002 .Dt WCRTOMB 3 .Os @@ -68,7 +69,7 @@ .Dv NULL , .Fn wcrtomb uses an internal, static -.Ft mbstate_t +.Vt mbstate_t object. .Sh RETURN VALUES The @@ -77,9 +78,7 @@ needed to represent .Fa wc , or -.No ( Ns -.Ft size_t Ns -.No ) Ns \&-1 +.Po Vt size_t Pc Ns \-1 if .Fa wc is not a valid wide character code. ==== //depot/projects/ia64/lib/libc/locale/wcsftime.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcsftime.3,v 1.1 2002/09/11 08:57:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsftime.3,v 1.2 2002/11/29 17:35:09 ru Exp $ .\" .Dd September 8, 2002 .Dt WCSFTIME 3 @@ -35,7 +35,10 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcsftime "wchar_t * restrict wcs" "size_t maxsize" "const wchar_t * restrict format" "const struct tm * restrict timeptr" +.Fo wcsftime +.Fa "wchar_t * restrict wcs" "size_t maxsize" +.Fa "const wchar_t * restrict format" "const struct tm * restrict timeptr" +.Fc .Sh DESCRIPTION The .Fn wcsftime @@ -48,7 +51,9 @@ .Sh COMPATIBILITY Some early implementations of .Fn wcsftime -had a format argument with type +had a +.Fa format +argument with type .Vt "const char *" instead of .Vt "const wchar_t *" . ==== //depot/projects/ia64/lib/libc/locale/wcsrtombs.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) [year] [your name] +.\" Copyright (c) 2002 Tim J. Robbins .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.3 2002/11/29 17:35:09 ru Exp $ +.\" .Dd August 16, 2002 .Dt WCSRTOMBS 3 .Os @@ -34,7 +35,10 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcsrtombs "char * restrict dst" "const wchar_t ** restrict src" "size_t len" "mbstate_t * restrict ps" +.Fo wcsrtombs +.Fa "char * restrict dst" "const wchar_t ** restrict src" +.Fa "size_t len" "mbstate_t * restrict ps" +.Fc .Sh DESCRIPTION The .Fn wcsrtombs @@ -62,12 +66,12 @@ .Fa src is updated to point to the character after the one that conversion stopped at. If conversion stops because a null character is encountered, -.No * Ns Fa src +.Fa *src is set to .Dv NULL . .Pp The -.Ft mbstate_t +.Vt mbstate_t argument, .Fa ps , is used to keep track of the shift state. @@ -75,7 +79,7 @@ .Dv NULL , .Fn wcsrtombs uses an internal, static -.Ft mbstate_t +.Vt mbstate_t object. .Sh RETURN VALUES The @@ -84,9 +88,7 @@ the array pointed to by .Fa dst (not including any terminating null), if successful, otherwise it returns -.No ( Ns -.Ft size_t Ns -.No ) Ns -1 . +.Po Vt size_t Pc Ns \-1 . .Sh ERRORS The .Fn wcsrtombs @@ -97,8 +99,8 @@ .El .Sh SEE ALSO .Xr mbsrtowcs 3 , -.Xr wcstombs 3 , -.Xr wcrtomb 3 +.Xr wcrtomb 3 , +.Xr wcstombs 3 .Sh STANDARDS The .Fn wcsrtombs ==== //depot/projects/ia64/lib/libc/locale/wcstod.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.1 2002/09/15 08:38:51 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstod.3,v 1.2 2002/11/29 16:36:53 ru Exp $ .\" .Dd September 12, 2002 .Dt WCSTOD 3 @@ -50,5 +50,5 @@ .Sh STANDARDS The .Fn wcstod -function conform to +function conforms to .St -isoC-99 . ==== //depot/projects/ia64/lib/libc/locale/wcstol.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.3 2002/09/22 08:06:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.4 2002/11/29 17:35:09 ru Exp $ .\" .Dd September 7, 2002 .Dt WCSTOL 3 @@ -74,7 +74,7 @@ .Fn strtoimax and .Fn strtoumax -functions. +functions, respectively. Refer to their manual pages (for example .Xr strtol 3 ) for details. ==== //depot/projects/ia64/lib/libc/locale/wctrans.3#3 (text+ko) ==== @@ -22,14 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wctrans.3,v 1.2 2002/10/03 08:49:29 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wctrans.3,v 1.3 2002/11/29 17:35:09 ru Exp $ .\" .Dd October 3, 2002 .Dt WCTRANS 3 .Os .Sh NAME -.Nm towctrans , -.Nm wctrans +.Nm towctrans , wctrans .Nd "wide character mapping functions" .Sh LIBRARY .Lb libc @@ -50,7 +49,7 @@ .Pp The following character mapping names are recognised: .Bl -column -offset indent ".Li tolower" ".Li toupper" -.It Li tolower Ta Li toupper +.It Li "tolower toupper" .El .Pp The ==== //depot/projects/ia64/lib/libc/locale/wctype.3#3 (text+ko) ==== @@ -22,14 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.3 2002/10/03 08:49:29 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.4 2002/11/29 17:35:09 ru Exp $ .\" .Dd October 3, 2002 .Dt WCTYPE 3 .Os .Sh NAME -.Nm iswctype , -.Nm wctype +.Nm iswctype , wctype .Nd "wide character class functions" .Sh LIBRARY .Lb libc @@ -50,9 +49,9 @@ .Pp The following character class names are recognised: .Bl -column -offset indent ".Li alnum" ".Li cntrl" ".Li phonogram" ".Li print" ".Li special" -.It Li alnum Ta Li cntrl Ta Li ideogram Ta Li print Ta Li special -.It Li alpha Ta Li digit Ta Li lower Ta Li punct Ta Li upper -.It Li blank Ta Li graph Ta Li phonogram Ta Li space Ta Li xdigit +.It Li "alnum cntrl ideogram print special" +.It Li "alpha digit lower punct upper" +.It Li "blank graph phonogram space xdigit" .El .Pp The @@ -82,7 +81,7 @@ .Fn iswctype . .Sh EXAMPLES Reimplement -.Fn iswalpha +.Xr iswalpha 3 in terms of .Fn iswctype and @@ -104,10 +103,10 @@ functions conform to .St -p1003.1-2001 . The -.Li ideogram , -.Li phonogram +.Dq Li ideogram , +.Dq Li phonogram and -.Li special +.Dq Li special character classes are extensions. .Sh HISTORY The ==== //depot/projects/ia64/lib/libc/locale/wcwidth.3#3 (text+ko) ==== @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.2 2002/10/03 08:49:29 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcwidth.3,v 1.3 2002/11/29 17:35:09 ru Exp $ +.\" .Dd October 3, 2002 .Dt WCWIDTH 3 .Os @@ -47,7 +48,7 @@ function returns 0 if the .Fa wc argument is a null wide character (L'\e0'), --1 if +\-1 if .Fa wc is not printable, otherwise it returns the number of column positions the @@ -67,11 +68,11 @@ if ((w = wcwidth(ch)) > 0) column += w; if (column >= 20) { - putwchar(L'\n'); + putwchar(L'\en'); column = 0; } putwchar(ch); - if (ch == L'\n') + if (ch == L'\en') column = 0; } .Ed ==== //depot/projects/ia64/lib/libc/net/rcmd.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.20 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.21 2002/11/29 15:57:49 ru Exp $ .\" .Dd March 3, 2000 .Dt RCMD 3 @@ -117,7 +117,7 @@ The control process will return diagnostic output from the command (unit 2) on this channel, and will also accept bytes on this channel as being -.Tn UNIX +.Ux signal numbers, to be forwarded to the process group of the command. If ==== //depot/projects/ia64/lib/libc/stdio/fseek.3#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fseek.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.22 2002/10/12 16:13:40 mike Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fseek.3,v 1.23 2002/11/29 15:57:49 ru Exp $ .\" .Dd October 12, 2002 .Dt FSEEK 3 @@ -166,7 +166,7 @@ and these routines may be the only way to portably reposition a text stream. .Pp If the stream is a wide character stream (see -.Xr fwide 3 Ns No ), +.Xr fwide 3 ) , the position specified by the combination of .Fa offset and ==== //depot/projects/ia64/lib/libc/stdlib/atexit.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)atexit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/atexit.3,v 1.8 2002/09/06 19:23:28 wollman Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/atexit.3,v 1.9 2002/11/29 15:57:49 ru Exp $ .\" .Dd September 6, 2002 .Dt ATEXIT 3 @@ -66,7 +66,8 @@ if it should be necessary to terminate the process while in such a function, the .Xr _exit 2 -function should be used. (Alternatively, the function may cause abnormal +function should be used. +(Alternatively, the function may cause abnormal process termination, for example by calling .Xr abort 3 . ) .Pp ==== //depot/projects/ia64/lib/libc/stdlib/insque.3#2 (text+ko) ==== @@ -4,9 +4,9 @@ .\" All rights reserved. .\" .\" As long as the above copyright statement and this notice remain -.\" unchanged, you can do what ever you want with this file. +.\" unchanged, you can do what ever you want with this file. .\" -.\" $FreeBSD: src/lib/libc/stdlib/insque.3,v 1.1 2002/10/16 14:00:46 robert Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/insque.3,v 1.2 2002/11/29 16:42:23 ru Exp $ .\" .Dd October 10, 2002 .Dt INSQUE 3 @@ -24,21 +24,30 @@ .Ft void .Fn remque "void *element" .Sh DESCRIPTION -.Pp The .Fn insque and .Fn remque functions encapsulate the ever-repeating task of doing insertion and -removal operations on doubly linked lists. The functions expect their +removal operations on doubly linked lists. +The functions expect their arguments to point to a structure whose first and second members are pointers to the next and previous element, respectively. The .Fn insque >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 20: 4:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE2B337B404; Fri, 29 Nov 2002 20:04:51 -0800 (PST) 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 8DFAF37B401 for ; Fri, 29 Nov 2002 20:04:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44FC643EB2 for ; Fri, 29 Nov 2002 20:04:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAU40xmV013327 for ; Fri, 29 Nov 2002 20:00:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAU40wMR013324 for perforce@freebsd.org; Fri, 29 Nov 2002 20:00:58 -0800 (PST) Date: Fri, 29 Nov 2002 20:00:58 -0800 (PST) Message-Id: <200211300400.gAU40wMR013324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21688 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21688 Change 21688 by marcel@marcel_nfs on 2002/11/29 20:00:13 Make the handling of sparse physical memory conditional. At this time it causes instability in form of failing processes and kernel panics triggered by passing (region 7) virtual addresses to vm_page_from_phys or addresses that are not covered by phys_avail. This clearly needs more thought and testing... Affected files ... .. //depot/projects/ia64/sys/vm/vm_page.c#27 edit .. //depot/projects/ia64/sys/vm/vm_page.h#19 edit Differences ... ==== //depot/projects/ia64/sys/vm/vm_page.c#27 (text+ko) ==== @@ -150,6 +150,7 @@ panic("vm_set_page_size: page size not a power of two"); } +#ifdef SPARSE_PHYSICAL_MEMORY /* * vm_page_from_phys * @@ -170,6 +171,7 @@ panic("vm_page_from_phys: unmanaged physical address."); return (0); } +#endif /* * vm_page_startup: @@ -254,12 +256,16 @@ * page). */ first_page = phys_avail[0] / PAGE_SIZE; +#ifdef SPARSE_PHYSICAL_MEMORY /* * Don't use the pysical address range for the actual page range. * On architectures with sparse memory addressing this is wrong. * Instead, use the total memory obtained above. */ page_range = total / PAGE_SIZE; +#else + page_range = phys_avail[(nblocks-1) * 2 + 1] / PAGE_SIZE - first_page; +#endif npages = (total - (page_range * sizeof(struct vm_page)) - (end - new_end)) / PAGE_SIZE; end = new_end; ==== //depot/projects/ia64/sys/vm/vm_page.h#19 (text+ko) ==== @@ -293,7 +293,11 @@ #define VM_PAGE_TO_PHYS(entry) ((entry)->phys_addr) -#define PHYS_TO_VM_PAGE(pa) vm_page_from_phys(pa) +#ifdef SPARSE_PHYSICAL_MEMORY +#define PHYS_TO_VM_PAGE(pa) vm_page_from_phys(pa) +#else +#define PHYS_TO_VM_PAGE(pa) (&vm_page_array[atop(pa) - first_page ]) +#endif extern struct mtx vm_page_queue_mtx; #define vm_page_lock_queues() mtx_lock(&vm_page_queue_mtx) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 20: 9: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B567937B404; Fri, 29 Nov 2002 20:08:57 -0800 (PST) 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 647CA37B401 for ; Fri, 29 Nov 2002 20:08:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C20843E4A for ; Fri, 29 Nov 2002 20:08:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAU454mV013469 for ; Fri, 29 Nov 2002 20:05:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAU454Uo013466 for perforce@freebsd.org; Fri, 29 Nov 2002 20:05:04 -0800 (PST) Date: Fri, 29 Nov 2002 20:05:04 -0800 (PST) Message-Id: <200211300405.gAU454Uo013466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21689 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21689 Change 21689 by marcel@marcel_nfs on 2002/11/29 20:04:29 Strip this file from anything that smells like isa or i386. Hook the sc device to the nexus instead. Affected files ... .. //depot/projects/ia64/sys/isa/syscons_isa.c#4 edit Differences ... ==== //depot/projects/ia64/sys/isa/syscons_isa.c#4 (text+ko) ==== @@ -37,25 +37,6 @@ #include #include - -#ifdef __i386__ - -#include -#include -#include - -#include -#include - -#include - -#define BIOS_CLKED (1 << 6) -#define BIOS_NLKED (1 << 5) -#define BIOS_SLKED (1 << 4) -#define BIOS_ALKED 0 - -#endif /* __i386__ */ - #include #include @@ -66,17 +47,15 @@ static sc_softc_t main_softc; static void -scidentify (driver_t *driver, device_t parent) +scidentify(driver_t *driver, device_t parent) { - BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "sc", 0); + + BUS_ADD_CHILD(parent, 65536, "sc", 0); } static int scprobe(device_t dev) { - /* No pnp support */ - if (isa_get_vendorid(dev)) - return (ENXIO); device_set_desc(dev, "System console"); return sc_probe_unit(device_get_unit(dev), device_get_flags(dev)); @@ -85,48 +64,10 @@ static int scattach(device_t dev) { + return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); } -#ifndef SC_NO_SUSPEND_VTYSWITCH -static int sc_cur_scr; -#endif - -static int -scsuspend(device_t dev) -{ -#ifndef SC_NO_SUSPEND_VTYSWITCH - int retry = 10; - static int dummy; - sc_softc_t *sc; - - sc = &main_softc; - sc_cur_scr = sc->cur_scp->index; - do { - sc_switch_scr(sc, 0); - if (!sc->switch_in_progress) { - break; - } - tsleep(&dummy, 0, "scsuspend", 100); - } while (retry--); - -#endif - return (0); -} - -static int -scresume(device_t dev) -{ -#ifndef SC_NO_SUSPEND_VTYSWITCH - sc_softc_t *sc; - - sc = &main_softc; - sc_switch_scr(sc, sc_cur_scr); - -#endif - return (0); -} - int sc_max_unit(void) { @@ -184,93 +125,32 @@ int sc_get_cons_priority(int *unit, int *flags) { - int disabled; - const char *at; - int u, f; - - *unit = -1; - for (u = 0; u < 16; u++) { - if ((resource_int_value(SC_DRIVER_NAME, u, "disabled", - &disabled) == 0) && disabled) - continue; - if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0) - continue; - if (resource_int_value(SC_DRIVER_NAME, u, "flags", &f) != 0) - f = 0; - if (f & SC_KERNEL_CONSOLE) { - /* the user designates this unit to be the console */ - *unit = u; - *flags = f; - break; - } - if (*unit < 0) { - /* ...otherwise remember the first found unit */ - *unit = u; - *flags = f; - } - } - if (*unit < 0) - return CN_DEAD; -#if 0 - return ((*flags & SC_KERNEL_CONSOLE) ? CN_INTERNAL : CN_NORMAL); -#endif + *unit = 0; + *flags = 0; return CN_INTERNAL; } void sc_get_bios_values(bios_values_t *values) { -#ifdef __i386__ - u_int8_t shift; - - values->cursor_start = *(u_int8_t *)BIOS_PADDRTOVADDR(0x461); - values->cursor_end = *(u_int8_t *)BIOS_PADDRTOVADDR(0x460); - shift = *(u_int8_t *)BIOS_PADDRTOVADDR(0x417); - values->shift_state = ((shift & BIOS_CLKED) ? CLKED : 0) - | ((shift & BIOS_NLKED) ? NLKED : 0) - | ((shift & BIOS_SLKED) ? SLKED : 0) - | ((shift & BIOS_ALKED) ? ALKED : 0); - values->bell_pitch = BELL_PITCH; -#else /* !__i386__ */ + /* XXX - MD */ values->cursor_start = 0; values->cursor_end = 32; values->shift_state = 0; values->bell_pitch = BELL_PITCH; -#endif /* __i386__ */ } int sc_tone(int herz) { -#ifdef __i386__ - int pitch; - - if (herz) { - /* set command for counter 2, 2 byte write */ - if (acquire_timer2(TIMER_16BIT | TIMER_SQWAVE)) - return EBUSY; - /* set pitch */ - pitch = timer_freq/herz; - outb(TIMER_CNTR2, pitch); - outb(TIMER_CNTR2, pitch >> 8); - /* enable counter 2 output to speaker */ - outb(IO_PPI, inb(IO_PPI) | 3); - } else { - /* disable counter 2 output to speaker */ - outb(IO_PPI, inb(IO_PPI) & 0xFC); - release_timer2(); - } -#endif /* __i386__ */ - + /* XXX - MD */ return 0; } static device_method_t sc_methods[] = { DEVMETHOD(device_identify, scidentify), - DEVMETHOD(device_probe, scprobe), - DEVMETHOD(device_attach, scattach), - DEVMETHOD(device_suspend, scsuspend), - DEVMETHOD(device_resume, scresume), + DEVMETHOD(device_probe, scprobe), + DEVMETHOD(device_attach, scattach), { 0, 0 } }; @@ -280,4 +160,4 @@ sizeof(sc_softc_t), }; -DRIVER_MODULE(sc, isa, sc_driver, sc_devclass, 0, 0); +DRIVER_MODULE(sc, nexus, sc_driver, sc_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 29 20:10: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE3B037B404; Fri, 29 Nov 2002 20:09:59 -0800 (PST) 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 87BB237B401 for ; Fri, 29 Nov 2002 20:09:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F22C43EA9 for ; Fri, 29 Nov 2002 20:09:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAU466mV013595 for ; Fri, 29 Nov 2002 20:06:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAU466NO013583 for perforce@freebsd.org; Fri, 29 Nov 2002 20:06:06 -0800 (PST) Date: Fri, 29 Nov 2002 20:06:06 -0800 (PST) Message-Id: <200211300406.gAU466NO013583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21690 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21690 Change 21690 by marcel@marcel_nfs on 2002/11/29 20:06:01 Don't make syscons_isa.c dependent on isa. We're misusing that file... Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#23 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#23 (text+ko) ==== @@ -111,7 +111,7 @@ isa/fd.c optional isa fdc isa/ppc.c optional ppc isa isa/psm.c optional psm isa -isa/syscons_isa.c optional isa sc +isa/syscons_isa.c optional sc kern/subr_diskmbr.c standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 30 10:58: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A94537B404; Sat, 30 Nov 2002 10:58:04 -0800 (PST) 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 BE00837B401 for ; Sat, 30 Nov 2002 10:58:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7082E43EA9 for ; Sat, 30 Nov 2002 10:58:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAUIs7mV068793 for ; Sat, 30 Nov 2002 10:54:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAUIs7aO068780 for perforce@freebsd.org; Sat, 30 Nov 2002 10:54:07 -0800 (PST) Date: Sat, 30 Nov 2002 10:54:07 -0800 (PST) Message-Id: <200211301854.gAUIs7aO068780@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 Subject: PERFORCE change 21709 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21709 Change 21709 by rwatson@rwatson_paprika on 2002/11/30 10:53:46 Fix licenses, command line arguments, cross references. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#4 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#4 (text+ko) ==== @@ -15,9 +15,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The names of the authors may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -61,4 +58,5 @@ .Xr mac_set_file 3 , .Xr mac_set_link 3 , .Xr getfmac 8 , +.Xr setfsmac 8 , .Xr mac 9 ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#2 (text+ko) ==== @@ -62,6 +62,10 @@ as a set of which at most one will be applied to each file traversed per .Fl f Ar specfile given. +.It Fl h +Apply +.Ar label +to symbolic links encountered, rather than their targets. .It Fl s Ar specfile Add the SEBSD-style specifications in .Ar specfile @@ -78,8 +82,6 @@ When given, information detailing the labelling operation is printed while in progress. .It Fl x Do not cross recurse into new filesystems when traversing them. -.Ar label -to symbolic links encountered, rather than their targets. .El .Sh SEE ALSO .Xr mac 3 , To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 30 12:16:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A88B37B406; Sat, 30 Nov 2002 12:16:45 -0800 (PST) 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 94F6D37B404 for ; Sat, 30 Nov 2002 12:16:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4806A43E4A for ; Sat, 30 Nov 2002 12:16:44 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAUKCmmV074116 for ; Sat, 30 Nov 2002 12:12:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAUKCl7G074113 for perforce@freebsd.org; Sat, 30 Nov 2002 12:12:47 -0800 (PST) Date: Sat, 30 Nov 2002 12:12:47 -0800 (PST) Message-Id: <200211302012.gAUKCl7G074113@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 Subject: PERFORCE change 21716 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21716 Change 21716 by rwatson@rwatson_paprika on 2002/11/30 12:12:06 More license fixery. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#3 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#3 (text+ko) ==== @@ -15,9 +15,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The names of the authors may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#9 (text+ko) ==== @@ -15,9 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 30 12:39:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC5DA37B404; Sat, 30 Nov 2002 12:39:12 -0800 (PST) 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 7B7C237B401 for ; Sat, 30 Nov 2002 12:39:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1050C43E4A for ; Sat, 30 Nov 2002 12:39:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAUKZGmV075349 for ; Sat, 30 Nov 2002 12:35:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAUKZFWU075346 for perforce@freebsd.org; Sat, 30 Nov 2002 12:35:15 -0800 (PST) Date: Sat, 30 Nov 2002 12:35:15 -0800 (PST) Message-Id: <200211302035.gAUKZFWU075346@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 Subject: PERFORCE change 21717 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21717 Change 21717 by rwatson@rwatson_paprika on 2002/11/30 12:34:53 Further license scrubbing. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#5 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#4 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#5 (text+ko) ==== @@ -2,10 +2,10 @@ .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris -.\" Costello at Safeport Network Services and NAI Labs, the Security -.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR -.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS -.\" research program. +.\" Costello at Safeport Network Services and Network Associates +.\" Laboratories, the Security Research Division of Network Associates, +.\" Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as +.\" part of the DARPA CHATS research program. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#4 (text+ko) ==== @@ -2,10 +2,10 @@ .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris -.\" Costello at Safeport Network Services and NAI Labs, the Security -.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR -.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS -.\" research program. +.\" Costello at Safeport Network Services and Network Associates +.\" Laboratories, the Security Research Division of Network Associates, +.\" Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as +.\" part of the DARPA CHATS research program. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#10 (text+ko) ==== @@ -2,10 +2,10 @@ * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project by NAI Labs, the - * Security Research Division of Network Associates, Inc. under - * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA - * CHATS research program. + * This software was developed for the FreeBSD Project by Network + * Associates Laboratories, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 30 13: 3:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1ACD37B404; Sat, 30 Nov 2002 13:03:43 -0800 (PST) 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 4C80137B401 for ; Sat, 30 Nov 2002 13:03:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 076B343EBE for ; Sat, 30 Nov 2002 13:03:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAUKxlmV077087 for ; Sat, 30 Nov 2002 12:59:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAUKxkZZ077084 for perforce@freebsd.org; Sat, 30 Nov 2002 12:59:46 -0800 (PST) Date: Sat, 30 Nov 2002 12:59:46 -0800 (PST) Message-Id: <200211302059.gAUKxkZZ077084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21719 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21719 Change 21719 by marcel@marcel_nfs on 2002/11/30 12:58:56 Remove isa and BOOTP_*. Comment out sio. The UART hardware is not supported by the sio driver. It is probed with some hackery, but the sio driver is in essense too ISA/i386 oriented (pretty much like fb/vga/sc). Affected files ... .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#5 (text+ko) ==== @@ -6,8 +6,6 @@ makeoptions DEBUG=-g options ATA_STATIC_ID -options BOOTP -options BOOTP_NFSROOT options CD9660 options COMPAT_43 options COMPAT_FREEBSD4 @@ -21,7 +19,7 @@ options NFSCLIENT options PROCFS options PSEUDOFS -#options ROOTDEVNAME=\"ufs:da0p2\" +options ROOTDEVNAME=\"ufs:da0p2\" options SCSI_DELAY=3000 #options SMP options SOFTUPDATES @@ -51,9 +49,7 @@ device random device sc device scbus -device sio +#device sio # Unsupported hardware (no ISA)... device ukbd device usb device vga - -device isa To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 30 19: 4:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9907937B404; Sat, 30 Nov 2002 19:04:06 -0800 (PST) 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 2F38337B401 for ; Sat, 30 Nov 2002 19:04:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DED1E43EDE for ; Sat, 30 Nov 2002 19:04:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gB1307mV099408 for ; Sat, 30 Nov 2002 19:00:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gB1306Ki099405 for perforce@freebsd.org; Sat, 30 Nov 2002 19:00:06 -0800 (PST) Date: Sat, 30 Nov 2002 19:00:06 -0800 (PST) Message-Id: <200212010300.gB1306Ki099405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21729 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21729 Change 21729 by marcel@marcel_vaio on 2002/11/30 18:59:17 IFC @21728 Affected files ... .. //depot/projects/ia64/etc/rc.d/devd#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#28 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#54 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#11 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#6 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#12 integrate .. //depot/projects/ia64/sbin/gpt/Makefile#6 integrate .. //depot/projects/ia64/sbin/gpt/add.c#3 integrate .. //depot/projects/ia64/sbin/gpt/gpt.8#1 branch .. //depot/projects/ia64/sbin/newfs/mkfs.c#19 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#16 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/md/md.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/ia64/sys/kern/init_main.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#9 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#13 integrate .. //depot/projects/ia64/sys/sys/lockmgr.h#6 integrate .. //depot/projects/ia64/sys/sys/syslimits.h#4 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#14 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#12 integrate Differences ... ==== //depot/projects/ia64/etc/rc.d/devd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.1 2002/11/09 07:45:53 imp Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.2 2002/11/30 00:40:53 imp Exp $ # # PROVIDE: devd -# REQUIRE: devfs +# BEFORE: disks # KEYWORD: FreeBSD . /etc/rc.subr @@ -15,3 +15,8 @@ load_rc_config $name run_rc_command "$1" + +# If devd is disabled, turn it off in the kernel to avoid memory leaks. +if ! checkyesno ${rcvar}; then + sysctl hw.bus.devctl_disable=1 +fi ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#28 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.116 2002/11/27 19:47:57 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.117 2002/11/30 22:13:38 bmah Exp $ Supported Devices @@ -2814,17 +2814,22 @@ USB Devices - A range of USB peripherals are supported; devices known to + A range of USB peripherals are supported; devices known to work are listed in this section. Owing to the generic nature of most USB devices, with some exceptions any device of a given class will be supported, even if not explicitly listed here. - + USB Ethernet adapters can be found in the section listing Ethernet interfaces. + + USB Bluetooth adapters can be found in Bluetooth section. + + Host Controllers (&man.ohci.4; and &man.uhci.4; drivers) @@ -3123,6 +3128,39 @@ + + Bluetooth Devices + + PCCARD Host Controllers (&man.ng.bt3c.4; driver) + + + 3Com/HP 3CRWB6096-A PCCARD adapter + + + + + USB Host Controllers (&man.ng.ubt.4; driver) + + + 3Com 3CREB96 + + + EPoX BT-DG02 + + + Mitsumi USB Bluetooth adapter + + + MSI MS-6967 + + + TDK Bluetooth USB adapter + + + + + + Cryptographic Accelerators ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#54 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.460 2002/11/27 22:13:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.461 2002/11/30 22:11:45 bmah Exp $ 2000 @@ -111,6 +111,19 @@ The &man.agp.4; driver for AGP devices has been added. &merged; + Preliminary support for Bluetooth devices has + been added, in the form of a series of Netgraph modules (see + &man.ng.bluetooth.4;). Two modules provide device driver + support for Bluetooth adapters: The &man.ng.bt3c.4; driver + supports the 3Com/HP Bluetooth PCCARD adapters, while the + &man.ng.ubt.4; driver supports several USB Bluetooth adapters. + + + Bluetooth support in &os; is a work in progress. + + + + A new in-kernel cryptographic framework (see &man.crypto.4; and &man.crypto.9;) has been imported from OpenBSD. It provides a consistent interface to hardware and software implementations ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#2 (text+ko) ==== @@ -24,8 +24,8 @@
@@ -36,7 +36,7 @@ &os; リリースエンジニアリングチーム - $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.1 2002/11/17 19:45:00 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/early-adopter/article.sgml,v 1.2 2002/11/30 01:27:00 hrs Exp $ 2002 @@ -407,7 +407,7 @@ &os; 5.0 には魅力的な機能がたくさん含まれています。 しかし現時点では、それがすべての皆さんの期待に応えられるものではないかも知れません。 この文書では、リリースエンジニアリングの背景と - 5.0 系列の特筆すべき新機能の一部について、 + 5.X 系列の特筆すべき新機能の一部について、 初期リリースを使う上でのいくつかの欠点についてとりあげました。 また、将来の 4-STABLE 開発ブランチの計画と、 初期リリースを利用する人向けのアップグレードのヒントも説明しています。 ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -15,29 +15,29 @@ はじめに この文書は &arch; アーキテクチャ版 &os; &release.current; - のリリースノートです. + のリリースノートです。 これには &release.prev; 以降に追加 (変更) - された新機能が書かれています. + された新機能が書かれています。 リリースノートが対象としているこの &release.type; は, + リリースノートが対象としているこの &release.type; は、 &release.branch; 開発ブランチの - &release.prev; と &release.next; の中間点に対応します. + &release.prev; と &release.next; の中間点に対応します。 このブランチにおける構築済みのバイナリ &release.type; - は から入手可能です. + は から入手可能です。 ]]> この &os; &release.current は &release.type; 版であり, + この &os; &release.current は &release.type; 版であり、 - および各ミラーサイトで公開されています. + および各ミラーサイトで公開されています。 &os; の &release.type; 版 (またはそれ以外) の入手法については FreeBSD ハンドブックの付録 - &os; を入手するにはをご覧ください. + &os; を入手するにはをご覧ください。 ]]> ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ FreeBSD プロジェクト - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.59 2002/11/21 21:54:37 kuriyama Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.64 2002/11/30 09:52:19 kuriyama Exp $ 2000 @@ -22,19 +22,19 @@ - この &os; &release.current; 用リリースノートには, + この &os; &release.current; 用リリースノートには、 - カーネルとユーザーランド双方の変更点が列挙されているのに加え, + カーネルとユーザーランド双方の変更点が列挙されているのに加え、 前のリリース以降に発行されたセキュリティ勧告のうちあてはまる - ものも含まれています. - また, アップグレードの際の注意点も載せてあります. + ものも含まれています。 + また、アップグレードの際の注意点も載せてあります。 @@ -42,34 +42,34 @@ はじめに この文書は &arch.print; ハードウェアプラットフォームの - &os; &release.current; 向けのリリースノートです. - &os; に最近追加、変更、削除された機能について解説しています. - また, &os; の前のバージョンからのアップグレードについても言及して - います. + &os; &release.current; 向けのリリースノートです。 + &os; に最近追加、変更、削除された機能について解説しています。 + また、&os; の前のバージョンからのアップグレードについても言及して + います。 このリリースノートが対応する &release.type; 配布物は, + このリリースノートが対応する &release.type; 配布物は、 &release.branch; 開発ブランチの &release.prev; から - 将来の &release.next; の間に位置します. + 将来の &release.next; の間に位置します。 このブランチのあらかじめコンパイルされたバイナリ &release.type; - 配布物は に公開されています. + 配布物は に公開されています。 ]]> この &os; &release.current; 配布物は &release.type; 配布物です. + この &os; &release.current; 配布物は &release.type; 配布物です。 この配布物はあらゆるミラーの - で見つけることができます. + で見つけることができます。 この (もしくは他の) &os; の &release.type; 配布物を取得する方法 は FreeBSD ハンドブック の 付録 FreeBSD を取得する - を参照してください. + を参照してください。 ]]> @@ -80,32 +80,32 @@ この節では - 多くのリリースノート項目は, 新しいドライバやハードウェアサポート, - 新しいコマンドやオプション, 重要なバグフィックスや寄贈ソフトウェア - のアップグレードなどについてのものです. - &release.prev; 以降に出されたセキュリティ勧告のうち, 適用されるもの - についても掲載しています. + 多くのリリースノート項目は、新しいドライバやハードウェアサポート、 + 新しいコマンドやオプション、重要なバグフィックスや寄贈ソフトウェア + のアップグレードなどについてのものです。 + &release.prev; 以降に出されたセキュリティ勧告のうち、適用されるもの + についても掲載しています。 - &os; に加えられた変更点のうち, - スペースの都合上ここに書かれていないものも多数存在します. - それらはたとえば文書の修正や改良, ごく影響の小さいバグの修正, - 監査で見つかったセキュリティ上好ましくないスタイルで書かれたコードの修正, - ソースコードの整理などです. + &os; に加えられた変更点のうち、 + スペースの都合上ここに書かれていないものも多数存在します。 + それらはたとえば文書の修正や改良、ごく影響の小さいバグの修正、 + 監査で見つかったセキュリティ上好ましくないスタイルで書かれたコードの修正、 + ソースコードの整理などです。 カーネルの変更点 @@ -119,11 +119,13 @@ append mode, so that &man.accton.8; can be used to enable accounting to an append-only file. &merged; - 新しく &man.amdpm.4; ドライバが追加されました. + 新しく &man.amdpm.4; + ドライバが追加されました。 これは AMD 756 チップセットのシステム監視機能へのアクセスを - 提供します. &merged; + 提供します。&merged; - AGP ハードウェア用ドライバ &man.agp.4; が追加されました. + AGP ハードウェア用ドライバ + &man.agp.4; が追加されました。 &merged; A new in-kernel cryptographic framework (see &man.crypto.4; @@ -135,15 +137,16 @@ (&man.hifn.4;) and Broadcom-based cards (&man.ubsec.4;). &man.ddb.4; に新たなコマンド - show pcpu が追加されました. - これは各 CPU の情報を表示します. + show pcpu が追加されました。 + これは各 CPU の情報を表示します。 - &man.ddb.4; に新たなコマンド hwatch - dhwatch が導入されました. - アーキテクチャが対応している必要がありますが, + &man.ddb.4; に新たなコマンド + hwatch + dhwatch が導入されました。 + アーキテクチャが対応している必要がありますが、 これらは (ソフトウェアウォッチポイントを設定する) watch および dwatch - のようにハードウェアウォッチポイントを設定するためのものです. + のようにハードウェアウォッチポイントを設定するためのものです。 &merged; A devctl device has been added to allow @@ -151,115 +154,118 @@ tree. This facility is primarily used by the &man.devd.8; utility. - &man.devfs.5; の大部分が書き直されました. + &man.devfs.5; の大部分が書き直されました。 これは /dev - ディレクトリ内のエントリを自動的に構築し, - デバイスの接続をより適応的に行なうことを可能にします. - &man.devfs.5; は標準で有効化されていますが, + ディレクトリ内のエントリを自動的に構築し、 + デバイスの接続をより適応的に行なうことを可能にします。 + &man.devfs.5; は標準で有効化されていますが、 NODEVFS - カーネルオプションを使うことで無効化できます. + カーネルオプションを使うことで無効化できます。 - The &man.devfs.5; rule subsystem has been introduced. DEVFS rules + The &man.devfs.5; rule subsystem has been introduced. + DEVFS rules permit the administrator to define certain properties of new device nodes before they become visible to the userland. Both static (e.g. /dev/speaker) and dynamic (e.g. /dev/bpf*, some removable devices) nodes are - supported. Each &man.devfs.5; mount may have a different ruleset assigned to + supported. + Each &man.devfs.5; mount may have a different ruleset assigned to it, permitting different policies to be implemented for things like jails. Rules and rulesets are manipulated with the &man.devfs.8; utility. - digi ドライバの採用にともない, dgm ドライバは削除されました. + digi ドライバの採用にともない、dgm ドライバは削除されました。 - PCI Xr ベースのカード, ISA Xem Digiboard カードに対応した - digi ドライバが新たに追加されました. + PCI Xr ベースのカード、ISA Xem Digiboard カードに対応した + digi ドライバが新たに追加されました。 新たに追加された &man.digictl.8; プログラムは (主に) PC/Xem のような外部ポートモジュールを持つカードを - 再初期化するためのものです. + 再初期化するためのものです。 - &man.eaccess.2; システムコールが追加されました. - &man.access.2; と似ていますが, 後者は実権限を使うのに対して, - 前者は実効権限を使います. + &man.eaccess.2; システムコールが追加されました。 + &man.access.2; と似ていますが、後者は実権限を使うのに対して、 + 前者は実効権限を使います。 - EBus ベースのデバイスがサポートされました. + EBus ベースのデバイスがサポートされました。 Initial support has been added for Firewire devices (see &man.firewire.4;). &merged; Intel 82801AA (ICH) SMBus コントローラおよびその互換品に対応した - &man.ichsmb.4; ドライバが追加されました. &merged; + &man.ichsmb.4; ドライバが追加されました。&merged; 各 &man.jail.2; 環境は各々の securelevel で動作することがで - きるようになりました. + きるようになりました。 &man.jail.2; 用の設定可能な sysctl 変数 が jail.* から - security.* へと移動しました. + security.* へと移動しました。 他のセキュリティ関連の sysctl 変数は kern.security.* から - security.* へと移動しました. + security.* へと移動しました。 kern.maxvnodes は使用する vnode の - 数を正しく制限するようになりました. - これまでは, キャッシュされていないページの vnode のみが - free でき, これにより多くのメモリを積んだマシンが - 多くの小さいファイルにアクセスする際に, 制限なしに vnode の - 数を大きくすることが可能でした. + 数を正しく制限するようになりました。 + これまでは、キャッシュされていないページの vnode のみが + free でき、これにより多くのメモリを積んだマシンが + 多くの小さいファイルにアクセスする際に、制限なしに vnode の + 数を大きくすることが可能でした。 vnlru カーネルスレッドが vnode の解放 - と再利用を行なっています. &merged; + と再利用を行なっています。&merged; カーネルメッセージバッファが (アーキテクチャに依存しない) sysctl 変数 kern.msgbuf - 経由でアクセスできるようになりました. - それにともない, &man.dmesg.8; が + 経由でアクセスできるようになりました。 + それにともない、&man.dmesg.8; が kmem で SGID - されている必要はなくなりました. &merged; + されている必要はなくなりました。&merged; - The kernel environment is now dynamic, and can be changed - via the new &man.kenv.2; system call. + カーネル環境が新たに &man.kenv.2; システムコールを利用して + 動的に変更することができるようになりました。 &os; カーネルに &man.kqueue.2; - イベント通知機能が追加されました. + イベント通知機能が追加されました。 これは &man.poll.2;/&man.select.2; - を置き換えることができる新たなインターフェイスで, + を置き換えることができる新たなインターフェイスで、 高パフォーマンスなだけでなく数多くの異なる種類のイベントを - 報告する機能を持っています. - また, シグナルやプロセスの監視だけでなく, - ソケット, パイプ, FIFO, ファイルの変更の監視にも対応しています. + 報告する機能を持っています。 + また、シグナルやプロセスの監視だけでなく、 + ソケット、パイプ、FIFO、ファイルの変更の監視にも対応しています。 &merged; - - 新しいカーネルオプション KVA_SPACE - が追加されました. - これはカーネル仮想アドレス空間の大きさを再設定するために使われます. + + 新しいカーネルオプション + KVA_SPACE + が追加されました。 + これはカーネル仮想アドレス空間の大きさを再設定するために使われます。 &merged; - labpc(4) ドライバは古くなったため削除されました. + labpc(4) ドライバは古くなったため削除されました。 - ローダとカーネルリンカは, + ローダとカーネルリンカは、 KLD のある各ディレクトリに存在する linker.hints というファイルから モジュール名およびバージョンと - KLD ファイル名の対応を調べるようになりました. - 新しく追加されたユーティリティ &man.kldxref.8; は, - これらのファイルを生成するために使用します. + KLD ファイル名の対応を調べるようになりました。 + 新しく追加されたユーティリティ &man.kldxref.8; は、 + これらのファイルを生成するために使用します。 Linux エミュレーションは emulators/linux_base (RedHat 7.X emulation) - で必要とされるカーネル機能に対応しました. &merged; + で必要とされるカーネル機能に対応しました。&merged; - Linux エミュレーションは, カーネル設定に - options SYSVSEM が必要になりました. &merged; + Linux エミュレーションは、カーネル設定に + options SYSVSEM が必要になりました。&merged; Low-Watermark Mandatory Access Control 用 セキュリティ機構 &man.lomac.4; がカーネルモジュールとして - 追加されました. - これは管理者からの追加の設定を必要としない, + 追加されました。 + これは管理者からの追加の設定を必要としない、 従来の UID ベースのセキュリティ機構に加えて使うことのできる - セキュリティ機構です. - この機能のスポンサーは DARPA と NAI Labs です. + セキュリティ機構です。 + この機能のスポンサーは DARPA と NAI Labs です。 &os; now supports an extensible Mandatory Access Control framework, the TrustedBSD MAC Framework. It permits loadable @@ -288,105 +294,111 @@ hw.mca.* sysctl variables. カーネル設定パラメータ maxusers - が起動時に変更可能になりました. maxusers - に由来する他のカーネル設定パラメータも起動時に反映されます. - また, hz パラメータも同様に変更可能になっています. + が起動時に変更可能になりました。maxusers + に由来する他のカーネル設定パラメータも起動時に反映されます。 + また、hz パラメータも同様に変更可能になっています。 &merged; カーネル設定パラメータ maxusers - に 0 を指定すると, - ブート時に適切な値 (32 から 384 の間で, 搭載メモリ量に依存して) + に 0 を指定すると、 + ブート時に適切な値 (32 から 384 の間で、搭載メモリ量に依存して) を計算するようになりました すべての GENERIC カーネルではこの値が - デフォルトとなりました. &merged; + デフォルトとなりました。&merged; - カーネルオプション MAXMEM + カーネルオプション + MAXMEM と hw.physmem 調整可能なローダ変数 - はテスト (やその他の目的) のために, 人工的にマシンのメモリサイズ - を減らすことに使えるようになりました. &merged; + はテスト (やその他の目的) のために、人工的にマシンのメモリサイズ + を減らすことに使えるようになりました。&merged; - カーネルコンフィギュレーションパラメータ - MAXTSIZ, DFLDSIZ, - MAXDSIZ, DFLSSIZ, - MAXSSIZ, SGROWSIZ + カーネル設定パラメータ + MAXTSIZ、DFLDSIZ、 + MAXDSIZ、DFLSSIZ、 + MAXSSIZ、SGROWSIZ は loader で設定可能になりました - (kern.maxtsiz, - kern.maxdfldsiz など). &merged; + (kern.maxtsiz、 + kern.maxdfldsiz など)。&merged; - &man.mutex.9; profiling code has been added, enabled by the - MUTEX_PROFILING kernel configuration option. - It enables the debug.mutex.prof.* hierarchy - of sysctl variables. + &man.mutex.9; にプロファイルのためのコードが追加されました。 + これはカーネルコンフィグファイルに + MUTEX_PROFILING + を加えることにより有効になり、sysctl 変数 + debug.mutex.prof.* + の設定が有効になります。 - SMP カーネルを設定するためのカーネルオプションである - NCPU, NAPIC, - NBUS, NINTR - は削除されました. - 現在 NCPU は最大の 16 に設定されており, - 上記のその他のオプションは動的に変化するものとなっています. + + SMP カーネルを設定するためのカーネルオプションである + NCPU、NAPIC、 + NBUS、NINTR + は削除されました。 + 現在 NCPU は最大の 16 に設定されており、 + 上記のその他のオプションは動的に変化するものとなっています。 &merged; - 新しく &man.nmdm.4; ヌルモデム端末ドライバが追加されました. + 新しく &man.nmdm.4; + ヌルモデム端末ドライバが追加されました。 &merged; &man.open.2; および &man.fcntl.2; に - O_DIRECT フラグが追加されました. - ファイルオープン時にこのフラグを設定すると, - 読み書き時のキャッシュの影響を最小化します. + O_DIRECT フラグが追加されました。 + ファイルオープン時にこのフラグを設定すると、 + 読み書き時のキャッシュの影響を最小化します。 &merged; - &man.orm.4; デバイスが追加されました. + &man.orm.4; デバイスが追加されました。 これは他のドライバが誤って - ROM と重なったアドレスを割り当てることのないよう, - ISA メモリ I/O 空間内のオプション ROM を取得するためのものです. + ROM と重なったアドレスを割り当てることのないよう、 + ISA メモリ I/O 空間内のオプション ROM を取得するためのものです。 &merged; The P1003_1B kernel option is no longer used and has been removed. PECOFF (Win32 実行ファイルフォーマット) - に対応しました. + に対応しました。 NEC PC-98NOTE 用のパワーマネージメント - コントローラである pmc ドライバが追加されました. &merged; + コントローラである pmc ドライバが追加されました。&merged; - POSIX.1b 共有メモリオブジェクトに対応しました. - 実装は通常ファイルを使っていますが, ファイルが - &man.mmap.2; されている場合は MAP_NOSYNC フラグが自動的に有効化されます. + POSIX.1b 共有メモリオブジェクトに対応しました。 + 実装は通常ファイルを使っていますが、ファイルが + &man.mmap.2; されている場合は MAP_NOSYNC フラグが自動的に有効化されます。 &merged; PQ_*CACHE オプションが PQ_CACHESIZE - という一つのオプションに置き換えられました. - これにはキャッシュサイズをキロバイト単位で指定します. - 後方互換性を保つため, 従来のオプションは現在もサポートされています. + という一つのオプションに置き換えられました。 + これにはキャッシュサイズをキロバイト単位で指定します。 + 後方互換性を保つため、従来のオプションは現在もサポートされています。 &merged; - &man.puc.4; (PCI Universal - Communications) ドライバが追加されました. + &man.puc.4; + (PCI Universal + Communications) ドライバが追加されました。 このドライバは PCI ベースのシリアルポートを &man.sio.4; ドライバに - 接続します. &merged; + 接続します。&merged; &man.random.4; デバイスが Yarrow - アルゴリズムを使うように書き直されました. - このアルゴリズムはコンソールデバイス, - イーサネット, PPP ネットワークインターフェイス, - 大容量記憶デバイスといった, - さまざまな割り込み要因からエントロピを収集します. + アルゴリズムを使うように書き直されました。 + このアルゴリズムはコンソールデバイス、 + イーサネット、PPP ネットワークインターフェイス、 + 大容量記憶デバイスといった、 + さまざまな割り込み要因からエントロピを収集します。 &man.random.4; デバイスから得られるエントロピは - シャットダウン時刻実行時だけでなく, + シャットダウン時刻実行時だけでなく、 定期的に /var/db/entropy - に保存されるようになっています. + に保存されるようになっています。 また /dev/random - のセマンティクスが変更され, - エントロピが生成する前でブロックするのではなく, - 疑似乱数データストリームを生成するようになりました. - これは /dev/urandom と完全に同じ動作です. + のセマンティクスが変更され、 + エントロピが生成する前でブロックするのではなく、 + 疑似乱数データストリームを生成するようになりました。 + これは /dev/urandom と完全に同じ動作です。 カーネルオプション options REGRESSION - が新たに追加されました. これは動作検証やレグレションテスト時に有用な - インターフェイスや機能を提供します. + が新たに追加されました。これは動作検証やレグレションテスト時に有用な + インターフェイスや機能を提供します。 RLIMIT_VMEM support has been added. This feature defines a new resource limit that covers a process's @@ -394,7 +406,7 @@ limit can be configured in &man.login.conf.5; via the new vmemoryuse variable. &merged; - SBus ベースのデバイスがサポートされました. + SBus ベースのデバイスがサポートされました。 The sab driver, which supports the Siemens SAB82532 serial chip found on many newer Sparc Ultra machines, @@ -404,25 +416,26 @@ counted against the size of the file to be sent, has been fixed. &merged; - &man.snp.4; デバイスは static ではなくなり, - モジュールとしてコンパイルできるようになりました. &merged; + &man.snp.4; デバイスが + モジュールとしてコンパイルできるようになりました。&merged; - &man.spic.4; ドライバが追加されました. + &man.spic.4; ドライバが追加されました。 これは Sony 製ラップトップに搭載されているジョグダイアルデバイスへ - アクセスを提供するものです. - &man.moused.8; support for this device has also been - added. &merged; + アクセスを提供するものです。 + &man.moused.8; も、このデバイスに対応しています。 + &merged; - &man.syscons.4; ドライバがキーボード操作によるペーストに対応しました. + &man.syscons.4; + ドライバがキーボード操作によるペーストに対応しました。 標準では Shift-Insert - に設定されています. + に設定されています。 - 出荷時の状態で USB デバイスをサポートするため, + 出荷時の状態で USB デバイスをサポートするため、 GENERIC カーネルと - インストールプログラムに USB デバイスのサポートが加えられました. - 現時点で SRM は USB デバイスに対応していないため, + インストールプログラムに USB デバイスのサポートが加えられました。 + 現時点で SRM は USB デバイスに対応していないため、 シリアルコンソールを使っていない場合には - まだ AT キーボードを使う必要があります. &merged; + まだ AT キーボードを使う必要があります。&merged; The uaudio driver, for USB audio devices, has been added. &merged; @@ -430,23 +443,25 @@ The ubsa driver has been added to support the Belkin F5U103 (and compatible) USB-to-serial adaptors. - USB モデムに対応した umodem ドライバが追加されました. - このドライバは - 3Com 5605 と Metricom Ricochet GS wireless USB モデムに対応しています. + USB モデムに対応した + &man.umodem.4; ドライバが追加されました。このドライバは + 3Com 5605 と Metricom Ricochet GS wireless USB モデムに対応しています。 &merged; 標準的な USB スキャナに対応した - &man.uscanner.4; ドライバが追加されました. - これは SANE を利用していますので, 対応スキャナは + &man.uscanner.4; ドライバが追加されました。 + これは SANE を利用していますので、対応スキャナは SANE - ホームページをご覧ください. - HP ScanJet 4100C, 5200C, 6300C の動作が確認されています. &merged; + ホームページをご覧ください。 + HP ScanJet 4100C、5200C、6300C の動作が確認されています。&merged; - The &man.ucom.4; device driver has been added, to support USB - modems, serial devices, and other programs that need to look - like a tty. The related &man.uplcom.4; and &man.uvscom.4; drivers provide specific - support for the Prolific PL-2303 serial adapter and the SUNTAC - Slipper U VS-10U, respectively. &merged; + USB モデムや USB シリアルデバイスなどを tty + のように見えるようにする + &man.ucom.4; ドライバが追加されました。 + また、&man.uplcom.4;、&man.uvscom.4; + ドライバはそれぞれ、 Prolific PL-2303 シリアルアダプタと + SUNTAC Slipper U VS-10U に対応しています。 + &merged; セキュリティを向上させるため、UCONSOLE カーネル設定オプションが削除されました。 @@ -458,24 +473,25 @@ /boot/device.hints. USER_LDT - カーネルオプションが標準設定で有効化されるようになりました. + カーネルオプションが標準設定で有効化されるようになりました。 The &man.uvisor.4; driver for connecting Handspring Visors via USB has been added. &merged; - &man.viapm.4; ドライバが新しく追加されました。 + &man.viapm.4; + ドライバが新しく追加されました。 これは VIA SMBus 電源管理コントローラに対応しています。 &merged; - VESA S3 リニアフレームバッファドライバが追加されました. + VESA S3 リニアフレームバッファドライバが追加されました。 クラッシュダンプに write combining 機能 (訳注: データをひとまとめにしてバス使用効率を向上させる機能) - が実装されました. - この機能は SCSI, IDE ディスクの両方で - 書き込みキャッシュが無効化されていて, - メモリのダンプが終了するまで 1 時間近くかかるような場合に有効です. + が実装されました。 + この機能は SCSI、IDE ディスクの両方で + 書き込みキャッシュが無効化されていて、 + メモリのダンプが終了するまで 1 時間近くかかるような場合に有効です。 &merged; The kernel crashdump infrastructure has been revised, to @@ -485,61 +501,61 @@ byte-order-agnostic. 極めて大きいスワップ領域 (67 GB 以上) - でも, システムがパニックしなくなりました. + でも、システムがパニックしなくなりました。 - Linux 互換機能が thread に対応しました. + Linux 互換機能が thread に対応しました。 - buildkernel ターゲットは, + buildkernel ターゲットは、 構築するカーネルのコンフィグレーションファイル名 (複数の場合もあり) - を KERNEL ではなく, - KERNCONF という変数から受け取るようになりました. + を KERNEL ではなく、 + KERNCONF という変数から受け取るようになりました。 buildkernel の前に buildworld を行なう必要はありません (ただし binutil - が更新されたメジャーリリース間でアップグレードを行なう場合, + が更新されたメジャーリリース間でアップグレードを行なう場合、 もしくは &man.config.8; が更新された場合は - buildworld を行なう必要があります). + buildworld を行なう必要があります)。 &merged; - デッドロックを避けるため, + デッドロックを避けるため、 スワップ領域不足時のプロセス終了処理は - 古いプロセスから行なわれるようになりました. - さらにその終了処理では, - プロセスサイズの計算に必要なスワップ領域も考慮に入れるようになりました. + 古いプロセスから行なわれるようになりました。 + さらにその終了処理では、 + プロセスサイズの計算に必要なスワップ領域も考慮に入れるようになりました。 &merged; リンカセット (訳注: ELF カーネル構築時に必要な情報の一つ) - を生成する必要がなくなりました. - 必要のなくなった gensetdefs(8) は削除されています. + を生成する必要がなくなりました。 + 必要のなくなった gensetdefs(8) は削除されています。 - ネットワークデバイスのクローニングが新たに実装され, - それを利用するように &man.gif.4; デバイスが変更されました. + ネットワークデバイスのクローニングが新たに実装され、 + それを利用するように &man.gif.4; デバイスが変更されました。 そのためデバイスインスタンスを追加したい場合は カーネルコンフィグレーションファイルに利用する数だけ - &man.gif.4; を指定するのではなく, + &man.gif.4; を指定するのではなく、 &man.ifconfig.8; の - オプションを使ってください. + オプションを使ってください。 &merged; カーネル構築時に &man.config.8; の ENV - 指示子を用いることで, (調整可能な) - カーネル環境変数を設定することができるようになりました. + 指示子を用いることで、(調整可能な) + カーネル環境変数を設定することができるようになりました。 - 新しく, idle 時にページをゼロで初期化する機能が追加されました. + 新しく、idle 時にページをゼロで初期化する機能が追加されました。 これは vm.idlezero_enable sysctl - 変数を使って有効化できます. + 変数を使って有効化できます。 カーネルのロードアドレスが - シンボルテーブルに格納されるようになり, - ハードコードされたさまざまな定数が削除されました. - これにより, 異なるアドレスでコンパイルされたカーネルに対しても - &man.ps.1; が正しく動作可能になっています. + シンボルテーブルに格納されるようになり、 + ハードコードされたさまざまな定数が削除されました。 + これにより、異なるアドレスでコンパイルされたカーネルに対しても + &man.ps.1; が正しく動作可能になっています。 &merged; 非常に大きいプロセス (あるいは非常に多数のプロセス) - のコアダンプが発生した場合でも, - マシンが長時間ロックしなくなりました. + のコアダンプが発生した場合でも、 + マシンが長時間ロックしなくなりました。 &merged; The &os; kernel scheduler now supports Kernel-Scheduled @@ -556,130 +572,136 @@ - カーネルは複数の低レベルコンソールデバイスをサポートします. - 異なったコンソールを操作するには, 新しい &man.conscontrol.8; - ユーティリティを使います. + カーネルは複数の低レベルコンソールデバイスをサポートします。 + 異なったコンソールを操作するには、新しい &man.conscontrol.8; + ユーティリティを使います。 コンソールドライバは TGA ベースのディスプレイ - アダプタに対応しました. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message