From owner-p4-projects@FreeBSD.ORG Sun Apr 13 00:10:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D6AB1065672; Sun, 13 Apr 2008 00:10:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A772106566B for ; Sun, 13 Apr 2008 00:10:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33D2A8FC17 for ; Sun, 13 Apr 2008 00:10:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3D0AuPZ030766 for ; Sun, 13 Apr 2008 00:10:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3D0AUPt030764 for perforce@freebsd.org; Sun, 13 Apr 2008 00:10:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 13 Apr 2008 00:10:30 GMT Message-Id: <200804130010.m3D0AUPt030764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 00:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=139951 Change 139951 by rwatson@rwatson_fledge on 2008/04/13 00:09:47 Integrate TrustedBSD base branch from FreeBSD CVS: - Ring in 2008 copyrights - Remove KSE - NFS mounts using TCP by default - OpenSolaris parts move into cddl/ source tree - amd 6.1.5 - BIND 9.4.2 - bzip2 1.0.5 - CVS 1.11.22 - file 4.23 - hostapd 0.5.10 - less 416 - ncurses 5.6 20080209 - OpenPAM Hydrangea - wpa_supplicant 0.5.10 - ddb.conf, ddb(8), DDB output capture, DDB scripting, and textdumps. - Support for many more ptys with tty_pty.c. - bsdar - fts ABI roll - pthread_getcpuclockid(), pthread_attr_{get,set}affinity_np(), pthread_{get,set}affinity_np(), pthread_mutex_{get,set}spinloops_np(), pthread_mutex_{get,set}yieldloops_np(), pthread_mutex_isowned_np(); pthread rwlocks. - feature_present(3) - {faccess,fchmod,fchown,fexec,link,symlink,unlink}_at(2) system calls. - libarchive(3) support for mtree reading, compress(1) writing, cpio(5). - kernel POSIX shared memory object support - libc + grantpt ptmx/pts improvements - libbsdelf - cpuset support - kernel NFS lock manager - sendfile(2) SF_MNOWAIT and SF_SYNC - hwpmc stack trace support - many new floating point parts/improvements - increasing quantities of MIPS support in rtld - many device driver updates - generic WOL support - newfs grows 'erase disk contents' flag - asmc(4), cmx(4), geom_linux_lvm(4), k8temp(4), malo(4), uchcom(4), ulcom(4), igb(4). - Zero-copy BPF buffers. - Optimized lockmgr(9) - Improved stack(9) - Per-CPU callout support - New timezone data - CPU topology - kdb_enter grows a 'why' argument - Superpages! - COMPAT_FREEBSD7 - i8254 reduction - coda cleanup, uses system namecache, access cache. - ipfw(4) nat support - TCP Offload - GEOM retaste - fo_truncate method on struct file - Much process locking simplication - procstat(8) and related sysctls - Adaptive rwlocks - Adaptive umtx - select locking optimization - New unix domain socket garbage collection algorithm - True kthreads, not just kprocs. - Buffer cache locking granularity improvements - New ip_id randomization - TCP header option fixes - More powerpc embedded stuff - mbuf header flag cleanups - fifolog Affected files ... .. //depot/projects/trustedbsd/base/COPYRIGHT#6 integrate .. //depot/projects/trustedbsd/base/LOCKS#3 integrate .. //depot/projects/trustedbsd/base/MAINTAINERS#47 integrate .. //depot/projects/trustedbsd/base/Makefile#53 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#90 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#33 integrate .. //depot/projects/trustedbsd/base/UPDATING#87 integrate .. //depot/projects/trustedbsd/base/bin/Makefile#10 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#13 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#9 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#16 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#20 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#18 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#12 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#13 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#11 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#13 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#34 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#29 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#12 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#26 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#17 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#26 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.1#6 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/Makefile#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/mksyntax.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#29 integrate .. //depot/projects/trustedbsd/base/bin/uuidgen/Makefile#1 branch .. //depot/projects/trustedbsd/base/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/trustedbsd/base/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/trustedbsd/base/cddl/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/trustedbsd/base/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/trustedbsd/base/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#5 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/trustedbsd/base/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/AUTHORS#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/BUGS#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/COPYING#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/FAQ#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/NEWS#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/README.attrcache#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/README.ldap#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/am_ops.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_auto.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_direct.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_error.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_host.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_inherit.c#4 delete .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_linkx.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_nfsx.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_program.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_root.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_toplvl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amfs_union.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_subr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amq_svc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/autil.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/clock.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_parse.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/conf_tok.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/get_args.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_file.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_hesiod.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ldap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_ndbm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nis.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_nisplus.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_passwd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/info_union.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/map.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mapc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/mntfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_prot_svc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_start.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/nfs_subr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_TEMPLATE.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cachefs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_cdfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_efs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_lofs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_mfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nfs3.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_nullfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_pcfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_tmpfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_ufs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_umapfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_unionfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/ops_xfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/opts.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/amd/restart.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/rpc_fwd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/sched.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_amfs_auto.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/srvr_nfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_clnt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq_xdr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/aux_conf.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/bootstrap#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/transp/transp_sockets.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/trap/trap_default.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/umount/umount_bsd44.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/am-utils.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/stamp-vti#3 branch .. //depot/projects/trustedbsd/base/contrib/amd/doc/texinfo.tex#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#8 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_analyze.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_data.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_dict.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_gram.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_lex.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsi_util.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#8 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_atab.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_bparam.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_dumpset.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_exportfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/wr_fstab.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/homedir.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/stubs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_compat.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_defs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_utils.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/am_xdr_func.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/amq_defs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/mount_headers1.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/ldap.schema#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/libamu/amu.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/hasmntopt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/misc_rpc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mount_fs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/mtab.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/strerror.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/libamu/util.c#4 delete .. //depot/projects/trustedbsd/base/contrib/amd/libamu/wire.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xdr_func.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/libamu/xutil.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/amindent#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/autopat#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/mkconf#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf-sample#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#8 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/automount2amd.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/ctl-amd.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/ctl-hlfsd.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/expn.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/amd/tasks#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/vers.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#10 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.docbook#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/control.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#10 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/cp-demangle.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-dis.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/trustedbsd/base/contrib/bzip2/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile-libbz2_so#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README.COMPILATION.PROBLEMS#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/blocksort.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2recover.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib_private.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/compress.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/crctable.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/decompress.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/huffman.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/randtable.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/csup/mux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/AUTHORS#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/BUGS#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FAQ#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/HACKING#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TESTS#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TODO#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/acinclude.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/compile#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/commit_prep.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs2vendor.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs_acls.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/debug_check_log.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/log_accum.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2log.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2sccs.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/sccs2rcs.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/depcomp#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/HACKING.DOCS#3 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.texinfo#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvsclient.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/fncase.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getpass.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/regex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/system.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/missing#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/add.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/admin.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/annotate.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkin.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkout.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/classify.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/commit.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/create_adm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvs.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvsrc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/diff.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/entries.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/expand_path.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/fileattr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/filesubr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/find_names.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hardlink.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/ignore.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/import.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/lock.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/login.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/logmsg.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/main.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/mkmodules.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/modules.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/no_diff.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcscmds.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/recurse.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/release.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/remove.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/repos.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/run.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/sanity.sh#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/status.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/subr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/tag.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/vers_ts.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/version.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/wrapper.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/zlib.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/apple#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Magdir/blender#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/chi#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cvs#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/efi#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/fortran#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/hdf#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Magdir/impulse#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/macintosh#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgi#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/acconfig.h#4 delete .. //depot/projects/trustedbsd/base/contrib/file/acinclude.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/file_opts.h#1 branch .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/funcs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/install-sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/is_tar.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/libmagic.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/missing#2 delete .. //depot/projects/trustedbsd/base/contrib/file/mkinstalldirs#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/names.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/file/stamp-h.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#5 delete .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#5 delete .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/i386fbsd-nat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtod.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#5 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/madwifi.conf#3 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/os.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/less/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.dsm#2 delete .. //depot/projects/trustedbsd/base/contrib/less/NEWS#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/README#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/ch.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/command.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure.ac#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/decode.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.ds#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.h.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.o2#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.o9#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.wn#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/edit.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/filename.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/funcs.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.man#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.nro#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.nro#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/line.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/optfunc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/opttbl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/screen.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/search.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/tags.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/version.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/NEWS#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/config.guess#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/config.sub#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/html/ncurses-intro.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/headers#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/form/modules#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/headers#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/ncurses_dll.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/include/tic.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/install-sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_attr.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_border.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_extend.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_insstr.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_mouse.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_outopts.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_termattrs.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_termcap.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_trace.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/default_colors.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_new.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_field_validation.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/infocmp.1m#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/term.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/term.7#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ncurses/man/tset.1#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 02:33:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 542D41065673; Sun, 13 Apr 2008 02:33:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F140D1065670 for ; Sun, 13 Apr 2008 02:33:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA7578FC12 for ; Sun, 13 Apr 2008 02:33:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3D2XOd5062498 for ; Sun, 13 Apr 2008 02:33:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3D2XOnT062496 for perforce@freebsd.org; Sun, 13 Apr 2008 02:33:24 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 02:33:24 GMT Message-Id: <200804130233.m3D2XOnT062496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 02:33:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=139952 Change 139952 by sam@sam_ebb on 2008/04/13 02:32:57 awi is dead Affected files ... .. //depot/projects/vap/share/man/man4/Makefile#9 edit .. //depot/projects/vap/share/man/man4/awi.4#4 delete Differences ... ==== //depot/projects/vap/share/man/man4/Makefile#9 (text+ko) ==== @@ -32,7 +32,6 @@ audit.4 \ auditpipe.4 \ aue.4 \ - awi.4 \ axe.4 \ bce.4 \ bfe.4 \ From owner-p4-projects@FreeBSD.ORG Sun Apr 13 03:52:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E9E1065676; Sun, 13 Apr 2008 03:52:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A73531065670 for ; Sun, 13 Apr 2008 03:52:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A2648FC14 for ; Sun, 13 Apr 2008 03:52:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3D3qp53066627 for ; Sun, 13 Apr 2008 03:52:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3D3qp9O066622 for perforce@freebsd.org; Sun, 13 Apr 2008 03:52:51 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 03:52:51 GMT Message-Id: <200804130352.m3D3qp9O066622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 03:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=139954 Change 139954 by imp@imp_paco-paco on 2008/04/13 03:52:47 IFC @139952 Affected files ... .. //depot/projects/arm/src/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/arm/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/arm/src/sbin/restore/dirs.c#4 integrate .. //depot/projects/arm/src/sbin/restore/tape.c#5 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#24 integrate .. //depot/projects/arm/src/share/man/man4/ddb.4#9 integrate .. //depot/projects/arm/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/arm/src/share/man/man9/lock.9#11 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#22 integrate .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#31 integrate .. //depot/projects/arm/src/sys/conf/files.i386#33 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/arm/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#44 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#13 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#23 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcefw.h#6 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#13 integrate .. //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#17 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#26 integrate .. //depot/projects/arm/src/sys/modules/Makefile#55 integrate .. //depot/projects/arm/src/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#14 integrate .. //depot/projects/arm/src/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include #include @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (test(FSR_GET_FCC0(fe.fe_fsr))); \ } @@ -112,11 +124,14 @@ struct fpemu fe; struct fpn *r; __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); + fe.fe_cx = 0; fe.fe_f1.fp_sign = a[0] >> 31; fe.fe_f1.fp_sticky = 0; fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); r = __fpu_sqrt(&fe); c[0] = __fpu_ftoq(&fe, r, c); + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); } _QP_OP(add) ==== //depot/projects/arm/src/lib/libc/sparc64/fpu/fpu_sqrt.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.4 2007/01/09 00:28:05 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.5 2008/04/12 03:10:13 das Exp $"); /* * Perform an FPU square root (return sqrt(x)). @@ -334,7 +334,7 @@ FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { x0 = d0, x1 = d1, x2 = d2; - q |= bit; + q = bit; y1 |= 1; /* now t1, y1 are set in concrete */ } ODD_DOUBLE; @@ -366,12 +366,12 @@ FPU_SUBCS(d2, x2, t2); FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); - ODD_DOUBLE; if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; - q |= bit; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; + q = bit; y2 |= 1; } + ODD_DOUBLE; while ((bit >>= 1) != 0) { EVEN_DOUBLE; t3 = y3 | bit; @@ -380,7 +380,7 @@ FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; q |= bit; y3 |= bit << 1; } ==== //depot/projects/arm/src/lib/libc/stdio/printf.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.60 2007/01/09 00:28:07 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.61 2008/04/12 03:11:56 das Exp $ .\" .Dd October 16, 2004 .Dt PRINTF 3 @@ -549,13 +549,14 @@ Note that there may be multiple valid ways to represent floating-point numbers in this hexadecimal format. For example, -.Li 0x3.24p+0 , 0x6.48p-1 +.Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 , and .Li 0xc.9p-2 are all equivalent. -The format chosen depends on the internal representation of the -number, but the implementation guarantees that the length of the -mantissa will be minimized. +.Fx 8.0 +and later always prints finite non-zero numbers using +.Ql 1 +as the digit before the hexadecimal point. Zeroes are always represented with a mantissa of 0 (preceded by a .Ql - if appropriate) and an exponent of ==== //depot/projects/arm/src/sbin/restore/dirs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.32 2008/04/03 20:37:38 imp Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; #endif /* not lint */ #include @@ -558,6 +558,7 @@ char *cp, *buf; const char *tmpdir; int bufsize; + uid_t myuid; vprintf(stdout, "Set directory mode, owner, and times.\n"); if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') @@ -578,6 +579,7 @@ } clearerr(mf); bufsize = 0; + myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); if (feof(mf)) @@ -624,7 +626,10 @@ "extended attributes for ", cp); } } - (void) chown(cp, node.uid, node.gid); + if (myuid != 0) + (void) chown(cp, myuid, node.gid); + else + (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); utimes(cp, node.ctimep); utimes(cp, node.mtimep); ==== //depot/projects/arm/src/sbin/restore/tape.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49 2007/03/06 08:13:20 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $"); #include #include @@ -582,7 +582,9 @@ ctimep[1].tv_sec = curfile.birthtime_sec; ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; extsize = curfile.extsize; - uid = curfile.uid; + uid = getuid(); + if (uid == 0) + uid = curfile.uid; gid = curfile.gid; mode = curfile.mode; flags = curfile.file_flags; @@ -1377,7 +1379,7 @@ } if (checksum((int *)buf) == FAIL) return (FAIL); - if (_time64_to_time(buf->c_date) != dumpdate) + if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate) fprintf(stderr, "Header with wrong dumpdate.\n"); if (Bcvt) { swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf); ==== //depot/projects/arm/src/share/man/man4/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.413 2008/04/01 07:20:04 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.414 2008/04/12 14:08:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -139,6 +139,7 @@ iwi.4 \ ixgb.4 \ joy.4 \ + k8temp.4 \ kbdmux.4 \ keyboard.4 \ kld.4 \ ==== //depot/projects/arm/src/share/man/man4/ddb.4#9 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.48 2008/03/07 18:14:29 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.49 2008/04/12 05:49:05 pjd Exp $ .\" .Dd December 26, 2007 .Dt DDB 4 @@ -908,7 +908,7 @@ .Xr kgdb 1 , .Xr acpi 4 , .Xr CAM 4 , -.Xr mac_text 4 , +.Xr mac_test 4 , .Xr ndis 4 , .Xr netgraph 4 , .Xr textdump 4 , ==== //depot/projects/arm/src/share/man/man9/lock.9#11 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.32 2008/04/06 21:22:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.33 2008/04/12 20:18:02 attilio Exp $ .\" -.Dd April 6, 2008 +.Dd April 12, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -178,6 +178,10 @@ .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_NOWITNESS +Skip the +.Xr witness 4 +checks for this instance. .It Dv LK_CANRECURSE Allow recursion on an exclusive lock. For every lock there must be a release. ==== //depot/projects/arm/src/sys/amd64/conf/NOTES#22 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $ # # @@ -444,8 +444,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/arm/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 (text+ko) ==== @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _IA32_SYS_ASM_LINKAGE_H -#define _IA32_SYS_ASM_LINKAGE_H +#ifndef _SYS_ASM_LINKAGE_H +#define _SYS_ASM_LINKAGE_H #ifdef __cplusplus extern "C" { @@ -41,6 +41,17 @@ #define ASM_ENTRY_ALIGN 16 +#elif defined(__sparc64__) + +/* GCC uses 32-byte function alignment for UltraSPARC CPUs. */ +#define ASM_ENTRY_ALIGN 32 + +#else + +#error Unsupported architecture. + +#endif + /* * ENTRY provides the standard procedure entry code and an easy way to * insert the calls to mcount for profiling. ENTRY_NP is identical, but @@ -67,40 +78,6 @@ #define SET_SIZE(x) \ .size x, [.-x] -#elif defined(__sparc64__) - -/* - * ENTRY provides the standard procedure entry code and an easy way to - * insert the calls to mcount for profiling. ENTRY_NP is identical, but - * never calls mcount. - */ -#define ENTRY(x) \ - .section ".text"; \ - .align 4; \ - .global x; \ - .type x, @function; \ -x: - -/* - * ALTENTRY provides for additional entry points. - */ -#define ALTENTRY(x) \ - .global x; \ - .type x, @function; \ -x: - -/* - * SET_SIZE trails a function and set the size for the ELF symbol table. - */ -#define SET_SIZE(x) \ - .size x, (.-x) - -#else - -#error Unsupported architecture. - -#endif - #endif /* _ASM */ #ifdef __cplusplus ==== //depot/projects/arm/src/sys/conf/files.amd64#31 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.118 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci ==== //depot/projects/arm/src/sys/conf/files.i386#33 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.592 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.593 2008/04/12 20:46:06 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -445,8 +445,10 @@ # isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.71 2008/03/09 11:19:03 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.72 2008/04/12 12:06:00 rpaulo Exp $"); #include "opt_acpi.h" #include @@ -157,6 +157,7 @@ static int acpi_cpu_cx_cst(struct acpi_cpu_softc *sc); static void acpi_cpu_startup(void *arg); static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); +static void acpi_cpu_cx_list(struct acpi_cpu_softc *sc); static void acpi_cpu_idle(void); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(void); @@ -801,7 +802,7 @@ } static void -acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +acpi_cpu_cx_list(struct acpi_cpu_softc *sc) { struct sbuf sb; int i; @@ -819,7 +820,13 @@ } sbuf_trim(&sb); sbuf_finish(&sb); +} +static void +acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +{ + acpi_cpu_cx_list(sc); + SYSCTL_ADD_STRING(&sc->cpu_sysctl_ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, "cx_supported", CTLFLAG_RD, @@ -998,12 +1005,25 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_cpu_softc *sc = (struct acpi_cpu_softc *)context; - + struct acpi_cpu_softc *isc; + int i; + if (notify != ACPI_NOTIFY_CX_STATES) return; - device_printf(sc->cpu_dev, "Cx states changed\n"); - /* acpi_cpu_cx_cst(sc); */ + /* Update the list of Cx states. */ + acpi_cpu_cx_cst(sc); + acpi_cpu_cx_list(sc); + + /* Update the new lowest useable Cx state for all CPUs. */ + ACPI_SERIAL_BEGIN(cpu); + cpu_cx_count = 0; + for (i = 0; i < cpu_ndevices; i++) { + isc = device_get_softc(cpu_devices[i]); + if (isc->cpu_cx_count > cpu_cx_count) + cpu_cx_count = isc->cpu_cx_count; + } + ACPI_SERIAL_END(cpu); } static int ==== //depot/projects/arm/src/sys/dev/asmc/asmc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.8 2008/04/11 17:16:19 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.9 2008/04/12 12:04:09 rpaulo Exp $"); #include #include @@ -114,9 +114,9 @@ int (*smc_light_left)(SYSCTL_HANDLER_ARGS); int (*smc_light_right)(SYSCTL_HANDLER_ARGS); - const char *smc_temps[8]; - const char *smc_tempnames[8]; - const char *smc_tempdescs[8]; + const char *smc_temps[ASMC_TEMP_MAX]; + const char *smc_tempnames[ASMC_TEMP_MAX]; + const char *smc_tempdescs[ASMC_TEMP_MAX]; }; static struct asmc_model *asmc_match(device_t dev); @@ -189,6 +189,15 @@ ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* Idem for the MacPro */ + { + "MacPro2", "Apple SMC Mac Pro (8-core)", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, + ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS + }, + { NULL, NULL } }; ==== //depot/projects/arm/src/sys/dev/asmc/asmcvar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.5 2008/04/07 12:58:43 rpaulo Exp $ + * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.6 2008/04/12 12:04:09 rpaulo Exp $ * */ @@ -126,9 +126,12 @@ /* * Temperatures. * - * First for MacBook, second for MacBook Pro, then for Intel Mac Mini. - * + * First for MacBook, second for MacBook Pro, third for Intel Mac Mini and + * last Mac Pro 8-core. + * */ +/* maximum array size for temperatures including the last NULL */ +#define ASMC_TEMP_MAX 36 #define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \ "TM0P", NULL } #define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \ @@ -156,3 +159,30 @@ #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } + +#define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPNAMES { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPDESCS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } ==== //depot/projects/arm/src/sys/dev/ata/ata-all.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.283 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.284 2008/04/11 22:56:27 sos Exp $"); #include "opt_ata.h" #include @@ -1014,12 +1014,14 @@ NULL, NULL, PAGE_SIZE, 1, PAGE_SIZE, 0, NULL, NULL, &request->dma.sg_tag)) { device_printf(ch->dev, "FAILURE - create sg_tag\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 03:57:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 570941065677; Sun, 13 Apr 2008 03:57:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00503106564A for ; Sun, 13 Apr 2008 03:57:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D78608FC1C for ; Sun, 13 Apr 2008 03:57:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3D3vurM066864 for ; Sun, 13 Apr 2008 03:57:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3D3vuVr066862 for perforce@freebsd.org; Sun, 13 Apr 2008 03:57:56 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 03:57:56 GMT Message-Id: <200804130357.m3D3vuVr066862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 03:57:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139955 Change 139955 by imp@imp_paco-paco on 2008/04/13 03:57:31 IFC @139952 Affected files ... .. //depot/projects/mips2/src/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/mips2/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/mips2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/mips2/src/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/mips2/src/sbin/restore/dirs.c#4 integrate .. //depot/projects/mips2/src/sbin/restore/tape.c#3 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#17 integrate .. //depot/projects/mips2/src/share/man/man4/ddb.4#6 integrate .. //depot/projects/mips2/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/mips2/src/share/man/man9/lock.9#10 integrate .. //depot/projects/mips2/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/mips2/src/sys/conf/files.amd64#12 integrate .. //depot/projects/mips2/src/sys/conf/files.i386#13 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/mips2/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/mips2/src/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/mips2/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/mips2/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/mips2/src/sys/ia64/ia64/interrupt.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_lock.c#12 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#14 integrate .. //depot/projects/mips2/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/mips2/src/sys/sys/rwlock.h#7 integrate .. //depot/projects/mips2/src/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate Differences ... ==== //depot/projects/mips2/src/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/mips2/src/lib/libc/gdtoa/_hdtoa.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/mips2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include #include @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (test(FSR_GET_FCC0(fe.fe_fsr))); \ } @@ -112,11 +124,14 @@ struct fpemu fe; struct fpn *r; __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); + fe.fe_cx = 0; fe.fe_f1.fp_sign = a[0] >> 31; fe.fe_f1.fp_sticky = 0; fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); r = __fpu_sqrt(&fe); c[0] = __fpu_ftoq(&fe, r, c); + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); } _QP_OP(add) ==== //depot/projects/mips2/src/lib/libc/sparc64/fpu/fpu_sqrt.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.4 2007/01/09 00:28:05 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.5 2008/04/12 03:10:13 das Exp $"); /* * Perform an FPU square root (return sqrt(x)). @@ -334,7 +334,7 @@ FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { x0 = d0, x1 = d1, x2 = d2; - q |= bit; + q = bit; y1 |= 1; /* now t1, y1 are set in concrete */ } ODD_DOUBLE; @@ -366,12 +366,12 @@ FPU_SUBCS(d2, x2, t2); FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); - ODD_DOUBLE; if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; - q |= bit; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; + q = bit; y2 |= 1; } + ODD_DOUBLE; while ((bit >>= 1) != 0) { EVEN_DOUBLE; t3 = y3 | bit; @@ -380,7 +380,7 @@ FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; q |= bit; y3 |= bit << 1; } ==== //depot/projects/mips2/src/lib/libc/stdio/printf.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.60 2007/01/09 00:28:07 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.61 2008/04/12 03:11:56 das Exp $ .\" .Dd October 16, 2004 .Dt PRINTF 3 @@ -549,13 +549,14 @@ Note that there may be multiple valid ways to represent floating-point numbers in this hexadecimal format. For example, -.Li 0x3.24p+0 , 0x6.48p-1 +.Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 , and .Li 0xc.9p-2 are all equivalent. -The format chosen depends on the internal representation of the -number, but the implementation guarantees that the length of the -mantissa will be minimized. +.Fx 8.0 +and later always prints finite non-zero numbers using +.Ql 1 +as the digit before the hexadecimal point. Zeroes are always represented with a mantissa of 0 (preceded by a .Ql - if appropriate) and an exponent of ==== //depot/projects/mips2/src/sbin/restore/dirs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.32 2008/04/03 20:37:38 imp Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; #endif /* not lint */ #include @@ -558,6 +558,7 @@ char *cp, *buf; const char *tmpdir; int bufsize; + uid_t myuid; vprintf(stdout, "Set directory mode, owner, and times.\n"); if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') @@ -578,6 +579,7 @@ } clearerr(mf); bufsize = 0; + myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); if (feof(mf)) @@ -624,7 +626,10 @@ "extended attributes for ", cp); } } - (void) chown(cp, node.uid, node.gid); + if (myuid != 0) + (void) chown(cp, myuid, node.gid); + else + (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); utimes(cp, node.ctimep); utimes(cp, node.mtimep); ==== //depot/projects/mips2/src/sbin/restore/tape.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49 2007/03/06 08:13:20 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $"); #include #include @@ -582,7 +582,9 @@ ctimep[1].tv_sec = curfile.birthtime_sec; ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; extsize = curfile.extsize; - uid = curfile.uid; + uid = getuid(); + if (uid == 0) + uid = curfile.uid; gid = curfile.gid; mode = curfile.mode; flags = curfile.file_flags; @@ -1377,7 +1379,7 @@ } if (checksum((int *)buf) == FAIL) return (FAIL); - if (_time64_to_time(buf->c_date) != dumpdate) + if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate) fprintf(stderr, "Header with wrong dumpdate.\n"); if (Bcvt) { swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf); ==== //depot/projects/mips2/src/share/man/man4/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.413 2008/04/01 07:20:04 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.414 2008/04/12 14:08:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -139,6 +139,7 @@ iwi.4 \ ixgb.4 \ joy.4 \ + k8temp.4 \ kbdmux.4 \ keyboard.4 \ kld.4 \ ==== //depot/projects/mips2/src/share/man/man4/ddb.4#6 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.48 2008/03/07 18:14:29 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.49 2008/04/12 05:49:05 pjd Exp $ .\" .Dd December 26, 2007 .Dt DDB 4 @@ -908,7 +908,7 @@ .Xr kgdb 1 , .Xr acpi 4 , .Xr CAM 4 , -.Xr mac_text 4 , +.Xr mac_test 4 , .Xr ndis 4 , .Xr netgraph 4 , .Xr textdump 4 , ==== //depot/projects/mips2/src/share/man/man9/lock.9#10 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.32 2008/04/06 21:22:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.33 2008/04/12 20:18:02 attilio Exp $ .\" -.Dd April 6, 2008 +.Dd April 12, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -178,6 +178,10 @@ .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_NOWITNESS +Skip the +.Xr witness 4 +checks for this instance. .It Dv LK_CANRECURSE Allow recursion on an exclusive lock. For every lock there must be a release. ==== //depot/projects/mips2/src/sys/amd64/conf/NOTES#12 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $ # # @@ -444,8 +444,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 (text+ko) ==== @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _IA32_SYS_ASM_LINKAGE_H -#define _IA32_SYS_ASM_LINKAGE_H +#ifndef _SYS_ASM_LINKAGE_H +#define _SYS_ASM_LINKAGE_H #ifdef __cplusplus extern "C" { @@ -41,6 +41,17 @@ #define ASM_ENTRY_ALIGN 16 +#elif defined(__sparc64__) + +/* GCC uses 32-byte function alignment for UltraSPARC CPUs. */ +#define ASM_ENTRY_ALIGN 32 + +#else + +#error Unsupported architecture. + +#endif + /* * ENTRY provides the standard procedure entry code and an easy way to * insert the calls to mcount for profiling. ENTRY_NP is identical, but @@ -67,40 +78,6 @@ #define SET_SIZE(x) \ .size x, [.-x] -#elif defined(__sparc64__) - -/* - * ENTRY provides the standard procedure entry code and an easy way to - * insert the calls to mcount for profiling. ENTRY_NP is identical, but - * never calls mcount. - */ -#define ENTRY(x) \ - .section ".text"; \ - .align 4; \ - .global x; \ - .type x, @function; \ -x: - -/* - * ALTENTRY provides for additional entry points. - */ -#define ALTENTRY(x) \ - .global x; \ - .type x, @function; \ -x: - -/* - * SET_SIZE trails a function and set the size for the ELF symbol table. - */ -#define SET_SIZE(x) \ - .size x, (.-x) - -#else - -#error Unsupported architecture. - -#endif - #endif /* _ASM */ #ifdef __cplusplus ==== //depot/projects/mips2/src/sys/conf/files.amd64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.118 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci ==== //depot/projects/mips2/src/sys/conf/files.i386#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.592 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.593 2008/04/12 20:46:06 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -445,8 +445,10 @@ # isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/mips2/src/sys/dev/acpica/acpi_cpu.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.71 2008/03/09 11:19:03 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.72 2008/04/12 12:06:00 rpaulo Exp $"); #include "opt_acpi.h" #include @@ -157,6 +157,7 @@ static int acpi_cpu_cx_cst(struct acpi_cpu_softc *sc); static void acpi_cpu_startup(void *arg); static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); +static void acpi_cpu_cx_list(struct acpi_cpu_softc *sc); static void acpi_cpu_idle(void); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(void); @@ -801,7 +802,7 @@ } static void -acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +acpi_cpu_cx_list(struct acpi_cpu_softc *sc) { struct sbuf sb; int i; @@ -819,7 +820,13 @@ } sbuf_trim(&sb); sbuf_finish(&sb); +} +static void +acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +{ + acpi_cpu_cx_list(sc); + SYSCTL_ADD_STRING(&sc->cpu_sysctl_ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, "cx_supported", CTLFLAG_RD, @@ -998,12 +1005,25 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_cpu_softc *sc = (struct acpi_cpu_softc *)context; - + struct acpi_cpu_softc *isc; + int i; + if (notify != ACPI_NOTIFY_CX_STATES) return; - device_printf(sc->cpu_dev, "Cx states changed\n"); - /* acpi_cpu_cx_cst(sc); */ + /* Update the list of Cx states. */ + acpi_cpu_cx_cst(sc); + acpi_cpu_cx_list(sc); + + /* Update the new lowest useable Cx state for all CPUs. */ + ACPI_SERIAL_BEGIN(cpu); + cpu_cx_count = 0; + for (i = 0; i < cpu_ndevices; i++) { + isc = device_get_softc(cpu_devices[i]); + if (isc->cpu_cx_count > cpu_cx_count) + cpu_cx_count = isc->cpu_cx_count; + } + ACPI_SERIAL_END(cpu); } static int ==== //depot/projects/mips2/src/sys/dev/asmc/asmc.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.8 2008/04/11 17:16:19 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.9 2008/04/12 12:04:09 rpaulo Exp $"); #include #include @@ -114,9 +114,9 @@ int (*smc_light_left)(SYSCTL_HANDLER_ARGS); int (*smc_light_right)(SYSCTL_HANDLER_ARGS); - const char *smc_temps[8]; - const char *smc_tempnames[8]; - const char *smc_tempdescs[8]; + const char *smc_temps[ASMC_TEMP_MAX]; + const char *smc_tempnames[ASMC_TEMP_MAX]; + const char *smc_tempdescs[ASMC_TEMP_MAX]; }; static struct asmc_model *asmc_match(device_t dev); @@ -189,6 +189,15 @@ ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* Idem for the MacPro */ + { + "MacPro2", "Apple SMC Mac Pro (8-core)", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, + ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS + }, + { NULL, NULL } }; ==== //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.5 2008/04/07 12:58:43 rpaulo Exp $ + * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.6 2008/04/12 12:04:09 rpaulo Exp $ * */ @@ -126,9 +126,12 @@ /* * Temperatures. * - * First for MacBook, second for MacBook Pro, then for Intel Mac Mini. - * + * First for MacBook, second for MacBook Pro, third for Intel Mac Mini and + * last Mac Pro 8-core. + * */ +/* maximum array size for temperatures including the last NULL */ +#define ASMC_TEMP_MAX 36 #define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \ "TM0P", NULL } #define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \ @@ -156,3 +159,30 @@ #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } + +#define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPNAMES { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPDESCS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } ==== //depot/projects/mips2/src/sys/dev/ata/ata-all.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.283 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.284 2008/04/11 22:56:27 sos Exp $"); #include "opt_ata.h" #include @@ -1014,12 +1014,14 @@ NULL, NULL, PAGE_SIZE, 1, PAGE_SIZE, 0, NULL, NULL, &request->dma.sg_tag)) { device_printf(ch->dev, "FAILURE - create sg_tag\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 03:59:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C241B1065672; Sun, 13 Apr 2008 03:59:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83874106566C for ; Sun, 13 Apr 2008 03:59:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 666BE8FC14 for ; Sun, 13 Apr 2008 03:59:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3D3xx6x066905 for ; Sun, 13 Apr 2008 03:59:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3D3xwcG066903 for perforce@freebsd.org; Sun, 13 Apr 2008 03:59:58 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 03:59:58 GMT Message-Id: <200804130359.m3D3xwcG066903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 04:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=139956 Change 139956 by imp@imp_paco-paco on 2008/04/13 03:59:04 IFC @139955 Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/restore/tape.c#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#7 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.amd64#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.i386#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/rwlock.h#5 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/mips2-jnpr/src/lib/libc/gdtoa/_hdtoa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/mips2-jnpr/src/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include #include @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (test(FSR_GET_FCC0(fe.fe_fsr))); \ } @@ -112,11 +124,14 @@ struct fpemu fe; struct fpn *r; __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); + fe.fe_cx = 0; fe.fe_f1.fp_sign = a[0] >> 31; fe.fe_f1.fp_sticky = 0; fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); r = __fpu_sqrt(&fe); c[0] = __fpu_ftoq(&fe, r, c); + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); } _QP_OP(add) ==== //depot/projects/mips2-jnpr/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.4 2007/01/09 00:28:05 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.5 2008/04/12 03:10:13 das Exp $"); /* * Perform an FPU square root (return sqrt(x)). @@ -334,7 +334,7 @@ FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { x0 = d0, x1 = d1, x2 = d2; - q |= bit; + q = bit; y1 |= 1; /* now t1, y1 are set in concrete */ } ODD_DOUBLE; @@ -366,12 +366,12 @@ FPU_SUBCS(d2, x2, t2); FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); - ODD_DOUBLE; if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; - q |= bit; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; + q = bit; y2 |= 1; } + ODD_DOUBLE; while ((bit >>= 1) != 0) { EVEN_DOUBLE; t3 = y3 | bit; @@ -380,7 +380,7 @@ FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; q |= bit; y3 |= bit << 1; } ==== //depot/projects/mips2-jnpr/src/lib/libc/stdio/printf.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.60 2007/01/09 00:28:07 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.61 2008/04/12 03:11:56 das Exp $ .\" .Dd October 16, 2004 .Dt PRINTF 3 @@ -549,13 +549,14 @@ Note that there may be multiple valid ways to represent floating-point numbers in this hexadecimal format. For example, -.Li 0x3.24p+0 , 0x6.48p-1 +.Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 , and .Li 0xc.9p-2 are all equivalent. -The format chosen depends on the internal representation of the -number, but the implementation guarantees that the length of the -mantissa will be minimized. +.Fx 8.0 +and later always prints finite non-zero numbers using +.Ql 1 +as the digit before the hexadecimal point. Zeroes are always represented with a mantissa of 0 (preceded by a .Ql - if appropriate) and an exponent of ==== //depot/projects/mips2-jnpr/src/sbin/restore/dirs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.32 2008/04/03 20:37:38 imp Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; #endif /* not lint */ #include @@ -558,6 +558,7 @@ char *cp, *buf; const char *tmpdir; int bufsize; + uid_t myuid; vprintf(stdout, "Set directory mode, owner, and times.\n"); if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') @@ -578,6 +579,7 @@ } clearerr(mf); bufsize = 0; + myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); if (feof(mf)) @@ -624,7 +626,10 @@ "extended attributes for ", cp); } } - (void) chown(cp, node.uid, node.gid); + if (myuid != 0) + (void) chown(cp, myuid, node.gid); + else + (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); utimes(cp, node.ctimep); utimes(cp, node.mtimep); ==== //depot/projects/mips2-jnpr/src/sbin/restore/tape.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49 2007/03/06 08:13:20 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $"); #include #include @@ -582,7 +582,9 @@ ctimep[1].tv_sec = curfile.birthtime_sec; ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; extsize = curfile.extsize; - uid = curfile.uid; + uid = getuid(); + if (uid == 0) + uid = curfile.uid; gid = curfile.gid; mode = curfile.mode; flags = curfile.file_flags; @@ -1377,7 +1379,7 @@ } if (checksum((int *)buf) == FAIL) return (FAIL); - if (_time64_to_time(buf->c_date) != dumpdate) + if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate) fprintf(stderr, "Header with wrong dumpdate.\n"); if (Bcvt) { swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf); ==== //depot/projects/mips2-jnpr/src/share/man/man4/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.413 2008/04/01 07:20:04 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.414 2008/04/12 14:08:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -139,6 +139,7 @@ iwi.4 \ ixgb.4 \ joy.4 \ + k8temp.4 \ kbdmux.4 \ keyboard.4 \ kld.4 \ ==== //depot/projects/mips2-jnpr/src/share/man/man4/ddb.4#3 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.48 2008/03/07 18:14:29 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.49 2008/04/12 05:49:05 pjd Exp $ .\" .Dd December 26, 2007 .Dt DDB 4 @@ -908,7 +908,7 @@ .Xr kgdb 1 , .Xr acpi 4 , .Xr CAM 4 , -.Xr mac_text 4 , +.Xr mac_test 4 , .Xr ndis 4 , .Xr netgraph 4 , .Xr textdump 4 , ==== //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#7 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.32 2008/04/06 21:22:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.33 2008/04/12 20:18:02 attilio Exp $ .\" -.Dd April 6, 2008 +.Dd April 12, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -178,6 +178,10 @@ .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_NOWITNESS +Skip the +.Xr witness 4 +checks for this instance. .It Dv LK_CANRECURSE Allow recursion on an exclusive lock. For every lock there must be a release. ==== //depot/projects/mips2-jnpr/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $ # # @@ -444,8 +444,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/mips2-jnpr/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 (text+ko) ==== @@ -24,8 +24,8 @@ * Use is subject to license terms. */ -#ifndef _IA32_SYS_ASM_LINKAGE_H -#define _IA32_SYS_ASM_LINKAGE_H +#ifndef _SYS_ASM_LINKAGE_H +#define _SYS_ASM_LINKAGE_H #ifdef __cplusplus extern "C" { @@ -41,6 +41,17 @@ #define ASM_ENTRY_ALIGN 16 +#elif defined(__sparc64__) + +/* GCC uses 32-byte function alignment for UltraSPARC CPUs. */ +#define ASM_ENTRY_ALIGN 32 + +#else + +#error Unsupported architecture. + +#endif + /* * ENTRY provides the standard procedure entry code and an easy way to * insert the calls to mcount for profiling. ENTRY_NP is identical, but @@ -67,40 +78,6 @@ #define SET_SIZE(x) \ .size x, [.-x] -#elif defined(__sparc64__) - -/* - * ENTRY provides the standard procedure entry code and an easy way to - * insert the calls to mcount for profiling. ENTRY_NP is identical, but - * never calls mcount. - */ -#define ENTRY(x) \ - .section ".text"; \ - .align 4; \ - .global x; \ - .type x, @function; \ -x: - -/* - * ALTENTRY provides for additional entry points. - */ -#define ALTENTRY(x) \ - .global x; \ - .type x, @function; \ -x: - -/* - * SET_SIZE trails a function and set the size for the ELF symbol table. - */ -#define SET_SIZE(x) \ - .size x, (.-x) - -#else - -#error Unsupported architecture. - -#endif - #endif /* _ASM */ #ifdef __cplusplus ==== //depot/projects/mips2-jnpr/src/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.118 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci ==== //depot/projects/mips2-jnpr/src/sys/conf/files.i386#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.592 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.593 2008/04/12 20:46:06 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -445,8 +445,10 @@ # isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/mips2-jnpr/src/sys/dev/acpica/acpi_cpu.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.71 2008/03/09 11:19:03 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.72 2008/04/12 12:06:00 rpaulo Exp $"); #include "opt_acpi.h" #include @@ -157,6 +157,7 @@ static int acpi_cpu_cx_cst(struct acpi_cpu_softc *sc); static void acpi_cpu_startup(void *arg); static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); +static void acpi_cpu_cx_list(struct acpi_cpu_softc *sc); static void acpi_cpu_idle(void); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(void); @@ -801,7 +802,7 @@ } static void -acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +acpi_cpu_cx_list(struct acpi_cpu_softc *sc) { struct sbuf sb; int i; @@ -819,7 +820,13 @@ } sbuf_trim(&sb); sbuf_finish(&sb); +} +static void +acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) +{ + acpi_cpu_cx_list(sc); + SYSCTL_ADD_STRING(&sc->cpu_sysctl_ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, "cx_supported", CTLFLAG_RD, @@ -998,12 +1005,25 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_cpu_softc *sc = (struct acpi_cpu_softc *)context; - + struct acpi_cpu_softc *isc; + int i; + if (notify != ACPI_NOTIFY_CX_STATES) return; - device_printf(sc->cpu_dev, "Cx states changed\n"); - /* acpi_cpu_cx_cst(sc); */ + /* Update the list of Cx states. */ + acpi_cpu_cx_cst(sc); + acpi_cpu_cx_list(sc); + + /* Update the new lowest useable Cx state for all CPUs. */ + ACPI_SERIAL_BEGIN(cpu); + cpu_cx_count = 0; + for (i = 0; i < cpu_ndevices; i++) { + isc = device_get_softc(cpu_devices[i]); + if (isc->cpu_cx_count > cpu_cx_count) + cpu_cx_count = isc->cpu_cx_count; + } + ACPI_SERIAL_END(cpu); } static int ==== //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.8 2008/04/11 17:16:19 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asmc/asmc.c,v 1.9 2008/04/12 12:04:09 rpaulo Exp $"); #include #include @@ -114,9 +114,9 @@ int (*smc_light_left)(SYSCTL_HANDLER_ARGS); int (*smc_light_right)(SYSCTL_HANDLER_ARGS); - const char *smc_temps[8]; - const char *smc_tempnames[8]; - const char *smc_tempdescs[8]; + const char *smc_temps[ASMC_TEMP_MAX]; + const char *smc_tempnames[ASMC_TEMP_MAX]; + const char *smc_tempdescs[ASMC_TEMP_MAX]; }; static struct asmc_model *asmc_match(device_t dev); @@ -189,6 +189,15 @@ ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* Idem for the MacPro */ + { + "MacPro2", "Apple SMC Mac Pro (8-core)", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, + ASMC_MP_TEMPS, ASMC_MP_TEMPNAMES, ASMC_MP_TEMPDESCS + }, + { NULL, NULL } }; ==== //depot/projects/mips2-jnpr/src/sys/dev/asmc/asmcvar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.5 2008/04/07 12:58:43 rpaulo Exp $ + * $FreeBSD: src/sys/dev/asmc/asmcvar.h,v 1.6 2008/04/12 12:04:09 rpaulo Exp $ * */ @@ -126,9 +126,12 @@ /* * Temperatures. * - * First for MacBook, second for MacBook Pro, then for Intel Mac Mini. - * + * First for MacBook, second for MacBook Pro, third for Intel Mac Mini and + * last Mac Pro 8-core. + * */ +/* maximum array size for temperatures including the last NULL */ +#define ASMC_TEMP_MAX 36 #define ASMC_MB_TEMPS { "TB0T", "TN0P", "TN1P", "Th0H", "Th1H", \ "TM0P", NULL } #define ASMC_MB_TEMPNAMES { "enclosure", "northbridge1", \ @@ -156,3 +159,30 @@ #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } + +#define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPNAMES { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } + +#define ASMC_MP_TEMPDESCS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ + "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ + "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ + "TH0P", "TH1P", "TH2P", "TH3P", "TMAP", \ + "TMAS", "TMBS", "TM0P", "TM0S", "TM1P", \ + "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", \ + "TM8S", "TM9P", "TM9S", "TN0H", "TS0C", \ + NULL } ==== //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.283 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.284 2008/04/11 22:56:27 sos Exp $"); #include "opt_ata.h" #include @@ -1017,12 +1017,14 @@ NULL, NULL, PAGE_SIZE, 1, PAGE_SIZE, 0, NULL, NULL, &request->dma.sg_tag)) { device_printf(ch->dev, "FAILURE - create sg_tag\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 16:56:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A22411065675; Sun, 13 Apr 2008 16:56:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DCB8106564A for ; Sun, 13 Apr 2008 16:56:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45F568FC2A for ; Sun, 13 Apr 2008 16:56:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DGuFuk052668 for ; Sun, 13 Apr 2008 16:56:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DGtfr5052659 for perforce@freebsd.org; Sun, 13 Apr 2008 16:55:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 13 Apr 2008 16:55:41 GMT Message-Id: <200804131655.m3DGtfr5052659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 139979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 16:56:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=139979 Change 139979 by rwatson@rwatson_fledge on 2008/04/13 16:54:53 First cut integration of TrustedBSD MAC branch through @139951 of the TrustedBSD base branch--merge MAC KPI changes from MAC OS X Leopard into MAC branch. Further conflict resolution and merging will be required. Affected files ... .. //depot/projects/trustedbsd/mac/COPYRIGHT#7 integrate .. //depot/projects/trustedbsd/mac/LOCKS#3 integrate .. //depot/projects/trustedbsd/mac/MAINTAINERS#39 integrate .. //depot/projects/trustedbsd/mac/Makefile#44 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#72 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#13 integrate .. //depot/projects/trustedbsd/mac/UPDATING#62 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#13 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#33 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#36 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#13 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#28 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#18 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#18 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#26 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#26 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#26 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#24 integrate .. //depot/projects/trustedbsd/mac/bin/realpath/realpath.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/realpath/realpath.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/cd.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#26 integrate .. //depot/projects/trustedbsd/mac/bin/uuidgen/Makefile#1 branch .. //depot/projects/trustedbsd/mac/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/trustedbsd/mac/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/trustedbsd/mac/cddl/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/trustedbsd/mac/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/AUTHORS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/BUGS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/COPYING#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/FAQ#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/README.attrcache#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/README.ldap#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/am_ops.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#8 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_auto.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_direct.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_error.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_host.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_inherit.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_link.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_linkx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_program.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_root.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_toplvl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_union.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_svc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/autil.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/clock.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_parse.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_tok.l#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/get_args.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_file.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_hesiod.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ldap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ndbm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nis.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nisplus.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_passwd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_union.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/map.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mapc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mntfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_prot_svc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_start.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_TEMPLATE.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cachefs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cdfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_efs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_lofs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_mfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs3.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nullfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_pcfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tmpfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_ufs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_umapfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_unionfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_xfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/opts.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/amd/restart.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/rpc_fwd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/sched.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_amfs_auto.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_nfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.8#8 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_clnt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_xdr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/aux_conf.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/bootstrap#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/checkmount/checkmount_bsd44.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/mtab/mtab_bsd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/transp/transp_sockets.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/trap/trap_default.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/umount/umount_bsd44.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/am-utils.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/stamp-vti#4 branch .. //depot/projects/trustedbsd/mac/contrib/amd/doc/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/version.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#9 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_analyze.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_data.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_dict.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_gram.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_lex.l#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_util.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#9 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_atab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_bparam.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_dumpset.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_exportfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_fstab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#8 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/homedir.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/nfs_prot_svc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/stubs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_compat.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_utils.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_xdr_func.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/amq_defs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/mount_headers1.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/mount_headers2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ldap-id.ms#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ldap.schema#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/alloca.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/amu.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/hasmntopt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/misc_rpc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mount_fs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mtab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/nfs_prot_xdr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/strerror.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/util.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/wire.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xdr_func.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xutil.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/amindent#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/autopat#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/mkconf#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/am-eject.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf-sample#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#9 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd2ldif.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd2sun.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/automount2amd.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/automount2amd.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-amd.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/ctl-hlfsd.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/fix-amd-map.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/fixrmtab.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/wait4amd.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/wait4amd2die.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/tasks#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/vers.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.docbook#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/control.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/include/dns/validator.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/validator.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/version#8 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/libiberty/cp-demangle.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ppc-dis.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/trustedbsd/mac/contrib/bzip2/LICENSE#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile-libbz2_so#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README.COMPILATION.PROBLEMS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/blocksort.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2recover.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib_private.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/compress.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/crctable.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/decompress.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/huffman.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/randtable.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/spewG.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/unzcrash.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/mux.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/AUTHORS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/BUGS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/FAQ#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/HACKING#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/INSTALL#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/NEWS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/TESTS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/TODO#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/acinclude.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/compile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/config.h.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.am#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/clmerge.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cln_hist.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/commit_prep.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs2vendor.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs_acls.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvscheck.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/debug_check_log.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/descend.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/log.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/log_accum.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/mfpipe.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/pvcs2rcs.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs-to-cvs.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2log.sh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2sccs.sh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcslock.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/sccs2rcs.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/depcomp#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/HACKING.DOCS#4 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.am#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.texinfo#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvsclient.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/mdate-sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-vti#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version-client.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/install-sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/Makefile.am#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/fncase.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/regex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/system.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/xtime.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/Makefile.am#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/missing#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.am#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/add.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/admin.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/annotate.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/checkin.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/checkout.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/classify.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/commit.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/create_adm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvs.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvsrc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/diff.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/edit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/edit.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/entries.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/expand_path.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/fileattr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/filesubr.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/find_names.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/hardlink.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/hardlink.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/hash.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/hash.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/history.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/history.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/ignore.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/import.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/lock.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/log.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/login.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/logmsg.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/mkmodules.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/modules.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/myndbm.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/myndbm.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/no_diff.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/parseinfo.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/patch.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcscmds.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/recurse.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/release.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/remove.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/repos.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/run.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/sanity.sh#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/status.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/subr.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/tag.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/update.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/vers_ts.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/version.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/watch.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/wrapper.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/zlib.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/acorn#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/animation#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/apple#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/archive#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/audio#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/blender#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/chi#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/commands#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/console#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/cvs#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/database#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/efi#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/elf#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/filesystems#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/fortran#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/hdf#2 delete .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/impulse#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/java#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/macintosh#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/msdos#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sgi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/wordperfect#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.am#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/acconfig.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/file/acinclude.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/aclocal.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/apprentice.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ascmagic.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/compress.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/config.h.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.man#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file_opts.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/fsmagic.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/funcs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/install-sh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/is_tar.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/libmagic.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.man#8 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.mime#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/missing#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/mkinstalldirs#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/names.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/patchlevel.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/print.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/softmagic.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/file/stamp-h.in#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/i386fbsd-nat.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtod.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#18 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#12 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#17 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/defconfig#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_test.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_db.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls_common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.conf#5 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11_auth.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/madwifi.conf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/os.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_openssl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/version.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#13 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptests.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sock.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/l4check.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printstate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/dotest#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f11#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f11#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/l1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/nattest#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipmon.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/less/LICENSE#5 integrate .. //depot/projects/trustedbsd/mac/contrib/less/Makefile.dsm#3 delete .. //depot/projects/trustedbsd/mac/contrib/less/NEWS#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/ch.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/charset.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/command.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/configure.ac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/less/decode.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/defines.ds#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/defines.h.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/defines.o2#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/defines.o9#6 integrate .. //depot/projects/trustedbsd/mac/contrib/less/defines.wn#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/edit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/less/filename.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/funcs.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/jump.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/less/less.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/less.man#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/less.nro#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/lessecho.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/less/lessecho.nro#3 integrate .. //depot/projects/trustedbsd/mac/contrib/less/lesskey.man#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/lesskey.nro#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/line.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/less/main.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/optfunc.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/opttbl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/screen.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/search.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/signal.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/less/tags.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/less/version.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CHANGES#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CREDITS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/FILES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/INSTALL#3 delete .. //depot/projects/trustedbsd/mac/contrib/libpcap/INSTALL.txt#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/README.dag#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/TODO#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/VERSION#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf_image.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/config.h.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/grammar.y#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/inet.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/lbl/gnuc.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/libpcap/nametoaddr.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/optimize.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dlpi.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-int.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-linux.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pf.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/libpcap/savefile.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/scanner.l#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/isearch.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/trustedbsd/mac/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/MANIFEST#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/NEWS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/config.guess#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/config.sub#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/dist.mk#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/hackguide.doc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/html/ncurses-intro.html#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/doc/ncurses-intro.doc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_def.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_dup.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_ftlink.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fld_newftyp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_alnum.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_alpha.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_enum.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_int.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_num.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/fty_regex.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/headers#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/form/modules#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/MKterm.h.awk.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/curses.wide#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/headers#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/nc_alloc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/ncurses_defs#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/ncurses_dll.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/include/tic.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/install-sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/captoinfo.1m#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/clear.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_add_wch.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_addch.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_attr.3x#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_border.3x#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_clear.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_deleteln.3x#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ncurses/man/curs_extend.3x#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 17:28:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E639B1065674; Sun, 13 Apr 2008 17:28:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8A671065672 for ; Sun, 13 Apr 2008 17:28:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93A338FC13 for ; Sun, 13 Apr 2008 17:28:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DHSm02074679 for ; Sun, 13 Apr 2008 17:28:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DHSmUQ074677 for perforce@freebsd.org; Sun, 13 Apr 2008 17:28:48 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 17:28:48 GMT Message-Id: <200804131728.m3DHSmUQ074677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 17:28:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=139981 Change 139981 by imp@imp_paco-paco on 2008/04/13 17:28:27 IFC @139980 Affected files ... .. //depot/projects/arm/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/arm/src/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/arm/src/sys/conf/files#89 integrate .. //depot/projects/arm/src/sys/conf/files.mips#1 branch .. //depot/projects/arm/src/sys/conf/files.pc98#20 integrate .. //depot/projects/arm/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/arm/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/arm/src/sys/conf/options#59 integrate .. //depot/projects/arm/src/sys/conf/options.mips#1 branch .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#20 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#19 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/arm/src/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/arm/src/sys/conf/files#89 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1288 2008/04/03 20:58:18 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1673,6 +1673,7 @@ net/ppp_tty.c optional ppp net/pfil.c optional ether | inet net/radix.c standard +net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard ==== //depot/projects/arm/src/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.359 2007/12/03 11:38:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,8 +314,10 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/arm/src/sys/conf/options#59 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.625 2008/04/13 05:45:13 qingli Exp $ # # On the handling of kernel options # @@ -393,6 +393,7 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h +RADIX_MPATH opt_mpath.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h ==== //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.31 2008/04/10 15:17:41 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.32 2008/04/13 14:40:02 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -375,6 +375,20 @@ { .name = NULL } }; +/* + * EeePC have an Asus ASUS010 gadget interface, + * but they can't be probed quite the same way as Asus laptops. + */ +static struct acpi_asus_model acpi_eeepc_models[] = { + { + .name = "EEE", + .brn_get = "\\_SB.ATKD.PBLG", + .brn_set = "\\_SB.ATKD.PBLS" + }, + + { .name = NULL } +}; + static struct { char *name; char *description; @@ -444,13 +458,17 @@ ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; - static char *asus_ids[] = { "ATK0100", NULL }; + static char *asus_ids[] = { "ATK0100", "ASUS010", NULL }; + char *rstr; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (acpi_disabled("asus") || - ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL) + if (acpi_disabled("asus")) + return (ENXIO); + rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids); + if (rstr == NULL) { return (ENXIO); + } sc = device_get_softc(dev); sc->dev = dev; @@ -489,6 +507,14 @@ AcpiOsFree(Buf.Pointer); return (0); } + + /* if EeePC */ + if(strncmp("ASUS010", rstr, 7) == 0) { + sc->model = &acpi_eeepc_models[0]; + device_set_desc(dev, "ASUS EeePC"); + AcpiOsFree(Buf.Pointer); + return (0); + } } sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); ==== //depot/projects/arm/src/sys/dev/ata/ata-all.h#20 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.130 2008/04/11 11:30:27 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.131 2008/04/13 16:05:34 sos Exp $ */ /* ATA register defines */ @@ -301,7 +301,7 @@ #define ATA_PC98_CTLADDR_RID 8 #define ATA_PC98_BANKADDR_RID 9 #define ATA_IRQ_RID 0 -#define ATA_DEV(unit) ((unit == ATA_ATA_SLAVE) ? 0x10 : 0) +#define ATA_DEV(unit) ((unit > 0) ? 0x10 : 0) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A #define ATA_CFA_MAGIC3 0x8400 ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.128 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.129 2008/04/13 16:05:34 sos Exp $"); #include "opt_ata.h" #include @@ -1669,9 +1669,8 @@ if (be32toh(meta->generation) >= raid->generation) { struct ata_device *atadev = device_get_softc(parent); struct ata_channel *ch = device_get_softc(GRANDPARENT(dev)); - int disk_number = (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + - ATA_DEV(atadev->unit); - + int disk_number = + (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + atadev->unit; raid->disks[disk_number].dev = parent; raid->disks[disk_number].sectors = be32toh(meta->configs[disk_number + 1].sectors); @@ -2303,7 +2302,7 @@ bcopy(atadev->param.serial, meta->disk[disk].serial, sizeof(rdp->disks[disk].serial)); meta->disk[disk].sectors = rdp->disks[disk].sectors; - meta->disk[disk].id = (ch->unit << 16) | ATA_DEV(atadev->unit); + meta->disk[disk].id = (ch->unit << 16) | atadev->unit; } else meta->disk[disk].sectors = rdp->total_sectors / rdp->width; @@ -3328,7 +3327,7 @@ device_get_softc(device_get_parent(rdp->disks[disk].dev)); meta->raid.channel = ch->unit; - meta->raid.device = ATA_DEV(atadev->unit); + meta->raid.device = atadev->unit; meta->raid.disk_sectors = rdp->disks[disk].sectors; meta->raid.disk_offset = rdp->offset_sectors; } @@ -3416,7 +3415,7 @@ device_get_softc(rdp->disks[drive].dev); meta->raid.disk[drive].channel = ch->unit; - meta->raid.disk[drive].device = ATA_DEV(atadev->unit); + meta->raid.disk[drive].device = atadev->unit; } meta->raid.disk[drive].magic_0 = PR_MAGIC0(meta->raid.disk[drive]) | timestamp.tv_sec; @@ -3742,7 +3741,7 @@ struct ata_channel *ch = device_get_softc(device_get_parent(rdp->disks[disk].dev)); struct ata_device *atadev = device_get_softc(rdp->disks[disk].dev); - int disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + int disk_number = 1 + atadev->unit + (ch->unit << 1); meta->disks |= disk_number << ((1 - disk) << 2); } @@ -3780,7 +3779,7 @@ bcopy(atadev->param.model, meta->model, sizeof(meta->model)); /* XXX SOS if total_disks > 2 this may not float */ - meta->disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + meta->disk_number = 1 + atadev->unit + (ch->unit << 1); if (testing || bootverbose) ata_raid_sis_print_meta(meta); From owner-p4-projects@FreeBSD.ORG Sun Apr 13 18:50:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54CDB1065674; Sun, 13 Apr 2008 18:50:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF4251065673 for ; Sun, 13 Apr 2008 18:50:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA2A38FC17 for ; Sun, 13 Apr 2008 18:50:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DIoHx9080035 for ; Sun, 13 Apr 2008 18:50:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DIoHn8080033 for perforce@freebsd.org; Sun, 13 Apr 2008 18:50:17 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 18:50:17 GMT Message-Id: <200804131850.m3DIoHn8080033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 18:50:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=139982 Change 139982 by sam@sam_ebb on 2008/04/13 18:49:46 first pass at updating; clean out lots of dreck Affected files ... .. //depot/projects/vap/share/man/man4/ath.4#4 edit .. //depot/projects/vap/share/man/man4/ipw.4#3 edit .. //depot/projects/vap/share/man/man4/iwi.4#3 edit .. //depot/projects/vap/share/man/man4/ral.4#3 edit .. //depot/projects/vap/share/man/man4/rum.4#3 edit .. //depot/projects/vap/share/man/man4/ural.4#3 edit .. //depot/projects/vap/share/man/man4/wi.4#4 edit .. //depot/projects/vap/share/man/man4/wpi.4#3 edit .. //depot/projects/vap/share/man/man4/zyd.4#3 edit Differences ... ==== //depot/projects/vap/share/man/man4/ath.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002-2004 Sam Leffler, Errno Consulting +.\" Copyright (c) 2002-2008 Sam Leffler, Errno Consulting .\" All rights reserved. .\"" .\" Redistribution and use in source and binary forms, with or without @@ -12,9 +12,6 @@ .\" similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any .\" redistribution must be conditioned upon including a substantially .\" similar Disclaimer requirement for further binary redistribution. -.\" 3. Neither the names of the above-listed copyright holders nor the names -.\" of any contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" NO WARRANTY .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -31,7 +28,7 @@ .\" .\" $FreeBSD: src/share/man/man4/ath.4,v 1.44 2008/01/28 18:08:40 brueffer Exp $ .\"/ -.Dd December 7, 2006 +.Dd April 13, 2008 .Dt ATH 4 .Os .Sh NAME @@ -59,7 +56,7 @@ .Nm driver provides support for wireless network adapters based on the Atheros AR5210, AR5211, and AR5212 programming APIs. -These APIs are used by a wide variety of chips; all chips with +These APIs are used by a wide variety of chips; most all chips with a PCI and/or CardBus interface are supported. Chip-specific support is provided by the Atheros Hardware Access Layer (HAL), that is packaged separately. @@ -97,26 +94,32 @@ .Xr ifconfig 8 as shown below. .Pp -By default, the -.Nm -driver configures the card for BSS operation (aka infrastructure -mode). -This mode requires the use of an access point (base station). -.Pp -The -.Nm -driver also supports the standard IBSS point-to-point mode -where stations can communicate amongst themselves without the -aid of an access point. -.Pp -The driver may also be configured to operate in hostap mode. -In this mode a host may function as an access point (base station). -Access points are different than operating in IBSS mode. -They operate in BSS mode. -They allow for easier roaming and bridge all Ethernet traffic such -that machines connected via an access point appear to be on the local -Ethernet segment. -.Pp +The driver supports +.Cm station , +.Cm adhoc , +.Cm adhoc-demo , +.Cm hostap , +.Cm wds , +and +.Cm monitor +mode operation. +Multiple +.Cm hostap +virtual interfaces may be configured for simultaneous +use on cards that use a 5212 part. +When multiple interfaces are configured each may have a separate +mac address that is formed by setting the U/L bits in the mac +address assigned to the underlying device. +Any number of +.Cm wds +virtual interfaces may be configured together with +.Cm hostap +interfaces. +Multiple +.Cm station +interfaces may be operated together with +.Cm hostap +interfaces to construct a wireless repeater device. For more information on configuring this device, see .Xr ifconfig 8 . .Pp @@ -127,8 +130,10 @@ .Sh HARDWARE The .Nm -driver supports all Atheros Cardbus or PCI cards, +driver supports most Atheros Cardbus or PCI cards, except those that are based on the AR5005VL chipset. +More recent parts may require a hal that is not part of +.Fb . .Pp A list of cards that are supported can be found at .Pa http://customerproducts.atheros.com/customerproducts/default.asp . @@ -144,38 +149,37 @@ .Pp Join a specific BSS network with WEP encryption: .Bd -literal -offset indent -ifconfig ath0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan0 create wlandev ath0 +ifconfig wlan0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e wepmode on wepkey 0x8736639624 .Ed .Pp Join/create an 802.11b IBSS network with network name .Dq Li my_net : .Bd -literal -offset indent -ifconfig ath0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e - mode 11b mediaopt adhoc +ifconfig wlan0 create wlandev ath0 wlanmode adhoc +ifconfig wlan0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e + mode 11b .Ed .Pp Create an 802.11g host-based access point: .Bd -literal -offset indent -ifconfig ath0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e - mode 11g mediaopt hostap +ifconfig wlan0 create wlandev ath0 wlanmode hostap +ifconfig wlan0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e + mode 11g .Ed .Pp -Create an 802.11a host-based access point with WEP enabled: +Create two virtual 802.11a host-based access points, one with +with WEP enabled and one with no security, and bridge them to +the fxp0 (wired) device: .Bd -literal -offset indent -ifconfig ath0 inet 192.168.0.10 netmask 0xffffff00 ssid my_ap \e - wepmode on wepkey 0x1234567890 mode 11a mediaopt hostap -.Ed -.Pp -Create a host-based wireless bridge to fxp0: -.Bd -literal -offset indent -ifconfig ath0 inet up ssid my_ap media DS/11Mbps mediaopt hostap -sysctl net.inet.ip.check_interface=0 -ifconfig bridge0 create -ifconfig bridge0 addm ath0 addm fxp0 up +ifconfig wlan0 create wlandev ath0 wlanmode hostap \e + ssid paying-customers wepmode on wepkey 0x1234567890 \e + mode 11a up +ifconfig wlan1 create wlandev ath0 wlanmode hostap bssid \e + ssid freeloaders up +ifconfig bridge0 create addm wlan0 addm wlan1 addm fxp0 up .Ed -.Pp -This will give you the same functionality as an access point. .Sh DIAGNOSTICS .Bl -diag .It "ath%d: unable to attach hardware; HAL status %u" @@ -252,15 +256,18 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr an 4 , -.Xr arp 4 , .Xr ath_hal 4 , -.Xr netintro 4 , +.Xr intro 4 , +.Xr cardbus 4 , .Xr pcic 4 , -.Xr wi 4 , .Xr wlan 4 , +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr wlan_xauth 4 , +.Xr hostapd 8 , .Xr ifconfig 8 , +.Xr wpa_supplicant 8 . .Sh HISTORY The .Nm @@ -281,17 +288,7 @@ .Sh BUGS There is no software retransmit; only hardware retransmit is used. .Pp -The driver does not fully enable power-save operation of the chip; -consequently power use is suboptimal. +The driver does not fully enable power-save operation of the chip +in station mode; consequently power use is suboptimal (e.g. on a laptop). .Pp -The driver honors the regulatory domain programmed into the EEPROM of a -device and does not support overriding this setting. -This is done to insure compliance with local regulatory agencies when -operating as an access point. -Unfortunately this also means that devices purchased for use in one locale -may not be usable in another. -Changes are planned to remove this restriction when operating in station mode. -.Pp WPA is not supported for 5210 parts. -.Pp -Atheros' SuperG functionality is not supported. ==== //depot/projects/vap/share/man/man4/ipw.4#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/ipw.4,v 1.17 2007/11/13 16:42:22 brueffer Exp $ .\" -.Dd March 6, 2007 +.Dd April 13, 2008 .Os .Dt IPW 4 .Sh NAME @@ -37,27 +37,24 @@ kernel configuration file: .Bd -ragged -offset indent .Cd "device ipw" +.Cd "device ipwfw" .Cd "device pci" .Cd "device wlan" .Cd "device firmware" .Ed .Pp Alternatively, to load the driver as a -module at boot time, place the following lines in +module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_ipw_load="YES" -wlan_load="YES" -firmware_load="YES" .Ed .Pp -In both cases, place the following lines in +In both cases, place the following line in .Xr loader.conf 5 -to load the firmware modules: +to acknowledge the firmware license (see below): .Bd -literal -offset indent -ipw_bss_load="YES" -ipw_ibss_load="YES" -ipw_monitor_load="YES" +legal.intel_ipw.license_ack=1 .Ed .Sh DESCRIPTION The @@ -65,19 +62,23 @@ driver provides support for the .Tn Intel PRO/Wireless 2100 MiniPCI network adapter. -.Pp -By default, the .Nm -driver configures the adapter for BSS operation (aka infrastructure mode). -This mode requires the use of an access point. -.Pp +supports +.Cm station , +.Cm adhoc , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. For more information on configuring this device, see .Xr ifconfig 8 . .Pp -This driver requires firmware to be loaded before it will work. -For the loaded firmware to work the license at +This driver requires the firmware built with the +.Nm ipwfw +module to work. +For the loaded firmware to be enabled for use the license at .Pa /usr/share/doc/legal/intel_ipw/LICENSE -must be agreed to and the following line be added to +must be agreed by adding the following line to .Xr loader.conf 5 : .Pp .Dl "legal.intel_ipw.license_ack=1" @@ -90,22 +91,25 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00" +.Bd -literal -offset indent +ifconfig wlan create wlandev ipw0 inet 192.168.0.20 \e + netmask 0xffffff00 +.Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Dl "ifconfig wlan create wlandev ipw0 ssid my_net up" .Pp -Join a specific BSS network with 40-bit WEP encryption: +Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - wepmode on wepkey 0x1234567890 weptxkey 1 +ifconfig wlan create wlandev ipw0 ssid my_net \e + wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed .Pp -Join a specific BSS network with 104-bit WEP encryption: +Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig ipw0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev ipw0 wlanmode adhoc ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS @@ -124,8 +128,9 @@ The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify that the necessary firmware modules are loaded and the -license agreement +Verify the +.Xr ipwfw 4 +firmware module is installed and the license agreement .Xr loader 8 tunable has been set. .It "ipw%d: could not load microcode" @@ -136,14 +141,16 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr iwi 4 , +.Xr ipwfw 4 , .Xr pci 4 , .Xr wlan 4 , -.Xr wpi 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr ifconfig 8 , +.Xr wpa_supplicant 8 . .Sh AUTHORS -The +The original .Nm driver was written by .An Damien Bergamini Aq damien@FreeBSD.org . ==== //depot/projects/vap/share/man/man4/iwi.4#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man4/iwi.4,v 1.19 2007/11/13 16:42:22 brueffer Exp $ .\" -.Dd March 6, 2007 +.Dd Apri 13, 2008 .Os .Dt IWI 4 .Sh NAME @@ -33,31 +33,28 @@ .Nd "Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 driver" .Sh SYNOPSIS To compile this driver into the kernel, -place the following lines in your +include the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device iwi" +.Cd "device iwifw" .Cd "device pci" .Cd "device wlan" .Cd "device firmware" .Ed .Pp Alternatively, to load the driver as a -module at boot time, place the following lines in +module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_iwi_load="YES" -wlan_load="YES" -firmware_load="YES" .Ed .Pp -In both cases, place the following lines in +In both cases, place the following line in .Xr loader.conf 5 -to load the firmware modules: +to acknowledge the firmware license (see below): .Bd -literal -offset indent -iwi_bss_load="YES" -iwi_ibss_load="YES" -iwi_monitor_load="YES" +legal.intel_iwi.license_ack=1 .Ed .Sh DESCRIPTION The @@ -65,19 +62,23 @@ driver provides support for .Tn Intel PRO/Wireless 2200BG/2915ABG MiniPCI and 2225BG PCI network adapters. -.Pp -By default, the .Nm -driver configures the adapter for BSS operation (aka infrastructure mode). -This mode requires the use of an access point. -.Pp +supports +.Cm station , +.Cm adhoc , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. For more information on configuring this device, see .Xr ifconfig 8 . .Pp -This driver requires firmware to be loaded before it will work. -For the loaded firmware to work the license at +This driver requires the firmware built with the +.Nm iwifw +module to work. +For the loaded firmware to be enabled for use the license at .Pa /usr/share/doc/legal/intel_iwi/LICENSE -must be agreed to and the following line be added to +must be agreed by adding the following line to .Xr loader.conf 5 : .Pp .Dl "legal.intel_iwi.license_ack=1" @@ -90,22 +91,25 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00" +.Bd -literal -offset indent +ifconfig wlan create wlandev iwi0 inet 192.168.0.20 \e + netmask 0xffffff00 +.Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Dl "ifconfig wlan create wlandev iwi0 ssid my_net up" .Pp Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - wepmode on wepkey 0x1234567890 weptxkey 1 +ifconfig wlan create wlandev iwi0 ssid my_net \e + wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed .Pp Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig iwi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev iwi0 wlanmode adhoc ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS @@ -114,7 +118,7 @@ The driver will reset the hardware. This should not happen. .It "iwi%d: firmware error" -The onboard microcontroller crashes for some reason. +The onboard microcontroller crashed for some reason. The driver will reset the hardware. This should not happen. .It "iwi%d: timeout waiting for firmware initialization to complete" @@ -124,8 +128,9 @@ The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify that the necessary firmware modules are loaded and the -license agreement +Verify the +.Xr iwifw 4 +firmware module is installed and the license agreement .Xr loader 8 tunable has been set. .It "iwi%d: could not load boot firmware" @@ -141,14 +146,16 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr ipw 4 , +.Xr iwifw 4 , .Xr pci 4 , .Xr wlan 4 , -.Xr wpi 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr ifconfig 8 , +.Xr wpa_supplicant 8 . .Sh AUTHORS -The +The original .Nm driver was written by .An Damien Bergamini Aq damien@FreeBSD.org . ==== //depot/projects/vap/share/man/man4/ral.4#3 (text+ko) ==== @@ -15,7 +15,7 @@ .\" .\" $FreeBSD: src/share/man/man4/ral.4,v 1.13 2007/09/10 17:54:14 brueffer Exp $ .\" -.Dd September 10, 2007 +.Dd April 13, 2008 .Os .Dt RAL 4 .Sh NAME @@ -27,7 +27,10 @@ kernel configuration file: .Bd -ragged -offset indent .Cd "device ral" +.Cd "device ralfw" .Cd "device wlan" +.Cd "device wlan_amrr" +.Cd "device firmware" .Ed .Pp Alternatively, to load the driver as a @@ -63,6 +66,31 @@ The transmit speed is user-selectable or can be adapted automatically by the driver depending on the received signal strength and on the number of hardware transmission retries. +.Pp +.Nm +supports +.Cm station , +.Cm adhoc , +.Cm hostap , +.Cm wds , +and +.Cm monitor +mode operation. +Only one +.Cm hostap +virtual interface may be configured at a time. +Any number of +.Cm wds +virtual interfaces may be configured together with a +.Cm hostap +interface. +Multiple +.Cm station +interfaces may be operated together with a +.Cm hostap +interface to construct a wireless repeater device. +For more information on configuring this device, see +.Xr ifconfig 8 . .Sh HARDWARE The .Nm @@ -163,22 +191,27 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00" +.Dl "ifconfig wlan create wlandev ral0 inet 192.168.0.20 netmask 0xffffff00" .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Bd -literal -offset indent +ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e + netmask 0xffffff00 ssid my_net +.Ed .Pp Join a specific BSS network with 40-bit WEP encryption: .Bd -literal -offset indent -ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e + netmask 0xffffff00 ssid my_net \e wepmode on wepkey 0x1234567890 weptxkey 1 .Ed .Pp Join a specific BSS network with 104-bit WEP encryption: .Bd -literal -offset indent -ifconfig ral0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev ral0 inet 192.168.0.20 \e + netmask 0xffffff00 ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS @@ -194,13 +227,16 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr arp 4 , +.Xr intro 4 , .Xr cardbus 4 , -.Xr netintro 4 , -.Xr pci 4 , .Xr wlan 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr wlan_xauth 4 , +.Xr hostapd 8 , +.Xr ifconfig 8 , +.Xr wpa_supplicant 8 . .Rs .%T "Ralink Technology" .%O http://www.ralinktech.com/ @@ -210,17 +246,8 @@ .Nm driver first appeared in .Ox 3.7 . -.Sh CAVEATS -PCI -.Nm -adapters seem to require a PCI 2.2 compliant motherboard and will likely not -work with PCI 2.1 only motherboard. -.Pp -The -.Nm -driver does not implement frame aggregation. .Sh AUTHORS -The +The original .Nm driver was written by .An Damien Bergamini Aq damien@FreeBSD.org . ==== //depot/projects/vap/share/man/man4/rum.4#3 (text+ko) ==== @@ -16,7 +16,7 @@ .\" .\" $FreeBSD: src/share/man/man4/rum.4,v 1.3 2007/09/07 15:28:39 brueffer Exp $ .\" -.Dd September 7, 2007 +.Dd April 13, 2008 .Os .Dt RUM 4 .Sh NAME @@ -45,11 +45,11 @@ .Sh DESCRIPTION The .Nm -driver supports USB 2.0 and PCI Express Mini Card wireless adapters based on the -Ralink RT2501USB and RT2601USB chipsets. +driver supports USB 2.0 and PCI Express Mini Card wireless adapters +based on the Ralink RT2501USB and RT2601USB chipsets. .Pp -Ralink PCI Express Mini Card adapters show up as normal USB 2.0 devices and are -thus handled by the +Ralink PCI Express Mini Card adapters show up as normal USB 2.0 +devices and are thus handled by the .Nm driver. .Pp @@ -58,15 +58,27 @@ It consists of two integrated chips, an RT2571W MAC/BBP and an RT2528 or RT5226 radio transceiver. .Pp -The RT2601USB chipset consists of two integrated chips, an RT2671 MAC/BBP and -an RT2527 or RT5225 radio transceiver. -This chipset uses the MIMO (multiple-input multiple-output) technology with -multiple antennas to extend the operating range of the adapter and to achieve -higher throughput. +The RT2601USB chipset consists of two integrated chips, an RT2671 +MAC/BBP and an RT2527 or RT5225 radio transceiver. +This chipset uses the MIMO (multiple-input multiple-output) technology +with multiple antennas to extend the operating range of the adapter +and to achieve higher throughput. +.Pp +.Nm +supports +.Cm station , +.Cm adhoc , +.Cm hostap , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. +For more information on configuring this device, see +.Xr ifconfig 8 . .Sh HARDWARE The .Nm -driver supports USB 2.0 and PCI Express Mini Card wireless +driver supports USB 2.0 wireless adapters based on the Ralink RT2501USB and RT2601USB chipsets, including: .Pp @@ -108,22 +120,25 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig rum0 inet 192.168.0.20 netmask 0xffffff00" +.Bd -literal -offset indent +ifconfig wlan create wlandev rum0 inet 192.168.0.20 \e + netmask 0xffffff00 +.Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Dl "ifconfig wlan create wlandev rum0 ssid my_net up" .Pp -Join a specific BSS network with 40-bit WEP encryption: +Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - wepmode on wepkey 0x1234567890 weptxkey 1 +ifconfig wlan create wlandev rum0 ssid my_net \e + wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed .Pp -Join a specific BSS network with 104-bit WEP encryption: +Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig rum0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev rum0 wlanmode adhoc ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS @@ -135,13 +150,18 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr arp 4 , +.Xr intro 4 , .Xr netintro 4 , .Xr usb 4 , .Xr wlan 4 , .Xr wlan_amrr 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr wlan_xauth 4 , +.Xr ifconfig 8 , +.Xr hostapd 8 , +.Xr wpa_supplicant 8 . .Rs .%T "Ralink Technology" .%O http://www.ralinktech.com/ @@ -151,16 +171,8 @@ .Nm driver first appeared in .Ox 4.0 . -.Sh CAVEATS -.Pp -The -.Nm -driver supports automatic control of the transmit speed in BSS mode only. -Therefore the use of a -.Nm -adapter in Host AP mode is discouraged. .Sh AUTHORS -The +The original .Nm driver was written by .An Niall O'Higgins Aq niallo@openbsd.org ==== //depot/projects/vap/share/man/man4/ural.4#3 (text+ko) ==== @@ -15,7 +15,7 @@ .\" .\" $FreeBSD: src/share/man/man4/ural.4,v 1.15 2007/09/10 17:54:14 brueffer Exp $ .\" -.Dd September 10, 2007 +.Dd April 13, 2008 .Os .Dt URAL 4 .Sh NAME @@ -52,6 +52,18 @@ The RT2522, RT2523, RT2524, RT2525, RT2525e and RT2526 radio transceivers operate in the 2.4GHz band (802.11b/g) whereas the RT5222 is a dual-band radio transceiver that can operate in the 2.4GHz and 5.2GHz bands (802.11a). +.Pp +.Nm +supports +.Cm station , +.Cm adhoc , +.Cm hostap , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. +For more information on configuring this device, see +.Xr ifconfig 8 . .Sh HARDWARE The .Nm @@ -94,22 +106,25 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig ural0 inet 192.168.0.20 netmask 0xffffff00" +.Bd -literal -offset indent +ifconfig wlan create wlandev ural0 inet 192.168.0.20 \e + netmask 0xffffff00 +.Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Dl "ifconfig wlan create wlandev ural0 ssid my_net up" .Pp -Join a specific BSS network with 40-bit WEP encryption: +Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent -ifconfig ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - wepmode on wepkey 0x1234567890 weptxkey 1 +ifconfig wlan create wlandev ural0 ssid my_net \e + wepmode on wepkey 0x1234567890 weptxkey 1 up .Ed .Pp -Join a specific BSS network with 104-bit WEP encryption: +Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig ural0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e +ifconfig wlan create wlandev ural0 wlanmode adhoc ssid my_net \e wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 .Ed .Sh DIAGNOSTICS @@ -119,13 +134,18 @@ This should not happen. .El .Sh SEE ALSO -.Xr altq 4 , -.Xr arp 4 , +.Xr intro 4 , .Xr netintro 4 , .Xr usb 4 , .Xr wlan 4 , .Xr wlan_amrr 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr wlan_xauth 4 , +.Xr ifconfig 8 , +.Xr hostapd 8 , +.Xr wpa_supplicant 8 . .Rs .%T "Ralink Technology" .%O http://www.ralinktech.com/ @@ -135,14 +155,8 @@ .Nm driver first appeared in .Ox 3.7 . -.Sh CAVEATS -.Pp -The -.Nm -driver does not support automatic adaptation of the transmit speed in IBSS -and HostAP operating modes. .Sh AUTHORS -The +The original .Nm driver was written by .An Damien Bergamini Aq damien@FreeBSD.org . ==== //depot/projects/vap/share/man/man4/wi.4#4 (text+ko) ==== @@ -31,12 +31,12 @@ .\" $FreeBSD: src/share/man/man4/wi.4,v 1.74 2008/01/28 18:08:41 brueffer Exp $ .\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" -.Dd July 16, 2005 +.Dd April 13, 2008 .Dt WI 4 .Os .Sh NAME .Nm wi -.Nd "Lucent Hermes, Intersil PRISM and Spectrum24 IEEE 802.11 driver" +.Nd "Lucent Hermes, and Intersil PRISM IEEE 802.11 driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -55,74 +55,30 @@ .Sh DESCRIPTION The .Nm -driver provides support for wireless network adapters based around -the Lucent Hermes, Intersil PRISM-II, Intersil PRISM-2.5, Intersil -Prism-3, and Symbol Spectrum24 chipsets. -All five chipsets provide a similar interface to the driver. -.Pp -Supported features include 802.11 and 802.3 frames, power management, BSS, -IBSS, WDS and old-style Lucent ad-hoc operation modes. -Cards based on the Intersil PRISM chips also support a host-based -access point mode which allows a card to act as a normal access point -(with some assistance from the -.Nm -driver). -The Lucent Hermes and Symbol Spectrum24 chipsets do not contain this -functionality. -The PRISM family of chips do not support the WDS functionality. +driver provides support for 802.11b wireless network adapters based around +the Lucent Hermes, Intersil PRISM-II, Intersil PRISM-2.5, and Intersil +Prism-3 chipsets. +All chipsets provide a similar interface to the driver. +Only the Intersil chipsets support access point operation. +Functionality, such as WPA support, depends on the specific version +of the firmware used. All host/device interaction is via programmed I/O, even on those cards that support a DMA interface. .Pp -The -.Nm -driver encapsulates all IP and ARP traffic as 802.11 frames, however -it can receive either 802.11 or 802.3 frames. -Transmit speed is selectable between 1Mbps, 2Mbps, 5.5 Mbps and 11Mbps -depending on your hardware. -Most hardware supports 11Mbps where the signal quality allows, but -falls back to slower speeds when it does not. -Except for the Lucent WaveLAN Bronze cards, all cards supported by the -.Nm -driver support WEP for encryption. -To enable encryption, use -.Xr ifconfig 8 -as shown below. +For more information on configuring this device, see +.Xr ifconfig 8 . .Pp -By default, the .Nm -driver configures the card for BSS operation (aka infrastructure -mode). -This mode requires the use of an access point (base station). -.Pp -The -.Nm -driver also supports a point-to-point mode -where stations can communicate amongst themselves without the -aid of an access point. -Note that there are two possible point-to-point modes. -One mode, referred to as -.Dq "ad-hoc demo mode" , -or -.Dq "legacy Lucent ad-hoc mode" , -predates the IEEE 802.11 specification and so may not interoperate -with cards from different vendors. -The standardized point-to-point mode is called IBSS (or confusingly -just ad-hoc mode), but is not supported by cards with very old -firmware revisions. -If your cards supports IBSS mode, it is recommended that you use it in -preference to the -.Dq "ad-hoc demo mode" -in new installations. -.Pp -Cards supported by the driver based on the Intersil PRISM family of chips also -have a host-based access point mode which allows the card to -act as an access point (base station). -Access points are different than operating in IBSS mode. -They operate in BSS mode. -They allow for easier roaming and bridge all Ethernet traffic such -that machines connected via an access point appear to be on the local -Ethernet segment. -.Pp +supports +.Cm station , +.Cm adhoc , +.Cm adhoc-demo , +.Cm hostap , +and +.Cm monitor +mode operation. +Only one +virtual interface may be configured at a time. For more information on configuring this device, see .Xr ifconfig 8 . .Pp @@ -151,7 +107,6 @@ .Pp .Bl -column -compact "Linksys Instant Wireless WPC11 2.5" "Spectrum24" "PCI or PCMCIA" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 18:58:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAA771065670; Sun, 13 Apr 2008 18:58:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D6C8106566B for ; Sun, 13 Apr 2008 18:58:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81E348FC20 for ; Sun, 13 Apr 2008 18:58:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DIwQao080298 for ; Sun, 13 Apr 2008 18:58:26 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DIwQjx080296 for perforce@freebsd.org; Sun, 13 Apr 2008 18:58:26 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 18:58:26 GMT Message-Id: <200804131858.m3DIwQjx080296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 18:58:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=139983 Change 139983 by sam@sam_ebb on 2008/04/13 18:58:15 damien doesn't live here any more; use the email address he sticks in his code Affected files ... .. //depot/projects/vap/share/man/man4/ipw.4#4 edit .. //depot/projects/vap/share/man/man4/iwi.4#4 edit .. //depot/projects/vap/share/man/man4/iwn.4#1 add .. //depot/projects/vap/share/man/man4/ural.4#4 edit Differences ... ==== //depot/projects/vap/share/man/man4/ipw.4#4 (text+ko) ==== @@ -153,4 +153,4 @@ The original .Nm driver was written by -.An Damien Bergamini Aq damien@FreeBSD.org . +.An Damien Bergamini Aq damien.bergamini@free.fr ==== //depot/projects/vap/share/man/man4/iwi.4#4 (text+ko) ==== @@ -158,4 +158,4 @@ The original .Nm driver was written by -.An Damien Bergamini Aq damien@FreeBSD.org . +.An Damien Bergamini Aq damien.bergamini@free.fr ==== //depot/projects/vap/share/man/man4/ural.4#4 (text+ko) ==== @@ -159,4 +159,4 @@ The original .Nm driver was written by -.An Damien Bergamini Aq damien@FreeBSD.org . +.An Damien Bergamini Aq damien.bergamini@free.fr From owner-p4-projects@FreeBSD.ORG Sun Apr 13 19:23:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8F34106566C; Sun, 13 Apr 2008 19:23:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D483106564A for ; Sun, 13 Apr 2008 19:23:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7991A8FC2B for ; Sun, 13 Apr 2008 19:23:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DJNu73082345 for ; Sun, 13 Apr 2008 19:23:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DJNuhb082343 for perforce@freebsd.org; Sun, 13 Apr 2008 19:23:56 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 19:23:56 GMT Message-Id: <200804131923.m3DJNuhb082343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 19:23:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=139984 Change 139984 by sam@sam_ebb on 2008/04/13 19:23:28 more Affected files ... .. //depot/projects/vap/share/man/man4/bwi.4#1 add .. //depot/projects/vap/share/man/man4/iwn.4#2 edit .. //depot/projects/vap/share/man/man4/malo.4#2 edit .. //depot/projects/vap/share/man/man4/mwl.4#1 add Differences ... ==== //depot/projects/vap/share/man/man4/iwn.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .Dt IWN 4 .Sh NAME .Nm iwn -.Nd "Intel Wireless WiFI Link 4965AGN IEEE 802.11 driver" +.Nd "Intel Wireless WiFI Link 4965AGN IEEE 802.11n driver" .Sh SYNOPSIS To compile this driver into the kernel, include the following lines in your ==== //depot/projects/vap/share/man/man4/malo.4#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" $FreeBSD: src/share/man/man4/malo.4,v 1.2 2008/03/25 20:32:19 brueffer Exp $ .\"/ -.Dd March 25, 2008 +.Dd April 13, 2008 .Dt MALO 4 .Os .Sh NAME @@ -53,41 +53,33 @@ .Xr loader.conf 5 : .Bd -literal -offset indent if_malo_load="YES" -wlan_load="YES" -firmware_load="YES" .Ed -.Pp -In both cases, place the following line in -.Xr loader.conf 5 -to load the firmware module: -.Bd -literal -offset indent -malofw_load="YES" -.Ed .Sh DESCRIPTION The .Nm driver provides support for Marvell Libertas 88W8335 based PCI -network adapters. -.Pp -This driver requires firmware to be loaded before it will work. -These firmware files are from the -.Ox +and Cardbus network adapters. .Nm -driver. +supports +.Cm station , +.Cm adhoc , +and +.Cm monitor +mode operation. +Only one virtual interface may be configured at any time. +For more information on configuring this device, see +.Xr ifconfig 8 . .Pp -A package for the firmware which can be installed via +This driver requires the +.Nm malofw +be installed before it will work. +The firmware files are not publicly available. +A package of the firmware which can be installed via .Xr pkg_add 1 -can be found at: +with: .Bd -literal -offset indent http://weongyo.org/project/malo/malo-firmware-1.4.tar.gz .Ed -.Pp -This package must be installed before -.Xr ifconfig 8 -will work. -.Pp -For more information on configuring this device, see -.Xr ifconfig 8 . .Sh HARDWARE The following cards are among those supported by the .Nm @@ -102,26 +94,38 @@ .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp -.Dl "ifconfig malo0 inet 192.168.0.20 netmask 0xffffff00" +.Bd -literal -offset indent +ifconfig wlan create wlandev iwn0 inet 192.168.0.20 \e + netmask 0xffffff00 +.Ed .Pp Join a specific BSS network with network name .Dq Li my_net : .Pp -.Dl "ifconfig malo0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net" +.Dl "ifconfig wlan create wlandev iwn0 ssid my_net up" +.Pp +Join a specific BSS network with 64-bit WEP encryption: +.Bd -literal -offset indent +ifconfig wlan create wlandev iwn0 ssid my_net \e + wepmode on wepkey 0x1234567890 weptxkey 1 up +.Ed .Pp -Join a specific BSS network with WEP encryption: +Join a specific BSS network with 128-bit WEP encryption: .Bd -literal -offset indent -ifconfig malo0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - wepmode on wepkey 0x8736639624 +ifconfig wlan create wlandev iwn0 wlanmode adhoc ssid my_net \e + wepmode on wepkey 0x01020304050607080910111213 weptxkey 1 +.Ed .Ed .Sh SEE ALSO -.Xr altq 4 , -.Xr arp 4 , +.Xr malofw 4 , +.Xr pci 4 , .Xr cardbus 4 , -.Xr netintro 4 , -.Xr pci 4 , .Xr wlan 4 , -.Xr ifconfig 8 +.Xr wlan_ccmp 4 , +.Xr wlan_tkip 4 , +.Xr wlan_wep 4 , +.Xr ifconfig 8 , +.Xr wpa_supplicant 8 . .Sh HISTORY The .Nm From owner-p4-projects@FreeBSD.ORG Sun Apr 13 19:24:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 192241065678; Sun, 13 Apr 2008 19:24:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEED1106564A for ; Sun, 13 Apr 2008 19:24:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2B888FC14 for ; Sun, 13 Apr 2008 19:24:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DJOvOx082437 for ; Sun, 13 Apr 2008 19:24:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DJOvQY082435 for perforce@freebsd.org; Sun, 13 Apr 2008 19:24:57 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 19:24:57 GMT Message-Id: <200804131924.m3DJOvQY082435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 19:24:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=139985 Change 139985 by sam@sam_ebb on 2008/04/13 19:24:12 hookup bwi, iwn, and mwl Affected files ... .. //depot/projects/vap/share/man/man4/Makefile#10 edit Differences ... ==== //depot/projects/vap/share/man/man4/Makefile#10 (text+ko) ==== @@ -40,6 +40,7 @@ blackhole.4 \ bpf.4 \ bt.4 \ + bwi.4 \ cardbus.4 \ carp.4 \ ccd.4 \ @@ -136,6 +137,7 @@ isp.4 \ ispfw.4 \ iwi.4 \ + iwn.4 \ ixgb.4 \ joy.4 \ kbdmux.4 \ @@ -180,6 +182,7 @@ msk.4 \ mtio.4 \ multicast.4 \ + mwl.4 \ mxge.4 \ my.4 \ natm.4 \ From owner-p4-projects@FreeBSD.ORG Sun Apr 13 19:51:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3215C1065674; Sun, 13 Apr 2008 19:51:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D00971065671 for ; Sun, 13 Apr 2008 19:51:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB4558FC1A for ; Sun, 13 Apr 2008 19:51:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DJpUA8083483 for ; Sun, 13 Apr 2008 19:51:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DJpTTb083481 for perforce@freebsd.org; Sun, 13 Apr 2008 19:51:29 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 19:51:29 GMT Message-Id: <200804131951.m3DJpTTb083481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 19:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=139988 Change 139988 by sam@sam_ebb on 2008/04/13 19:50:59 IFC @ 139987 Affected files ... .. //depot/projects/vap/contrib/top/machine.h#4 integrate .. //depot/projects/vap/include/unistd.h#8 integrate .. //depot/projects/vap/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/vap/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/vap/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate .. //depot/projects/vap/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/vap/lib/libc/stdlib/strfmon.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/inode.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/vap/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/vap/sbin/restore/dirs.c#4 integrate .. //depot/projects/vap/sbin/restore/tape.c#3 integrate .. //depot/projects/vap/sbin/route/route.c#4 integrate .. //depot/projects/vap/share/man/man4/Makefile#11 integrate .. //depot/projects/vap/share/man/man4/ddb.4#5 integrate .. //depot/projects/vap/share/man/man4/k8temp.4#1 branch .. //depot/projects/vap/share/man/man9/lock.9#10 integrate .. //depot/projects/vap/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/vap/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/vap/sys/arm/arm/intr.c#7 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/vap/sys/conf/Makefile.mips#1 branch .. //depot/projects/vap/sys/conf/files#30 edit .. //depot/projects/vap/sys/conf/files.amd64#8 integrate .. //depot/projects/vap/sys/conf/files.i386#8 integrate .. //depot/projects/vap/sys/conf/files.mips#1 branch .. //depot/projects/vap/sys/conf/files.pc98#7 integrate .. //depot/projects/vap/sys/conf/ldscript.mips#1 branch .. //depot/projects/vap/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/vap/sys/conf/options#19 integrate .. //depot/projects/vap/sys/conf/options.mips#1 branch .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/vap/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/vap/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-disk.h#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/vap/sys/dev/ata/ata_if.m#5 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cd.h#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/vap/sys/dev/ata/atapi-tape.h#6 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/vap/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/vap/sys/dev/iicbus/lm90.c#1 add .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/vap/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/vap/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC.hints#6 edit .. //depot/projects/vap/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#8 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#10 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#9 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#12 integrate .. //depot/projects/vap/sys/kern/subr_taskqueue.c#9 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#10 integrate .. //depot/projects/vap/sys/modules/Makefile#19 integrate .. //depot/projects/vap/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/vap/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#9 integrate .. //depot/projects/vap/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/vap/sys/sys/ata.h#8 integrate .. //depot/projects/vap/sys/sys/cpuset.h#6 integrate .. //depot/projects/vap/sys/sys/interrupt.h#7 integrate .. //depot/projects/vap/sys/sys/jail.h#6 integrate .. //depot/projects/vap/sys/sys/rwlock.h#6 integrate .. //depot/projects/vap/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/vap/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/vap/usr.bin/top/machine.c#6 integrate .. //depot/projects/vap/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/vap/usr.sbin/config/main.c#4 integrate .. //depot/projects/vap/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/vap/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/vap/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/vap/usr.sbin/pkg_install/delete/perform.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/lib/match.c#3 integrate .. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#5 integrate Differences ... ==== //depot/projects/vap/contrib/top/machine.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/vap/include/unistd.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/vap/lib/libc/gdtoa/Makefile.inc#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/vap/lib/libc/gdtoa/_hdtoa.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/vap/lib/libc/sparc64/fpu/fpu_qp.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include #include @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (test(FSR_GET_FCC0(fe.fe_fsr))); \ } @@ -112,11 +124,14 @@ struct fpemu fe; struct fpn *r; __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); + fe.fe_cx = 0; fe.fe_f1.fp_sign = a[0] >> 31; fe.fe_f1.fp_sticky = 0; fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); r = __fpu_sqrt(&fe); c[0] = __fpu_ftoq(&fe, r, c); + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); } _QP_OP(add) ==== //depot/projects/vap/lib/libc/sparc64/fpu/fpu_sqrt.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.4 2007/01/09 00:28:05 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_sqrt.c,v 1.5 2008/04/12 03:10:13 das Exp $"); /* * Perform an FPU square root (return sqrt(x)). @@ -334,7 +334,7 @@ FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { x0 = d0, x1 = d1, x2 = d2; - q |= bit; + q = bit; y1 |= 1; /* now t1, y1 are set in concrete */ } ODD_DOUBLE; @@ -366,12 +366,12 @@ FPU_SUBCS(d2, x2, t2); FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); - ODD_DOUBLE; if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; - q |= bit; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; + q = bit; y2 |= 1; } + ODD_DOUBLE; while ((bit >>= 1) != 0) { EVEN_DOUBLE; t3 = y3 | bit; @@ -380,7 +380,7 @@ FPU_SUBCS(d1, x1, t1); FPU_SUBC(d0, x0, t0); if ((int)d0 >= 0) { - x0 = d0, x1 = d1, x2 = d2; + x0 = d0, x1 = d1, x2 = d2; x3 = d3; q |= bit; y3 |= bit << 1; } ==== //depot/projects/vap/lib/libc/stdio/printf.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.60 2007/01/09 00:28:07 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.61 2008/04/12 03:11:56 das Exp $ .\" .Dd October 16, 2004 .Dt PRINTF 3 @@ -549,13 +549,14 @@ Note that there may be multiple valid ways to represent floating-point numbers in this hexadecimal format. For example, -.Li 0x3.24p+0 , 0x6.48p-1 +.Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 , and .Li 0xc.9p-2 are all equivalent. -The format chosen depends on the internal representation of the -number, but the implementation guarantees that the length of the -mantissa will be minimized. +.Fx 8.0 +and later always prints finite non-zero numbers using +.Ql 1 +as the digit before the hexadecimal point. Zeroes are always represented with a mantissa of 0 (preceded by a .Ql - if appropriate) and an exponent of ==== //depot/projects/vap/lib/libc/stdlib/strfmon.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/vap/sbin/fsck_ffs/fsck.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.38 2008/04/10 23:49:23 delphij Exp $ */ #include @@ -270,6 +270,7 @@ int bkgrdflag; /* use a snapshot to run on an active system */ int bflag; /* location of alternate super block */ int debug; /* output debugging info */ +char catastrophicflag; /* run in catastrophic mode */ int cvtlevel; /* convert to newer file system format */ int bkgrdcheck; /* determine if background check is possible */ int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */ @@ -335,6 +336,7 @@ void catch(int); void catchquit(int); int changeino(ino_t dir, const char *name, ino_t newnum); +void check_cgmagic(int cg, struct cg *cgp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); ==== //depot/projects/vap/sbin/fsck_ffs/fsck_ffs.8#3 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsck.8 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $ +.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.35 2008/04/10 23:49:23 delphij Exp $ .\" -.Dd April 24, 2001 +.Dd April 10, 2008 .Dt FSCK_FFS 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd file system consistency check and interactive repair .Sh SYNOPSIS .Nm -.Op Fl BFpfny +.Op Fl BCFpfny .Op Fl b Ar block .Op Fl c Ar level .Op Fl m Ar mode @@ -175,6 +175,26 @@ the super block for the file system. An alternate super block is usually located at block 32 for UFS1, and block 160 for UFS2. +.It Fl C +Run +.Nm +in 'catastrophic recovery' mode, which will enable certain aggressive +operations that can make +.Nm +to survive with file systems that has very serious data damage, which +is an useful last resort when on disk data damage is very serious +and causes +.Nm +to crash otherwise. Be +.Em very careful +using this flag, is dangerous if there are data transmission hazards +because a false positive cylinder group magic number mismatch could +cause +.Em irrevertible data loss! +.Pp +This option implies the +.Fl f +flag. .It Fl c Convert the file system to the specified level. Note that the level of a file system can only be raised. ==== //depot/projects/vap/sbin/fsck_ffs/fsutil.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.27 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -418,6 +418,35 @@ } /* + * Check cg's magic number. If catastrophic mode is enabled and the cg's + * magic number is bad, offer an option to clear the whole cg. + */ +void +check_cgmagic(int cg, struct cg *cgp) +{ + + if (!cg_chkmagic(cgp)) { + pwarn("CG %d: BAD MAGIC NUMBER\n", cg); + if (catastrophicflag) { + if (reply("CLEAR CG")) { + memset(cgp, 0, (size_t)sblock.fs_cgsize); + cgp->cg_initediblk = sblock.fs_ipg; + cgp->cg_old_niblk = sblock.fs_ipg; + cgp->cg_old_ncyl = sblock.fs_old_cpg; + cgp->cg_cgx = cg; + cgp->cg_niblk = sblock.fs_ipg; + cgp->cg_ndblk = sblock.fs_size - cgbase(&sblock, cg); + cgp->cg_magic = CG_MAGIC; + cgdirty(); + printf("PLEASE RERUN FSCK.\n"); + rerun = 1; + } + } else + printf("YOU MAY NEED TO RERUN FSCK WITH -C IF IT CRASHED.\n"); + } +} + +/* * allocate a data block with the specified number of fragments */ ufs2_daddr_t @@ -441,8 +470,7 @@ } cg = dtog(&sblock, i + j); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); baseblk = dtogd(&sblock, i + j); for (k = 0; k < frags; k++) { setbmap(i + j + k); ==== //depot/projects/vap/sbin/fsck_ffs/inode.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.39 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -617,8 +617,7 @@ return (0); cg = ino_to_cg(&sblock, ino); getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize); - if (!cg_chkmagic(cgp)) - pfatal("CG %d: BAD MAGIC NUMBER\n", cg); + check_cgmagic(cg, cgp); setbit(cg_inosused(cgp), ino % sblock.fs_ipg); cgp->cg_cs.cs_nifree--; switch (type & IFMT) { ==== //depot/projects/vap/sbin/fsck_ffs/main.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.51 2008/04/10 23:49:23 delphij Exp $"); #include #include @@ -81,7 +81,8 @@ sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) { + catastrophicflag = 0; + while ((ch = getopt(argc, argv, "b:Bc:CdfFm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -105,6 +106,10 @@ debug++; break; + case 'C': + catastrophicflag = 1; + /* FALLTHROUGH */ + case 'f': skipclean = 0; break; ==== //depot/projects/vap/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/vap/sbin/restore/dirs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.32 2008/04/03 20:37:38 imp Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; #endif /* not lint */ #include @@ -558,6 +558,7 @@ char *cp, *buf; const char *tmpdir; int bufsize; + uid_t myuid; vprintf(stdout, "Set directory mode, owner, and times.\n"); if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') @@ -578,6 +579,7 @@ } clearerr(mf); bufsize = 0; + myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); if (feof(mf)) @@ -624,7 +626,10 @@ "extended attributes for ", cp); } } - (void) chown(cp, node.uid, node.gid); + if (myuid != 0) + (void) chown(cp, myuid, node.gid); + else + (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); utimes(cp, node.ctimep); utimes(cp, node.mtimep); ==== //depot/projects/vap/sbin/restore/tape.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.49 2007/03/06 08:13:20 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sbin/restore/tape.c,v 1.51 2008/04/11 21:51:53 mckusick Exp $"); #include #include @@ -582,7 +582,9 @@ ctimep[1].tv_sec = curfile.birthtime_sec; ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; extsize = curfile.extsize; - uid = curfile.uid; + uid = getuid(); + if (uid == 0) + uid = curfile.uid; gid = curfile.gid; mode = curfile.mode; flags = curfile.file_flags; @@ -1377,7 +1379,7 @@ } if (checksum((int *)buf) == FAIL) return (FAIL); - if (_time64_to_time(buf->c_date) != dumpdate) + if (dumpdate != 0 && _time64_to_time(buf->c_date) != dumpdate) fprintf(stderr, "Header with wrong dumpdate.\n"); if (Bcvt) { swabst((u_char *)"8l4s1q8l2q17l", (u_char *)buf); ==== //depot/projects/vap/sbin/route/route.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.84 2008/03/22 12:50:43 remko Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.85 2008/04/10 12:16:20 ru Exp $"; #endif /* not lint */ #include @@ -1187,7 +1187,7 @@ #define NEXTADDR(w, u) \ if (rtm_addrs & (w)) {\ l = SA_SIZE(&(u.sa)); memmove(cp, &(u), l); cp += l;\ - if (verbose) sodump(&(u),"u");\ + if (verbose) sodump(&(u),#u);\ } errno = 0; ==== //depot/projects/vap/share/man/man4/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.413 2008/04/01 07:20:04 weongyo Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 13 19:59:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DD1C1065675; Sun, 13 Apr 2008 19:59:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 304F81065673 for ; Sun, 13 Apr 2008 19:59:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04A398FC15 for ; Sun, 13 Apr 2008 19:59:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DJxd1w083926 for ; Sun, 13 Apr 2008 19:59:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DJxdGp083924 for perforce@freebsd.org; Sun, 13 Apr 2008 19:59:39 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 19:59:39 GMT Message-Id: <200804131959.m3DJxdGp083924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 139989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 19:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=139989 Change 139989 by sam@sam_ebb on 2008/04/13 19:58:50 add a placeholder for /etc/regdomain.xml Affected files ... .. //depot/projects/vap/share/man/man5/Makefile#3 edit .. //depot/projects/vap/share/man/man5/regdomain.5#1 add Differences ... ==== //depot/projects/vap/share/man/man5/Makefile#3 (text+ko) ==== @@ -55,6 +55,7 @@ protocols.5 \ quota.user.5 \ rc.conf.5 \ + regdomain.5 \ reiserfs.5 \ remote.5 \ resolver.5 \ From owner-p4-projects@FreeBSD.ORG Sun Apr 13 21:54:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CC871065674; Sun, 13 Apr 2008 21:54:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A655106566B for ; Sun, 13 Apr 2008 21:54:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 877F88FC1D for ; Sun, 13 Apr 2008 21:54:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DLsmca099573 for ; Sun, 13 Apr 2008 21:54:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DLsmqA099571 for perforce@freebsd.org; Sun, 13 Apr 2008 21:54:48 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 21:54:48 GMT Message-Id: <200804132154.m3DLsmqA099571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139997 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 21:54:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=139997 Change 139997 by imp@imp_paco-paco on 2008/04/13 21:54:29 IFC @139995 Affected files ... .. //depot/projects/arm/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/mips2/src/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/mips2/src/sys/conf/files#24 integrate .. //depot/projects/mips2/src/sys/conf/files.pc98#8 integrate .. //depot/projects/mips2/src/sys/conf/options#18 integrate .. //depot/projects/mips2/src/sys/dev/acpi_support/acpi_asus.c#5 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-raid.c#7 integrate Differences ... ==== //depot/projects/arm/src/sbin/geom/class/part/geom_part.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/mips2/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/mips2/src/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/mips2/src/sys/conf/files#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1288 2008/04/03 20:58:18 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1673,6 +1673,7 @@ net/ppp_tty.c optional ppp net/pfil.c optional ether | inet net/radix.c standard +net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard ==== //depot/projects/mips2/src/sys/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.359 2007/12/03 11:38:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,8 +314,10 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/mips2/src/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.625 2008/04/13 05:45:13 qingli Exp $ # # On the handling of kernel options # @@ -393,6 +393,7 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h +RADIX_MPATH opt_mpath.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h ==== //depot/projects/mips2/src/sys/dev/acpi_support/acpi_asus.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.31 2008/04/10 15:17:41 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.32 2008/04/13 14:40:02 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -375,6 +375,20 @@ { .name = NULL } }; +/* + * EeePC have an Asus ASUS010 gadget interface, + * but they can't be probed quite the same way as Asus laptops. + */ +static struct acpi_asus_model acpi_eeepc_models[] = { + { + .name = "EEE", + .brn_get = "\\_SB.ATKD.PBLG", + .brn_set = "\\_SB.ATKD.PBLS" + }, + + { .name = NULL } +}; + static struct { char *name; char *description; @@ -444,13 +458,17 @@ ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; - static char *asus_ids[] = { "ATK0100", NULL }; + static char *asus_ids[] = { "ATK0100", "ASUS010", NULL }; + char *rstr; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (acpi_disabled("asus") || - ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL) + if (acpi_disabled("asus")) + return (ENXIO); + rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids); + if (rstr == NULL) { return (ENXIO); + } sc = device_get_softc(dev); sc->dev = dev; @@ -489,6 +507,14 @@ AcpiOsFree(Buf.Pointer); return (0); } + + /* if EeePC */ + if(strncmp("ASUS010", rstr, 7) == 0) { + sc->model = &acpi_eeepc_models[0]; + device_set_desc(dev, "ASUS EeePC"); + AcpiOsFree(Buf.Pointer); + return (0); + } } sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); ==== //depot/projects/mips2/src/sys/dev/ata/ata-all.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.130 2008/04/11 11:30:27 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.131 2008/04/13 16:05:34 sos Exp $ */ /* ATA register defines */ @@ -301,7 +301,7 @@ #define ATA_PC98_CTLADDR_RID 8 #define ATA_PC98_BANKADDR_RID 9 #define ATA_IRQ_RID 0 -#define ATA_DEV(unit) ((unit == ATA_ATA_SLAVE) ? 0x10 : 0) +#define ATA_DEV(unit) ((unit > 0) ? 0x10 : 0) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A #define ATA_CFA_MAGIC3 0x8400 ==== //depot/projects/mips2/src/sys/dev/ata/ata-raid.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.128 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.129 2008/04/13 16:05:34 sos Exp $"); #include "opt_ata.h" #include @@ -1669,9 +1669,8 @@ if (be32toh(meta->generation) >= raid->generation) { struct ata_device *atadev = device_get_softc(parent); struct ata_channel *ch = device_get_softc(GRANDPARENT(dev)); - int disk_number = (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + - ATA_DEV(atadev->unit); - + int disk_number = + (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + atadev->unit; raid->disks[disk_number].dev = parent; raid->disks[disk_number].sectors = be32toh(meta->configs[disk_number + 1].sectors); @@ -2303,7 +2302,7 @@ bcopy(atadev->param.serial, meta->disk[disk].serial, sizeof(rdp->disks[disk].serial)); meta->disk[disk].sectors = rdp->disks[disk].sectors; - meta->disk[disk].id = (ch->unit << 16) | ATA_DEV(atadev->unit); + meta->disk[disk].id = (ch->unit << 16) | atadev->unit; } else meta->disk[disk].sectors = rdp->total_sectors / rdp->width; @@ -3328,7 +3327,7 @@ device_get_softc(device_get_parent(rdp->disks[disk].dev)); meta->raid.channel = ch->unit; - meta->raid.device = ATA_DEV(atadev->unit); + meta->raid.device = atadev->unit; meta->raid.disk_sectors = rdp->disks[disk].sectors; meta->raid.disk_offset = rdp->offset_sectors; } @@ -3416,7 +3415,7 @@ device_get_softc(rdp->disks[drive].dev); meta->raid.disk[drive].channel = ch->unit; - meta->raid.disk[drive].device = ATA_DEV(atadev->unit); + meta->raid.disk[drive].device = atadev->unit; } meta->raid.disk[drive].magic_0 = PR_MAGIC0(meta->raid.disk[drive]) | timestamp.tv_sec; @@ -3742,7 +3741,7 @@ struct ata_channel *ch = device_get_softc(device_get_parent(rdp->disks[disk].dev)); struct ata_device *atadev = device_get_softc(rdp->disks[disk].dev); - int disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + int disk_number = 1 + atadev->unit + (ch->unit << 1); meta->disks |= disk_number << ((1 - disk) << 2); } @@ -3780,7 +3779,7 @@ bcopy(atadev->param.model, meta->model, sizeof(meta->model)); /* XXX SOS if total_disks > 2 this may not float */ - meta->disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + meta->disk_number = 1 + atadev->unit + (ch->unit << 1); if (testing || bootverbose) ata_raid_sis_print_meta(meta); From owner-p4-projects@FreeBSD.ORG Sun Apr 13 21:55:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27F681065671; Sun, 13 Apr 2008 21:55:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE552106566C for ; Sun, 13 Apr 2008 21:55:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCC498FC0A for ; Sun, 13 Apr 2008 21:55:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DLtnbd000766 for ; Sun, 13 Apr 2008 21:55:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DLtnmr000748 for perforce@freebsd.org; Sun, 13 Apr 2008 21:55:49 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 21:55:49 GMT Message-Id: <200804132155.m3DLtnmr000748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 21:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=139998 Change 139998 by imp@imp_paco-paco on 2008/04/13 21:55:31 Pull in the files from FreeBSD that were committed... Affected files ... .. //depot/projects/mips2/src/libexec/rtld-elf/mips/reloc.c#3 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_machdep.h#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_start.S#4 integrate .. //depot/projects/mips2/src/sys/conf/Makefile.mips#13 integrate .. //depot/projects/mips2/src/sys/conf/files.mips#21 integrate .. //depot/projects/mips2/src/sys/conf/ldscript.mips#5 integrate .. //depot/projects/mips2/src/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/mips2/src/sys/conf/options.mips#7 integrate Differences ... ==== //depot/projects/mips2/src/libexec/rtld-elf/mips/reloc.c#3 (text+ko) ==== ==== //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_machdep.h#2 (text+ko) ==== ==== //depot/projects/mips2/src/libexec/rtld-elf/mips/rtld_start.S#4 (text+ko) ==== ==== //depot/projects/mips2/src/sys/conf/Makefile.mips#13 (text+ko) ==== ==== //depot/projects/mips2/src/sys/conf/files.mips#21 (text+ko) ==== ==== //depot/projects/mips2/src/sys/conf/ldscript.mips#5 (text+ko) ==== ==== //depot/projects/mips2/src/sys/conf/ldscript.mips.cfe#2 (text+ko) ==== ==== //depot/projects/mips2/src/sys/conf/options.mips#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Apr 13 21:57:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64E6106566C; Sun, 13 Apr 2008 21:57:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A82BB1065670 for ; Sun, 13 Apr 2008 21:57:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 955D18FC28 for ; Sun, 13 Apr 2008 21:57:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DLvqAd004550 for ; Sun, 13 Apr 2008 21:57:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DLvqat004548 for perforce@freebsd.org; Sun, 13 Apr 2008 21:57:52 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 21:57:52 GMT Message-Id: <200804132157.m3DLvqat004548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 21:57:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=139999 Change 139999 by imp@imp_paco-paco on 2008/04/13 21:56:52 IFC @139998 Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/reloc.c#5 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#4 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#4 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#11 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.mips#19 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.pc98#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options#9 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.mips#6 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-raid.c#5 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/reloc.c#5 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_machdep.h#2 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#4 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sbin/geom/class/journal/gjournal.8#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/mips2-jnpr/src/sbin/geom/class/part/geom_part.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#4 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1288 2008/04/03 20:58:18 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1674,6 +1674,7 @@ net/ppp_tty.c optional ppp net/pfil.c optional ether | inet net/radix.c standard +net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard ==== //depot/projects/mips2-jnpr/src/sys/conf/files.mips#19 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.359 2007/12/03 11:38:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,8 +314,10 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#2 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips.cfe#2 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.625 2008/04/13 05:45:13 qingli Exp $ # # On the handling of kernel options # @@ -393,6 +393,7 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h +RADIX_MPATH opt_mpath.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h ==== //depot/projects/mips2-jnpr/src/sys/conf/options.mips#6 (text+ko) ==== ==== //depot/projects/mips2-jnpr/src/sys/dev/acpi_support/acpi_asus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.31 2008/04/10 15:17:41 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.32 2008/04/13 14:40:02 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -375,6 +375,20 @@ { .name = NULL } }; +/* + * EeePC have an Asus ASUS010 gadget interface, + * but they can't be probed quite the same way as Asus laptops. + */ +static struct acpi_asus_model acpi_eeepc_models[] = { + { + .name = "EEE", + .brn_get = "\\_SB.ATKD.PBLG", + .brn_set = "\\_SB.ATKD.PBLS" + }, + + { .name = NULL } +}; + static struct { char *name; char *description; @@ -444,13 +458,17 @@ ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; - static char *asus_ids[] = { "ATK0100", NULL }; + static char *asus_ids[] = { "ATK0100", "ASUS010", NULL }; + char *rstr; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (acpi_disabled("asus") || - ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL) + if (acpi_disabled("asus")) + return (ENXIO); + rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids); + if (rstr == NULL) { return (ENXIO); + } sc = device_get_softc(dev); sc->dev = dev; @@ -489,6 +507,14 @@ AcpiOsFree(Buf.Pointer); return (0); } + + /* if EeePC */ + if(strncmp("ASUS010", rstr, 7) == 0) { + sc->model = &acpi_eeepc_models[0]; + device_set_desc(dev, "ASUS EeePC"); + AcpiOsFree(Buf.Pointer); + return (0); + } } sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); ==== //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-all.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.130 2008/04/11 11:30:27 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.131 2008/04/13 16:05:34 sos Exp $ */ /* ATA register defines */ @@ -301,7 +301,7 @@ #define ATA_PC98_CTLADDR_RID 8 #define ATA_PC98_BANKADDR_RID 9 #define ATA_IRQ_RID 0 -#define ATA_DEV(unit) ((unit == ATA_ATA_SLAVE) ? 0x10 : 0) +#define ATA_DEV(unit) ((unit > 0) ? 0x10 : 0) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A #define ATA_CFA_MAGIC3 0x8400 ==== //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-raid.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.128 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.129 2008/04/13 16:05:34 sos Exp $"); #include "opt_ata.h" #include @@ -1669,9 +1669,8 @@ if (be32toh(meta->generation) >= raid->generation) { struct ata_device *atadev = device_get_softc(parent); struct ata_channel *ch = device_get_softc(GRANDPARENT(dev)); - int disk_number = (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + - ATA_DEV(atadev->unit); - + int disk_number = + (ch->unit << !(ch->flags & ATA_NO_SLAVE)) + atadev->unit; raid->disks[disk_number].dev = parent; raid->disks[disk_number].sectors = be32toh(meta->configs[disk_number + 1].sectors); @@ -2303,7 +2302,7 @@ bcopy(atadev->param.serial, meta->disk[disk].serial, sizeof(rdp->disks[disk].serial)); meta->disk[disk].sectors = rdp->disks[disk].sectors; - meta->disk[disk].id = (ch->unit << 16) | ATA_DEV(atadev->unit); + meta->disk[disk].id = (ch->unit << 16) | atadev->unit; } else meta->disk[disk].sectors = rdp->total_sectors / rdp->width; @@ -3328,7 +3327,7 @@ device_get_softc(device_get_parent(rdp->disks[disk].dev)); meta->raid.channel = ch->unit; - meta->raid.device = ATA_DEV(atadev->unit); + meta->raid.device = atadev->unit; meta->raid.disk_sectors = rdp->disks[disk].sectors; meta->raid.disk_offset = rdp->offset_sectors; } @@ -3416,7 +3415,7 @@ device_get_softc(rdp->disks[drive].dev); meta->raid.disk[drive].channel = ch->unit; - meta->raid.disk[drive].device = ATA_DEV(atadev->unit); + meta->raid.disk[drive].device = atadev->unit; } meta->raid.disk[drive].magic_0 = PR_MAGIC0(meta->raid.disk[drive]) | timestamp.tv_sec; @@ -3742,7 +3741,7 @@ struct ata_channel *ch = device_get_softc(device_get_parent(rdp->disks[disk].dev)); struct ata_device *atadev = device_get_softc(rdp->disks[disk].dev); - int disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + int disk_number = 1 + atadev->unit + (ch->unit << 1); meta->disks |= disk_number << ((1 - disk) << 2); } @@ -3780,7 +3779,7 @@ bcopy(atadev->param.model, meta->model, sizeof(meta->model)); /* XXX SOS if total_disks > 2 this may not float */ - meta->disk_number = 1 + ATA_DEV(atadev->unit) + (ch->unit << 1); + meta->disk_number = 1 + atadev->unit + (ch->unit << 1); if (testing || bootverbose) ata_raid_sis_print_meta(meta); From owner-p4-projects@FreeBSD.ORG Sun Apr 13 21:59:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E9261065674; Sun, 13 Apr 2008 21:59:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4732106564A for ; Sun, 13 Apr 2008 21:59:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D2C568FC23 for ; Sun, 13 Apr 2008 21:59:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DLxsNb004672 for ; Sun, 13 Apr 2008 21:59:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DLxs1b004670 for perforce@freebsd.org; Sun, 13 Apr 2008 21:59:54 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Apr 2008 21:59:54 GMT Message-Id: <200804132159.m3DLxs1b004670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 140000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 21:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=140000 Change 140000 by imp@imp_lighthouse on 2008/04/13 21:59:12 Allow MSI to be compiled out. Affected files ... .. //depot/projects/arm/src/sys/dev/pci/pci.c#32 edit .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/dev/pci/pci.c#32 (text+ko) ==== @@ -101,6 +101,7 @@ int reg, uint32_t data); #endif static void pci_read_vpd(device_t pcib, pcicfgregs *cfg); +#ifdef MSI static void pci_disable_msi(device_t dev); static void pci_enable_msi(device_t dev, uint64_t address, uint16_t data); @@ -111,6 +112,7 @@ static int pci_msi_blacklisted(void); static void pci_resume_msi(device_t dev); static void pci_resume_msix(device_t dev); +#endif static device_method_t pci_methods[] = { /* Device interface */ @@ -155,12 +157,14 @@ DEVMETHOD(pci_set_powerstate, pci_set_powerstate_method), DEVMETHOD(pci_assign_interrupt, pci_assign_interrupt_method), DEVMETHOD(pci_find_extcap, pci_find_extcap_method), +#ifdef MSI DEVMETHOD(pci_alloc_msi, pci_alloc_msi_method), DEVMETHOD(pci_alloc_msix, pci_alloc_msix_method), DEVMETHOD(pci_remap_msix, pci_remap_msix_method), DEVMETHOD(pci_release_msi, pci_release_msi_method), DEVMETHOD(pci_msi_count, pci_msi_count_method), DEVMETHOD(pci_msix_count, pci_msix_count_method), +#endif { 0, 0 } }; @@ -191,6 +195,7 @@ /* As does the Serverworks OSB4 (the SMBus mapping register) */ { 0x02001166, PCI_QUIRK_MAP_REG, 0x90, 0 }, +#ifdef MSI /* * MSI doesn't work with the ServerWorks CNB20-HE Host Bridge * or the CMIC-SL (AKA ServerWorks GC_LE). @@ -215,7 +220,7 @@ * bridge. */ { 0x74501022, PCI_QUIRK_DISABLE_MSI, 0, 0 }, - +#endif { 0 } }; @@ -255,6 +260,7 @@ &pci_do_power_resume, 1, "Transition from D3 -> D0 on resume."); +#ifdef MSI static int pci_do_msi = 1; TUNABLE_INT("hw.pci.enable_msi", &pci_do_msi); SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RW, &pci_do_msi, 1, @@ -269,6 +275,7 @@ TUNABLE_INT("hw.pci.honor_msi_blacklist", &pci_honor_msi_blacklist); SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD, &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI"); +#endif /* Find a device_t by bus/slot/function in domain 0 */ @@ -544,6 +551,7 @@ cfg->pp.pp_data = ptr + PCIR_POWER_DATA; } break; +#ifdef MSI #if defined(__i386__) || defined(__amd64__) case PCIY_HT: /* HyperTransport */ /* Determine HT-specific capability type. */ @@ -592,6 +600,7 @@ PCIM_MSIX_BIR_MASK); cfg->msix.msix_pba_offset = val & ~PCIM_MSIX_BIR_MASK; break; +#endif case PCIY_VPD: /* PCI Vital Product Data */ cfg->vpd.vpd_reg = ptr; break; @@ -1081,6 +1090,7 @@ return (ENOENT); } +#ifdef MSI /* * Support for MSI-X message interrupts. */ @@ -1914,6 +1924,7 @@ return (msi->msi_msgnum); return (0); } +#endif /* free pcicfgregs structure and all depending data structures */ @@ -2194,6 +2205,7 @@ cfg->pp.pp_cap & PCIM_PCAP_D2SUPP ? " D2" : "", status & PCIM_PSTAT_DMASK); } +#ifdef MSI if (cfg->msi.msi_location) { int ctrl; @@ -2216,6 +2228,7 @@ cfg->msix.msix_table_bar, cfg->msix.msix_pba_bar); } +#endif } } @@ -2744,19 +2757,23 @@ pci_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { +#ifdef MSI struct pci_devinfo *dinfo; struct msix_table_entry *mte; struct msix_vector *mv; + int rid; uint64_t addr; uint32_t data; +#endif void *cookie; - int error, rid; + int error; error = bus_generic_setup_intr(dev, child, irq, flags, filter, intr, arg, &cookie); if (error) return (error); +#ifdef MSI /* * If this is a direct child, check to see if the interrupt is * MSI or MSI-X. If so, ask our parent to map the MSI and give @@ -2813,6 +2830,7 @@ return (error); } } +#endif *cookiep = cookie; return (0); } @@ -2821,9 +2839,11 @@ pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { +#ifdef MSI struct msix_table_entry *mte; + struct pci_devinfo *dinfo; struct resource_list_entry *rle; - struct pci_devinfo *dinfo; +#endif int error, rid; /* @@ -2834,6 +2854,7 @@ */ if (irq == NULL || !(rman_get_flags(irq) & RF_ACTIVE)) return (EINVAL); +#ifdef MSI rid = rman_get_rid(irq); if (device_get_parent(child) == dev && rid > 0) { dinfo = device_get_ivars(child); @@ -2861,6 +2882,7 @@ pci_mask_msix(child, rid - 1); } } +#endif error = bus_generic_teardown_intr(dev, child, irq, cookie); if (device_get_parent(child) == dev && rid > 0) KASSERT(error == 0, @@ -2900,6 +2922,7 @@ int subclass; char *desc; } pci_nomatch_tab[] = { +#if 0 {PCIC_OLD, -1, "old"}, {PCIC_OLD, PCIS_OLD_NONVGA, "non-VGA display device"}, {PCIC_OLD, PCIS_OLD_VGA, "VGA-compatible display device"}, @@ -2978,6 +3001,7 @@ {PCIC_CRYPTO, PCIS_CRYPTO_ENTERTAIN, "entertainment crypto"}, {PCIC_DASP, -1, "dasp"}, {PCIC_DASP, PCIS_DASP_DPIO, "DPIO module"}, +#endif {0, 0, NULL} }; @@ -3667,11 +3691,13 @@ pci_write_config(dev, PCIR_PROGIF, dinfo->cfg.progif, 1); pci_write_config(dev, PCIR_REVID, dinfo->cfg.revid, 1); +#ifdef MSI /* Restore MSI and MSI-X configurations if they are present. */ if (dinfo->cfg.msi.msi_location != 0) pci_resume_msi(dev); if (dinfo->cfg.msix.msix_location != 0) pci_resume_msix(dev); +#endif } void ==== //depot/projects/arm/src/sys/dev/pci/pci_pci.c#14 (text+ko) ==== @@ -79,11 +79,13 @@ DEVMETHOD(pcib_read_config, pcib_read_config), DEVMETHOD(pcib_write_config, pcib_write_config), DEVMETHOD(pcib_route_interrupt, pcib_route_interrupt), +#ifdef MSI DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), +#endif { 0, 0 } }; @@ -242,8 +244,10 @@ } } +#ifdef MSI if (pci_msi_device_blacklisted(dev)) sc->flags |= PCIB_DISABLE_MSI; +#endif /* * Intel 815, 845 and other chipsets say they are PCI-PCI bridges, @@ -554,6 +558,7 @@ return(intnum); } +#ifdef MSI /* Pass request to alloc MSI/MSI-X messages up to the parent bridge. */ int pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs) @@ -611,6 +616,7 @@ bus = device_get_parent(pcib); return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data)); } +#endif /* * Try to read the bus number of a host-PCI bridge using appropriate config From owner-p4-projects@FreeBSD.ORG Sun Apr 13 22:24:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 210311065674; Sun, 13 Apr 2008 22:24:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D08E91065672 for ; Sun, 13 Apr 2008 22:24:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF49C8FC1D for ; Sun, 13 Apr 2008 22:24:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3DMOJCF008810 for ; Sun, 13 Apr 2008 22:24:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3DMOJSf008808 for perforce@freebsd.org; Sun, 13 Apr 2008 22:24:19 GMT (envelope-from sam@freebsd.org) Date: Sun, 13 Apr 2008 22:24:19 GMT Message-Id: <200804132224.m3DMOJSf008808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2008 22:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=140001 Change 140001 by sam@sam_ebb on 2008/04/13 22:23:41 check dotd in the right place Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_output.c#48 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_output.c#48 (text+ko) ==== @@ -2187,7 +2187,8 @@ *frm++ = 2; *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ } - if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH)) + if ((vap->iv_flags & IEEE80211_F_DOTH) || + (vap->iv_flags_ext & IEEE80211_FEXT_DOTD)) frm = ieee80211_add_countryie(frm, ic); if (vap->iv_flags & IEEE80211_F_WPA2) { if (vap->iv_rsn_ie != NULL) @@ -2470,7 +2471,8 @@ bo->bo_tim_len = 1; } bo->bo_tim_trailer = frm; - if (vap->iv_flags & (IEEE80211_F_DOTD|IEEE80211_F_DOTH)) + if ((vap->iv_flags & IEEE80211_F_DOTH) || + (vap->iv_flags_ext & IEEE80211_FEXT_DOTD)) frm = ieee80211_add_countryie(frm, ic); if (vap->iv_flags & IEEE80211_F_WPA2) { if (vap->iv_rsn_ie != NULL) From owner-p4-projects@FreeBSD.ORG Mon Apr 14 03:03:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA4CF1065672; Mon, 14 Apr 2008 03:03:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 992DB1065670 for ; Mon, 14 Apr 2008 03:03:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87AEB8FC0C for ; Mon, 14 Apr 2008 03:03:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E33LBH033320 for ; Mon, 14 Apr 2008 03:03:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E33KI3033318 for perforce@freebsd.org; Mon, 14 Apr 2008 03:03:20 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Apr 2008 03:03:20 GMT Message-Id: <200804140303.m3E33KI3033318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 03:03:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=140008 Change 140008 by jb@jb_freebsd1 on 2008/04/14 03:03:00 IFC Affected files ... .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/book.sgml#5 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#68 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#65 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#26 integrate .. //depot/projects/dtrace/ports/GIDs#20 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#11 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#27 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#6 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/cleanup-chroots#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeduds#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeparallel#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makerestr#3 integrate .. //depot/projects/dtrace/ports/UIDs#24 integrate .. //depot/projects/dtrace/src/contrib/top/machine.h#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/ppp#12 integrate .. //depot/projects/dtrace/src/include/string.h#4 integrate .. //depot/projects/dtrace/src/include/unistd.h#13 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/_hdtoa.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_qp.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/fpu/fpu_sqrt.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/printf.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/strfmon.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/memchr.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsck.h#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/fsutil.c#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/inode.c#5 integrate .. //depot/projects/dtrace/src/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/dtrace/src/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/dtrace/src/sbin/restore/dirs.c#6 integrate .. //depot/projects/dtrace/src/sbin/restore/tape.c#7 integrate .. //depot/projects/dtrace/src/sbin/route/route.c#7 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#33 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#15 integrate .. //depot/projects/dtrace/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/dtrace/src/share/man/man9/lock.9#15 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#40 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#18 integrate .. //depot/projects/dtrace/src/sys/arm/arm/intr.c#9 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/dtrace/src/sys/conf/files#82 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#27 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#32 integrate .. //depot/projects/dtrace/src/sys/conf/files.mips#1 branch .. //depot/projects/dtrace/src/sys/conf/files.pc98#18 integrate .. //depot/projects/dtrace/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/dtrace/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/dtrace/src/sys/conf/options#47 integrate .. //depot/projects/dtrace/src/sys/conf/options.mips#1 branch .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata_if.m#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#13 integrate .. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfereg.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC.hints#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#36 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#13 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#10 integrate .. //depot/projects/dtrace/src/sys/isa/atrtc.c#1 branch .. //depot/projects/dtrace/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#25 integrate .. //depot/projects/dtrace/src/sys/kern/subr_clock.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/dtrace/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/IDT#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/_types.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/asm.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/bus.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cache.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/clock.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/defs.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/elf.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/endian.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/exec.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/float.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/frame.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/intr.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/limits.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/locore.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/param.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/proc.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/profile.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/psl.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pte.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/queue.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/reg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/resource.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/runq.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/segments.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/signal.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/smp.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/trap.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/dtrace/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/support.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/dtrace/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/dtrace/src/sys/modules/Makefile#40 integrate .. //depot/projects/dtrace/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/net/radix.c#4 integrate .. //depot/projects/dtrace/src/sys/net/radix.h#4 integrate .. //depot/projects/dtrace/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/dtrace/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/dtrace/src/sys/net/route.c#14 integrate .. //depot/projects/dtrace/src/sys/net/route.h#7 integrate .. //depot/projects/dtrace/src/sys/net/rtsock.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/in_proto.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#8 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/dtrace/src/sys/pci/if_rl.c#11 integrate .. //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/atomic.h#10 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#16 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#11 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#12 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#15 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#10 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/ata.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/cpuset.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/interrupt.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/jail.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/lock.h#10 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#49 integrate .. //depot/projects/dtrace/src/sys/sys/rwlock.h#11 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/dirhash.h#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-printfloat.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/dtrace/src/usr.bin/top/machine.c#11 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/config/main.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/perform.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#8 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/match.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd.c#11 integrate .. //depot/projects/dtrace/www/de/developers.sgml#10 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#13 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#20 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#14 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#30 integrate .. //depot/projects/dtrace/www/en/internal/doceng.sgml#5 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#10 integrate Differences ... ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#3 (text+ko) ==== @@ -30,7 +30,7 @@ Íéêüëáïò Êüêêáëçò - $FreeBSD: doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml,v 1.2 2008/01/14 14:19:42 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml,v 1.3 2008/04/12 19:16:50 keramida Exp $ &tm-attrib.freebsd; @@ -139,7 +139,7 @@ áñ÷åßï /etc/rc.conf ôéò ðáñáêÜôù ñõèìßóåéò: - font8x16="grfixed8x16" + font8x16="grfixed-8x16" keymap="keramida.el-iso" Ìå áõôÝò ôéò ñõèìßóåéò, ôï óýóôçìÜ ìáò èá ÷ñçóéìïðïéåß ôá áñ÷åßá @@ -175,7 +175,7 @@ âÜëïõìå óôï áñ÷åßï .profile ôïõ ëïãáñéáóìïý ìáò ôéò åîÞò ñõèìßóåéò: - export LANG="C" + export LANG="el_GR.ISO8859-7" export LC_CTYPE="el_GR.ISO8859-7" export LC_COLLATE="el_GR.ISO8859-7" unset LC_ALL LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME @@ -202,7 +202,7 @@ áñ÷åßï .bashrc ôïõ ëïãáñéáóìïý ìáò ôéò åîÞò ñõèìßóåéò: - export LANG="C" + export LANG="el_GR.ISO8859-7" export LC_CTYPE="el_GR.ISO8859-7" export LC_COLLATE="el_GR.ISO8859-7" unset LC_ALL LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME @@ -277,7 +277,7 @@ áñ÷åßï .xinitrc óôï ëïãáñéáóìü ìáò. Ðéï óõãêåêñéìÝíá èá ðñÝðåé íá ðñïóèÝóïõìå ôéò ðáñáêÜôù ãñáììÝò óå áõôü: - export LANG="el_GR" + export LANG="el_GR.ISO8859-7" export LC_CTYPE="el_GR.ISO8859-7" export LC_COLLATE="el_GR.ISO8859-7" @@ -320,7 +320,8 @@ åîÞò ñõèìßóåéò: (setq unibyte-display-via-language-environment t) -(set-language-environment "Greek") +(if (< emacs-major-version 22) + (set-language-environment "Greek")) (set-terminal-coding-system 'greek-iso-8bit) (set-input-mode (car (current-input-mode)) (nth 1 (current-input-mode)) ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/book.sgml#5 (text+ko) ==== @@ -21,7 +21,7 @@ Ç ÏìÜäá Ôåêìçñßùóçò ôïõ &os; - $FreeBSD: doc/el_GR.ISO8859-7/books/faq/book.sgml,v 1.5 2008/02/10 09:46:58 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/faq/book.sgml,v 1.9 2008/04/12 20:48:13 keramida Exp $ 1995 @@ -149,8 +149,7 @@ ãéá ïðïéïäÞðïôå ðéèáíü óêïðü, Ýôóé þóôå ï êþäéêáò ìáò íá Ý÷åé ôçí åõñýôåñç äõíáôÞ ÷ñÞóç êáé åðéôõã÷Üíåé ôï ìåãáëýôåñï äõíáôü üöåëïò. Ðéóôåýïõìå üôé áõôüò åßíáé Ýíáò áðü ôïõò óçìáíôéêüôåñïõò - óêïðïýò ôïõ Åëåýèåñïõ Ëïãéóìéêïý êáé ôïí õðïóôçñßæïõìå èåñìÜ. - + óêïðïýò ôïõ Åëåýèåñïõ Ëïãéóìéêïý êáé ôïí õðïóôçñßæïõìå èåñìÜ. Ï êþäéêáò, óôï äÝíôñï ôïõ ðçãáßïõ ìáò êþäéêá, ï ïðïßïò åìðßðôåé óôç Üäåéá ÷ñÞóçò @@ -356,8 +355,7 @@ íá âñåßôå óôçí Óåëßäá - Ðñïåôïéìáóßáò Åêäüóåùí óôçí äéêôõáêÞ ôïðïèåóßá ôïõ &os;. - + Ðñïåôïéìáóßáò Åêäüóåùí óôçí äéêôõáêÞ ôïðïèåóßá ôïõ &os;. @@ -410,8 +408,7 @@ Íá äþóåé ôç äõíáôüôçôá åýêïëçò åãêáôÜóôáóçò óå üóïõò åðéèõìïýí íá åêôåëïýí ôï -CURRENT Þ ôï -STABLE áëëÜ äåí Ý÷ïõí - ôï ÷ñüíï Þ ôï åýñïò æþíçò íá ôï ðáñáêïëïõèïýí ìÝñá ìå ôç ìÝñá. - + ôï ÷ñüíï Þ ôï åýñïò æþíçò íá ôï ðáñáêïëïõèïýí ìÝñá ìå ôç ìÝñá. @@ -652,8 +649,7 @@ áêüëïõèåò ðáñáãñÜöïõò. Åðéðñüóèåôá, èá âñåßôå êáé Üëëá óõíéóôþìåíá âéâëßá óôçí - Âéâëéïãñáößá óôï ôÝëïò áõôïý ôïõ FAQ, êáé ôïõ Åã÷åéñéäßïõ. - + Âéâëéïãñáößá óôï ôÝëïò áõôïý ôïõ FAQ, êáé ôïõ Åã÷åéñéäßïõ. @@ -997,8 +993,7 @@ &prompt.root; pkg_add ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/packages/faq.en_US.ISO8859-1.pdf.tgz Áöïý ôï êÜíåôå áõôü, ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ - &man.pkg.info.1; ãéá íá âñåßôå ðïõ Ý÷åé åãêáôáóôáèåß ôï áñ÷åßï. - + &man.pkg.info.1; ãéá íá âñåßôå ðïõ Ý÷åé åãêáôáóôáèåß ôï áñ÷åßï. &prompt.root; pkg_info -f faq.en_US.ISO8859-1.pdf Information for faq.en_US.ISO8859-1.pdf: @@ -1013,13 +1008,11 @@ ¼ðùò ìðïñåßôå íá äåßôå, ôï book.pdf èá Ý÷åé åãêáôáóôáèåß óôïí êáôÜëïãï - /usr/share/doc/en_US.ISO8859-1/books/faq. - + /usr/share/doc/en_US.ISO8859-1/books/faq. Áí äåí èÝëåôå íá ÷ñçóéìïðïéÞóåôå ôá ðáêÝôá, èá ðñÝðåé íá êáôåâÜóåôå ìüíïé óáò ôá óõìðéåóìÝíá áñ÷åßá, íá ôá áðïóõìðéÝóåôå - êáé Ýðåéôá íá áíôéãñÜøåôå ôá áíôßóôïé÷á Ýããñáöá óôç èÝóç ôïõò. - + êáé Ýðåéôá íá áíôéãñÜøåôå ôá áíôßóôïé÷á Ýããñáöá óôç èÝóç ôïõò. Ãéá ðáñÜäåéãìá, ç Ýêäïóç ôïõ FAQ óå óõíäåäåìÝíá áñ÷åßá HTML, óõìðéåóìÝíç ìå ÷ñÞóç ôïõ &man.bzip2.1;, ìðïñåß íá âñåèåß óôï @@ -1069,8 +1062,7 @@ - ÕðÜñ÷ïõí êáíÜëéá óôï IRC (Internet Relay Chat) ãéá ôï &os;; - + ÕðÜñ÷ïõí êáíÜëéá óôï IRC (Internet Relay Chat) ãéá ôï &os;; @@ -1088,8 +1080,7 @@ êáíÜëé óõæÞôçóçò, ðñþôá áðü üëá, êáé ôá èÝìáôá åêåß ìðïñåß íá êõìáßíïíôáé áíÜìåóá óôï óåî, ôïí áèëçôéóìü, ôá ðõñçíéêÜ üðëá ùò êáé ôï &os;. Óáò Ý÷ïõìå ðñïåéäïðïéÞóåé! Åßíáé - äéáèÝóéìï óôïí åîõðçñåôçôÞ irc.chat.org. - + äéáèÝóéìï óôïí åîõðçñåôçôÞ irc.chat.org. @@ -1114,8 +1105,7 @@ êüóìï. Áí èÝëåôå íá ñùôÞóåôå óôç ìçôñéêÞ óáò ãëþóóá, ðñïóðáèÞóôå íá êÜíåôå ôçí åñþôçóç óôá ÁããëéêÜ êáé Ýðåéôá ìåôáêéíçèåßôå óå êÜðïéï Üëëï êáíÜëé - ##freebsd-lang áí ÷ñåéÜæåôáé. - + ##freebsd-lang áí ÷ñåéÜæåôáé. @@ -1216,7 +1206,7 @@ - ×ñåéÜæåóôå ôñßá images (åéêüíåò) äéóêåôþí: + ×ñåéÜæåóôå ôñßá images äéóêåôþí: floppies/boot.flp, floppies/kern1.flp, êáé floppies/kern2.flp. Ôá images áõôÜ ðñÝðåé íá @@ -1224,9 +1214,9 @@ fdimage Þ ôï &man.dd.1;. Áí ðñÝðåé íá êáôåâÜóåôå ìüíïé óáò ôá óåô äéáíïìþí - (distributions) (ãéá ðáñÜäåéãìá ãéá ìéá åãêáôÜóôáóç ìÝóù óõóôÞìáôïò - áñ÷åßùí DOS), èá âñåßôå ðáñáêÜôù ìåñéêÝò óõóôÜóåéò ó÷åôéêÜ ìå ôï - ðïéåò äéáíïìÝò íá êáôåâÜóåôå: + (distributions — ãéá ðáñÜäåéãìá ãéá ìéá åãêáôÜóôáóç ìÝóù + óõóôÞìáôïò áñ÷åßùí DOS), èá âñåßôå ðáñáêÜôù ìåñéêÝò óõóôÜóåéò + ó÷åôéêÜ ìå ôï ðïéåò äéáíïìÝò íá êáôåâÜóåôå: @@ -1251,7 +1241,7 @@ - ÐëÞñåéò ïäçãßåò ó÷åôéêÜ ìå ôç äéáäéêáóßá êáèùò êáé + ÐëÞñåéò ïäçãßåò ó÷åôéêÜ ìå ôç äéáäéêáóßá êáèþò êáé ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ãåíéêÜ ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç ìðïñåßôå íá âñåßôå óôï ÊåöÜëáéï ôïõ @@ -1286,15 +1276,15 @@ ìåôáöïñÜò äåäïìÝíùí êáé ðñïóðáèïýí íá áëëÜîïõí ôïõò ÷áñáêôÞñåò ôÝëïõò ãñáììÞò þóôå íá ôáéñéÜæïõí ìå ôéò óõìâÜóåéò ðïõ ÷ñçóéìïðïéïýíôáé áðü ôï óýóôçìá óôï ïðïßï ãßíåôáé ç ëÞøç. - Áõôü ó÷åäüí óßãïõñá èá êáôáóôñÝøåé ôçí åéêüíá åêêßíçóçò. - ¸ëåãîôå ôï ìÝãåèïò ôïõ image åêêßíçóçò ðïõ êáôåâÜóáôå: Áí äåí + Áõôü ó÷åäüí óßãïõñá èá êáôáóôñÝøåé ôï image åêêßíçóçò. + ÅëÝãîôå ôï ìÝãåèïò ôïõ image åêêßíçóçò ðïõ êáôåâÜóáôå: Áí äåí åßíáé áêñéâþò áõôü ðïõ öáßíåôáé óôïí åîõðçñåôçôÞ, ç äéáäéêáóßá ôïõ êáôåâÜóìáôïò èá ðñÝðåé íá - èåùñåßôáé ýðïðôç. + èåùñçèåß ýðïðôç. Ãéá íá ðáñáêÜìøåôå ôï ðñüâëçìá: ãñÜøôå binary óôçí ãñáììÞ åíôïëþí ôïõ FTP, ìåôÜ - ðïõ èá óõíäåèåßôå óôïí åîõðçñåôçôÞ êáé ðñéí îåêéíÞóåôå íá + ðïõ èá óõíäåèåßôå óôïí åîõðçñåôçôÞ, êáé ðñéí îåêéíÞóåôå íá êáôåâÜæåôå ôï image. @@ -1303,13 +1293,13 @@ áíôßóôïé÷ïõ ãñáöéêïý åñãáëåßïõ) ãéá ôç ìåôáöïñÜ ôïõ áñ÷åßïõ image óôç äéóêÝôá. - ÐñïãñÜììáôá üðùò ôï copy äåí èá + ÐñïãñÜììáôá üðùò ôï copy, äåí èá ëåéôïõñãÞóïõí óùóôÜ êáèþò ôï image åêêßíçóçò Ý÷åé öôéá÷ôåß þóôå íá åêêéíåß Üìåóá. Ôï image Ý÷åé ôá ðëÞñç ðåñéå÷üìåíá ôçò äéóêÝôáò, ôñï÷éÜ ðñïò ôñï÷éÜ, êáé äåí ðñÝðåé íá ãñáöåß óôç äéóêÝôá ùò êáíïíéêü áñ÷åßï. Èá ðñÝðåé íá ôï ìåôáöÝñåôå óôç äéóêÝôá ìå ùìü ôñüðï, ÷ñçóéìïðïéþíôáò - åñãáëåßá ÷áìçëïý åðéðÝäïõ (low-level) (üðùò ð.÷ ôï + åñãáëåßá ÷áìçëïý åðéðÝäïõ (low-level) (üðùò ð.÷. ôï fdimage Þ ôï rawrite) ðïõ ðåñéãñÜöïíôáé óôïí ïäçãü åãêáôÜóôáóçò ôïõ @@ -1360,8 +1350,7 @@ Ôç äåäïìÝíç óôéãìÞ, äåí õðÜñ÷åé ôñüðïò íá öôéÜîåôå áðëþò ìéá ðñïóáñìïóìÝíç äéóêÝôá åãêáôÜóôáóçò. Èá ðñÝðåé íá äçìéïõñãÞóåôå ïëüêëçñç íÝá Ýêäïóç, ç ïðïßá èá - ðåñéëáìâÜíåé êáé ôçí ðñïóáñìïóìÝíç äéóêÝôá åãêáôÜóôáóçò óáò. - + ðåñéëáìâÜíåé êáé ôçí ðñïóáñìïóìÝíç äéóêÝôá åãêáôÜóôáóçò óáò. Ãéá íá äçìéïõñãÞóåôå ìéá ðñïóáñìïóìÝíç Ýêäïóç, áêïëïõèÞóôå ôéò ïäçãßåò óôï Üñèñï ó÷åôéêÜ ìå ôçí @@ -1459,16 +1448,16 @@ Ï öïñçôüò ìïõ õðïëïãéóôÞò óåéñÜò IBM Thinkpad, óåéñÜò Á, Ô Þ - ×, êïëëÜåé üôáí ðñïóðáèþ íá åêêéíÞóù ôï &os; ìåôÜ ôçí - åãêáôÜóôáóç. Ðùò ìðïñþ íá åðéëýóù áõôü ôï ðñüâëçìá; + ×, óôáìáôÜåé íá áðïêñßíåôáé üôáí ðñïóðáèþ íá åêêéíÞóù ôï &os; + ìåôÜ ôçí åãêáôÜóôáóç. Ðùò ìðïñþ íá åðéëýóù áõôü ôï ðñüâëçìá; Ðñüêåéôáé ãéá Ýíá ðñüâëçìá óôéò áñ÷éêÝò åêäüóåéò ôïõ BIOS ôçò ÉÂÌ óôá óõãêåêñéìÝíá ìç÷áíÞìáôá, ôï ïðïßï áíáãíùñßæåé ôçí êáôÜôìçóç ôïõ &os; ùò ðéèáíü äéáìÝñéóìá FAT ãéá ôç ëåéôïõñãßá - áäñáíïðïßçóçò óôï äßóêï (suspend-to-disk). Ôï BIOS êïëëÜåé êáèþò - ðñïóðáèåß íá áíáëýóåé ôï äéáìÝñéóìá ôïõ &os;. + áäñáíïðïßçóçò óôï äßóêï (suspend-to-disk). Ôï BIOS óôáìáôÜåé íá + áðïêñßíåôáé êáèþò ðñïóðáèåß íá áíáëýóåé ôï äéáìÝñéóìá ôïõ &os;. Óýìöùíá ìå ôçí IBMÓå Ýíá e-mail áðü ôïí Keith Frechette @@ -1527,7 +1516,7 @@ ¸÷åé áíáöåñèåß üôé ìåôáãåíÝóôåñåò åêäüóåéò ôïõ BIOS ôçò ÉÂÌ, ßóùò ðáñïõóéÜæïõí îáíÜ ôï ðñüâëçìá. - To ìýíçìá áõôü áðü ôïí Jacques Vidrine óôçí + To ìÞíõìá áõôü áðü ôïí Jacques Vidrine óôçí &a.mobile; ðåñéãñÜöåé ìéá äéáäéêáóßá ç ïðïßá ßóùò äïõëÝøåé óå íåüôåñá ìïíôÝëá öïñçôþí ôçò IBM ôá ïðïßá äåí åêêéíïýí êáíïíéêÜ ôï &os;, êáé óôá ïðïßá ìðïñåßôå íá áíáâáèìßóåôå ôï BIOS Þ êáé íá @@ -1606,8 +1595,7 @@ ÊÜíôå åðáíåêêßíçóç. Óôçí ðñïôñïðÞ åêêßíçóçò èá äåßôå ôçí åðéëïãÞ íá îåêéíÞóåôå ôï OpenBSD. Óôçí - ðñáãìáôéêüôçôá, ìå áõôü ôïí ôñüðï èá îåêéíÞóåôå ôï &os;. - + ðñáãìáôéêüôçôá, ìå áõôü ôïí ôñüðï èá îåêéíÞóåôå ôï &os;. @@ -1620,7 +1608,7 @@ Ìðïñþ íá êÜíù åãêáôÜóôáóç óå Ýíá äßóêï ìå ÷áëáóìÝíïõò - ôïìÝéò; + ôïìåßò; @@ -1646,36 +1634,35 @@ - Áí âëÝðåôå êáôáóôÜóåéò üðùò ôï ìç÷Üíçìá íá êïëëÜåé Þ íá êÜíåé - åðáíåêêßíçóç ìüíï ôïõ üôáí ðñïóðáèåßôå íá åêêéíÞóåôå ìå ôçí - äéóêÝôá åêêßíçóçò, èá ðñÝðåé íá êÜíåôå óôïí åáõôü óáò ôñåéò - åñùôÞóåéò:- + Áí âëÝðåôå êáôáóôÜóåéò üðùò ôï ìç÷Üíçìá íá ìçí áðïêñßíåôáé Þ + íá êÜíåé åðáíåêêßíçóç ìüíï ôïõ üôáí ðñïóðáèåßôå íá åêêéíÞóåôå ìå + ôçí äéóêÝôá åêêßíçóçò, èá ðñÝðåé íá êÜíåôå óôïí åáõôü óáò ôñåéò + åñùôÞóåéò: ×ñçóéìïðïéÞóáôå êáéíïýñéåò, öñåóêï-äéáìïñöùìÝíåò, êáé - ÷ùñßò ëÜèç äéóêÝôåò (êáôÜ ðñïôßìçóç êáëÞò åôáéñßáò ôçò ïðïßåò + ÷ùñßò ëÜèç äéóêÝôåò (êáôÜ ðñïôßìçóç êáëÞò åôáéñßáò ôéò ïðïßåò ìüëéò âãÜëáôå êáéíïýñéåò áðü ôï êïõôß ôïõò, óå áíôßèåóç ìå ôç äéóêÝôá ðïõ ðÞñáôå ìáæß ìå êÜðïéï ðåñéïäéêü êáé ç ïðïßá - âñßóêïíôáí êÜôù áðü ôï êñåâÜôé ôá ôñßá ôåëåõôáßá ÷ñüíéá); - + âñßóêïíôáí êÜôù áðü ôï êñåâÜôé ôá ôñßá ôåëåõôáßá ÷ñüíéá); ÊáôåâÜóáôå ôï image ôçò äéóêÝôáò ìå äõáäéêü (binary Þ image) ôñüðï ìåôáöïñÜò; (ìç íôñÝðåóôå, áêüìá êáé ïé êáëýôåñïé áðü ìáò Ý÷ïõí êáôÜ ëÜèïò êáôåâÜóåé êÜðïéï äõáäéêü áñ÷åßï óå - êáôÜóôáóç ASCII (êåéìÝíïõ), ôïõëÜ÷éóôïí ìéá öïñÜ! + êáôÜóôáóç ASCII (êåéìÝíïõ), ôïõëÜ÷éóôïí ìéá öïñÜ!) - Áí ÷ñçóéìïðïéåßôå &windows; 95 or 98, åêôåëÝóáôå ôï + Áí ÷ñçóéìïðïéåßôå &windows; 95 Þ 98, åêôåëÝóôå ôï fdimage Þ ôï - rawrite óå êáèáñÞ êáôÜóôáóç DOS; ÁõôÜ ôá - ëåéôïõñãéêÜ óõóôÞìáôá ìðïñåß íá ðáñåìâëçèïýí óå ðñïãñÜììáôá ôá + rawrite óå êáèáñÞ êáôÜóôáóç DOS; Ôá + ëåéôïõñãéêÜ áõôÜ ìðïñåß íá ðáñåìâëçèïýí óå ðñïãñÜììáôá ôá ïðïßá ãñÜöïõí áðåõèåßáò óôï õëéêü, êÜôé ôï ïðïßï óõìâáßíåé êáé ìå ôá ðñïãñÜììáôá äçìéïõñãßáò ôùí äéóêåôþí. Ìðïñåß íá - äçìéïõñãçèåß ðñüâëçìá, áêüìá êáé áí ôá ôñÝ÷åôå óå ðáñÜèõñï + äçìéïõñãçèåß ðñüâëçìá, áêüìá êáé áí ôá åêôåëåßôå óå ðáñÜèõñï DOS ìÝóá áðü ôï ãñáöéêü ðåñéâÜëëïí. @@ -1714,7 +1701,7 @@ Ìðïñþ íá åãêáôáóôÞóù ôï &os; óôï öïñçôü ìïõ ÷ñçóéìïðïéþíôáò - PLIP (Parallel Line IP, IP ÐáñÜëëçëçò ÃñáììÞò); + PLIP (Parallel Line IP, IP ìÝóù ÐáñÜëëçëçò Èýñáò); @@ -1774,8 +1761,8 @@ ÌÂ. Ãéá ðáñÜäåéãìá, ãéá Ýíá äßóêï 2GB, èá ðñÝðåé íá Ý÷åôå 2048 êõëßíäñïõò, 64 êåöáëÝò, êáé 32 ôïìåßò/ôñï÷éÜ. - Áí åßíáé åíåñãïðïéçìÝíï (êáé óõ÷íÜ - ðáñÝ÷åôáé Ýôóé þóôå íá îåðåñíïýíôáé êÜðïéïé ðåñéïñéóìïß óôï + Áí åßíáé åíåñãïðïéçìÝíç (êáé óõ÷íÜ + ðáñÝ÷åôáé Ýôóé þóôå íá îåðåñíéïýíôáé êÜðïéïé ðåñéïñéóìïß óôï &ms-dos;) êáé ç ÷ùñçôéêüôçôá ôïõ äßóêïõ åßíáé ìåãáëýôåñç áðü 1GB, ÷ñçóéìïðïéÞóôå M êõëßíäñïõò, 63 ôïìåßò áíÜ ôñï÷éÜ (ü÷é 64) êáé 255 êåöáëÝò, üðïõ M åßíáé @@ -1790,8 +1777,8 @@ èá áíé÷íåýóåé ôç óùóôÞ ãåùìåôñßá, êáé ìðïñåßôå ðÜíôá íá äéáãñÜøåôå ôï äéáìÝñéóìá DOS ìÝóá áðü ôïí åðåîåñãáóôÞ êáôáôìÞóåùí, áí äå èÝëåôå íá ôï êñáôÞóåôå. Ìðïñåß ùóôüóï íá èåëÞóåôå íá ôï - áöÞóåôå, ãéá íá ðñïãñáììáôßæåôå êÜñôåò äéêôýïõ êáé íá êÜíåôå Üëëåò - áíôßóôïé÷åò åñãáóßåò. + áöÞóåôå, ãéá íá ðñïãñáììáôßæåôå êÜñôåò äéêôýïõ êáé ãéá Üëëåò, + áíôßóôïé÷åò, åñãáóßåò. ÅíáëëáêôéêÜ, õðÜñ÷åé Ýíá åëåýèåñá äéáèÝóéìï âïçèçôéêü ðñüãñáììá ôï ïðïßï äéáíÝìåôáé ìå ôï &os; êáé ëÝãåôáé @@ -1820,8 +1807,7 @@ Ãéá Ýíá äßóêï SCSI, óõíÞèùò áõôü óçìáßíåé üôé ç ñéæéêÞ êáôÜôìçóç èá âñßóêåôáé óôá ðñþôá 1024MB (Þ óôá ðñþôá 4096Ì áí ÷ñçóéìïðïéåßôáé ç åêôåôáìÝíç ìåôÜöñáóç - äåßôå ôçí ðñïçãïýìåíç - åñþôçóç). Ãéá äßóêïõò IDE, ôï áíôßóôïé÷ï üñéï åßíáé ôá 504MB. - + åñþôçóç). Ãéá äßóêïõò IDE, ôï áíôßóôïé÷ï üñéï åßíáé ôá 504MB. @@ -1835,13 +1821,12 @@ To &os; áíáãíùñßæåé êáé åðéôñÝðåé ôç ÷ñÞóç ôïõ Ontrack Disk Manager. Äåí õðïóôçñßæïíôáé Üëëïé äéá÷åéñéóôÝò äßóêùí. - Áí èÝëåôå áðëþò íá ÷ñçóéìïðïéÞóåôå ôï äßóêï ìå ôï &os; äåí + Áí èÝëåôå áðëþò íá ÷ñçóéìïðïéÞóåôå ôï äßóêï ìå ôï &os;, äåí ÷ñåéÜæåóôå äéá÷åéñéóôÞ äßóêïõ. Áðëþò ñõèìßóôå ôï äßóêï ãéá üóï ðåñéóóüôåñï ÷þñï ìðïñåß íá äåé ôï BIOS (óõíÞèùò 504ÌÂ), êáé ôï &os; èá áíáêáëýøåé ðüóï åëåýèåñï ÷þñï Ý÷åôå óôçí ðñáãìáôéêüôçôá. - Áí ÷ñçóéìïðïéåßôáé êÜðïéï ðáëéü äßóêï óå åëåãêôÞ MFM, ßóùò íá - ðñÝðåé íá ðåßôå óôï &os; ðüóïõò êõëßíäñïõò íá ÷ñçóéìïðïéÞóåé. - + Áí ÷ñçóéìïðïéåßôå êÜðïéï ðáëéü äßóêï óå åëåãêôÞ MFM, ßóùò íá + ðñÝðåé íá ðåßôå óôï &os; ðüóïõò êõëßíäñïõò íá ÷ñçóéìïðïéÞóåé. Áí èÝëåôå íá ÷ñçóéìïðïéÞóåôå ôï äßóêï ôüóï ìå ôï &os; üóï êáé ìå êÜðïéï Üëëï ëåéôïõñãéêü óýóôçìá, èá ðñÝðåé íá ìðïñåßôå íá ôï @@ -1856,8 +1841,7 @@ ¼ôáí åêêéíþ ôï &os; ãéá ðñþôç öïñÜ, ðáßñíù ôï ìÞíõìá - Missing Operating System. Ôé óõìâáßíåé; - + Missing Operating System. Ôé óõìâáßíåé; @@ -1880,7 +1864,7 @@ Áõôü åßíáé Üëëï Ýíá óýìðôùìá ôïõ ðñïâëÞìáôïò ðïõ ðåñéãñÜöåôáé óôçí ðñïçãïýìåíç åñþôçóç. Äåí óõìðßðôåé ç ãåùìåôñßá ôïõ BIOS ìå áõôÞ ôïõ &os;! Áí ï åëåãêôÞò Þ ôï BIOS óáò õðïóôçñßæåé ìåôÜöñáóç - êõëßíäñùí (óõ÷íÜ áíáöÝñåôáé þò >1GB drive + êõëßíäñùí (óõ÷íÜ áíáöÝñåôáé ùò >1GB drive support), äïêéìÜóôå íá áëëÜîåôå áõôÞ ôç ôéìÞ êáé íá åðáíåãêáôáóôÞóåôå ôï &os;. @@ -1967,9 +1951,9 @@ ôïõò íÝïõò êùäéêïýò, åëÝã÷åôáé áðü ôçí äõíáôüôçôá åéóüäïõ passwd_format óôï /etc/login.conf, ôï ïðïßï ðáßñíåé ôéò ôéìÝò - des, blf (áí åßíáé äéáèÝóéìåò) + des, blf (áí åßíáé äéáèÝóéìç) Þ md5. Äåßôå ôç óåëßäá manual ôïõ - &man.login.conf.5; ãéá ðåñéóóüôåñåò ðëçñïöïñéÝò ó÷åôéêÜ ìå ôéò + &man.login.conf.5; ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôéò äõíáôüôçôåò åéóüäïõ. @@ -2012,8 +1996,7 @@ ï äßóêïò åêêßíçóçò, ad0 åíþ óôçí ðñáãìáôéêüôçôá åßíáé ï ad2 êáé öõóéêÜ áðïôõã÷Üíåé. - Ãéá íá äéïñèþóåôå ôï ðñüâëçìá, êÜíôå Ýíá áðü ôá ðáñáêÜôù: - + Ãéá íá äéïñèþóåôå ôï ðñüâëçìá, êÜíôå Ýíá áðü ôá ðáñáêÜôù: @@ -2049,9 +2032,8 @@ - Ìåôáêéíåßóôå ôï äßóêï ôïõ &os; óôïí ðñùôåýïíôá - åëåãêôÞ IDE, þóôå ïé óêëçñïß äßóêïé íá åßíáé óõíå÷üìåíïé. - + ÌåôáêéíÞóôå ôï äßóêï ôïõ &os; óôïí ðñùôåýïíôá + åëåãêôÞ IDE, þóôå ïé óêëçñïß äßóêïé íá åßíáé óõíå÷üìåíïé. @@ -2064,8 +2046,8 @@ Ôï üñéï åßíáé ôá 4 gigabytes óå ìéá óõíçèéóìÝíç åãêáôÜóôáóç - óå áñ÷éôåêôïíéêÞ &i386;. Îåêéíþíôáò áðü ôéò åêäüóåéò &os; - õðïóôçñßæåôáé êáé ðåñéóóüôåñç ìíÞìç ìÝóù ôïõ + óå áñ÷éôåêôïíéêÞ &i386;. Îåêéíþíôáò áðü ôéò åêäüóåéò &os; 4.9 êáé + 5.1, õðïóôçñßæåôáé êáé ðåñéóóüôåñç ìíÞìç ìÝóù ôïõ &man.pae.4;. ×ñåéÜæåôáé ùóôüóï íá ìåôáãëùôôéóôåß îáíÜ ï ðõñÞíáò ðåñéëáìâÜíïíôáò êáé ìéá Ýîôñá åðéëïãÞ ãéá ôçí åíåñãïðïßçóç ôïõ PAE: @@ -2186,7 +2168,7 @@ Ãéáôß ï ðõñÞíáò óáò êáé ôï õðüëïéðï ôïõ âáóéêïý óõóôÞìáôïò (world) åßíáé åêôüò óõã÷ñïíéóìïý. Ç ëåéôïõñãßá óå áõôÞ ôçí - êáôÜóôáóç äåí õðïóôçñßæåôáé. Âåâáéùèåßôå üôé ÷ñçóéìïðïßåéôå ôéò + êáôÜóôáóç äåí õðïóôçñßæåôáé. Âåâáéùèåßôå üôé ÷ñçóéìïðïéåßôå ôéò åíôïëÝò make buildworld êáé make buildkernel ãéá íá áíáâáèìßóåôå ôïí ðõñÞíá óáò. @@ -2198,8 +2180,7 @@ - Ç åãêáôÜóôáóç êáôáññÝåé êáôÜ ôçí åêêßíçóç. Ôé ìðïñþ íá êÜíù; - + Ç åãêáôÜóôáóç êáôáññÝåé êáôÜ ôçí åêêßíçóç. Ôé ìðïñþ íá êÜíù; @@ -2224,30 +2205,30 @@ - I want to get a piece of hardware for my FreeBSD - system. Which model/brand/type is best? + ÈÝëù íá áãïñÜóù õëéêü ãéá ôï &os; óýóôçìá ìïõ. Ðïéï ìïíôÝëï / + ìÜñêá / ôýðïò åßíáé ôï êáëýôåñï; - This is discussed continually on the FreeBSD mailing - lists. Since hardware changes so quickly, however, we - expect this. We still strongly - recommend that you read through the Hardware notes for &os; + ÕðÜñ÷ïõí óõíÝ÷åéá óõæçôÞóåéò ãéá ôï èÝìá áõôü óôéò ëßóôåò + çëåêôñïíéêïý ôá÷õäñïìåßïõ ôïõ &os;. Áõôü ùóôüóï åßíáé áíáìåíüìåíï, + êáèþò ôï õëéêü ôùí õðïëïãéóôþí áëëÜæåé ðïëý ãñÞãïñá. Åìåßò + åîáêïëïõèïýìå íá óõíéóôïýìå ìå Ýìöáóç, íá + äéáâÜóåôå ôéò Óçìåéþóåéò Õëéêïý ôïõ &os; &rel.current; - or + Þ &rel2.current; - and search the mailing list + êáé íá øÜîåôå óôá - archives before asking about the latest and - greatest hardware. Chances are a discussion about the - type of hardware you are looking for took place just last - week. + áñ÷åßá ôùí ëéóôþí çëåêôñïíéêïý ôá÷õäñïìåßïõ, ðñéí áñ÷ßóåôå + íá ñùôÜôå ó÷åôéêÜ ìå ôï ôåëåõôáßï êáé êáëýôåñï õëéêü. Åßíáé áñêåôÜ + ðéèáíü íá äéáðéóôþóåôå, üôé ãéá ôï õëéêü ðïõ áíáæçôÜôå, õðÞñîå + ó÷åôéêÞ óõæÞôçóç ìüëéò ðñéí ìéá åâäïìÜäá. - If you are looking for a laptop, check the - FreeBSD-mobile mailing list archives. Otherwise, you - probably want the archives for FreeBSD-questions, or - possibly a specific mailing list for a particular hardware - type. + Áí øÜ÷íåôå ãéá öïñçôü õðïëïãéóôÞ, åëÝãîôå ôá áñ÷åßá ôÞò ëßóôáò + çëåêôñïíéêïý ôá÷õäñïìåßïõ &a.mobile.name;. ÄéáöïñåôéêÜ, ìÜëëïí èá + èÝëåôå íá äåßôå ôá áñ÷åßá ôçò &a.questions.name; Þ ðéèáíüí ìéá + ëßóôá ðïõ íá åîåéäéêåýåôáé óôïí ôýðï ôïõ õëéêïý ðïõ øÜ÷íåôå. @@ -2260,42 +2241,45 @@ - Does FreeBSD support architectures other than the x86? + Õðïóôçñßæåé ôï &os; áñ÷éôåêôïíéêÝò äéáöïñåôéêÝò áðü ôçí + x86; - Yes. FreeBSD currently runs on the Intel x86 and DEC - (now Compaq) Alpha architectures. As of FreeBSD 5.0, the - AMD64 and Intel EM64T, IA-64, and &sparc64; architectures - are also supported. Upcoming platforms are &mips; and - &powerpc;, join the &a.ppc; or the &a.mips; respectively - for more information about ongoing work on these - platforms. For general discussion on new architectures, - join the &a.platforms;. + Íáé. ÁõôÞ ôç óôéãìÞ ôï &os; ìðïñåß íá åêôåëåóôåß óå + áñ÷éôåêôïíéêÝò x86 êáé DEC (ôþñá ðëÝïí Compaq) Alpha. Áðü ôï + &os; 5.0 êáé ìåôÜ, õðïóôçñßæïíôáé åðßóçò ïé áñ÷éôåêôïíéêÝò + AMD64 êáé Intel EM64T, ç IA-64 êáèþò êáé ç &sparc64;. + Áñ÷éôåêôïíéêÝò ðïõ èá õðïóôçñßæïíôáé ìåëëïíôéêÜ, ðåñéëáìâÜíïõí + ôçí &mips; êáé &powerpc;. Ìðïñåßôå íá åããñáöåßôå óôéò ëßóôåò + ôá÷õäñïìåßïõ &a.ppc.name; êáé &a.mips.name; áíôßóôïé÷á ãéá + ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí ðñüïäï ôùí åñãáóéþí óå áõôÝò ôéò + áñ÷éôåêôïíéêÝò. Ãéá ãåíéêÝò ðëçñïöïñßåò ó÷åôéêÜ ìå íÝåò + áñ÷éôåêôïíéêÝò, åããñáöåßôå óôçí &a.platforms;. - If your machine has a different architecture and you - need something right now, we suggest you look at NetBSD or OpenBSD. + Áí ôï ìç÷Üíçìá óáò åßíáé äéáöïñåôéêÞò áñ÷éôåêôïíéêÞò êáé + ÷ñåéÜæåóôå ëåéôïõñãéêü Üìåóá, óáò óõíéóôïýìå íá ñßîåôå ìéá ìáôéÜ + óôá NetBSD Þ + OpenBSD. - Does FreeBSD support Symmetric Multiprocessing - (SMP)? + Õðïóôçñßæåé ôï &os; ÓõììåôñéêÞ Ðïëõåðåîåñãáóßá (SMP); - Yes. SMP was enabled by default in the - GENERIC kernel as of &os; 5.2. + Íáé. Ôï SMP Þôáí åíåñãïðïéçìÝíï áðü ðñïåðéëïãÞ óôïí ðõñÞíá + GENERIC Þäç áðü ôï &os; 5.2. - The intention was also to enable it by default for - the &os; 5.3 release, but problems running the SMP kernel - on certain UP machines led to the decision to disable it - until those problems can be addressed. This is a priority - for &os; 5.4. + Ç áñ÷éêÞ ðñüèåóç Þôáí íá åßíáé åíåñãïðïéçìÝíï åðßóçò áðü + ðñïåðéëïãÞ êáé óôïí ðõñÞíá ôÞò Ýêäïóçò 5.3 ôïõ &os;, áëëÜ ëüãù + êÜðïéùí ðñïâëçìÜôùí óôçí åêôÝëåóç ôïõ ðõñÞíá SMP óå ìç÷áíÞìáôá + ÷ùñßò ðïëëáðëïýò åðåîåñãáóôÝò, áðïöáóßóôçêå íá ìåßíåé áíåíåñãü + ìÝ÷ñé ôçí áíôéìåôþðéóç ôïõò. Áõôü ùóôüóï áðïôåëåß ðñïôåñáéüôçôá + ãéá ôçí Ýêäïóç 5.4 ôïõ &os;. @@ -2308,82 +2292,89 @@ - What kind of hard drives does FreeBSD support? + Ðïéá åßäç óêëçñþí äßóêùí õðïóôçñßæïíôáé áðü ôï &os;; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 04:07:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 526761065674; Mon, 14 Apr 2008 04:07:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1197B106566B for ; Mon, 14 Apr 2008 04:07:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 005AB8FC24 for ; Mon, 14 Apr 2008 04:07:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E47Ww6037352 for ; Mon, 14 Apr 2008 04:07:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E47W9g037350 for perforce@freebsd.org; Mon, 14 Apr 2008 04:07:32 GMT (envelope-from imp@freebsd.org) Date: Mon, 14 Apr 2008 04:07:32 GMT Message-Id: <200804140407.m3E47W9g037350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 140010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 04:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=140010 Change 140010 by imp@imp_paco-paco on 2008/04/14 04:06:37 IFC @140006 Affected files ... .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#14 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#10 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.h#8 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#19 integrate .. //depot/projects/arm/src/sys/isa/atrtc.c#1 branch .. //depot/projects/arm/src/sys/kern/kern_lock.c#18 integrate .. //depot/projects/arm/src/sys/kern/subr_clock.c#6 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#27 integrate .. //depot/projects/arm/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/arm/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/arm/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/arm/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/arm/src/sys/mips/conf/IDT#1 branch .. //depot/projects/arm/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/arm/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/arm/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/arm/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/arm/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/arm/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/arm/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/arm/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/arm/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/arm/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/arm/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/arm/src/sys/mips/include/_types.h#1 branch .. //depot/projects/arm/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/arm/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/arm/src/sys/mips/include/asm.h#1 branch .. //depot/projects/arm/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/arm/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/arm/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/arm/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/arm/src/sys/mips/include/bus.h#1 branch .. //depot/projects/arm/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/arm/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cache.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/arm/src/sys/mips/include/clock.h#1 branch .. //depot/projects/arm/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/arm/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/arm/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/arm/src/sys/mips/include/defs.h#1 branch .. //depot/projects/arm/src/sys/mips/include/elf.h#1 branch .. //depot/projects/arm/src/sys/mips/include/endian.h#1 branch .. //depot/projects/arm/src/sys/mips/include/exec.h#1 branch .. //depot/projects/arm/src/sys/mips/include/float.h#1 branch .. //depot/projects/arm/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/arm/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/arm/src/sys/mips/include/frame.h#1 branch .. //depot/projects/arm/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/arm/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/arm/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/arm/src/sys/mips/include/intr.h#1 branch .. //depot/projects/arm/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/arm/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/arm/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/arm/src/sys/mips/include/limits.h#1 branch .. //depot/projects/arm/src/sys/mips/include/locore.h#1 branch .. //depot/projects/arm/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/arm/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/arm/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/arm/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/arm/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/arm/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/arm/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/arm/src/sys/mips/include/param.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/arm/src/sys/mips/include/proc.h#1 branch .. //depot/projects/arm/src/sys/mips/include/profile.h#1 branch .. //depot/projects/arm/src/sys/mips/include/psl.h#1 branch .. //depot/projects/arm/src/sys/mips/include/pte.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/arm/src/sys/mips/include/queue.h#1 branch .. //depot/projects/arm/src/sys/mips/include/reg.h#1 branch .. //depot/projects/arm/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/arm/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/arm/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/arm/src/sys/mips/include/resource.h#1 branch .. //depot/projects/arm/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/arm/src/sys/mips/include/runq.h#1 branch .. //depot/projects/arm/src/sys/mips/include/segments.h#1 branch .. //depot/projects/arm/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/arm/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/arm/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/arm/src/sys/mips/include/signal.h#1 branch .. //depot/projects/arm/src/sys/mips/include/smp.h#1 branch .. //depot/projects/arm/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/arm/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/arm/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/arm/src/sys/mips/include/trap.h#1 branch .. //depot/projects/arm/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/arm/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/arm/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/arm/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/support.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/arm/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/arm/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/arm/src/sys/modules/Makefile#56 integrate .. //depot/projects/arm/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/arm/src/sys/net/radix.c#3 integrate .. //depot/projects/arm/src/sys/net/radix.h#2 integrate .. //depot/projects/arm/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/arm/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/arm/src/sys/net/route.c#10 integrate .. //depot/projects/arm/src/sys/net/route.h#5 integrate .. //depot/projects/arm/src/sys/net/rtsock.c#13 integrate .. //depot/projects/arm/src/sys/netinet/in_proto.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#29 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/arm/src/sys/pc98/cbus/clock.c#11 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC.hints#5 integrate .. //depot/projects/arm/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#25 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#17 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#17 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#11 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#19 integrate .. //depot/projects/arm/src/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#10 integrate .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#12 integrate .. //depot/projects/arm/src/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/arm/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/arm/src/sys/sys/lock.h#15 integrate Differences ... ==== //depot/projects/arm/src/sys/dev/pci/pcivar.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.81 2008/04/12 20:26:07 phk Exp $ * */ @@ -238,7 +238,7 @@ PCI_IVAR_CACHELNSZ, PCI_IVAR_MINGNT, PCI_IVAR_MAXLAT, - PCI_IVAR_LATTIMER, + PCI_IVAR_LATTIMER }; /* ==== //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#20 (text+ko) ==== @@ -81,10 +81,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20071129_0050" +#define HDA_DRV_TEST_REV "20080412_0051" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.51 2007/12/13 15:48:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.52 2008/04/12 15:07:32 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -102,6 +102,12 @@ #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) #define hdac_lockowned(sc) mtx_owned((sc)->lock) +#undef HDAC_MSI_ENABLED +#if __FreeBSD_version >= 700026 || \ + (__FreeBSD_version < 700000 && __FreeBSD_version >= 602106) +#define HDAC_MSI_ENABLED 1 +#endif + #define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) #define HDA_DEV_MATCH(fl, v) ((fl) == (v) || \ (fl) == 0xffffffff || \ @@ -188,6 +194,7 @@ /* Dell */ #define DELL_VENDORID 0x1028 #define DELL_D820_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01cc) +#define DELL_V1500_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x0228) #define DELL_I1300_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01c9) #define DELL_XPSM1210_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01d7) #define DELL_OPLX745_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01da) @@ -208,19 +215,20 @@ /* Asus */ #define ASUS_VENDORID 0x1043 -#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_A8X_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) #define ASUS_U5F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) -#define ASUS_A8JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) -#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_A7M_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1323) +#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_G2K_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1339) #define ASUS_A7T_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x13c2) -#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_W2J_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1971) -#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) #define ASUS_M2V_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81e7) +#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_M2N_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x8234) -#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) -#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_A8NVMCSM_SUBVENDOR HDA_MODEL_CONSTRUCT(NVIDIA, 0xcb84) #define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) @@ -548,6 +556,7 @@ #define HDA_CODEC_STAC922XD HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7681) #define HDA_CODEC_STAC9227 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7618) #define HDA_CODEC_STAC9271D HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7627) +#define HDA_CODEC_STAC9205 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x76a0) #define HDA_CODEC_STACXXXX HDA_CODEC_CONSTRUCT(SIGMATEL, 0xffff) /* @@ -610,6 +619,7 @@ { HDA_CODEC_STAC922XD, "Sigmatel STAC9220D/9223D" }, { HDA_CODEC_STAC9227, "Sigmatel STAC9227" }, { HDA_CODEC_STAC9271D, "Sigmatel STAC9271D" }, + { HDA_CODEC_STAC9205, "Sigmatel STAC9205" }, { HDA_CODEC_CXVENICE, "Conexant Venice" }, { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, { HDA_CODEC_VT1708_8, "VIA VT1708_8" }, @@ -676,6 +686,8 @@ 0, 0, -1, 13, { 14, -1 }, -1 }, { DELL_OPLX745_SUBVENDOR, HDA_CODEC_AD1983, HDAC_HP_SWITCH_CTL, 0, 0, -1, 6, { 5, 7, -1 }, -1 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, HDAC_HP_SWITCH_CTRL, + 0, 0, -1, 10, { 13, -1 }, -1 }, { APPLE_MB3_SUBVENDOR, HDA_CODEC_ALC885, HDAC_HP_SWITCH_CTL, 0, 0, -1, 21, { 20, 22, -1 }, -1 }, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDAC_HP_SWITCH_CTRL, @@ -1560,7 +1572,7 @@ irq = &sc->irq; irq->irq_rid = 0x0; -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && (result = pci_msi_count(sc->dev)) == 1 && pci_alloc_msi(sc->dev, &result) == 0) @@ -1609,7 +1621,7 @@ if (irq->irq_res != NULL) bus_release_resource(sc->dev, SYS_RES_IRQ, irq->irq_rid, irq->irq_res); -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && irq->irq_rid == 0x1) pci_release_msi(sc->dev); #endif @@ -3811,7 +3823,7 @@ ); } -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if (resource_int_value(device_get_name(dev), device_get_unit(dev), "msi", &i) == 0 && i != 0 && pci_msi_count(dev) == 1) @@ -4201,6 +4213,8 @@ HDA_QUIRK_FORCESTEREO | HDA_QUIRK_IVREF, 0 }, { ACER_ALL_SUBVENDOR, HDA_MATCH_ALL, HDA_QUIRK_GPIO0, 0 }, + { ASUS_G2K_SUBVENDOR, HDA_CODEC_ALC660, + HDA_QUIRK_GPIO0, 0 }, { ASUS_M5200_SUBVENDOR, HDA_CODEC_ALC880, HDA_QUIRK_GPIO0, 0 }, { ASUS_A7M_SUBVENDOR, HDA_CODEC_ALC880, @@ -4211,7 +4225,7 @@ HDA_QUIRK_GPIO0, 0 }, { ASUS_U5F_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, - { ASUS_A8JC_SUBVENDOR, HDA_CODEC_AD1986A, + { ASUS_A8X_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, { ASUS_F3JC_SUBVENDOR, HDA_CODEC_ALC861, HDA_QUIRK_OVREF, 0 }, @@ -4231,6 +4245,8 @@ HDA_QUIRK_GPIO0 | HDA_QUIRK_OVREF50, 0}, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDA_QUIRK_GPIO0 | HDA_QUIRK_GPIO1, 0 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, + HDA_QUIRK_GPIO0, 0 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988, HDA_QUIRK_IVREF80, HDA_QUIRK_IVREF50 | HDA_QUIRK_IVREF100 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988B, @@ -4432,6 +4448,20 @@ w = hdac_widget_get(devinfo, 16); if (w != NULL) w->selconn = 1; + } else if (subvendor == ASUS_A8X_SUBVENDOR) { + /* + * This is just plain ridiculous.. There + * are several A8 series that share the same + * pci id but works differently (EAPD). + */ + w = hdac_widget_get(devinfo, 26); + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX && + (w->wclass.pin.config & + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK) != + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_NONE) + devinfo->function.audio.quirks &= + ~HDA_QUIRK_EAPDINV; } break; case HDA_CODEC_AD1988: @@ -4487,6 +4517,16 @@ ctl->widget->ctlflags |= SOUND_MASK_SPEAKER; } break; + case HDA_CODEC_STAC9205: + if (subvendor == DELL_V1500_SUBVENDOR) { + w = hdac_widget_get(devinfo, 29); + if (w != NULL) + w->selconn = 1; + w = hdac_widget_get(devinfo, 30); + if (w != NULL) + w->selconn = 1; + } + break; case HDA_CODEC_STAC9221: /* * Dell XPS M1210 need all DACs for each output jacks ==== //depot/projects/arm/src/sys/geom/part/g_part.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.16 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.17 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -112,6 +112,7 @@ enum g_part_ctl { G_PART_CTL_NONE, G_PART_CTL_ADD, + G_PART_CTL_BOOTCODE, G_PART_CTL_COMMIT, G_PART_CTL_CREATE, G_PART_CTL_DELETE, @@ -514,6 +515,48 @@ } static int +g_part_ctl_bootcode(struct gctl_req *req, struct g_part_parms *gpp) +{ + struct g_geom *gp; + struct g_part_table *table; + struct sbuf *sb; + int error, sz; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + sz = table->gpt_scheme->gps_bootcodesz; + if (sz == 0) { + error = ENODEV; + goto fail; + } + if (gpp->gpp_codesize != sz) { + error = EINVAL; + goto fail; + } + + error = G_PART_BOOTCODE(table, gpp); + if (error) + goto fail; + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s has bootcode\n", gp->name); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); + + fail: + gctl_error(req, "%d", error); + return (error); +} + +static int g_part_ctl_commit(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1023,7 +1066,7 @@ enum g_part_ctl ctlreq; unsigned int i, mparms, oparms, parm; int auto_commit, close_on_error; - int error, modifies; + int error, len, modifies; G_PART_TRACE((G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, verb)); g_topology_assert(); @@ -1041,6 +1084,12 @@ oparms |= G_PART_PARM_INDEX | G_PART_PARM_LABEL; } break; + case 'b': + if (!strcmp(verb, "bootcode")) { + ctlreq = G_PART_CTL_BOOTCODE; + mparms |= G_PART_PARM_GEOM | G_PART_PARM_BOOTCODE; + } + break; case 'c': if (!strcmp(verb, "commit")) { ctlreq = G_PART_CTL_COMMIT; @@ -1098,6 +1147,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'b': + if (!strcmp(ap->name, "bootcode")) + parm = G_PART_PARM_BOOTCODE; + break; case 'c': if (!strcmp(ap->name, "class")) continue; @@ -1153,12 +1206,20 @@ gctl_error(req, "%d param '%s'", EINVAL, ap->name); return; } - p = gctl_get_asciiparam(req, ap->name); + if (parm == G_PART_PARM_BOOTCODE) + p = gctl_get_param(req, ap->name, &len); + else + p = gctl_get_asciiparam(req, ap->name); if (p == NULL) { gctl_error(req, "%d param '%s'", ENOATTR, ap->name); return; } switch (parm) { + case G_PART_PARM_BOOTCODE: + gpp.gpp_codeptr = p; + gpp.gpp_codesize = len; + error = 0; + break; case G_PART_PARM_ENTRIES: error = g_part_parm_uint(p, &gpp.gpp_entries); break; @@ -1240,6 +1301,9 @@ case G_PART_CTL_ADD: error = g_part_ctl_add(req, &gpp); break; + case G_PART_CTL_BOOTCODE: + error = g_part_ctl_bootcode(req, &gpp); + break; case G_PART_CTL_COMMIT: error = g_part_ctl_commit(req, &gpp); break; ==== //depot/projects/arm/src/sys/geom/part/g_part.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.8 2008/03/29 17:33:29 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -56,6 +56,7 @@ size_t gps_entrysz; int gps_minent; int gps_maxent; + int gps_bootcodesz; TAILQ_ENTRY(g_part_scheme) scheme_list; }; @@ -134,6 +135,7 @@ #define G_PART_PARM_START 0x0200 #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 +#define G_PART_PARM_BOOTCODE 0x1000 struct g_part_parms { unsigned int gpp_parms; @@ -148,6 +150,8 @@ quad_t gpp_start; const char *gpp_type; unsigned int gpp_version; + const void *gpp_codeptr; + unsigned int gpp_codesize; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.6 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.7 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -52,6 +52,8 @@ #define EQUUID(a,b) (memcmp(a, b, sizeof(struct uuid)) == 0) +#define MBRSIZE 512 + enum gpt_elt { GPT_ELT_PRIHDR, GPT_ELT_PRITBL, @@ -70,6 +72,7 @@ struct g_part_gpt_table { struct g_part_table base; + u_char mbr[MBRSIZE]; struct gpt_hdr hdr; quad_t lba[GPT_ELT_COUNT]; enum gpt_state state[GPT_ELT_COUNT]; @@ -82,6 +85,7 @@ static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_gpt_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_create(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_dumpto(struct g_part_table *, struct g_part_entry *); @@ -97,6 +101,7 @@ static kobj_method_t g_part_gpt_methods[] = { KOBJMETHOD(g_part_add, g_part_gpt_add), + KOBJMETHOD(g_part_bootcode, g_part_gpt_bootcode), KOBJMETHOD(g_part_create, g_part_gpt_create), KOBJMETHOD(g_part_destroy, g_part_gpt_destroy), KOBJMETHOD(g_part_dumpto, g_part_gpt_dumpto), @@ -116,6 +121,7 @@ .gps_entrysz = sizeof(struct g_part_gpt_entry), .gps_minent = 128, .gps_maxent = INT_MAX, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_gpt); @@ -352,6 +358,16 @@ } static int +g_part_gpt_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_gpt_table *table; + + table = (struct g_part_gpt_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_provider *pp; @@ -363,13 +379,24 @@ pp = gpp->gpp_provider; tblsz = (basetable->gpt_entries * sizeof(struct gpt_ent) + pp->sectorsize - 1) / pp->sectorsize; - if (pp->sectorsize < 512 || + if (pp->sectorsize < MBRSIZE || pp->mediasize < (3 + 2 * tblsz + basetable->gpt_entries) * pp->sectorsize) return (ENOSPC); last = (pp->mediasize / pp->sectorsize) - 1; + le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); + table->mbr[DOSPARTOFF + 1] = 0xff; /* shd */ + table->mbr[DOSPARTOFF + 2] = 0xff; /* ssect */ + table->mbr[DOSPARTOFF + 3] = 0xff; /* scyl */ + table->mbr[DOSPARTOFF + 4] = 0xee; /* typ */ + table->mbr[DOSPARTOFF + 5] = 0xff; /* ehd */ + table->mbr[DOSPARTOFF + 6] = 0xff; /* esect */ + table->mbr[DOSPARTOFF + 7] = 0xff; /* ecyl */ + le32enc(table->mbr + DOSPARTOFF + 8, 1); /* start */ + le32enc(table->mbr + DOSPARTOFF + 12, MIN(last, 0xffffffffLL)); + table->lba[GPT_ELT_PRIHDR] = 1; table->lba[GPT_ELT_PRITBL] = 2; table->lba[GPT_ELT_SECHDR] = last; @@ -469,7 +496,7 @@ * It's better to catch this pathological case early than behaving * pathologically later on... */ - if (pp->sectorsize < 512 || pp->mediasize < 6 * pp->sectorsize) + if (pp->sectorsize < MBRSIZE || pp->mediasize < 6 * pp->sectorsize) return (ENOSPC); /* Check that there's a MBR. */ @@ -508,11 +535,19 @@ struct g_provider *pp; struct g_part_gpt_table *table; struct g_part_gpt_entry *entry; - int index; + u_char *buf; + int error, index; table = (struct g_part_gpt_table *)basetable; pp = cp->provider; + /* Read the PMBR */ + buf = g_read_data(cp, 0, pp->sectorsize, &error); + if (buf == NULL) + return (error); + bcopy(buf, table->mbr, MBRSIZE); + g_free(buf); + /* Read the primary header and table. */ gpt_read_hdr(table, cp, GPT_ELT_PRIHDR, &prihdr); if (table->state[GPT_ELT_PRIHDR] == GPT_STATE_OK) { @@ -640,24 +675,13 @@ tlbsz = (table->hdr.hdr_entries * table->hdr.hdr_entsz + pp->sectorsize - 1) / pp->sectorsize; - if (basetable->gpt_created) { - buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); - le16enc(buf + DOSMAGICOFFSET, DOSMAGIC); - buf[DOSPARTOFF + 1] = 0xff; /* shd */ - buf[DOSPARTOFF + 2] = 0xff; /* ssect */ - buf[DOSPARTOFF + 3] = 0xff; /* scyl */ - buf[DOSPARTOFF + 4] = 0xee; /* typ */ - buf[DOSPARTOFF + 5] = 0xff; /* ehd */ - buf[DOSPARTOFF + 6] = 0xff; /* esect */ - buf[DOSPARTOFF + 7] = 0xff; /* ecyl */ - le32enc(buf + DOSPARTOFF + 8, 1); /* start */ - le32enc(buf + DOSPARTOFF + 12, - MIN(pp->mediasize / pp->sectorsize - 1, 0xffffffffLL)); - error = g_write_data(cp, 0, buf, pp->sectorsize); - g_free(buf); - if (error) - return (error); - } + /* Write the PMBR */ + buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); + bcopy(table->mbr, buf, MBRSIZE); + error = g_write_data(cp, 0, buf, pp->sectorsize); + g_free(buf); + if (error) + return (error); /* Allocate space for the header and entries. */ buf = g_malloc((tlbsz + 1) * pp->sectorsize, M_WAITOK | M_ZERO); ==== //depot/projects/arm/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.2 2007/02/08 04:02:56 rodrigc Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ #include #include @@ -47,6 +47,12 @@ struct g_part_parms *gpp; }; +# bootcode() - scheme specific processing for the bootcode verb. +METHOD int bootcode { + struct g_part_table *table; + struct g_part_parms *gpp; +}; + # create() - scheme specific processing for the create verb. METHOD int create { struct g_part_table *table; ==== //depot/projects/arm/src/sys/geom/part/g_part_mbr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.5 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.6 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -59,6 +59,7 @@ static int g_part_mbr_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_mbr_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_create(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_dumpto(struct g_part_table *, struct g_part_entry *); @@ -74,6 +75,7 @@ static kobj_method_t g_part_mbr_methods[] = { KOBJMETHOD(g_part_add, g_part_mbr_add), + KOBJMETHOD(g_part_bootcode, g_part_mbr_bootcode), KOBJMETHOD(g_part_create, g_part_mbr_create), KOBJMETHOD(g_part_destroy, g_part_mbr_destroy), KOBJMETHOD(g_part_dumpto, g_part_mbr_dumpto), @@ -93,6 +95,7 @@ .gps_entrysz = sizeof(struct g_part_mbr_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_mbr); @@ -201,6 +204,16 @@ } static int +g_part_mbr_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_mbr_table *table; + + table = (struct g_part_mbr_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_mbr_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/arm/src/sys/geom/part/g_part_pc98.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.1 2008/03/28 17:58:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.2 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -60,6 +60,7 @@ static int g_part_pc98_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_pc98_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_create(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_dumpto(struct g_part_table *, struct g_part_entry *); @@ -75,6 +76,7 @@ static kobj_method_t g_part_pc98_methods[] = { KOBJMETHOD(g_part_add, g_part_pc98_add), + KOBJMETHOD(g_part_bootcode, g_part_pc98_bootcode), KOBJMETHOD(g_part_create, g_part_pc98_create), KOBJMETHOD(g_part_destroy, g_part_pc98_destroy), KOBJMETHOD(g_part_dumpto, g_part_pc98_dumpto), @@ -94,6 +96,7 @@ .gps_entrysz = sizeof(struct g_part_pc98_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = SECSIZE, }; G_PART_SCHEME_DECLARE(g_part_pc98); @@ -184,6 +187,16 @@ } static int +g_part_pc98_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_pc98_table *table; + + table = (struct g_part_pc98_table *)basetable; + bcopy(gpp->gpp_codeptr, table->boot, DOSMAGICOFFSET); + return (0); +} + +static int g_part_pc98_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/arm/src/sys/i386/conf/GENERIC.hints#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.19 2007/12/25 22:41:28 wkoszek Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.20 2008/04/12 20:46:06 phk Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -74,3 +74,6 @@ hint.le.0.port="0x280" hint.le.0.irq="10" hint.le.0.drq="0" +hint.atrtc.0.at="isa" +hint.atrtc.0.port="0x70" +hint.atrtc.0.irq="8" ==== //depot/projects/arm/src/sys/i386/isa/clock.c#19 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.245 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.246 2008/04/12 20:46:06 phk Exp $"); /* * Routines to handle clock hardware. @@ -206,7 +206,6 @@ mtx_unlock_spin(&clock_lock); } - /* * This routine receives statistical clock interrupts from the RTC. * As explained above, these occur at 128 interrupts per second. @@ -396,8 +395,7 @@ */ int -rtcin(reg) - int reg; +rtcin(int reg) { u_char val; @@ -522,98 +520,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - int s; - struct timespec ts; - struct clocktime ct; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) { - printf("Invalid time in clock: check and reset the date!\n"); - return; - } - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - ct.nsec = 0; - ct.sec = readrtc(RTC_SEC); - ct.min = readrtc(RTC_MIN); - ct.hour = readrtc(RTC_HRS); - ct.day = readrtc(RTC_DAY); - ct.dow = readrtc(RTC_WDAY) - 1; - ct.mon = readrtc(RTC_MONTH); - ct.year = readrtc(RTC_YEAR); -#ifdef USE_RTC_CENTURY - ct.year += readrtc(RTC_CENTURY) * 100; -#else - ct.year += 2000; -#endif - /* Set dow = -1 because some clocks don't set it correctly. */ - ct.dow = -1; - if (clock_ct_to_ts(&ct, &ts)) { - printf("Invalid time in clock: check and reset the date!\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 04:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62B981065672; Mon, 14 Apr 2008 04:18:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C009106566B for ; Mon, 14 Apr 2008 04:18:45 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EEC0C8FC29 for ; Mon, 14 Apr 2008 04:18:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E4IiQw037801 for ; Mon, 14 Apr 2008 04:18:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E4IiIb037799 for perforce@freebsd.org; Mon, 14 Apr 2008 04:18:44 GMT (envelope-from imp@freebsd.org) Date: Mon, 14 Apr 2008 04:18:44 GMT Message-Id: <200804140418.m3E4IiIb037799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 140011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 04:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=140011 Change 140011 by imp@imp_paco-paco on 2008/04/14 04:18:04 IFC @140006 Affected files ... .. //depot/projects/mips2/src/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part.h#7 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/mips2/src/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/mips2/src/sys/i386/isa/clock.c#10 integrate .. //depot/projects/mips2/src/sys/isa/atrtc.c#1 branch .. //depot/projects/mips2/src/sys/kern/kern_lock.c#13 integrate .. //depot/projects/mips2/src/sys/kern/subr_clock.c#4 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#13 integrate .. //depot/projects/mips2/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/mips2/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/mips2/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/mips2/src/sys/mips/conf/ADM5120.hints#4 integrate .. //depot/projects/mips2/src/sys/mips/conf/IDT#5 integrate .. //depot/projects/mips2/src/sys/mips/conf/IDT.hints#6 integrate .. //depot/projects/mips2/src/sys/mips/conf/MALTA#16 integrate .. //depot/projects/mips2/src/sys/mips/conf/MALTA.hints#3 integrate .. //depot/projects/mips2/src/sys/mips/conf/QEMU#7 integrate .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#9 integrate .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5.hints#4 integrate .. //depot/projects/mips2/src/sys/mips/include/_bus.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/_inttypes.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/_stdint.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/_types.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/asm.h#14 integrate .. //depot/projects/mips2/src/sys/mips/include/asmacros.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/atomic.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/bus.h#7 integrate .. //depot/projects/mips2/src/sys/mips/include/bus_dma.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/cache.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/cache_mipsNN.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/cache_r4k.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/clock.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/cpu.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/cpufunc.h#18 integrate .. //depot/projects/mips2/src/sys/mips/include/cpuinfo.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/cpuregs.h#10 integrate .. //depot/projects/mips2/src/sys/mips/include/cputypes.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/db_machdep.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/defs.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/elf.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/endian.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/exec.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/float.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/floatingpoint.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/fpu.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/frame.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/gdb_machdep.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/hwfunc.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/ieeefp.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/in_cksum.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/intr.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/intr_machdep.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/iodev.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/kdb.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/limits.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/md_var.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/memdev.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/metadata.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/minidump.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/mips_opcode.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/mp_watchdog.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/mutex.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/param.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/pcb.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/pcb_ext.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/pci_cfgreg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/pcpu.h#6 integrate .. //depot/projects/mips2/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/pmap.h#10 integrate .. //depot/projects/mips2/src/sys/mips/include/pmc_mdep.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/ppireg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/proc.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/profile.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/psl.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/pte.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/ptrace.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/queue.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/reg.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/regnum.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/reloc.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/resource.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/mips2/src/sys/mips/include/runq.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/segments.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/setjmp.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/sf_buf.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/sigframe.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/signal.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/stdarg.h#3 integrate .. //depot/projects/mips2/src/sys/mips/include/sysarch.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/timerreg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/trap.h#5 integrate .. //depot/projects/mips2/src/sys/mips/include/ucontext.h#4 integrate .. //depot/projects/mips2/src/sys/mips/include/varargs.h#2 integrate .. //depot/projects/mips2/src/sys/mips/include/vmparam.h#11 integrate .. //depot/projects/mips2/src/sys/mips/mips/autoconf.c#6 integrate .. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#10 integrate .. //depot/projects/mips2/src/sys/mips/mips/cache.c#4 integrate .. //depot/projects/mips2/src/sys/mips/mips/cache_mipsNN.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips/copystr.S#5 integrate .. //depot/projects/mips2/src/sys/mips/mips/cpu.c#22 integrate .. //depot/projects/mips2/src/sys/mips/mips/db_disasm.c#4 integrate .. //depot/projects/mips2/src/sys/mips/mips/db_interface.c#6 integrate .. //depot/projects/mips2/src/sys/mips/mips/db_trace.c#8 integrate .. //depot/projects/mips2/src/sys/mips/mips/dump_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/mips/mips/exception.S#27 integrate .. //depot/projects/mips2/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/mips2/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/genassym.c#8 integrate .. //depot/projects/mips2/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips/intr_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/mips/mips/locore.S#21 integrate .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#36 integrate .. //depot/projects/mips2/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/mem.c#5 integrate .. //depot/projects/mips2/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/nexus.c#12 integrate .. //depot/projects/mips2/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#30 integrate .. //depot/projects/mips2/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/mips2/src/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips/support.S#13 integrate .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#14 integrate .. //depot/projects/mips2/src/sys/mips/mips/tick.c#19 integrate .. //depot/projects/mips2/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/mips2/src/sys/mips/mips/trap.c#24 integrate .. //depot/projects/mips2/src/sys/mips/mips/uio_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#19 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120reg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/admpci.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/console.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/files.adm5120#5 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/if_admsw.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/if_admswreg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/if_admswvar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/obio.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/obiovar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/std.adm5120#4 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/files.idt#6 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/idt_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/idtpci.c#6 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/idtreg.h#7 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/if_kr.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/if_krreg.h#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#6 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/obiovar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/std.idt#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#3 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/files.malta#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/gt.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/gt_pci.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/gtreg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/gtvar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/maltareg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/obio.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/obiovar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/std.malta#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/yamon.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/malta/yamon.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#11 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/obio.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/obiovar.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5reg.h#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_cc.c#8 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_mips.c#5 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_sdram.c#5 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#15 integrate .. //depot/projects/mips2/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/mips2/src/sys/net/radix.c#2 integrate .. //depot/projects/mips2/src/sys/net/radix.h#2 integrate .. //depot/projects/mips2/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/mips2/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/mips2/src/sys/net/route.c#7 integrate .. //depot/projects/mips2/src/sys/net/route.h#3 integrate .. //depot/projects/mips2/src/sys/net/rtsock.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/in_proto.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/mips2/src/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/clock.c#8 integrate .. //depot/projects/mips2/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/mips2/src/sys/security/audit/audit.c#11 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_klib.c#9 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/mips2/src/sys/sys/lock.h#7 integrate Differences ... ==== //depot/projects/mips2/src/sys/dev/pci/pcivar.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.81 2008/04/12 20:26:07 phk Exp $ * */ @@ -238,7 +238,7 @@ PCI_IVAR_CACHELNSZ, PCI_IVAR_MINGNT, PCI_IVAR_MAXLAT, - PCI_IVAR_LATTIMER, + PCI_IVAR_LATTIMER }; /* ==== //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#8 (text+ko) ==== @@ -81,10 +81,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20071129_0050" +#define HDA_DRV_TEST_REV "20080412_0051" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.51 2007/12/13 15:48:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.52 2008/04/12 15:07:32 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -102,6 +102,12 @@ #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) #define hdac_lockowned(sc) mtx_owned((sc)->lock) +#undef HDAC_MSI_ENABLED +#if __FreeBSD_version >= 700026 || \ + (__FreeBSD_version < 700000 && __FreeBSD_version >= 602106) +#define HDAC_MSI_ENABLED 1 +#endif + #define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) #define HDA_DEV_MATCH(fl, v) ((fl) == (v) || \ (fl) == 0xffffffff || \ @@ -188,6 +194,7 @@ /* Dell */ #define DELL_VENDORID 0x1028 #define DELL_D820_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01cc) +#define DELL_V1500_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x0228) #define DELL_I1300_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01c9) #define DELL_XPSM1210_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01d7) #define DELL_OPLX745_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01da) @@ -208,19 +215,20 @@ /* Asus */ #define ASUS_VENDORID 0x1043 -#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_A8X_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) #define ASUS_U5F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) -#define ASUS_A8JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) -#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_A7M_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1323) +#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_G2K_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1339) #define ASUS_A7T_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x13c2) -#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_W2J_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1971) -#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) #define ASUS_M2V_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81e7) +#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_M2N_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x8234) -#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) -#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_A8NVMCSM_SUBVENDOR HDA_MODEL_CONSTRUCT(NVIDIA, 0xcb84) #define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) @@ -548,6 +556,7 @@ #define HDA_CODEC_STAC922XD HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7681) #define HDA_CODEC_STAC9227 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7618) #define HDA_CODEC_STAC9271D HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7627) +#define HDA_CODEC_STAC9205 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x76a0) #define HDA_CODEC_STACXXXX HDA_CODEC_CONSTRUCT(SIGMATEL, 0xffff) /* @@ -610,6 +619,7 @@ { HDA_CODEC_STAC922XD, "Sigmatel STAC9220D/9223D" }, { HDA_CODEC_STAC9227, "Sigmatel STAC9227" }, { HDA_CODEC_STAC9271D, "Sigmatel STAC9271D" }, + { HDA_CODEC_STAC9205, "Sigmatel STAC9205" }, { HDA_CODEC_CXVENICE, "Conexant Venice" }, { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, { HDA_CODEC_VT1708_8, "VIA VT1708_8" }, @@ -676,6 +686,8 @@ 0, 0, -1, 13, { 14, -1 }, -1 }, { DELL_OPLX745_SUBVENDOR, HDA_CODEC_AD1983, HDAC_HP_SWITCH_CTL, 0, 0, -1, 6, { 5, 7, -1 }, -1 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, HDAC_HP_SWITCH_CTRL, + 0, 0, -1, 10, { 13, -1 }, -1 }, { APPLE_MB3_SUBVENDOR, HDA_CODEC_ALC885, HDAC_HP_SWITCH_CTL, 0, 0, -1, 21, { 20, 22, -1 }, -1 }, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDAC_HP_SWITCH_CTRL, @@ -1560,7 +1572,7 @@ irq = &sc->irq; irq->irq_rid = 0x0; -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && (result = pci_msi_count(sc->dev)) == 1 && pci_alloc_msi(sc->dev, &result) == 0) @@ -1609,7 +1621,7 @@ if (irq->irq_res != NULL) bus_release_resource(sc->dev, SYS_RES_IRQ, irq->irq_rid, irq->irq_res); -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && irq->irq_rid == 0x1) pci_release_msi(sc->dev); #endif @@ -3811,7 +3823,7 @@ ); } -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if (resource_int_value(device_get_name(dev), device_get_unit(dev), "msi", &i) == 0 && i != 0 && pci_msi_count(dev) == 1) @@ -4201,6 +4213,8 @@ HDA_QUIRK_FORCESTEREO | HDA_QUIRK_IVREF, 0 }, { ACER_ALL_SUBVENDOR, HDA_MATCH_ALL, HDA_QUIRK_GPIO0, 0 }, + { ASUS_G2K_SUBVENDOR, HDA_CODEC_ALC660, + HDA_QUIRK_GPIO0, 0 }, { ASUS_M5200_SUBVENDOR, HDA_CODEC_ALC880, HDA_QUIRK_GPIO0, 0 }, { ASUS_A7M_SUBVENDOR, HDA_CODEC_ALC880, @@ -4211,7 +4225,7 @@ HDA_QUIRK_GPIO0, 0 }, { ASUS_U5F_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, - { ASUS_A8JC_SUBVENDOR, HDA_CODEC_AD1986A, + { ASUS_A8X_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, { ASUS_F3JC_SUBVENDOR, HDA_CODEC_ALC861, HDA_QUIRK_OVREF, 0 }, @@ -4231,6 +4245,8 @@ HDA_QUIRK_GPIO0 | HDA_QUIRK_OVREF50, 0}, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDA_QUIRK_GPIO0 | HDA_QUIRK_GPIO1, 0 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, + HDA_QUIRK_GPIO0, 0 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988, HDA_QUIRK_IVREF80, HDA_QUIRK_IVREF50 | HDA_QUIRK_IVREF100 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988B, @@ -4432,6 +4448,20 @@ w = hdac_widget_get(devinfo, 16); if (w != NULL) w->selconn = 1; + } else if (subvendor == ASUS_A8X_SUBVENDOR) { + /* + * This is just plain ridiculous.. There + * are several A8 series that share the same + * pci id but works differently (EAPD). + */ + w = hdac_widget_get(devinfo, 26); + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX && + (w->wclass.pin.config & + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK) != + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_NONE) + devinfo->function.audio.quirks &= + ~HDA_QUIRK_EAPDINV; } break; case HDA_CODEC_AD1988: @@ -4487,6 +4517,16 @@ ctl->widget->ctlflags |= SOUND_MASK_SPEAKER; } break; + case HDA_CODEC_STAC9205: + if (subvendor == DELL_V1500_SUBVENDOR) { + w = hdac_widget_get(devinfo, 29); + if (w != NULL) + w->selconn = 1; + w = hdac_widget_get(devinfo, 30); + if (w != NULL) + w->selconn = 1; + } + break; case HDA_CODEC_STAC9221: /* * Dell XPS M1210 need all DACs for each output jacks ==== //depot/projects/mips2/src/sys/geom/part/g_part.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.16 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.17 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -112,6 +112,7 @@ enum g_part_ctl { G_PART_CTL_NONE, G_PART_CTL_ADD, + G_PART_CTL_BOOTCODE, G_PART_CTL_COMMIT, G_PART_CTL_CREATE, G_PART_CTL_DELETE, @@ -514,6 +515,48 @@ } static int +g_part_ctl_bootcode(struct gctl_req *req, struct g_part_parms *gpp) +{ + struct g_geom *gp; + struct g_part_table *table; + struct sbuf *sb; + int error, sz; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + sz = table->gpt_scheme->gps_bootcodesz; + if (sz == 0) { + error = ENODEV; + goto fail; + } + if (gpp->gpp_codesize != sz) { + error = EINVAL; + goto fail; + } + + error = G_PART_BOOTCODE(table, gpp); + if (error) + goto fail; + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s has bootcode\n", gp->name); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); + + fail: + gctl_error(req, "%d", error); + return (error); +} + +static int g_part_ctl_commit(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1023,7 +1066,7 @@ enum g_part_ctl ctlreq; unsigned int i, mparms, oparms, parm; int auto_commit, close_on_error; - int error, modifies; + int error, len, modifies; G_PART_TRACE((G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, verb)); g_topology_assert(); @@ -1041,6 +1084,12 @@ oparms |= G_PART_PARM_INDEX | G_PART_PARM_LABEL; } break; + case 'b': + if (!strcmp(verb, "bootcode")) { + ctlreq = G_PART_CTL_BOOTCODE; + mparms |= G_PART_PARM_GEOM | G_PART_PARM_BOOTCODE; + } + break; case 'c': if (!strcmp(verb, "commit")) { ctlreq = G_PART_CTL_COMMIT; @@ -1098,6 +1147,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'b': + if (!strcmp(ap->name, "bootcode")) + parm = G_PART_PARM_BOOTCODE; + break; case 'c': if (!strcmp(ap->name, "class")) continue; @@ -1153,12 +1206,20 @@ gctl_error(req, "%d param '%s'", EINVAL, ap->name); return; } - p = gctl_get_asciiparam(req, ap->name); + if (parm == G_PART_PARM_BOOTCODE) + p = gctl_get_param(req, ap->name, &len); + else + p = gctl_get_asciiparam(req, ap->name); if (p == NULL) { gctl_error(req, "%d param '%s'", ENOATTR, ap->name); return; } switch (parm) { + case G_PART_PARM_BOOTCODE: + gpp.gpp_codeptr = p; + gpp.gpp_codesize = len; + error = 0; + break; case G_PART_PARM_ENTRIES: error = g_part_parm_uint(p, &gpp.gpp_entries); break; @@ -1240,6 +1301,9 @@ case G_PART_CTL_ADD: error = g_part_ctl_add(req, &gpp); break; + case G_PART_CTL_BOOTCODE: + error = g_part_ctl_bootcode(req, &gpp); + break; case G_PART_CTL_COMMIT: error = g_part_ctl_commit(req, &gpp); break; ==== //depot/projects/mips2/src/sys/geom/part/g_part.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.8 2008/03/29 17:33:29 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -56,6 +56,7 @@ size_t gps_entrysz; int gps_minent; int gps_maxent; + int gps_bootcodesz; TAILQ_ENTRY(g_part_scheme) scheme_list; }; @@ -134,6 +135,7 @@ #define G_PART_PARM_START 0x0200 #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 +#define G_PART_PARM_BOOTCODE 0x1000 struct g_part_parms { unsigned int gpp_parms; @@ -148,6 +150,8 @@ quad_t gpp_start; const char *gpp_type; unsigned int gpp_version; + const void *gpp_codeptr; + unsigned int gpp_codesize; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/mips2/src/sys/geom/part/g_part_gpt.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.6 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.7 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -52,6 +52,8 @@ #define EQUUID(a,b) (memcmp(a, b, sizeof(struct uuid)) == 0) +#define MBRSIZE 512 + enum gpt_elt { GPT_ELT_PRIHDR, GPT_ELT_PRITBL, @@ -70,6 +72,7 @@ struct g_part_gpt_table { struct g_part_table base; + u_char mbr[MBRSIZE]; struct gpt_hdr hdr; quad_t lba[GPT_ELT_COUNT]; enum gpt_state state[GPT_ELT_COUNT]; @@ -82,6 +85,7 @@ static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_gpt_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_create(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_dumpto(struct g_part_table *, struct g_part_entry *); @@ -97,6 +101,7 @@ static kobj_method_t g_part_gpt_methods[] = { KOBJMETHOD(g_part_add, g_part_gpt_add), + KOBJMETHOD(g_part_bootcode, g_part_gpt_bootcode), KOBJMETHOD(g_part_create, g_part_gpt_create), KOBJMETHOD(g_part_destroy, g_part_gpt_destroy), KOBJMETHOD(g_part_dumpto, g_part_gpt_dumpto), @@ -116,6 +121,7 @@ .gps_entrysz = sizeof(struct g_part_gpt_entry), .gps_minent = 128, .gps_maxent = INT_MAX, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_gpt); @@ -352,6 +358,16 @@ } static int +g_part_gpt_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_gpt_table *table; + + table = (struct g_part_gpt_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_provider *pp; @@ -363,13 +379,24 @@ pp = gpp->gpp_provider; tblsz = (basetable->gpt_entries * sizeof(struct gpt_ent) + pp->sectorsize - 1) / pp->sectorsize; - if (pp->sectorsize < 512 || + if (pp->sectorsize < MBRSIZE || pp->mediasize < (3 + 2 * tblsz + basetable->gpt_entries) * pp->sectorsize) return (ENOSPC); last = (pp->mediasize / pp->sectorsize) - 1; + le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); + table->mbr[DOSPARTOFF + 1] = 0xff; /* shd */ + table->mbr[DOSPARTOFF + 2] = 0xff; /* ssect */ + table->mbr[DOSPARTOFF + 3] = 0xff; /* scyl */ + table->mbr[DOSPARTOFF + 4] = 0xee; /* typ */ + table->mbr[DOSPARTOFF + 5] = 0xff; /* ehd */ + table->mbr[DOSPARTOFF + 6] = 0xff; /* esect */ + table->mbr[DOSPARTOFF + 7] = 0xff; /* ecyl */ + le32enc(table->mbr + DOSPARTOFF + 8, 1); /* start */ + le32enc(table->mbr + DOSPARTOFF + 12, MIN(last, 0xffffffffLL)); + table->lba[GPT_ELT_PRIHDR] = 1; table->lba[GPT_ELT_PRITBL] = 2; table->lba[GPT_ELT_SECHDR] = last; @@ -469,7 +496,7 @@ * It's better to catch this pathological case early than behaving * pathologically later on... */ - if (pp->sectorsize < 512 || pp->mediasize < 6 * pp->sectorsize) + if (pp->sectorsize < MBRSIZE || pp->mediasize < 6 * pp->sectorsize) return (ENOSPC); /* Check that there's a MBR. */ @@ -508,11 +535,19 @@ struct g_provider *pp; struct g_part_gpt_table *table; struct g_part_gpt_entry *entry; - int index; + u_char *buf; + int error, index; table = (struct g_part_gpt_table *)basetable; pp = cp->provider; + /* Read the PMBR */ + buf = g_read_data(cp, 0, pp->sectorsize, &error); + if (buf == NULL) + return (error); + bcopy(buf, table->mbr, MBRSIZE); + g_free(buf); + /* Read the primary header and table. */ gpt_read_hdr(table, cp, GPT_ELT_PRIHDR, &prihdr); if (table->state[GPT_ELT_PRIHDR] == GPT_STATE_OK) { @@ -640,24 +675,13 @@ tlbsz = (table->hdr.hdr_entries * table->hdr.hdr_entsz + pp->sectorsize - 1) / pp->sectorsize; - if (basetable->gpt_created) { - buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); - le16enc(buf + DOSMAGICOFFSET, DOSMAGIC); - buf[DOSPARTOFF + 1] = 0xff; /* shd */ - buf[DOSPARTOFF + 2] = 0xff; /* ssect */ - buf[DOSPARTOFF + 3] = 0xff; /* scyl */ - buf[DOSPARTOFF + 4] = 0xee; /* typ */ - buf[DOSPARTOFF + 5] = 0xff; /* ehd */ - buf[DOSPARTOFF + 6] = 0xff; /* esect */ - buf[DOSPARTOFF + 7] = 0xff; /* ecyl */ - le32enc(buf + DOSPARTOFF + 8, 1); /* start */ - le32enc(buf + DOSPARTOFF + 12, - MIN(pp->mediasize / pp->sectorsize - 1, 0xffffffffLL)); - error = g_write_data(cp, 0, buf, pp->sectorsize); - g_free(buf); - if (error) - return (error); - } + /* Write the PMBR */ + buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); + bcopy(table->mbr, buf, MBRSIZE); + error = g_write_data(cp, 0, buf, pp->sectorsize); + g_free(buf); + if (error) + return (error); /* Allocate space for the header and entries. */ buf = g_malloc((tlbsz + 1) * pp->sectorsize, M_WAITOK | M_ZERO); ==== //depot/projects/mips2/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.2 2007/02/08 04:02:56 rodrigc Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ #include #include @@ -47,6 +47,12 @@ struct g_part_parms *gpp; }; +# bootcode() - scheme specific processing for the bootcode verb. +METHOD int bootcode { + struct g_part_table *table; + struct g_part_parms *gpp; +}; + # create() - scheme specific processing for the create verb. METHOD int create { struct g_part_table *table; ==== //depot/projects/mips2/src/sys/geom/part/g_part_mbr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.5 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.6 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -59,6 +59,7 @@ static int g_part_mbr_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_mbr_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_create(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_dumpto(struct g_part_table *, struct g_part_entry *); @@ -74,6 +75,7 @@ static kobj_method_t g_part_mbr_methods[] = { KOBJMETHOD(g_part_add, g_part_mbr_add), + KOBJMETHOD(g_part_bootcode, g_part_mbr_bootcode), KOBJMETHOD(g_part_create, g_part_mbr_create), KOBJMETHOD(g_part_destroy, g_part_mbr_destroy), KOBJMETHOD(g_part_dumpto, g_part_mbr_dumpto), @@ -93,6 +95,7 @@ .gps_entrysz = sizeof(struct g_part_mbr_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_mbr); @@ -201,6 +204,16 @@ } static int +g_part_mbr_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_mbr_table *table; + + table = (struct g_part_mbr_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_mbr_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/mips2/src/sys/geom/part/g_part_pc98.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.1 2008/03/28 17:58:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.2 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -60,6 +60,7 @@ static int g_part_pc98_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_pc98_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_create(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_dumpto(struct g_part_table *, struct g_part_entry *); @@ -75,6 +76,7 @@ static kobj_method_t g_part_pc98_methods[] = { KOBJMETHOD(g_part_add, g_part_pc98_add), + KOBJMETHOD(g_part_bootcode, g_part_pc98_bootcode), KOBJMETHOD(g_part_create, g_part_pc98_create), KOBJMETHOD(g_part_destroy, g_part_pc98_destroy), KOBJMETHOD(g_part_dumpto, g_part_pc98_dumpto), @@ -94,6 +96,7 @@ .gps_entrysz = sizeof(struct g_part_pc98_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = SECSIZE, }; G_PART_SCHEME_DECLARE(g_part_pc98); @@ -184,6 +187,16 @@ } static int +g_part_pc98_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_pc98_table *table; + + table = (struct g_part_pc98_table *)basetable; + bcopy(gpp->gpp_codeptr, table->boot, DOSMAGICOFFSET); + return (0); +} + +static int g_part_pc98_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/mips2/src/sys/i386/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.19 2007/12/25 22:41:28 wkoszek Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.20 2008/04/12 20:46:06 phk Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -74,3 +74,6 @@ hint.le.0.port="0x280" hint.le.0.irq="10" hint.le.0.drq="0" +hint.atrtc.0.at="isa" +hint.atrtc.0.port="0x70" +hint.atrtc.0.irq="8" ==== //depot/projects/mips2/src/sys/i386/isa/clock.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.245 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.246 2008/04/12 20:46:06 phk Exp $"); /* * Routines to handle clock hardware. @@ -206,7 +206,6 @@ mtx_unlock_spin(&clock_lock); } - /* * This routine receives statistical clock interrupts from the RTC. * As explained above, these occur at 128 interrupts per second. @@ -396,8 +395,7 @@ */ int -rtcin(reg) - int reg; +rtcin(int reg) { u_char val; @@ -522,98 +520,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - int s; - struct timespec ts; - struct clocktime ct; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) { - printf("Invalid time in clock: check and reset the date!\n"); - return; - } - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - ct.nsec = 0; - ct.sec = readrtc(RTC_SEC); - ct.min = readrtc(RTC_MIN); - ct.hour = readrtc(RTC_HRS); - ct.day = readrtc(RTC_DAY); - ct.dow = readrtc(RTC_WDAY) - 1; - ct.mon = readrtc(RTC_MONTH); - ct.year = readrtc(RTC_YEAR); -#ifdef USE_RTC_CENTURY - ct.year += readrtc(RTC_CENTURY) * 100; -#else - ct.year += 2000; -#endif - /* Set dow = -1 because some clocks don't set it correctly. */ - ct.dow = -1; - if (clock_ct_to_ts(&ct, &ts)) { - printf("Invalid time in clock: check and reset the date!\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 05:08:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F6981065671; Mon, 14 Apr 2008 05:08:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCE3B106564A for ; Mon, 14 Apr 2008 05:08:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBA1F8FC14 for ; Mon, 14 Apr 2008 05:08:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E58au9049416 for ; Mon, 14 Apr 2008 05:08:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E58aHu049414 for perforce@freebsd.org; Mon, 14 Apr 2008 05:08:36 GMT (envelope-from imp@freebsd.org) Date: Mon, 14 Apr 2008 05:08:36 GMT Message-Id: <200804140508.m3E58aHu049414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 140012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 05:08:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=140012 Change 140012 by imp@imp_paco-paco on 2008/04/14 05:07:39 IF misp2 # There should have been some conflicts, but none are reported? Affected files ... .. //depot/projects/mips2-jnpr/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/isa/clock.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/isa/atrtc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lock.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/ADM5120.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/IDT#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/IDT.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/MALTA#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/MALTA.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/conf/SENTRY5.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_inttypes.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_limits.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_stdint.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#16 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/asmacros.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#8 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus_dma.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cache.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cache_mipsNN.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cache_r4k.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#15 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpuinfo.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpuregs.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/cputypes.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/db_machdep.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#12 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/exec.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/float.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/floatingpoint.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/fpu.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/gdb_machdep.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/hwfunc.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ieeefp.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/in_cksum.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr_machdep.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/iodev.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/kdb.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/limits.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/locore.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#10 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/memdev.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/metadata.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/minidump.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mips_opcode.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mp_watchdog.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mutex.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb_ext.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pci_cfgreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcpu.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmc_mdep.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ppireg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/profile.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/psl.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ptrace.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reg.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reloc.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/resource.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/runq.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/segments.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sf_buf.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sigframe.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/smp.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/stdarg.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sysarch.h#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/timerreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/varargs.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/autoconf.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache_mipsNN.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/copystr.S#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_disasm.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_trace.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/dump_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#24 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#7 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#22 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#25 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mem.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#9 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#28 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/stack_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#17 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tick.c#11 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#17 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/uio_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#24 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120_machdep.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/adm5120reg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/admpci.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/console.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/files.adm5120#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/if_admsw.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/if_admswreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/if_admswvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/obio.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/obiovar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/std.adm5120#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/files.idt#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idt_machdep.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtpci.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/idtreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_kr.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/if_krreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obiovar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/std.idt#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/files.malta#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gtreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gtvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/malta_machdep.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/maltareg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/obio.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/obiovar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/std.malta#5 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/yamon.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/yamon.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/files.sentry5#3 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/obio.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/obiovar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/s5_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/s5reg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/siba_cc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/siba_mips.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/siba_sdram.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/Makefile#6 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/net/radix.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/radix.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/net/route.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/net/route.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/rtsock.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/lock.h#3 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/sys/dev/pci/pcivar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.81 2008/04/12 20:26:07 phk Exp $ * */ @@ -238,7 +238,7 @@ PCI_IVAR_CACHELNSZ, PCI_IVAR_MINGNT, PCI_IVAR_MAXLAT, - PCI_IVAR_LATTIMER, + PCI_IVAR_LATTIMER }; /* ==== //depot/projects/mips2-jnpr/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -81,10 +81,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20071129_0050" +#define HDA_DRV_TEST_REV "20080412_0051" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.51 2007/12/13 15:48:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.52 2008/04/12 15:07:32 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -102,6 +102,12 @@ #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) #define hdac_lockowned(sc) mtx_owned((sc)->lock) +#undef HDAC_MSI_ENABLED +#if __FreeBSD_version >= 700026 || \ + (__FreeBSD_version < 700000 && __FreeBSD_version >= 602106) +#define HDAC_MSI_ENABLED 1 +#endif + #define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) #define HDA_DEV_MATCH(fl, v) ((fl) == (v) || \ (fl) == 0xffffffff || \ @@ -188,6 +194,7 @@ /* Dell */ #define DELL_VENDORID 0x1028 #define DELL_D820_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01cc) +#define DELL_V1500_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x0228) #define DELL_I1300_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01c9) #define DELL_XPSM1210_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01d7) #define DELL_OPLX745_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01da) @@ -208,19 +215,20 @@ /* Asus */ #define ASUS_VENDORID 0x1043 -#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_A8X_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) #define ASUS_U5F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) -#define ASUS_A8JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) -#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_A7M_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1323) +#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_G2K_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1339) #define ASUS_A7T_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x13c2) -#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_W2J_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1971) -#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) #define ASUS_M2V_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81e7) +#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_M2N_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x8234) -#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) -#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_A8NVMCSM_SUBVENDOR HDA_MODEL_CONSTRUCT(NVIDIA, 0xcb84) #define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) @@ -548,6 +556,7 @@ #define HDA_CODEC_STAC922XD HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7681) #define HDA_CODEC_STAC9227 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7618) #define HDA_CODEC_STAC9271D HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7627) +#define HDA_CODEC_STAC9205 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x76a0) #define HDA_CODEC_STACXXXX HDA_CODEC_CONSTRUCT(SIGMATEL, 0xffff) /* @@ -610,6 +619,7 @@ { HDA_CODEC_STAC922XD, "Sigmatel STAC9220D/9223D" }, { HDA_CODEC_STAC9227, "Sigmatel STAC9227" }, { HDA_CODEC_STAC9271D, "Sigmatel STAC9271D" }, + { HDA_CODEC_STAC9205, "Sigmatel STAC9205" }, { HDA_CODEC_CXVENICE, "Conexant Venice" }, { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, { HDA_CODEC_VT1708_8, "VIA VT1708_8" }, @@ -676,6 +686,8 @@ 0, 0, -1, 13, { 14, -1 }, -1 }, { DELL_OPLX745_SUBVENDOR, HDA_CODEC_AD1983, HDAC_HP_SWITCH_CTL, 0, 0, -1, 6, { 5, 7, -1 }, -1 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, HDAC_HP_SWITCH_CTRL, + 0, 0, -1, 10, { 13, -1 }, -1 }, { APPLE_MB3_SUBVENDOR, HDA_CODEC_ALC885, HDAC_HP_SWITCH_CTL, 0, 0, -1, 21, { 20, 22, -1 }, -1 }, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDAC_HP_SWITCH_CTRL, @@ -1560,7 +1572,7 @@ irq = &sc->irq; irq->irq_rid = 0x0; -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && (result = pci_msi_count(sc->dev)) == 1 && pci_alloc_msi(sc->dev, &result) == 0) @@ -1609,7 +1621,7 @@ if (irq->irq_res != NULL) bus_release_resource(sc->dev, SYS_RES_IRQ, irq->irq_rid, irq->irq_res); -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if ((sc->flags & HDAC_F_MSI) && irq->irq_rid == 0x1) pci_release_msi(sc->dev); #endif @@ -3811,7 +3823,7 @@ ); } -#if __FreeBSD_version >= 602106 +#ifdef HDAC_MSI_ENABLED if (resource_int_value(device_get_name(dev), device_get_unit(dev), "msi", &i) == 0 && i != 0 && pci_msi_count(dev) == 1) @@ -4201,6 +4213,8 @@ HDA_QUIRK_FORCESTEREO | HDA_QUIRK_IVREF, 0 }, { ACER_ALL_SUBVENDOR, HDA_MATCH_ALL, HDA_QUIRK_GPIO0, 0 }, + { ASUS_G2K_SUBVENDOR, HDA_CODEC_ALC660, + HDA_QUIRK_GPIO0, 0 }, { ASUS_M5200_SUBVENDOR, HDA_CODEC_ALC880, HDA_QUIRK_GPIO0, 0 }, { ASUS_A7M_SUBVENDOR, HDA_CODEC_ALC880, @@ -4211,7 +4225,7 @@ HDA_QUIRK_GPIO0, 0 }, { ASUS_U5F_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, - { ASUS_A8JC_SUBVENDOR, HDA_CODEC_AD1986A, + { ASUS_A8X_SUBVENDOR, HDA_CODEC_AD1986A, HDA_QUIRK_EAPDINV, 0 }, { ASUS_F3JC_SUBVENDOR, HDA_CODEC_ALC861, HDA_QUIRK_OVREF, 0 }, @@ -4231,6 +4245,8 @@ HDA_QUIRK_GPIO0 | HDA_QUIRK_OVREF50, 0}, { APPLE_INTEL_MAC, HDA_CODEC_STAC9221, HDA_QUIRK_GPIO0 | HDA_QUIRK_GPIO1, 0 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, + HDA_QUIRK_GPIO0, 0 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988, HDA_QUIRK_IVREF80, HDA_QUIRK_IVREF50 | HDA_QUIRK_IVREF100 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988B, @@ -4432,6 +4448,20 @@ w = hdac_widget_get(devinfo, 16); if (w != NULL) w->selconn = 1; + } else if (subvendor == ASUS_A8X_SUBVENDOR) { + /* + * This is just plain ridiculous.. There + * are several A8 series that share the same + * pci id but works differently (EAPD). + */ + w = hdac_widget_get(devinfo, 26); + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX && + (w->wclass.pin.config & + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK) != + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_NONE) + devinfo->function.audio.quirks &= + ~HDA_QUIRK_EAPDINV; } break; case HDA_CODEC_AD1988: @@ -4487,6 +4517,16 @@ ctl->widget->ctlflags |= SOUND_MASK_SPEAKER; } break; + case HDA_CODEC_STAC9205: + if (subvendor == DELL_V1500_SUBVENDOR) { + w = hdac_widget_get(devinfo, 29); + if (w != NULL) + w->selconn = 1; + w = hdac_widget_get(devinfo, 30); + if (w != NULL) + w->selconn = 1; + } + break; case HDA_CODEC_STAC9221: /* * Dell XPS M1210 need all DACs for each output jacks ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.16 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part.c,v 1.17 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -112,6 +112,7 @@ enum g_part_ctl { G_PART_CTL_NONE, G_PART_CTL_ADD, + G_PART_CTL_BOOTCODE, G_PART_CTL_COMMIT, G_PART_CTL_CREATE, G_PART_CTL_DELETE, @@ -514,6 +515,48 @@ } static int +g_part_ctl_bootcode(struct gctl_req *req, struct g_part_parms *gpp) +{ + struct g_geom *gp; + struct g_part_table *table; + struct sbuf *sb; + int error, sz; + + gp = gpp->gpp_geom; + G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, gp->name)); + g_topology_assert(); + + table = gp->softc; + sz = table->gpt_scheme->gps_bootcodesz; + if (sz == 0) { + error = ENODEV; + goto fail; + } + if (gpp->gpp_codesize != sz) { + error = EINVAL; + goto fail; + } + + error = G_PART_BOOTCODE(table, gpp); + if (error) + goto fail; + + /* Provide feedback if so requested. */ + if (gpp->gpp_parms & G_PART_PARM_OUTPUT) { + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(sb, "%s has bootcode\n", gp->name); + sbuf_finish(sb); + gctl_set_param(req, "output", sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + } + return (0); + + fail: + gctl_error(req, "%d", error); + return (error); +} + +static int g_part_ctl_commit(struct gctl_req *req, struct g_part_parms *gpp) { struct g_consumer *cp; @@ -1023,7 +1066,7 @@ enum g_part_ctl ctlreq; unsigned int i, mparms, oparms, parm; int auto_commit, close_on_error; - int error, modifies; + int error, len, modifies; G_PART_TRACE((G_T_TOPOLOGY, "%s(%s,%s)", __func__, mp->name, verb)); g_topology_assert(); @@ -1041,6 +1084,12 @@ oparms |= G_PART_PARM_INDEX | G_PART_PARM_LABEL; } break; + case 'b': + if (!strcmp(verb, "bootcode")) { + ctlreq = G_PART_CTL_BOOTCODE; + mparms |= G_PART_PARM_GEOM | G_PART_PARM_BOOTCODE; + } + break; case 'c': if (!strcmp(verb, "commit")) { ctlreq = G_PART_CTL_COMMIT; @@ -1098,6 +1147,10 @@ ap = &req->arg[i]; parm = 0; switch (ap->name[0]) { + case 'b': + if (!strcmp(ap->name, "bootcode")) + parm = G_PART_PARM_BOOTCODE; + break; case 'c': if (!strcmp(ap->name, "class")) continue; @@ -1153,12 +1206,20 @@ gctl_error(req, "%d param '%s'", EINVAL, ap->name); return; } - p = gctl_get_asciiparam(req, ap->name); + if (parm == G_PART_PARM_BOOTCODE) + p = gctl_get_param(req, ap->name, &len); + else + p = gctl_get_asciiparam(req, ap->name); if (p == NULL) { gctl_error(req, "%d param '%s'", ENOATTR, ap->name); return; } switch (parm) { + case G_PART_PARM_BOOTCODE: + gpp.gpp_codeptr = p; + gpp.gpp_codesize = len; + error = 0; + break; case G_PART_PARM_ENTRIES: error = g_part_parm_uint(p, &gpp.gpp_entries); break; @@ -1240,6 +1301,9 @@ case G_PART_CTL_ADD: error = g_part_ctl_add(req, &gpp); break; + case G_PART_CTL_BOOTCODE: + error = g_part_ctl_bootcode(req, &gpp); + break; case G_PART_CTL_COMMIT: error = g_part_ctl_commit(req, &gpp); break; ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/part/g_part.h,v 1.8 2008/03/29 17:33:29 marcel Exp $ + * $FreeBSD: src/sys/geom/part/g_part.h,v 1.9 2008/04/13 19:54:54 marcel Exp $ */ #ifndef _GEOM_PART_H_ @@ -56,6 +56,7 @@ size_t gps_entrysz; int gps_minent; int gps_maxent; + int gps_bootcodesz; TAILQ_ENTRY(g_part_scheme) scheme_list; }; @@ -134,6 +135,7 @@ #define G_PART_PARM_START 0x0200 #define G_PART_PARM_TYPE 0x0400 #define G_PART_PARM_VERSION 0x0800 +#define G_PART_PARM_BOOTCODE 0x1000 struct g_part_parms { unsigned int gpp_parms; @@ -148,6 +150,8 @@ quad_t gpp_start; const char *gpp_type; unsigned int gpp_version; + const void *gpp_codeptr; + unsigned int gpp_codesize; }; void g_part_geometry_heads(off_t, u_int, off_t *, u_int *); ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_gpt.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.6 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_gpt.c,v 1.7 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -52,6 +52,8 @@ #define EQUUID(a,b) (memcmp(a, b, sizeof(struct uuid)) == 0) +#define MBRSIZE 512 + enum gpt_elt { GPT_ELT_PRIHDR, GPT_ELT_PRITBL, @@ -70,6 +72,7 @@ struct g_part_gpt_table { struct g_part_table base; + u_char mbr[MBRSIZE]; struct gpt_hdr hdr; quad_t lba[GPT_ELT_COUNT]; enum gpt_state state[GPT_ELT_COUNT]; @@ -82,6 +85,7 @@ static int g_part_gpt_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_gpt_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_create(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_gpt_dumpto(struct g_part_table *, struct g_part_entry *); @@ -97,6 +101,7 @@ static kobj_method_t g_part_gpt_methods[] = { KOBJMETHOD(g_part_add, g_part_gpt_add), + KOBJMETHOD(g_part_bootcode, g_part_gpt_bootcode), KOBJMETHOD(g_part_create, g_part_gpt_create), KOBJMETHOD(g_part_destroy, g_part_gpt_destroy), KOBJMETHOD(g_part_dumpto, g_part_gpt_dumpto), @@ -116,6 +121,7 @@ .gps_entrysz = sizeof(struct g_part_gpt_entry), .gps_minent = 128, .gps_maxent = INT_MAX, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_gpt); @@ -352,6 +358,16 @@ } static int +g_part_gpt_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_gpt_table *table; + + table = (struct g_part_gpt_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_gpt_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_provider *pp; @@ -363,13 +379,24 @@ pp = gpp->gpp_provider; tblsz = (basetable->gpt_entries * sizeof(struct gpt_ent) + pp->sectorsize - 1) / pp->sectorsize; - if (pp->sectorsize < 512 || + if (pp->sectorsize < MBRSIZE || pp->mediasize < (3 + 2 * tblsz + basetable->gpt_entries) * pp->sectorsize) return (ENOSPC); last = (pp->mediasize / pp->sectorsize) - 1; + le16enc(table->mbr + DOSMAGICOFFSET, DOSMAGIC); + table->mbr[DOSPARTOFF + 1] = 0xff; /* shd */ + table->mbr[DOSPARTOFF + 2] = 0xff; /* ssect */ + table->mbr[DOSPARTOFF + 3] = 0xff; /* scyl */ + table->mbr[DOSPARTOFF + 4] = 0xee; /* typ */ + table->mbr[DOSPARTOFF + 5] = 0xff; /* ehd */ + table->mbr[DOSPARTOFF + 6] = 0xff; /* esect */ + table->mbr[DOSPARTOFF + 7] = 0xff; /* ecyl */ + le32enc(table->mbr + DOSPARTOFF + 8, 1); /* start */ + le32enc(table->mbr + DOSPARTOFF + 12, MIN(last, 0xffffffffLL)); + table->lba[GPT_ELT_PRIHDR] = 1; table->lba[GPT_ELT_PRITBL] = 2; table->lba[GPT_ELT_SECHDR] = last; @@ -469,7 +496,7 @@ * It's better to catch this pathological case early than behaving * pathologically later on... */ - if (pp->sectorsize < 512 || pp->mediasize < 6 * pp->sectorsize) + if (pp->sectorsize < MBRSIZE || pp->mediasize < 6 * pp->sectorsize) return (ENOSPC); /* Check that there's a MBR. */ @@ -508,11 +535,19 @@ struct g_provider *pp; struct g_part_gpt_table *table; struct g_part_gpt_entry *entry; - int index; + u_char *buf; + int error, index; table = (struct g_part_gpt_table *)basetable; pp = cp->provider; + /* Read the PMBR */ + buf = g_read_data(cp, 0, pp->sectorsize, &error); + if (buf == NULL) + return (error); + bcopy(buf, table->mbr, MBRSIZE); + g_free(buf); + /* Read the primary header and table. */ gpt_read_hdr(table, cp, GPT_ELT_PRIHDR, &prihdr); if (table->state[GPT_ELT_PRIHDR] == GPT_STATE_OK) { @@ -640,24 +675,13 @@ tlbsz = (table->hdr.hdr_entries * table->hdr.hdr_entsz + pp->sectorsize - 1) / pp->sectorsize; - if (basetable->gpt_created) { - buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); - le16enc(buf + DOSMAGICOFFSET, DOSMAGIC); - buf[DOSPARTOFF + 1] = 0xff; /* shd */ - buf[DOSPARTOFF + 2] = 0xff; /* ssect */ - buf[DOSPARTOFF + 3] = 0xff; /* scyl */ - buf[DOSPARTOFF + 4] = 0xee; /* typ */ - buf[DOSPARTOFF + 5] = 0xff; /* ehd */ - buf[DOSPARTOFF + 6] = 0xff; /* esect */ - buf[DOSPARTOFF + 7] = 0xff; /* ecyl */ - le32enc(buf + DOSPARTOFF + 8, 1); /* start */ - le32enc(buf + DOSPARTOFF + 12, - MIN(pp->mediasize / pp->sectorsize - 1, 0xffffffffLL)); - error = g_write_data(cp, 0, buf, pp->sectorsize); - g_free(buf); - if (error) - return (error); - } + /* Write the PMBR */ + buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO); + bcopy(table->mbr, buf, MBRSIZE); + error = g_write_data(cp, 0, buf, pp->sectorsize); + g_free(buf); + if (error) + return (error); /* Allocate space for the header and entries. */ buf = g_malloc((tlbsz + 1) * pp->sectorsize, M_WAITOK | M_ZERO); ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_if.m#2 (text+ko) ==== @@ -23,7 +23,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.2 2007/02/08 04:02:56 rodrigc Exp $ +# $FreeBSD: src/sys/geom/part/g_part_if.m,v 1.3 2008/04/13 19:54:54 marcel Exp $ #include #include @@ -47,6 +47,12 @@ struct g_part_parms *gpp; }; +# bootcode() - scheme specific processing for the bootcode verb. +METHOD int bootcode { + struct g_part_table *table; + struct g_part_parms *gpp; +}; + # create() - scheme specific processing for the create verb. METHOD int create { struct g_part_table *table; ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_mbr.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.5 2008/03/23 01:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_mbr.c,v 1.6 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -59,6 +59,7 @@ static int g_part_mbr_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_mbr_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_create(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_mbr_dumpto(struct g_part_table *, struct g_part_entry *); @@ -74,6 +75,7 @@ static kobj_method_t g_part_mbr_methods[] = { KOBJMETHOD(g_part_add, g_part_mbr_add), + KOBJMETHOD(g_part_bootcode, g_part_mbr_bootcode), KOBJMETHOD(g_part_create, g_part_mbr_create), KOBJMETHOD(g_part_destroy, g_part_mbr_destroy), KOBJMETHOD(g_part_dumpto, g_part_mbr_dumpto), @@ -93,6 +95,7 @@ .gps_entrysz = sizeof(struct g_part_mbr_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = MBRSIZE, }; G_PART_SCHEME_DECLARE(g_part_mbr); @@ -201,6 +204,16 @@ } static int +g_part_mbr_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_mbr_table *table; + + table = (struct g_part_mbr_table *)basetable; + bcopy(gpp->gpp_codeptr, table->mbr, DOSPARTOFF); + return (0); +} + +static int g_part_mbr_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_pc98.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.1 2008/03/28 17:58:55 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/part/g_part_pc98.c,v 1.2 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -60,6 +60,7 @@ static int g_part_pc98_add(struct g_part_table *, struct g_part_entry *, struct g_part_parms *); +static int g_part_pc98_bootcode(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_create(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_destroy(struct g_part_table *, struct g_part_parms *); static int g_part_pc98_dumpto(struct g_part_table *, struct g_part_entry *); @@ -75,6 +76,7 @@ static kobj_method_t g_part_pc98_methods[] = { KOBJMETHOD(g_part_add, g_part_pc98_add), + KOBJMETHOD(g_part_bootcode, g_part_pc98_bootcode), KOBJMETHOD(g_part_create, g_part_pc98_create), KOBJMETHOD(g_part_destroy, g_part_pc98_destroy), KOBJMETHOD(g_part_dumpto, g_part_pc98_dumpto), @@ -94,6 +96,7 @@ .gps_entrysz = sizeof(struct g_part_pc98_entry), .gps_minent = NDOSPART, .gps_maxent = NDOSPART, + .gps_bootcodesz = SECSIZE, }; G_PART_SCHEME_DECLARE(g_part_pc98); @@ -184,6 +187,16 @@ } static int +g_part_pc98_bootcode(struct g_part_table *basetable, struct g_part_parms *gpp) +{ + struct g_part_pc98_table *table; + + table = (struct g_part_pc98_table *)basetable; + bcopy(gpp->gpp_codeptr, table->boot, DOSMAGICOFFSET); + return (0); +} + +static int g_part_pc98_create(struct g_part_table *basetable, struct g_part_parms *gpp) { struct g_consumer *cp; ==== //depot/projects/mips2-jnpr/src/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.19 2007/12/25 22:41:28 wkoszek Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.20 2008/04/12 20:46:06 phk Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -74,3 +74,6 @@ hint.le.0.port="0x280" hint.le.0.irq="10" hint.le.0.drq="0" +hint.atrtc.0.at="isa" +hint.atrtc.0.port="0x70" +hint.atrtc.0.irq="8" ==== //depot/projects/mips2-jnpr/src/sys/i386/isa/clock.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.245 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.246 2008/04/12 20:46:06 phk Exp $"); /* * Routines to handle clock hardware. @@ -206,7 +206,6 @@ mtx_unlock_spin(&clock_lock); } - /* * This routine receives statistical clock interrupts from the RTC. * As explained above, these occur at 128 interrupts per second. @@ -396,8 +395,7 @@ */ int -rtcin(reg) - int reg; +rtcin(int reg) { u_char val; @@ -522,98 +520,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - int s; - struct timespec ts; - struct clocktime ct; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) { - printf("Invalid time in clock: check and reset the date!\n"); - return; - } - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - ct.nsec = 0; - ct.sec = readrtc(RTC_SEC); - ct.min = readrtc(RTC_MIN); - ct.hour = readrtc(RTC_HRS); - ct.day = readrtc(RTC_DAY); - ct.dow = readrtc(RTC_WDAY) - 1; - ct.mon = readrtc(RTC_MONTH); - ct.year = readrtc(RTC_YEAR); -#ifdef USE_RTC_CENTURY - ct.year += readrtc(RTC_CENTURY) * 100; -#else - ct.year += 2000; -#endif - /* Set dow = -1 because some clocks don't set it correctly. */ - ct.dow = -1; - if (clock_ct_to_ts(&ct, &ts)) { - printf("Invalid time in clock: check and reset the date!\n"); - return; - } - ts.tv_sec += utc_offset(); - tc_setclock(&ts); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - struct timespec ts; - struct clocktime ct; - - if (disable_rtc_set) - return; - - getnanotime(&ts); - ts.tv_sec -= utc_offset(); - clock_ts_to_ct(&ts, &ct); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 09:06:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 910061065674; Mon, 14 Apr 2008 09:06:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A098106564A for ; Mon, 14 Apr 2008 09:06:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 271398FC23 for ; Mon, 14 Apr 2008 09:06:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E96nLU087598 for ; Mon, 14 Apr 2008 09:06:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E96mLF087596 for perforce@freebsd.org; Mon, 14 Apr 2008 09:06:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Apr 2008 09:06:48 GMT Message-Id: <200804140906.m3E96mLF087596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 09:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=140019 Change 140019 by rwatson@rwatson_zoo on 2008/04/14 09:06:13 Integrate TrustedBSD base branch from FreeBSD CVS: - MIPS port - atrtc driver - Multipath routing - lockmgr witness support Affected files ... .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strfmon.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/lock.9#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/clock.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.mips#1 branch .. //depot/projects/trustedbsd/base/sys/conf/files#126 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#47 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#80 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.mips#1 branch .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#66 integrate .. //depot/projects/trustedbsd/base/sys/conf/ldscript.mips#1 branch .. //depot/projects/trustedbsd/base/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/trustedbsd/base/sys/conf/options#90 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.mips#1 branch .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_ibm.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/vga.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pcivar.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC.hints#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/clock.h#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#43 integrate .. //depot/projects/trustedbsd/base/sys/isa/atrtc.c#1 branch .. //depot/projects/trustedbsd/base/sys/isa/rtc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_clock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#72 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/ADM5120#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/IDT#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/MALTA#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/QEMU#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/trustedbsd/base/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_limits.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/_types.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/archtype.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/asm.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/atomic.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/bswap.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cache.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/clock.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/clockvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cp0.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cpu.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/cputypes.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/defs.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/elf.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/endian.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/exec.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/float.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/fpu.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/frame.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ieee.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/intr.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/iodev.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/kdb.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/limits.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/locore.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/md_var.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/memdev.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/metadata.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/minidump.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/mutex.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ns16550.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/param.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pcb.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pltfm.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pmap.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/proc.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/profile.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/psl.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/pte.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/queue.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/regdef.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/regnum.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/reloc.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/resource.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/rm7000.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/runq.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/segments.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/signal.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/smp.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/trap.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/varargs.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/cache.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/copystr.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/cpu.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/exception.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/fp.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/genassym.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/locore.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/mem.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/nexus.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/pmap.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/support.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/swtch.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/tick.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/tlb.S#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/trap.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/trustedbsd/base/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/trustedbsd/base/sys/modules/Makefile#98 integrate .. //depot/projects/trustedbsd/base/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/radix.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.h#9 integrate .. //depot/projects/trustedbsd/base/sys/net/radix_mpath.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/radix_mpath.h#1 branch .. //depot/projects/trustedbsd/base/sys/net/route.c#30 integrate .. //depot/projects/trustedbsd/base/sys/net/route.h#19 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#60 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_src.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/clock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC.hints#15 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#25 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#19 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_framework.h#11 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#13 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/lock.h#21 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libc/stdlib/strfmon.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/trustedbsd/base/lib/libthr/thread/thr_rwlock.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include @@ -32,7 +32,6 @@ #include "namespace.h" #include -#include #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/trustedbsd/base/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/trustedbsd/base/sbin/geom/class/part/geom_part.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/trustedbsd/base/share/man/man9/lock.9#13 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.32 2008/04/06 21:22:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.33 2008/04/12 20:18:02 attilio Exp $ .\" -.Dd April 6, 2008 +.Dd April 12, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -178,6 +178,10 @@ .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_NOWITNESS +Skip the +.Xr witness 4 +checks for this instance. .It Dv LK_CANRECURSE Allow recursion on an exclusive lock. For every lock there must be a release. ==== //depot/projects/trustedbsd/base/sys/amd64/include/clock.h#12 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#26 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include #include #include -#include #include #include @@ -78,13 +70,6 @@ #include #endif -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; } @@ -738,7 +521,8 @@ count = i8254_max_count - ((high << 8) | low); if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || - ((count < 20 || (!(rflags & PSL_I) && count < i8254_max_count / 2u)) && + ((count < 20 || (!(rflags & PSL_I) && + count < i8254_max_count / 2u)) && i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += i8254_max_count; @@ -751,11 +535,10 @@ #ifdef DEV_ISA /* - * Attach to the ISA PnP descriptors for the timer and realtime clock. + * Attach to the ISA PnP descriptors for the timer */ static struct isa_pnp_id attimer_ids[] = { { 0x0001d041 /* PNP0100 */, "AT timer" }, - { 0x000bd041 /* PNP0B00 */, "AT realtime clock" }, { 0 } }; @@ -764,7 +547,8 @@ { int result; - if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids)) <= 0) + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); + if (result <= 0) device_quiet(dev); return(result); } @@ -781,8 +565,8 @@ DEVMETHOD(device_attach, attimer_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ - DEVMETHOD(device_resume, bus_generic_resume), /* XXX restart statclock? */ + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; ==== //depot/projects/trustedbsd/base/sys/conf/files#126 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1288 2008/04/03 20:58:18 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1670,6 +1670,7 @@ net/ppp_tty.c optional ppp net/pfil.c optional ether | inet net/radix.c standard +net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard ==== //depot/projects/trustedbsd/base/sys/conf/files.amd64#47 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -207,9 +207,12 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/link_elf_obj.c standard +kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/trustedbsd/base/sys/conf/files.i386#80 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.592 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -443,10 +443,13 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/trustedbsd/base/sys/conf/files.pc98#66 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.359 2007/12/03 11:38:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,8 +314,10 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/trustedbsd/base/sys/conf/options#90 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.625 2008/04/13 05:45:13 qingli Exp $ # # On the handling of kernel options # @@ -393,6 +393,7 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h +RADIX_MPATH opt_mpath.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h ==== //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.31 2008/04/10 15:17:41 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.32 2008/04/13 14:40:02 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 09:09:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81237106567A; Mon, 14 Apr 2008 09:09:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A4261065677 for ; Mon, 14 Apr 2008 09:09:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 176668FC39 for ; Mon, 14 Apr 2008 09:09:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3E99q6P088454 for ; Mon, 14 Apr 2008 09:09:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3E99qTs088452 for perforce@freebsd.org; Mon, 14 Apr 2008 09:09:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Apr 2008 09:09:52 GMT Message-Id: <200804140909.m3E99qTs088452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 09:09:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=140020 Change 140020 by rwatson@rwatson_zoo on 2008/04/14 09:09:06 Integrate TrustedBSD MAC branch through @140019. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strfmon.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/lock.9#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/clock.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.mips#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/files#135 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#61 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.mips#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#52 integrate .. //depot/projects/trustedbsd/mac/sys/conf/ldscript.mips#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/options#90 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.mips#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_ibm.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pcivar.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC.hints#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/clock.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/isa/atrtc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/isa/rtc.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lock.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_clock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#59 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/ADM5120#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/IDT#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/MALTA#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/QEMU#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_limits.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/_types.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/archtype.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/asm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/asmacros.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/atomic.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/bswap.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cache.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/clock.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/clockvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cp0.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cpu.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/cputypes.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/defs.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/elf.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/endian.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/exec.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/float.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/fpu.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/frame.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ieee.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/intr.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/iodev.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/kdb.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/limits.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/locore.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/md_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/memdev.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/metadata.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/minidump.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/mutex.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ns16550.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/param.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pcb.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pcpu.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pltfm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pmap.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/proc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/profile.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/psl.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/pte.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ptrace.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/queue.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/regdef.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/regnum.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/reloc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/resource.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/rm7000.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/runq.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/segments.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/setjmp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/sigframe.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/signal.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/smp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/stdarg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/sysarch.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/trap.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/ucontext.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/varargs.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/include/vmparam.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/cache.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/copystr.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/cpu.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/exception.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/fp.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/genassym.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/locore.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/mem.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/nexus.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/pmap.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/support.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/swtch.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/tick.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/tlb.S#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/trap.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/trustedbsd/mac/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#96 integrate .. //depot/projects/trustedbsd/mac/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/radix.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix_mpath.c#1 branch .. //depot/projects/trustedbsd/mac/sys/net/radix_mpath.h#1 branch .. //depot/projects/trustedbsd/mac/sys/net/route.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/net/route.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#14 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#27 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/lock.h#18 integrate Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/stdlib/strfmon.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_rwlock.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include @@ -32,7 +32,6 @@ #include "namespace.h" #include -#include #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/trustedbsd/mac/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/trustedbsd/mac/sbin/geom/class/part/geom_part.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/trustedbsd/mac/share/man/man9/lock.9#12 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/lock.9,v 1.32 2008/04/06 21:22:12 attilio Exp $ +.\" $FreeBSD: src/share/man/man9/lock.9,v 1.33 2008/04/12 20:18:02 attilio Exp $ .\" -.Dd April 6, 2008 +.Dd April 12, 2008 .Dt LOCK 9 .Os .Sh NAME @@ -178,6 +178,10 @@ .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_NOWITNESS +Skip the +.Xr witness 4 +checks for this instance. .It Dv LK_CANRECURSE Allow recursion on an exclusive lock. For every lock there must be a release. ==== //depot/projects/trustedbsd/mac/sys/amd64/include/clock.h#11 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#19 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include #include #include -#include #include #include @@ -78,13 +70,6 @@ #include #endif -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; } @@ -738,7 +521,8 @@ count = i8254_max_count - ((high << 8) | low); if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || - ((count < 20 || (!(rflags & PSL_I) && count < i8254_max_count / 2u)) && + ((count < 20 || (!(rflags & PSL_I) && + count < i8254_max_count / 2u)) && i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += i8254_max_count; @@ -751,11 +535,10 @@ #ifdef DEV_ISA /* - * Attach to the ISA PnP descriptors for the timer and realtime clock. + * Attach to the ISA PnP descriptors for the timer */ static struct isa_pnp_id attimer_ids[] = { { 0x0001d041 /* PNP0100 */, "AT timer" }, - { 0x000bd041 /* PNP0B00 */, "AT realtime clock" }, { 0 } }; @@ -764,7 +547,8 @@ { int result; - if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids)) <= 0) + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); + if (result <= 0) device_quiet(dev); return(result); } @@ -781,8 +565,8 @@ DEVMETHOD(device_attach, attimer_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ - DEVMETHOD(device_resume, bus_generic_resume), /* XXX restart statclock? */ + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; ==== //depot/projects/trustedbsd/mac/sys/conf/files#135 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1288 2008/04/03 20:58:18 jfv Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1671,6 +1671,7 @@ net/ppp_tty.c optional ppp net/pfil.c optional ether | inet net/radix.c standard +net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard ==== //depot/projects/trustedbsd/mac/sys/conf/files.amd64#31 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -207,9 +207,12 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/link_elf_obj.c standard +kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/trustedbsd/mac/sys/conf/files.i386#61 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.592 2008/02/03 07:07:29 scottl Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -443,10 +443,13 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/trustedbsd/mac/sys/conf/files.pc98#52 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.359 2007/12/03 11:38:28 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -314,8 +314,10 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +kern/clock_if.m standard kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip +kern/subr_rtc.c standard libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard ==== //depot/projects/trustedbsd/mac/sys/conf/options#90 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.624 2008/04/05 20:13:14 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.625 2008/04/13 05:45:13 qingli Exp $ # # On the handling of kernel options # @@ -395,6 +395,7 @@ PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h +RADIX_MPATH opt_mpath.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h ==== //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_asus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.31 2008/04/10 15:17:41 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.32 2008/04/13 14:40:02 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -375,6 +375,20 @@ { .name = NULL } }; +/* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 13:47:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D620C1065677; Mon, 14 Apr 2008 13:47:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 971A31065674 for ; Mon, 14 Apr 2008 13:47:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 856A08FC16 for ; Mon, 14 Apr 2008 13:47:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3EDlmBA015641 for ; Mon, 14 Apr 2008 13:47:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3EDlmBQ015639 for perforce@freebsd.org; Mon, 14 Apr 2008 13:47:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Apr 2008 13:47:48 GMT Message-Id: <200804141347.m3EDlmBQ015639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 13:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=140027 Change 140027 by rwatson@rwatson_zoo on 2008/04/14 13:47:20 For some reason, support.[ch] in rtld-aout got lost, or not re-found, so forcibly re-integ. Affected files ... .. //depot/projects/trustedbsd/base/libexec/rtld-aout/shlib.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-aout/shlib.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-aout/support.c#4 branch .. //depot/projects/trustedbsd/base/libexec/rtld-aout/support.h#4 branch Differences ... ==== //depot/projects/trustedbsd/base/libexec/rtld-aout/shlib.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/base/libexec/rtld-aout/shlib.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Apr 14 16:16:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2089E1065672; Mon, 14 Apr 2008 16:16:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D61BA106566C for ; Mon, 14 Apr 2008 16:16:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C421B8FC25 for ; Mon, 14 Apr 2008 16:16:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3EGGRYW028334 for ; Mon, 14 Apr 2008 16:16:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3EGGQMj028324 for perforce@freebsd.org; Mon, 14 Apr 2008 16:16:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Apr 2008 16:16:26 GMT Message-Id: <200804141616.m3EGGQMj028324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 16:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=140031 Change 140031 by rwatson@rwatson_zoo on 2008/04/14 16:16:09 Further integrate of MAC branch to pick up missing files from base. Affected files ... .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/shlib.c#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/shlib.h#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/support.c#4 branch .. //depot/projects/trustedbsd/mac/libexec/rtld-aout/support.h#4 branch Differences ... ==== //depot/projects/trustedbsd/mac/libexec/rtld-aout/shlib.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/libexec/rtld-aout/shlib.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Apr 14 16:43:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888BE1065670; Mon, 14 Apr 2008 16:43:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3266D1065671 for ; Mon, 14 Apr 2008 16:43:58 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F8498FC12 for ; Mon, 14 Apr 2008 16:43:58 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3EGhwLS029612 for ; Mon, 14 Apr 2008 16:43:58 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3EGhvej029610 for perforce@freebsd.org; Mon, 14 Apr 2008 16:43:57 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 14 Apr 2008 16:43:57 GMT Message-Id: <200804141643.m3EGhvej029610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 16:43:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=140032 Change 140032 by thompsa@thompsa_burger on 2008/04/14 16:43:57 IFC Affected files ... .. //depot/projects/vap/lib/libthr/thread/thr_rwlock.c#4 integrate .. //depot/projects/vap/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/vap/sys/amd64/include/clock.h#6 integrate .. //depot/projects/vap/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/vap/sys/conf/files.amd64#9 integrate .. //depot/projects/vap/sys/conf/files.i386#9 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/vap/sys/dev/fb/vga.c#7 integrate .. //depot/projects/vap/sys/dev/nvram/nvram.c#3 integrate .. //depot/projects/vap/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#5 integrate .. //depot/projects/vap/sys/geom/part/g_part.h#6 integrate .. //depot/projects/vap/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/vap/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC.hints#7 integrate .. //depot/projects/vap/sys/i386/include/clock.h#7 integrate .. //depot/projects/vap/sys/i386/isa/clock.c#8 integrate .. //depot/projects/vap/sys/isa/atrtc.c#1 branch .. //depot/projects/vap/sys/isa/rtc.h#3 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#13 integrate .. //depot/projects/vap/sys/kern/subr_clock.c#5 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#11 integrate .. //depot/projects/vap/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/vap/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/vap/sys/mips/conf/ADM5120#1 branch .. //depot/projects/vap/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/vap/sys/mips/conf/IDT#1 branch .. //depot/projects/vap/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/vap/sys/mips/conf/MALTA#1 branch .. //depot/projects/vap/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/vap/sys/mips/conf/QEMU#1 branch .. //depot/projects/vap/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/vap/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/vap/sys/mips/include/_bus.h#1 branch .. //depot/projects/vap/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/vap/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/vap/sys/mips/include/_limits.h#1 branch .. //depot/projects/vap/sys/mips/include/_stdint.h#1 branch .. //depot/projects/vap/sys/mips/include/_types.h#1 branch .. //depot/projects/vap/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/vap/sys/mips/include/archtype.h#1 branch .. //depot/projects/vap/sys/mips/include/asm.h#1 branch .. //depot/projects/vap/sys/mips/include/asmacros.h#1 branch .. //depot/projects/vap/sys/mips/include/atomic.h#1 branch .. //depot/projects/vap/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/vap/sys/mips/include/bswap.h#1 branch .. //depot/projects/vap/sys/mips/include/bus.h#1 branch .. //depot/projects/vap/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/vap/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/vap/sys/mips/include/cache.h#1 branch .. //depot/projects/vap/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/vap/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/vap/sys/mips/include/clock.h#1 branch .. //depot/projects/vap/sys/mips/include/clockvar.h#1 branch .. //depot/projects/vap/sys/mips/include/cp0.h#1 branch .. //depot/projects/vap/sys/mips/include/cpu.h#1 branch .. //depot/projects/vap/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/vap/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/vap/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/vap/sys/mips/include/cputypes.h#1 branch .. //depot/projects/vap/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/vap/sys/mips/include/defs.h#1 branch .. //depot/projects/vap/sys/mips/include/elf.h#1 branch .. //depot/projects/vap/sys/mips/include/endian.h#1 branch .. //depot/projects/vap/sys/mips/include/exec.h#1 branch .. //depot/projects/vap/sys/mips/include/float.h#1 branch .. //depot/projects/vap/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/vap/sys/mips/include/fpu.h#1 branch .. //depot/projects/vap/sys/mips/include/frame.h#1 branch .. //depot/projects/vap/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/vap/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/vap/sys/mips/include/ieee.h#1 branch .. //depot/projects/vap/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/vap/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/vap/sys/mips/include/intr.h#1 branch .. //depot/projects/vap/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/vap/sys/mips/include/iodev.h#1 branch .. //depot/projects/vap/sys/mips/include/kdb.h#1 branch .. //depot/projects/vap/sys/mips/include/limits.h#1 branch .. //depot/projects/vap/sys/mips/include/locore.h#1 branch .. //depot/projects/vap/sys/mips/include/md_var.h#1 branch .. //depot/projects/vap/sys/mips/include/memdev.h#1 branch .. //depot/projects/vap/sys/mips/include/metadata.h#1 branch .. //depot/projects/vap/sys/mips/include/minidump.h#1 branch .. //depot/projects/vap/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/vap/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/vap/sys/mips/include/mutex.h#1 branch .. //depot/projects/vap/sys/mips/include/ns16550.h#1 branch .. //depot/projects/vap/sys/mips/include/param.h#1 branch .. //depot/projects/vap/sys/mips/include/pcb.h#1 branch .. //depot/projects/vap/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/vap/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/vap/sys/mips/include/pcpu.h#1 branch .. //depot/projects/vap/sys/mips/include/pltfm.h#1 branch .. //depot/projects/vap/sys/mips/include/pmap.h#1 branch .. //depot/projects/vap/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/vap/sys/mips/include/ppireg.h#1 branch .. //depot/projects/vap/sys/mips/include/proc.h#1 branch .. //depot/projects/vap/sys/mips/include/profile.h#1 branch .. //depot/projects/vap/sys/mips/include/psl.h#1 branch .. //depot/projects/vap/sys/mips/include/pte.h#1 branch .. //depot/projects/vap/sys/mips/include/ptrace.h#1 branch .. //depot/projects/vap/sys/mips/include/queue.h#1 branch .. //depot/projects/vap/sys/mips/include/reg.h#1 branch .. //depot/projects/vap/sys/mips/include/regdef.h#1 branch .. //depot/projects/vap/sys/mips/include/regnum.h#1 branch .. //depot/projects/vap/sys/mips/include/reloc.h#1 branch .. //depot/projects/vap/sys/mips/include/resource.h#1 branch .. //depot/projects/vap/sys/mips/include/rm7000.h#1 branch .. //depot/projects/vap/sys/mips/include/runq.h#1 branch .. //depot/projects/vap/sys/mips/include/segments.h#1 branch .. //depot/projects/vap/sys/mips/include/setjmp.h#1 branch .. //depot/projects/vap/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/vap/sys/mips/include/sigframe.h#1 branch .. //depot/projects/vap/sys/mips/include/signal.h#1 branch .. //depot/projects/vap/sys/mips/include/smp.h#1 branch .. //depot/projects/vap/sys/mips/include/stdarg.h#1 branch .. //depot/projects/vap/sys/mips/include/sysarch.h#1 branch .. //depot/projects/vap/sys/mips/include/timerreg.h#1 branch .. //depot/projects/vap/sys/mips/include/trap.h#1 branch .. //depot/projects/vap/sys/mips/include/ucontext.h#1 branch .. //depot/projects/vap/sys/mips/include/varargs.h#1 branch .. //depot/projects/vap/sys/mips/include/vmparam.h#1 branch .. //depot/projects/vap/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/vap/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/cache.c#1 branch .. //depot/projects/vap/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/vap/sys/mips/mips/copystr.S#1 branch .. //depot/projects/vap/sys/mips/mips/cpu.c#1 branch .. //depot/projects/vap/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/vap/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/vap/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/vap/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/exception.S#1 branch .. //depot/projects/vap/sys/mips/mips/fp.S#1 branch .. //depot/projects/vap/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/genassym.c#1 branch .. //depot/projects/vap/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/vap/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/locore.S#1 branch .. //depot/projects/vap/sys/mips/mips/machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/vap/sys/mips/mips/mem.c#1 branch .. //depot/projects/vap/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/vap/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/nexus.c#1 branch .. //depot/projects/vap/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/pmap.c#1 branch .. //depot/projects/vap/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/vap/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/support.S#1 branch .. //depot/projects/vap/sys/mips/mips/swtch.S#1 branch .. //depot/projects/vap/sys/mips/mips/tick.c#1 branch .. //depot/projects/vap/sys/mips/mips/tlb.S#1 branch .. //depot/projects/vap/sys/mips/mips/trap.c#1 branch .. //depot/projects/vap/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/vap/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/vap/sys/modules/Makefile#20 integrate .. //depot/projects/vap/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/vap/sys/net/radix.c#5 integrate .. //depot/projects/vap/sys/net/radix.h#3 integrate .. //depot/projects/vap/sys/net/radix_mpath.c#1 branch .. //depot/projects/vap/sys/net/radix_mpath.h#1 branch .. //depot/projects/vap/sys/net/route.c#7 integrate .. //depot/projects/vap/sys/net/route.h#6 integrate .. //depot/projects/vap/sys/net/rtsock.c#7 integrate .. //depot/projects/vap/sys/netinet/in_proto.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#8 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/vap/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/vap/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/vap/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/vap/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/vap/sys/security/audit/audit.c#8 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/vap/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_trigger.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/vap/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/vap/sys/sys/lock.h#7 integrate Differences ... ==== //depot/projects/vap/lib/libthr/thread/thr_rwlock.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include @@ -32,7 +32,6 @@ #include "namespace.h" #include -#include #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/vap/sbin/geom/class/part/geom_part.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/vap/sys/amd64/include/clock.h#6 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/vap/sys/amd64/isa/clock.c#8 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include #include #include -#include #include #include @@ -78,13 +70,6 @@ #include #endif -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; } @@ -738,7 +521,8 @@ count = i8254_max_count - ((high << 8) | low); if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || - ((count < 20 || (!(rflags & PSL_I) && count < i8254_max_count / 2u)) && + ((count < 20 || (!(rflags & PSL_I) && + count < i8254_max_count / 2u)) && i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += i8254_max_count; @@ -751,11 +535,10 @@ #ifdef DEV_ISA /* - * Attach to the ISA PnP descriptors for the timer and realtime clock. + * Attach to the ISA PnP descriptors for the timer */ static struct isa_pnp_id attimer_ids[] = { { 0x0001d041 /* PNP0100 */, "AT timer" }, - { 0x000bd041 /* PNP0B00 */, "AT realtime clock" }, { 0 } }; @@ -764,7 +547,8 @@ { int result; - if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids)) <= 0) + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); + if (result <= 0) device_quiet(dev); return(result); } @@ -781,8 +565,8 @@ DEVMETHOD(device_attach, attimer_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ - DEVMETHOD(device_resume, bus_generic_resume), /* XXX restart statclock? */ + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; ==== //depot/projects/vap/sys/conf/files.amd64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -207,9 +207,12 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/link_elf_obj.c standard +kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/vap/sys/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.593 2008/04/12 20:46:06 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -443,6 +443,7 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/clock_if.m standard ==== //depot/projects/vap/sys/dev/acpi_support/acpi_ibm.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.15 2007/10/25 17:30:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.16 2008/04/14 08:00:00 phk Exp $"); /* * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops. @@ -48,7 +48,7 @@ #include #include #include -#include +#include #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("IBM") ==== //depot/projects/vap/sys/dev/fb/vga.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.37 2007/12/29 23:26:55 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.38 2008/04/14 08:00:00 phk Exp $"); #include "opt_vga.h" #include "opt_fb.h" @@ -154,7 +154,7 @@ /* LOW-LEVEL */ -#include +#include #ifdef __i386__ #include #endif ==== //depot/projects/vap/sys/dev/nvram/nvram.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.1 2007/10/26 03:23:53 peter Exp $ + * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.2 2008/04/14 08:00:00 phk Exp $ */ #include @@ -35,7 +35,6 @@ #include #include -#include #include /* ==== //depot/projects/vap/sys/dev/pci/pcivar.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.81 2008/04/12 20:26:07 phk Exp $ * */ @@ -238,7 +238,7 @@ PCI_IVAR_CACHELNSZ, PCI_IVAR_MINGNT, PCI_IVAR_MAXLAT, - PCI_IVAR_LATTIMER, + PCI_IVAR_LATTIMER }; /* ==== //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#4 (text+ko) ==== @@ -81,10 +81,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20071129_0050" +#define HDA_DRV_TEST_REV "20080412_0051" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.51 2007/12/13 15:48:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.52 2008/04/12 15:07:32 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -102,6 +102,12 @@ #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) #define hdac_lockowned(sc) mtx_owned((sc)->lock) +#undef HDAC_MSI_ENABLED +#if __FreeBSD_version >= 700026 || \ + (__FreeBSD_version < 700000 && __FreeBSD_version >= 602106) +#define HDAC_MSI_ENABLED 1 +#endif + #define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) #define HDA_DEV_MATCH(fl, v) ((fl) == (v) || \ (fl) == 0xffffffff || \ @@ -188,6 +194,7 @@ /* Dell */ #define DELL_VENDORID 0x1028 #define DELL_D820_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01cc) +#define DELL_V1500_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x0228) #define DELL_I1300_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01c9) #define DELL_XPSM1210_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01d7) #define DELL_OPLX745_SUBVENDOR HDA_MODEL_CONSTRUCT(DELL, 0x01da) @@ -208,19 +215,20 @@ /* Asus */ #define ASUS_VENDORID 0x1043 -#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_A8X_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) #define ASUS_U5F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) -#define ASUS_A8JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1153) -#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_A7M_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1323) +#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_G2K_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1339) #define ASUS_A7T_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x13c2) -#define ASUS_W6F_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1263) #define ASUS_W2J_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1971) -#define ASUS_F3JC_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1338) +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_P1AH2_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) +#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) #define ASUS_M2V_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81e7) +#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_M2N_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x8234) -#define ASUS_M2NPVMX_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81cb) -#define ASUS_P5BWD_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x81ec) #define ASUS_A8NVMCSM_SUBVENDOR HDA_MODEL_CONSTRUCT(NVIDIA, 0xcb84) #define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) @@ -548,6 +556,7 @@ #define HDA_CODEC_STAC922XD HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7681) #define HDA_CODEC_STAC9227 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7618) #define HDA_CODEC_STAC9271D HDA_CODEC_CONSTRUCT(SIGMATEL, 0x7627) +#define HDA_CODEC_STAC9205 HDA_CODEC_CONSTRUCT(SIGMATEL, 0x76a0) #define HDA_CODEC_STACXXXX HDA_CODEC_CONSTRUCT(SIGMATEL, 0xffff) /* @@ -610,6 +619,7 @@ { HDA_CODEC_STAC922XD, "Sigmatel STAC9220D/9223D" }, { HDA_CODEC_STAC9227, "Sigmatel STAC9227" }, { HDA_CODEC_STAC9271D, "Sigmatel STAC9271D" }, + { HDA_CODEC_STAC9205, "Sigmatel STAC9205" }, { HDA_CODEC_CXVENICE, "Conexant Venice" }, { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, { HDA_CODEC_VT1708_8, "VIA VT1708_8" }, @@ -676,6 +686,8 @@ 0, 0, -1, 13, { 14, -1 }, -1 }, { DELL_OPLX745_SUBVENDOR, HDA_CODEC_AD1983, HDAC_HP_SWITCH_CTL, 0, 0, -1, 6, { 5, 7, -1 }, -1 }, + { DELL_V1500_SUBVENDOR, HDA_CODEC_STAC9205, HDAC_HP_SWITCH_CTRL, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 17:27:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445271065670; Mon, 14 Apr 2008 17:27:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2125106564A for ; Mon, 14 Apr 2008 17:27:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D057C8FC13 for ; Mon, 14 Apr 2008 17:27:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3EHRj7N041254 for ; Mon, 14 Apr 2008 17:27:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3EHRjiY041252 for perforce@freebsd.org; Mon, 14 Apr 2008 17:27:45 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 Apr 2008 17:27:45 GMT Message-Id: <200804141727.m3EHRjiY041252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140035 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 17:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=140035 Change 140035 by sam@sam_ebb on 2008/04/14 17:27:22 checkpoint; associates Affected files ... .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#12 edit .. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#9 edit Differences ... ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#12 (text+ko) ==== @@ -118,6 +118,10 @@ static int ipw_newstate(struct ieee80211vap *, enum ieee80211_state, int); static uint16_t ipw_read_prom_word(struct ipw_softc *, uint8_t); static void ipw_rx_cmd_intr(struct ipw_softc *, struct ipw_soft_buf *); +static void ipw_assocsuccess(void *, int); +static void ipw_assocfailed(void *, int); +static void ipw_scandone(void *, int); +static void ipw_bmiss(void *, int); static void ipw_rx_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *); static void ipw_rx_data_intr(struct ipw_softc *, struct ipw_status *, struct ipw_soft_bd *, struct ipw_soft_buf *); @@ -130,6 +134,8 @@ static int ipw_cmd(struct ipw_softc *, uint32_t, void *, uint32_t); static int ipw_tx_start(struct ifnet *, struct mbuf *, struct ieee80211_node *); +static int ipw_raw_xmit(struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); static void ipw_start(struct ifnet *); static void ipw_start_locked(struct ifnet *); static void ipw_watchdog(void *); @@ -142,12 +148,10 @@ static int ipw_load_firmware(struct ipw_softc *, const char *, int); static int ipw_config(struct ipw_softc *); static void ipw_assoc_task(void *, int); -static int ipw_auth_and_assoc(struct ipw_softc *); static void ipw_disassoc_task(void *, int); -static int ipw_disassociate(struct ipw_softc *); static void ipw_init_task(void *, int); static void ipw_init(void *); -static void ipw_init_locked(struct ipw_softc *, int); +static void ipw_init_locked(struct ipw_softc *); static void ipw_stop(void *); static void ipw_stop_locked(struct ipw_softc *); static int ipw_sysctl_stats(SYSCTL_HANDLER_ARGS); @@ -236,8 +240,7 @@ TASK_INIT(&sc->sc_init_task, 0, ipw_init_task, sc); TASK_INIT(&sc->sc_scan_task, 0, ipw_scan_task, sc); - TASK_INIT(&sc->sc_assoc_task, 0, ipw_assoc_task, sc); - TASK_INIT(&sc->sc_disassoc_task, 0, ipw_disassoc_task, sc); + TASK_INIT(&sc->sc_bmiss_task, 0, ipw_bmiss, sc); callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { @@ -267,23 +270,23 @@ RF_ACTIVE | RF_SHAREABLE); if (sc->irq == NULL) { device_printf(dev, "could not allocate interrupt resource\n"); - goto fail; + goto fail1; } if (ipw_reset(sc) != 0) { device_printf(dev, "could not reset adapter\n"); - goto fail; + goto fail2; } if (ipw_dma_alloc(sc) != 0) { device_printf(dev, "could not allocate DMA resources\n"); - goto fail; + goto fail2; } ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { device_printf(dev, "can not if_alloc()\n"); - goto fail; + goto fail3; } ic = ifp->if_l2com; @@ -298,6 +301,7 @@ IFQ_SET_READY(&ifp->if_snd); ic->ic_ifp = ifp; + ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_DS; /* set device capabilities */ @@ -342,6 +346,7 @@ ic->ic_set_channel = ipw_set_channel; ic->ic_scan_curchan = ipw_scan_curchan; ic->ic_scan_mindwell = ipw_scan_mindwell; + ic->ic_raw_xmit = ipw_raw_xmit; ic->ic_vap_create = ipw_vap_create; ic->ic_vap_delete = ipw_vap_delete; @@ -377,15 +382,23 @@ NULL, ipw_intr, sc, &sc->sc_ih); if (error != 0) { device_printf(dev, "could not set up interrupt\n"); - goto fail; + goto fail4; } if (bootverbose) ieee80211_announce(ic); return 0; - -fail: ipw_detach(dev); +fail4: + if_free(ifp); +fail3: + ipw_release(sc); +fail2: + bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); +fail1: + bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); +fail: + mtx_destroy(&sc->sc_mtx); return ENXIO; } @@ -397,29 +410,23 @@ struct ieee80211com *ic = ifp->if_l2com; ipw_stop(sc); + + bpfdetach(ifp); + ieee80211_ifdetach(ic); + callout_drain(&sc->sc_wdtimer); taskqueue_drain(taskqueue_fast, &sc->sc_init_task); taskqueue_drain(taskqueue_fast, &sc->sc_scan_task); - taskqueue_drain(taskqueue_fast, &sc->sc_assoc_task); - taskqueue_drain(taskqueue_fast, &sc->sc_disassoc_task); + taskqueue_drain(taskqueue_fast, &sc->sc_bmiss_task); - if (ifp != NULL) { - bpfdetach(ifp); - ieee80211_ifdetach(ic); - } - ipw_release(sc); - if (sc->irq != NULL) { - bus_teardown_intr(dev, sc->irq, sc->sc_ih); - bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); - } + bus_teardown_intr(dev, sc->irq, sc->sc_ih); + bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq); - if (sc->mem != NULL) - bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); + bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem); - if (ifp != NULL) - if_free(ifp); + if_free(ifp); if (sc->sc_firmware != NULL) { firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD); @@ -437,16 +444,77 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { + struct ifnet *ifp = ic->ic_ifp; + struct ipw_softc *sc = ifp->if_softc; struct ipw_vap *ivp; struct ieee80211vap *vap; + const struct firmware *fp; + const struct ipw_firmware_hdr *hdr; + const char *imagename; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ return NULL; + + switch (opmode) { + case IEEE80211_M_STA: + imagename = "ipw_bss"; + break; + case IEEE80211_M_IBSS: + imagename = "ipw_ibss"; + break; + case IEEE80211_M_MONITOR: + imagename = "ipw_monitor"; + break; + default: + return NULL; + } + + /* + * Load firmware image using the firmware(9) subsystem. Doing + * this unlocked is ok since we're single-threaded by the + * 802.11 layer. + */ + if (sc->sc_firmware == NULL || + strcmp(sc->sc_firmware->name, imagename) != 0) { + if (sc->sc_firmware != NULL) + firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD); + sc->sc_firmware = firmware_get(imagename); + } + if (sc->sc_firmware == NULL) { + device_printf(sc->sc_dev, + "could not load firmware image '%s'\n", imagename); + return NULL; + } + fp = sc->sc_firmware; + if (fp->datasize < sizeof *hdr) { + device_printf(sc->sc_dev, + "firmware image too short %zu\n", fp->datasize); + firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD); + sc->sc_firmware = NULL; + return NULL; + } + hdr = (const struct ipw_firmware_hdr *)fp->data; + if (fp->datasize < sizeof *hdr + le32toh(hdr->mainsz) + + le32toh(hdr->ucodesz)) { + device_printf(sc->sc_dev, + "firmware image too short %zu\n", fp->datasize); + firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD); + sc->sc_firmware = NULL; + return NULL; + } + ivp = (struct ipw_vap *) malloc(sizeof(struct ipw_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (ivp == NULL) return NULL; vap = &ivp->vap; + + TASK_INIT(&ivp->assoc_task, 0, ipw_assoc_task, vap); + TASK_INIT(&ivp->disassoc_task, 0, ipw_disassoc_task, vap); + TASK_INIT(&ivp->assoc_success_task, 0, ipw_assocsuccess, vap); + TASK_INIT(&ivp->assoc_failed_task, 0, ipw_assocfailed, vap); + TASK_INIT(&ivp->scandone_task, 0, ipw_scandone, vap); + ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); /* override with driver methods */ ivp->newstate = vap->iv_newstate; @@ -786,7 +854,7 @@ pci_write_config(dev, 0x41, 0, 1); if (ifp->if_flags & IFF_UP) { - ipw_init_locked(sc, 0); + ipw_init_locked(sc); if (ifp->if_drv_flags & IFF_DRV_RUNNING) ipw_start_locked(ifp); } @@ -848,30 +916,34 @@ * AUTH -> RUN transition and we want to do nothing. * This is all totally bogus and needs to be redone. */ - if (vap->iv_state == IEEE80211_S_SCAN) - taskqueue_enqueue_fast(taskqueue_fast, - &sc->sc_assoc_task); + if (vap->iv_state == IEEE80211_S_SCAN) { + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->assoc_task); + return EINPROGRESS; + } } break; case IEEE80211_S_INIT: if (sc->flags & IPW_FLAG_ASSOCIATED) - taskqueue_enqueue_fast(taskqueue_fast, - &sc->sc_disassoc_task); + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->disassoc_task); break; case IEEE80211_S_AUTH: - taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_assoc_task); - break; + taskqueue_enqueue(taskqueue_swi, &IPW_VAP(vap)->assoc_task); + return EINPROGRESS; case IEEE80211_S_ASSOC: /* * If we are not transitioning from AUTH the resend the * association request. */ - if (vap->iv_state != IEEE80211_S_AUTH) - taskqueue_enqueue_fast(taskqueue_fast, - &sc->sc_assoc_task); + if (vap->iv_state != IEEE80211_S_AUTH) { + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->assoc_task); + return EINPROGRESS; + } break; default: @@ -954,6 +1026,38 @@ } static void +ipw_assocsuccess(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_RUN, -1); +} + +static void +ipw_assocfailed(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_new_state(vap, IEEE80211_S_SCAN, -1); +} + +static void +ipw_scandone(void *arg, int npending) +{ + struct ieee80211vap *vap = arg; + + ieee80211_scan_done(vap); +} + +static void +ipw_bmiss(void *arg, int npending) +{ + struct ieee80211com *ic = arg; + + ieee80211_beacon_miss(ic); +} + +static void ipw_rx_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf) { #define IEEESTATE(vap) ieee80211_state_name[vap->iv_state] @@ -970,13 +1074,16 @@ case IPW_STATE_ASSOCIATED: DPRINTFN(2, ("Association succeeded (%s flags 0x%x)\n", IEEESTATE(vap), sc->flags)); + /* XXX suppress state change in case the fw auto-associates */ + if ((sc->flags & IPW_FLAG_ASSOCIATING) == 0) { + DPRINTF(("Unexpected association (%s, flags 0x%x)\n", + IEEESTATE(vap), sc->flags)); + break; + } + sc->flags &= ~IPW_FLAG_ASSOCIATING; sc->flags |= IPW_FLAG_ASSOCIATED; - /* XXX suppress state change in case the fw auto-associates */ - if (vap->iv_state != IEEE80211_S_ASSOC) { - DPRINTF(("Unexpected association (state %u)\n", - vap->iv_state)); - } else - ieee80211_new_state(vap, IEEE80211_S_RUN, -1); + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->assoc_success_task); break; case IPW_STATE_SCANNING: @@ -988,8 +1095,10 @@ * scan and we would treat it as a beacon miss if * we checked the 802.11 layer state. */ - if (sc->flags & IPW_FLAG_ASSOCIATED) - ieee80211_beacon_miss(ic); + if (sc->flags & IPW_FLAG_ASSOCIATED) { + /* XXX probably need to issue disassoc to fw */ + taskqueue_enqueue(taskqueue_swi, &sc->sc_bmiss_task); + } break; case IPW_STATE_SCAN_COMPLETE: @@ -1000,14 +1109,15 @@ * around this by marking the HACK flag and skipping * the first scan complete event. */ + DPRINTFN(3, ("Scan complete (%s flags 0x%x)\n", + IEEESTATE(vap), sc->flags)); if (sc->flags & IPW_FLAG_HACK) { sc->flags &= ~IPW_FLAG_HACK; break; } - DPRINTFN(3, ("Scan complete (%s flags 0x%x)\n", - IEEESTATE(vap), sc->flags)); if (sc->flags & IPW_FLAG_SCANNING) { - ieee80211_scan_done(vap); + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->scandone_task); sc->flags &= ~IPW_FLAG_SCANNING; sc->sc_scan_timer = 0; } @@ -1016,21 +1126,25 @@ case IPW_STATE_ASSOCIATION_LOST: DPRINTFN(2, ("Association lost (%s flags 0x%x)\n", IEEESTATE(vap), sc->flags)); - sc->flags &= ~IPW_FLAG_ASSOCIATED; + sc->flags &= ~(IPW_FLAG_ASSOCIATING | IPW_FLAG_ASSOCIATED); if (vap->iv_state == IEEE80211_S_RUN) - ieee80211_new_state(vap, IEEE80211_S_SCAN, -1); + taskqueue_enqueue(taskqueue_swi, + &IPW_VAP(vap)->assoc_failed_task); break; case IPW_STATE_DISABLED: + /* XXX? is this right? */ + sc->flags &= ~(IPW_FLAG_HACK | IPW_FLAG_SCANNING | + IPW_FLAG_ASSOCIATING | IPW_FLAG_ASSOCIATED); DPRINTFN(2, ("Firmware disabled (%s flags 0x%x)\n", IEEESTATE(vap), sc->flags)); break; case IPW_STATE_RADIO_DISABLED: - DPRINTFN(2, ("Radio off (%s flags 0x%x)\n", - IEEESTATE(vap), sc->flags)); - vap->iv_ifp->if_flags &= ~IFF_UP; /* XXX */ + device_printf(sc->sc_dev, "radio turned off\n"); + ieee80211_notify_radio(ic, 0); ipw_stop_locked(sc); + /* XXX start polling thread to detect radio on */ break; default: @@ -1199,9 +1313,6 @@ static void ipw_rx_intr(struct ipw_softc *sc) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ipw_status *status; struct ipw_soft_bd *sbd; struct ipw_soft_buf *sbuf; @@ -1236,11 +1347,7 @@ case IPW_STATUS_CODE_NOTIFICATION: DPRINTFN(2, ("notification status, len %u flags 0x%x\n", le32toh(status->len), status->flags)); - if (vap->iv_state == IEEE80211_S_AUTH) { - /* XXX assume auth notification */ - ieee80211_node_authorize(vap->iv_bss); - ieee80211_new_state(vap, IEEE80211_S_ASSOC, -1); - } + /* XXX maybe drive state machine AUTH->ASSOC? */ break; default: @@ -1352,7 +1459,7 @@ if (r & (IPW_INTR_FATAL_ERROR | IPW_INTR_PARITY_ERROR)) { device_printf(sc->sc_dev, "firmware error\n"); - taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_init_task); + taskqueue_enqueue(taskqueue_swi, &sc->sc_init_task); r = 0; /* don't process more interrupts */ } @@ -1440,6 +1547,8 @@ bus_addr_t physaddr; int error; + IPW_LOCK_ASSERT(sc); + if (sc->flags & IPW_FLAG_BUSY) { device_printf(sc->sc_dev, "%s: %s not sent, busy\n", __func__, ipw_cmdname(type)); @@ -1652,6 +1761,16 @@ return 0; } +static int +ipw_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, + const struct ieee80211_bpf_params *params) +{ + /* no support; just discard */ + m_freem(m); + ieee80211_free_node(ni); + return 0; +} + static void ipw_start(struct ifnet *ifp) { @@ -1710,8 +1829,7 @@ if (--sc->sc_tx_timer == 0) { if_printf(ifp, "device timeout\n"); ifp->if_oerrors++; - taskqueue_enqueue_fast(taskqueue_fast, - &sc->sc_init_task); + taskqueue_enqueue(taskqueue_swi, &sc->sc_init_task); } } if (sc->sc_scan_timer > 0) { @@ -1737,17 +1855,17 @@ int error = 0; IPW_LOCK_DECL; - IPW_LOCK(sc); - switch (cmd) { case SIOCSIFFLAGS: + IPW_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - ipw_init_locked(sc, 0); + ipw_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) ipw_stop_locked(sc); } + IPW_UNLOCK(sc); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -1756,9 +1874,6 @@ default: error = ether_ioctl(ifp, cmd, data); } - - IPW_UNLOCK(sc); - return error; } @@ -2146,146 +2261,50 @@ return error; } -static int -ipw_config(struct ipw_softc *sc) +static void +ipw_assoc_task(void *context, int pending) { - struct ifnet *ifp = sc->sc_ifp; + struct ieee80211vap *vap = context; + struct ifnet *ifp = vap->iv_ic->ic_ifp; struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct ipw_softc *sc = ifp->if_softc; + struct ieee80211_node *ni = vap->iv_bss; struct ipw_security security; - struct ipw_configuration config; uint32_t data; int error; + IPW_LOCK_DECL; + IPW_LOCK(sc); error = ipw_disable(sc); if (error != 0) - return error; + goto done; - switch (ic->ic_opmode) { - case IEEE80211_M_STA: - case IEEE80211_M_HOSTAP: - case IEEE80211_M_WDS: /* XXX */ - data = htole32(IPW_MODE_BSS); - break; - case IEEE80211_M_IBSS: - case IEEE80211_M_AHDEMO: - data = htole32(IPW_MODE_IBSS); - break; - case IEEE80211_M_MONITOR: - data = htole32(IPW_MODE_MONITOR); - break; - } - DPRINTF(("Setting mode to %u\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_MODE, &data, sizeof data); + memset(&security, 0, sizeof security); + security.authmode = (ni->ni_authmode == IEEE80211_AUTH_SHARED) ? + IPW_AUTH_SHARED : IPW_AUTH_OPEN; + security.ciphers = htole32(IPW_CIPHER_NONE); + DPRINTF(("Setting authmode to %u\n", security.authmode)); + error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security, + sizeof security); if (error != 0) - return error; - - if (ic->ic_opmode == IEEE80211_M_IBSS || - ic->ic_opmode == IEEE80211_M_MONITOR) { - error = ipw_setchannel(sc, ic->ic_curchan); - if (error != 0) - return error; - } - - if (ic->ic_opmode == IEEE80211_M_MONITOR) - return ipw_enable(sc); - - IEEE80211_ADDR_COPY(vap->iv_myaddr, IF_LLADDR(ifp)); - DPRINTF(("Setting MAC address to %6D\n", vap->iv_myaddr, ":")); - error = ipw_cmd(sc, IPW_CMD_SET_MAC_ADDRESS, vap->iv_myaddr, - IEEE80211_ADDR_LEN); - if (error != 0) - return error; - - config.flags = htole32(IPW_CFG_BSS_MASK | IPW_CFG_IBSS_MASK | - IPW_CFG_PREAMBLE_AUTO | IPW_CFG_802_1x_ENABLE); - if (ic->ic_opmode == IEEE80211_M_IBSS) - config.flags |= htole32(IPW_CFG_IBSS_AUTO_START); - if (ifp->if_flags & IFF_PROMISC) - config.flags |= htole32(IPW_CFG_PROMISCUOUS); - config.bss_chan = htole32(0x3fff); /* channels 1-14 */ - config.ibss_chan = htole32(0x7ff); /* channels 1-11 */ - DPRINTF(("Setting configuration to 0x%x\n", le32toh(config.flags))); - error = ipw_cmd(sc, IPW_CMD_SET_CONFIGURATION, &config, sizeof config); - if (error != 0) - return error; - - data = htole32(0x3); /* 1, 2 */ - DPRINTF(("Setting basic tx rates to 0x%x\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_BASIC_TX_RATES, &data, sizeof data); - if (error != 0) - return error; - - /* NB: use the same rate set */ - DPRINTF(("Setting msdu tx rates to 0x%x\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_MSDU_TX_RATES, &data, sizeof data); - if (error != 0) - return error; - - data = htole32(0xf); /* 1, 2, 5.5, 11 */ - DPRINTF(("Setting tx rates to 0x%x\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_TX_RATES, &data, sizeof data); - if (error != 0) - return error; - - data = htole32(IPW_POWER_MODE_CAM); - DPRINTF(("Setting power mode to %u\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_POWER_MODE, &data, sizeof data); - if (error != 0) - return error; - - if (ic->ic_opmode == IEEE80211_M_IBSS) { - data = htole32(32); /* default value */ - DPRINTF(("Setting tx power index to %u\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_TX_POWER_INDEX, &data, - sizeof data); - if (error != 0) - return error; - } + goto done; data = htole32(vap->iv_rtsthreshold); DPRINTF(("Setting RTS threshold to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_RTS_THRESHOLD, &data, sizeof data); if (error != 0) - return error; + goto done; data = htole32(vap->iv_fragthreshold); DPRINTF(("Setting frag threshold to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_FRAG_THRESHOLD, &data, sizeof data); if (error != 0) - return error; - - error = ipw_setssid(sc, vap->iv_des_ssid[0].ssid, vap->iv_des_ssid[0].len); - if (error != 0) - return error; - - error = ipw_setbssid(sc, NULL); - if (error != 0) - return error; - - if (vap->iv_flags & IEEE80211_F_DESBSSID) { - DPRINTF(("Setting desired BSSID to %6D\n", vap->iv_des_bssid, - ":")); - error = ipw_cmd(sc, IPW_CMD_SET_DESIRED_BSSID, - vap->iv_des_bssid, IEEE80211_ADDR_LEN); - if (error != 0) - return error; - } - - memset(&security, 0, sizeof security); - security.authmode = (vap->iv_bss->ni_authmode == IEEE80211_AUTH_SHARED) ? - IPW_AUTH_SHARED : IPW_AUTH_OPEN; - security.ciphers = htole32(IPW_CIPHER_NONE); - DPRINTF(("Setting authmode to %u\n", security.authmode)); - error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security, - sizeof security); - if (error != 0) - return error; + goto done; if (vap->iv_flags & IEEE80211_F_PRIVACY) { error = ipw_setwepkeys(sc); if (error != 0) - return error; + goto done; if (vap->iv_def_txkey != IEEE80211_KEYIX_NONE) { data = htole32(vap->iv_def_txkey); @@ -2294,7 +2313,7 @@ error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data, sizeof data); if (error != 0) - return error; + goto done; } } @@ -2302,159 +2321,66 @@ DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data); if (error != 0) - return error; - - if (vap->iv_appie_assocreq != NULL) { - struct ieee80211_appie *ie = vap->iv_appie_assocreq; - error = ipw_setwpaie(sc, ie->ie_data, ie->ie_len); - if (error != 0) - return error; - } - - if (ic->ic_opmode == IEEE80211_M_IBSS) { - data = htole32(ic->ic_bintval); - DPRINTF(("Setting beacon interval to %u\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_BEACON_INTERVAL, &data, - sizeof data); - if (error != 0) - return error; - } - - error = ipw_setscanopts(sc, 0x3fff, 0); - if (error != 0) - return error; - - return (ipw_enable(sc)); -} - -/* - * Handler for sc_assoc_task. This is a simple wrapper around - * ipw_auth_and_assoc(). - */ -static void -ipw_assoc_task(void *context, int pending) -{ - struct ipw_softc *sc = context; - IPW_LOCK_DECL; - - IPW_LOCK(sc); - ipw_auth_and_assoc(sc); - IPW_UNLOCK(sc); -} - -static int -ipw_auth_and_assoc(struct ipw_softc *sc) -{ - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct ieee80211_node *ni = vap->iv_bss; - struct ipw_security security; - uint32_t data; - int error; - - error = ipw_disable(sc); - if (error != 0) - return (error); - - memset(&security, 0, sizeof security); - security.authmode = (ni->ni_authmode == IEEE80211_AUTH_SHARED) ? - IPW_AUTH_SHARED : IPW_AUTH_OPEN; - security.ciphers = htole32(IPW_CIPHER_NONE); - DPRINTF(("Setting authmode to %u\n", security.authmode)); - error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security, - sizeof security); - if (error != 0) - return (error); - - if (vap->iv_flags & IEEE80211_F_PRIVACY) { - error = ipw_setwepkeys(sc); - if (error != 0) - return error; - - if (vap->iv_def_txkey != IEEE80211_KEYIX_NONE) { - data = htole32(vap->iv_def_txkey); - DPRINTF(("Setting wep tx key index to %u\n", - le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data, - sizeof data); - if (error != 0) - return error; - } - } + goto done; - data = htole32((vap->iv_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0); - DPRINTF(("Setting wep flags to 0x%x\n", le32toh(data))); - error = ipw_cmd(sc, IPW_CMD_SET_WEP_FLAGS, &data, sizeof data); - if (error != 0) - return error; - error = ipw_setssid(sc, ni->ni_essid, ni->ni_esslen); if (error != 0) - return (error); + goto done; error = ipw_setbssid(sc, ni->ni_bssid); if (error != 0) - return (error); + goto done; if (vap->iv_appie_assocreq != NULL) { struct ieee80211_appie *ie = vap->iv_appie_assocreq; error = ipw_setwpaie(sc, ie->ie_data, ie->ie_len); if (error != 0) - return error; + goto done; } if (ic->ic_opmode == IEEE80211_M_IBSS) { error = ipw_setchannel(sc, ni->ni_chan); if (error != 0) - return (error); + goto done; } /* lock scan to ap's channel and enable associate */ error = ipw_setscanopts(sc, - 1<<(ieee80211_chan2ieee(ic, ni->ni_chan)-1), 0); + 1<<(ieee80211_chan2ieee(ic, ni->ni_chan)-1), 0); + if (error != 0) + goto done; - return ipw_enable(sc); /* finally, enable adapter */ + error = ipw_enable(sc); /* finally, enable adapter */ + if (error == 0) + sc->flags |= IPW_FLAG_ASSOCIATING; +done: + IPW_UNLOCK(sc); } -/* - * Handler for sc_disassoc_task. This is a simple wrapper around - * ipw_disassociate(). - */ static void ipw_disassoc_task(void *context, int pending) { - struct ipw_softc *sc = context; + struct ieee80211vap *vap = context; + struct ifnet *ifp = vap->iv_ic->ic_ifp; + struct ieee80211_node *ni = vap->iv_bss; + struct ipw_softc *sc = ifp->if_softc; IPW_LOCK_DECL; IPW_LOCK(sc); - ipw_disassociate(sc); - IPW_UNLOCK(sc); -} - -static int -ipw_disassociate(struct ipw_softc *sc) -{ - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct ieee80211_node *ni = vap->iv_bss; - DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":")); - /* * NB: don't try to do this if ipw_stop_master has * shutdown the firmware and disabled interrupts. */ - if (!(sc->flags & IPW_FLAG_FW_INITED)) - return (0); - - sc->flags &= ~IPW_FLAG_ASSOCIATED; - /* - * NB: firmware currently ignores bssid parameter, but - * supply it in case this changes (follow linux driver). - */ - return ipw_cmd(sc, IPW_CMD_DISASSOCIATE, - ni->ni_bssid, IEEE80211_ADDR_LEN); + if (sc->flags & IPW_FLAG_FW_INITED) { + sc->flags &= ~IPW_FLAG_ASSOCIATED; + /* + * NB: firmware currently ignores bssid parameter, but + * supply it in case this changes (follow linux driver). + */ + (void) ipw_cmd(sc, IPW_CMD_DISASSOCIATE, + ni->ni_bssid, IEEE80211_ADDR_LEN); + } + IPW_UNLOCK(sc); } /* @@ -2474,20 +2400,19 @@ IPW_LOCK_DECL; IPW_LOCK(sc); - ipw_init_locked(sc, 0); + ipw_init_locked(sc); IPW_UNLOCK(sc); } static void -ipw_init_locked(struct ipw_softc *sc, int force) +ipw_init_locked(struct ipw_softc *sc) { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); const struct firmware *fp; const struct ipw_firmware_hdr *hdr; - const char *imagename, *fw; - IPW_LOCK_DECL; + const char *fw; IPW_LOCK_ASSERT(sc); @@ -2507,63 +2432,22 @@ if (ipw_reset(sc) != 0) { device_printf(sc->sc_dev, "could not reset adapter\n"); - goto fail1; - } - - switch (ic->ic_opmode) { - case IEEE80211_M_STA: - imagename = "ipw_bss"; - break; - case IEEE80211_M_IBSS: - imagename = "ipw_ibss"; - break; - case IEEE80211_M_MONITOR: - imagename = "ipw_monitor"; - break; - default: - imagename = NULL; /* should not get there */ - } - - /* - * Load firmware image using the firmware(9) subsystem. We need to - * release the driver's lock first. - */ - if (sc->sc_firmware == NULL || strcmp(sc->sc_firmware->name, - imagename) != 0) { - IPW_UNLOCK(sc); - if (sc->sc_firmware != NULL) - firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD); - sc->sc_firmware = firmware_get(imagename); - IPW_LOCK(sc); + goto fail; } if (sc->sc_firmware == NULL) { - device_printf(sc->sc_dev, - "could not load firmware image '%s'\n", imagename); - goto fail1; + device_printf(sc->sc_dev, "no firmware\n"); + goto fail; } - + /* NB: consistency already checked on load */ fp = sc->sc_firmware; - if (fp->datasize < sizeof *hdr) { - device_printf(sc->sc_dev, - "firmware image too short %zu\n", fp->datasize); - goto fail2; - } - hdr = (const struct ipw_firmware_hdr *)fp->data; - if (fp->datasize < sizeof *hdr + le32toh(hdr->mainsz) + - le32toh(hdr->ucodesz)) { - device_printf(sc->sc_dev, - "firmware image too short %zu\n", fp->datasize); - goto fail2; - } - - DPRINTF(("Loading firmware image '%s'\n", imagename)); + DPRINTF(("Loading firmware image '%s'\n", fp->name)); fw = (const char *)fp->data + sizeof *hdr + le32toh(hdr->mainsz); if (ipw_load_ucode(sc, fw, le32toh(hdr->ucodesz)) != 0) { device_printf(sc->sc_dev, "could not load microcode\n"); - goto fail2; + goto fail; } ipw_stop_master(sc); @@ -2591,7 +2475,7 @@ fw = (const char *)fp->data + sizeof *hdr; if (ipw_load_firmware(sc, fw, le32toh(hdr->mainsz)) != 0) { device_printf(sc->sc_dev, "could not load firmware\n"); - goto fail2; + goto fail; } sc->flags |= IPW_FLAG_FW_INITED; @@ -2604,26 +2488,114 @@ if (ipw_config(sc) != 0) { device_printf(sc->sc_dev, "device configuration failed\n"); - goto fail1; + goto fail; } callout_reset(&sc->sc_wdtimer, hz, ipw_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 21:44:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70A851065674; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32EE0106566C for ; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 230048FC21 for ; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ELiNIp071683 for ; Mon, 14 Apr 2008 21:44:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ELiMWh071681 for perforce@freebsd.org; Mon, 14 Apr 2008 21:44:22 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 Apr 2008 21:44:22 GMT Message-Id: <200804142144.m3ELiMWh071681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 21:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=140047 Change 140047 by sam@sam_ebb on 2008/04/14 21:43:27 forgot about wlanaddr Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#18 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#18 (text+ko) ==== @@ -4296,6 +4296,19 @@ } static +DECL_CMD_FUNC(set80211clone_wlanaddr, arg, d) +{ + const struct ether_addr *ea; + + ea = ether_aton(arg); + if (ea == NULL) + errx(1, "%s: cannot parse addres", arg); + memcpy(params.icp_macaddr, ea->octet, IEEE80211_ADDR_LEN); + params.icp_flags |= IEEE80211_CLONE_MACADDR; + clone_setcallback(wlan_create); +} + +static DECL_CMD_FUNC(set80211clone_wlanmode, arg, d) { #define iseq(a,b) (strncasecmp(a,b,sizeof(b)-1) == 0) @@ -4483,6 +4496,7 @@ DEF_CMD_ARG("chanswitch", set80211chanswitch), /* vap cloning support */ + DEF_CLONE_CMD_ARG("wlanaddr", set80211clone_wlanaddr), DEF_CLONE_CMD_ARG("wlanbssid", set80211clone_wlanbssid), DEF_CLONE_CMD_ARG("wlandev", set80211clone_wlandev), DEF_CLONE_CMD_ARG("wlanmode", set80211clone_wlanmode), From owner-p4-projects@FreeBSD.ORG Mon Apr 14 21:44:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DFA7106571A; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55FF61065670 for ; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 462AE8FC22 for ; Mon, 14 Apr 2008 21:44:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ELiNg4071688 for ; Mon, 14 Apr 2008 21:44:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ELiNhN071686 for perforce@freebsd.org; Mon, 14 Apr 2008 21:44:23 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 Apr 2008 21:44:23 GMT Message-Id: <200804142144.m3ELiNhN071686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 21:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=140048 Change 140048 by sam@sam_ebb on 2008/04/14 21:43:52 document cloning parameters Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#11 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifconfig.8#11 (text+ko) ==== @@ -584,7 +584,81 @@ the hardware will be re-initialized. .El .Pp -The following parameters are specific to IEEE 802.11 wireless interfaces: +The following parameters are specific to cloning +IEEE 802.11 wireless interfaces with the +.Cm create +request: +.Bl -tag -width indent +.It Cm wlandev Ar device +Use +.Ar device +as the parent for the cloned device. +.It Cm wlanmode Ar mode +Specify the operating mode for this cloned device. +.Ar mode +is one of +.Cm sta , +.Cm ahdemo +(or +.Cm adhoc-demo ), +.Cm ibss , +(or +.Cm adhoc ), +.Cm ap , +(or +.Cm hostap ), +.Cm wds , +and +.Cm monitor . +The operating mode of a cloned interface cannot be changed. +.It Cm wlanbssid Ar bssid +The 802.11 mac address to use for the bssid. +This must be specified at create time for a legacy +.Cm wds +device. +.It Cm wlanaddr Ar address +The local mac address. +If this is not specified then a mac address will automatically be assigned +to the cloned device. +Typically this address is the same as the address of the parent device +but if the +.Cm bssid +parameter is specified then the driver will craft a unique address for +the device (if supported). +.It Cm wdslegacy +Mark a +.Cm wds +device as operating in ``legacy mode''. +Legacy +.Cm wds +devices have a fixed peer relationship and do not, for example, roam +if their peer stops communicating. +For completeness a Dynamic WDS (DWDS) interface may marked as +.Fl wdslegacy . +.It Cm bssid +Request a unique local mac address for the cloned device. +This is only possible if the device supports multiple mac addresses. +To force use of the parent's mac address use +.Fl bssid . +.It Cm beacons +Mark the cloned interface as depending on hardware support to +track received beacons. +To have beacons tracked in software use +.Fl beacons . +For +.Cm hostap +mode +.Fl beacons +can also be used to indicate no beacons should +be transmitted; this can be useful when creating a WDS configuration but +.Cm wds +interfaces can only be created as companions to an access point. +.El +.Pp +The following parameters are specific to IEEE 802.11 wireless interfaces +cloned with a +.Cm create +operation: .Bl -tag -width indent .It Cm ampdu Enable sending and receiving AMPDU frames when using 802.11n (default). From owner-p4-projects@FreeBSD.ORG Mon Apr 14 23:12:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04F121065672; Mon, 14 Apr 2008 23:12:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA4B91065670 for ; Mon, 14 Apr 2008 23:12:54 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7A7F8FC22 for ; Mon, 14 Apr 2008 23:12:54 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ENCsA2077681 for ; Mon, 14 Apr 2008 23:12:54 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ENCrlw077679 for perforce@freebsd.org; Mon, 14 Apr 2008 23:12:53 GMT (envelope-from julian@freebsd.org) Date: Mon, 14 Apr 2008 23:12:53 GMT Message-Id: <200804142312.m3ENCrlw077679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 23:12:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=140051 Change 140051 by julian@julian_trafmon1 on 2008/04/14 23:12:26 IFC to current Affected files ... .. //depot/projects/arp-v2/src/contrib/top/machine.h#3 integrate .. //depot/projects/arp-v2/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/ppp#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/arp-v2/src/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/arp-v2/src/include/string.h#2 integrate .. //depot/projects/arp-v2/src/include/unistd.h#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/memrchr.c#1 branch .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/arp-v2/src/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/arp-v2/src/sbin/restore/dirs.c#3 integrate .. //depot/projects/arp-v2/src/sbin/restore/tape.c#2 integrate .. //depot/projects/arp-v2/src/sbin/route/route.c#3 integrate .. //depot/projects/arp-v2/src/share/man/man4/Makefile#4 integrate .. //depot/projects/arp-v2/src/share/man/man4/ddb.4#4 integrate .. //depot/projects/arp-v2/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/arp-v2/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/arp-v2/src/share/man/man9/lock.9#4 integrate .. //depot/projects/arp-v2/src/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/arp-v2/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/files#5 integrate .. //depot/projects/arp-v2/src/sys/conf/files.amd64#4 integrate .. //depot/projects/arp-v2/src/sys/conf/files.i386#4 integrate .. //depot/projects/arp-v2/src/sys/conf/files.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/files.pc98#2 integrate .. //depot/projects/arp-v2/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/arp-v2/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/arp-v2/src/sys/conf/options#4 integrate .. //depot/projects/arp-v2/src/sys/conf/options.mips#1 branch .. //depot/projects/arp-v2/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/arp-v2/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/arp-v2/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/arp-v2/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/arp-v2/src/sys/isa/atrtc.c#1 branch .. //depot/projects/arp-v2/src/sys/isa/rtc.h#2 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/arp-v2/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/IDT#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/_types.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/asm.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/clock.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/defs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/elf.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/endian.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/exec.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/float.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/frame.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/intr.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/limits.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/locore.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/param.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/proc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/profile.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/psl.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/pte.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/queue.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/resource.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/runq.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/segments.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/signal.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/smp.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/trap.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/support.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/arp-v2/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/arp-v2/src/sys/modules/Makefile#4 integrate .. //depot/projects/arp-v2/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/net/radix.c#2 integrate .. //depot/projects/arp-v2/src/sys/net/radix.h#2 integrate .. //depot/projects/arp-v2/src/sys/net/radix_mpath.c#1 branch .. //depot/projects/arp-v2/src/sys/net/radix_mpath.h#1 branch .. //depot/projects/arp-v2/src/sys/net/route.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/route.h#3 integrate .. //depot/projects/arp-v2/src/sys/net/rtsock.c#4 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/arp-v2/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/arp-v2/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/arp-v2/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/arp-v2/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/arp-v2/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/arp-v2/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/arp-v2/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/arp-v2/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/arp-v2/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/sys/ata.h#4 integrate .. //depot/projects/arp-v2/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/arp-v2/src/sys/sys/interrupt.h#3 integrate .. //depot/projects/arp-v2/src/sys/sys/jail.h#2 integrate .. //depot/projects/arp-v2/src/sys/sys/lock.h#3 integrate .. //depot/projects/arp-v2/src/sys/sys/param.h#4 integrate .. //depot/projects/arp-v2/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/arp-v2/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/arp-v2/src/tools/regression/lib/libc/stdio/test-printfloat.c#2 integrate .. //depot/projects/arp-v2/src/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/arp-v2/src/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/arp-v2/src/usr.bin/top/machine.c#4 integrate .. //depot/projects/arp-v2/src/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/arp-v2/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/rpc.lockd/lockd.c#3 integrate Differences ... ==== //depot/projects/arp-v2/src/contrib/top/machine.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/arp-v2/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -105,6 +105,10 @@ #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. +wpa_supplicant_program="/usr/sbin/wpa_supplicant" +wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant +wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" +# firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) @@ -379,6 +383,19 @@ bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file +rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO) +rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf +# +#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one' +rfcomm_pppd_server_one_channel="1" # Override local channel for 'one' +#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_one_register_dun="NO" # for 'one' +# +#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two' +rfcomm_pppd_server_two_channel="3" # Override local channel for 'two' +#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register +#rfcomm_pppd_server_two_register_dun="NO" # for 'two' + ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets ==== //depot/projects/arp-v2/src/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $ .include @@ -29,7 +29,7 @@ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - random rarpd resolv root \ + random rarpd resolv rfcomm_pppd_server root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp statd swap1 \ ==== //depot/projects/arp-v2/src/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.19 2008/04/06 20:39:33 brooks Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $ # # PROVIDE: ppp @@ -19,6 +19,7 @@ ppp_start_profile() { local _ppp_profile _ppp_mode _ppp_nat _ppp_unit + local _ppp_profile_cleaned _punct _punct_c _ppp_profile=$1 _ppp_profile_cleaned=$1 ==== //depot/projects/arp-v2/src/etc/rc.d/wpa_supplicant#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.3 2008/04/08 18:54:42 sam Exp $ +# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $ # # PROVIDE: wpa_supplicant @@ -12,27 +12,43 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then return 1 fi +is_wired_interface() +{ + media=`ifconfig $1 2>/dev/null | while read line; do + case "$line" in + *media:?Ethernet*) + echo Ethernet + ;; + esac + done` + test "$media" = "Ethernet" +} + case ${ifn} in ndis*) driver="ndis" ;; *) - driver="bsd" + if is_wired_interface ${ifn} ; then + driver="wired" + else + driver="bsd" + fi ;; esac load_rc_config $name +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} pidfile="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" ==== //depot/projects/arp-v2/src/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $ + * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ */ #ifndef _STRING_H_ @@ -59,6 +59,7 @@ void *memccpy(void * __restrict, const void * __restrict, int, size_t); #endif void *memchr(const void *, int, size_t) __pure; +void *memrchr(const void *, int, size_t) __pure; int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE ==== //depot/projects/arp-v2/src/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/arp-v2/src/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/arp-v2/src/lib/libc/gdtoa/_hdtoa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; - case FP_INFINITE: - *decpt = INT_MAX; - return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: - *decpt = INT_MAX; - return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); + manh = u.bits.manh; + manl = u.bits.manl; + *s0 = '1'; + for (s = s0 + 1; s < s0 + bufsize; s++) { + *s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf]; + manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4)); + manl <<= 4; } - /* FP_NORMAL or FP_SUBNORMAL */ - - if (ndigits == 0) /* dtoa() compatibility */ - ndigits = 1; - - /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. - */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; - s0 = rv_alloc(bufsize); - - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; - } - - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4)); - /* If ndigits < 0, we are expected to auto-size the precision. */ if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) + for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--) ; } - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - s = s0 + ndigits; + *s = '\0'; if (rve != NULL) *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - return (s0); } - -#else /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ - -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - - return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve)); -} - -#endif /* (LDBL_MANT_DIG == DBL_MANT_DIG) */ ==== //depot/projects/arp-v2/src/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.8 2006/04/16 14:32:53 marius Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.9 2008/04/12 03:09:51 das Exp $"); #include #include @@ -41,6 +41,7 @@ struct fpemu fe; \ struct fpn *r; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -49,6 +50,8 @@ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ r = __fpu_ ## op(&fe); \ c[0] = __fpu_ftoq(&fe, r, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \ @@ -59,10 +62,13 @@ struct fpemu fe; \ union { atype a[2]; ntype n; } u = { .n = n }; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \ c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ } #define _QP_QTOT(qname, fname, type, ...) \ @@ -73,10 +79,13 @@ struct fpemu fe; \ union { u_int a; type n; } u; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = c[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \ u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \ + fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \ + __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \ return (u.n); \ } @@ -95,6 +104,7 @@ { \ struct fpemu fe; \ __asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \ + fe.fe_cx = 0; \ fe.fe_f1.fp_sign = a[0] >> 31; \ fe.fe_f1.fp_sticky = 0; \ fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \ @@ -102,6 +112,8 @@ fe.fe_f2.fp_sticky = 0; \ fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \ __fpu_compare(&fe, cmpe, 0); \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 23:24:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15EF31065671; Mon, 14 Apr 2008 23:24:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA776106566C for ; Mon, 14 Apr 2008 23:24:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7AA78FC15 for ; Mon, 14 Apr 2008 23:24:06 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ENO6i5078000 for ; Mon, 14 Apr 2008 23:24:06 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ENO6ll077998 for perforce@freebsd.org; Mon, 14 Apr 2008 23:24:06 GMT (envelope-from julian@freebsd.org) Date: Mon, 14 Apr 2008 23:24:06 GMT Message-Id: <200804142324.m3ENO6ll077998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 23:24:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=140052 Change 140052 by julian@julian_trafmon1 on 2008/04/14 23:24:04 IFC to 140046 Affected files ... .. //depot/projects/qingli_mpath/src/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/qingli_mpath/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/qingli_mpath/src/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/files#7 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.amd64#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.i386#4 integrate .. //depot/projects/qingli_mpath/src/sys/conf/files.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/files.pc98#2 integrate .. //depot/projects/qingli_mpath/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/qingli_mpath/src/sys/conf/options#6 integrate .. //depot/projects/qingli_mpath/src/sys/conf/options.mips#1 branch .. //depot/projects/qingli_mpath/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/qingli_mpath/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/isa/atrtc.c#1 branch .. //depot/projects/qingli_mpath/src/sys/isa/rtc.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/ADM5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/IDT#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/MALTA#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/QEMU#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_bus.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_limits.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_stdint.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/_types.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/asm.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/asmacros.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/atomic.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/clock.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/cputypes.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/defs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/elf.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/endian.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/exec.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/float.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/fpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/frame.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ieee.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/intr.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/iodev.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/kdb.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/limits.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/locore.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/md_var.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/memdev.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/metadata.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/minidump.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/mutex.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/param.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcb.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcb_ext.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pcpu.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pmap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ppireg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/proc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/profile.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/psl.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/pte.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ptrace.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/queue.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/regnum.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/reloc.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/resource.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/runq.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/segments.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/setjmp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sigframe.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/signal.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/smp.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/stdarg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/sysarch.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/timerreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/trap.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/ucontext.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/varargs.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/include/vmparam.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cache.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/copystr.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/cpu.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/exception.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/genassym.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/locore.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mem.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/nexus.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/pmap.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/support.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/swtch.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/tick.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/trap.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/qingli_mpath/src/sys/modules/Makefile#6 integrate .. //depot/projects/qingli_mpath/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/qingli_mpath/src/sys/net/radix.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/radix.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/route.c#6 integrate .. //depot/projects/qingli_mpath/src/sys/net/route.h#3 integrate .. //depot/projects/qingli_mpath/src/sys/net/rtsock.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/qingli_mpath/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/qingli_mpath/src/sys/sys/lock.h#3 integrate Differences ... ==== //depot/projects/qingli_mpath/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $"); #include #include @@ -535,12 +535,11 @@ /* make sure that we've enough space for result string */ bufsize = strlen(avalue)*2+1; - rslt = malloc(bufsize); + rslt = calloc(1, bufsize); if (rslt == NULL) { free(avalue); return (NULL); } - memset(rslt, 0, bufsize); bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */ /* skip spaces at beggining */ ==== //depot/projects/qingli_mpath/src/lib/libthr/thread/thr_rwlock.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include @@ -32,7 +32,6 @@ #include "namespace.h" #include -#include #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/qingli_mpath/src/sbin/geom/class/journal/gjournal.8#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.3 2007/11/15 06:31:18 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.5 2008/04/13 11:05:59 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/qingli_mpath/src/sbin/geom/class/part/geom_part.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.5 2008/04/13 19:54:54 marcel Exp $"); #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include "core/geom.h" #include "misc/subr.h" @@ -55,7 +56,8 @@ static char optional[] = ""; static char flags[] = "C"; -static void gpart_show(struct gctl_req *, unsigned); +static void gpart_bootcode(struct gctl_req *, unsigned int); +static void gpart_show(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { @@ -66,7 +68,13 @@ { 'l', "label", optional, G_TYPE_STRING }, { 'f', "flags", flags, G_TYPE_STRING }, G_OPT_SENTINEL }, - "geom", NULL, + "geom", NULL + }, + { "bootcode", 0, gpart_bootcode, { + { 'b', "bootcode", NULL, G_TYPE_STRING }, + { 'f', "flags", flags, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "geom", NULL }, { "commit", 0, NULL, G_NULL_OPTS, "geom", NULL }, { "create", 0, NULL, { @@ -241,7 +249,7 @@ } static void -gpart_show(struct gctl_req *req, unsigned fl __unused) +gpart_show(struct gctl_req *req, unsigned int fl __unused) { struct gmesh mesh; struct gclass *classp; @@ -277,3 +285,39 @@ } geom_deletetree(&mesh); } + +static void +gpart_bootcode(struct gctl_req *req, unsigned int fl __unused) +{ + struct stat sb; + const char *bootfile; + void *code; + int error, fd, size; + + bootfile = gctl_get_ascii(req, "bootcode"); + if (bootfile == NULL) + errx(EXIT_FAILURE, "Missing bootfile argument"); + + error = stat(bootfile, &sb); + if (error) + errx(EXIT_FAILURE, "%s: not found", bootfile); + if (!S_ISREG(sb.st_mode)) + errx(EXIT_FAILURE, "%s: not a regular file", bootfile); + if (sb.st_size >= 1024*1024) + errx(EXIT_FAILURE, "%s: file too big", bootfile); + + size = sb.st_size; + + fd = open(bootfile, O_RDONLY); + if (fd == -1) + errx(EXIT_FAILURE, "%s: unable to open", bootfile); + code = malloc(size); + if (code == NULL) + errx(EXIT_FAILURE, "out of memory"); + if (read(fd, code, size) != size) + errx(EXIT_FAILURE, "%s: unable to read", bootfile); + close(fd); + + gctl_change_param(req, "bootcode", size, code); + gctl_issue(req); +} ==== //depot/projects/qingli_mpath/src/sbin/restore/dirs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.34 2008/04/14 20:15:53 mckusick Exp $"; #endif /* not lint */ #include @@ -120,6 +120,7 @@ static void rst_seekdir(RST_DIR *, long, long); static long rst_telldir(RST_DIR *); static struct direct *searchdir(ino_t, char *); +static void fail_dirtmp(char *); /* * Extract directory contents, building up a directory structure @@ -147,7 +148,7 @@ if (fd == -1 || (df = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create directory temporary\nfopen", dirfile); + warn("%s: cannot create directory database", dirfile); done(1); } if (genmode != 0) { @@ -160,7 +161,7 @@ if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create modefile\nfopen", modefile); + warn("%s: cannot create modefile", modefile); done(1); } } @@ -172,25 +173,24 @@ for (;;) { curfile.name = ""; curfile.action = USING; - if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) { - (void) fclose(df); - dirp = opendirfile(dirfile); - if (dirp == NULL) - fprintf(stderr, "opendirfile: %s\n", - strerror(errno)); - if (mf != NULL) - (void) fclose(mf); - i = dirlookup(dot); - if (i == 0) - panic("Root directory is not on tape\n"); - return; - } + if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) + break; itp = allocinotab(&curfile, seekpt); getfile(putdir, putdirattrs, xtrnull); putent(&nulldir); flushent(); itp->t_size = seekpt - itp->t_seekpt; } + if (fclose(df) != 0) + fail_dirtmp(dirfile); + dirp = opendirfile(dirfile); + if (dirp == NULL) + fprintf(stderr, "opendirfile: %s\n", strerror(errno)); + if (mf != NULL && fclose(mf) != 0) + fail_dirtmp(modefile); + i = dirlookup(dot); + if (i == 0) + panic("Root directory is not on tape\n"); } /* @@ -390,7 +390,8 @@ if (dirloc + dp->d_reclen > DIRBLKSIZ) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, 1, DIRBLKSIZ, df); + if (fwrite(dirbuf, DIRBLKSIZ, 1, df) != 1) + fail_dirtmp(dirfile); dirloc = 0; } memmove(dirbuf + dirloc, dp, (long)dp->d_reclen); @@ -405,7 +406,8 @@ flushent(void) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, (int)dirloc, 1, df); + if (fwrite(dirbuf, (int)dirloc, 1, df) != 1) + fail_dirtmp(dirfile); seekpt = ftell(df); dirloc = 0; } @@ -417,8 +419,8 @@ putdirattrs(char *buf, long size) { - if (mf != NULL) - (void) fwrite(buf, 1, size, mf); + if (mf != NULL && fwrite(buf, size, 1, mf) != 1) + fail_dirtmp(modefile); } /* @@ -582,6 +584,11 @@ myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", modefile); + fprintf(stderr, "Mode, owner, and times not set.\n"); + break; + } if (feof(mf)) break; if (node.extsize > 0) { @@ -596,8 +603,22 @@ } if (bufsize >= node.extsize) { (void) fread(buf, 1, node.extsize, mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", + modefile); + fprintf(stderr, "Not all external "); + fprintf(stderr, "attributes set.\n"); + break; + } } else { (void) fseek(mf, node.extsize, SEEK_CUR); + if (ferror(mf)) { + warn("%s: cannot seek in modefile.", + modefile); + fprintf(stderr, "Not all directory "); + fprintf(stderr, "attributes set.\n"); + break; + } } } ep = lookupino(node.ino); @@ -639,8 +660,6 @@ } if (bufsize > 0) free(buf); - if (ferror(mf)) - panic("error setting directory modes\n"); (void) fclose(mf); } @@ -734,7 +753,8 @@ node.flags = ctxp->file_flags; node.uid = ctxp->uid; node.gid = ctxp->gid; - (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf); + if (fwrite((char *)&node, sizeof(struct modeinfo), 1, mf) != 1) + fail_dirtmp(modefile); return (itp); } @@ -760,9 +780,33 @@ { closemt(); - if (modefile[0] != '#') + if (modefile[0] != '#') { + (void) truncate(modefile, 0); (void) unlink(modefile); - if (dirfile[0] != '#') + } + if (dirfile[0] != '#') { + (void) truncate(dirfile, 0); (void) unlink(dirfile); + } exit(exitcode); } + +/* + * Print out information about the failure to save directory, + * extended attribute, and mode information. + */ +static void +fail_dirtmp(char *filename) +{ + const char *tmpdir; + + warn("%s: cannot write directory database", filename); + if (errno == ENOSPC) { + if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') + tmpdir = _PATH_TMP; + fprintf(stderr, "Try making space in %s, %s\n%s\n", tmpdir, + "or set environment variable TMPDIR", + "to an alternate location with more disk space."); + } + done(1); +} ==== //depot/projects/qingli_mpath/src/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/qingli_mpath/src/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include #include #include -#include #include #include @@ -78,13 +70,6 @@ #include #endif -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 14 23:36:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8D3F1065671; Mon, 14 Apr 2008 23:36:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82D66106566C for ; Mon, 14 Apr 2008 23:36:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7238F8FC0C for ; Mon, 14 Apr 2008 23:36:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ENaJoB078393 for ; Mon, 14 Apr 2008 23:36:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ENaJ1o078391 for perforce@freebsd.org; Mon, 14 Apr 2008 23:36:19 GMT (envelope-from julian@freebsd.org) Date: Mon, 14 Apr 2008 23:36:19 GMT Message-Id: <200804142336.m3ENaJ1o078391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 23:36:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=140053 Change 140053 by julian@julian_trafmon1 on 2008/04/14 23:36:01 match with -current Affected files ... .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#6 edit .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#4 edit .. //depot/projects/qingli_mpath/src/sys/net/route.c#7 edit Differences ... ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#6 (text+ko) ==== @@ -33,6 +33,11 @@ * PROPERTIES. */ +#include +__FBSDID("$FreeBSD: src/sys/net/radix_mpath.c,v 1.3 2008/04/13 23:04:46 qingli Exp $"); + +#include "opt_inet6.h" + #include #include #include @@ -126,7 +131,7 @@ struct radix_node *t, *tt; if (!headrt || !rt) - return FALSE; + return (0); t = (struct radix_node *)headrt; tt = rn_mpath_next(t); while (tt) { @@ -135,12 +140,12 @@ tt->rn_dupedkey = NULL; tt->rn_flags &= ~RNF_ACTIVE; tt[1].rn_flags &= ~RNF_ACTIVE; - return (TRUE); + return (1); } t = tt; tt = rn_mpath_next((struct radix_node *)t); } - return (FALSE); + return (0); } /* @@ -219,7 +224,7 @@ goto different; } - maskmatched: +maskmatched: /* key/mask were the same. compare gateway for all multipaths */ do { @@ -229,23 +234,23 @@ if (rn1 == rn) continue; - if (rt1->rt_gateway->sa_family == AF_LINK) { - if (rt1->rt_ifa->ifa_addr->sa_len != rt->rt_ifa->ifa_addr->sa_len || - bcmp(rt1->rt_ifa->ifa_addr, rt->rt_ifa->ifa_addr, - rt1->rt_ifa->ifa_addr->sa_len)) - continue; - } else { - if (rt1->rt_gateway->sa_len != rt->rt_gateway->sa_len || - bcmp(rt1->rt_gateway, rt->rt_gateway, - rt1->rt_gateway->sa_len)) - continue; - } + if (rt1->rt_gateway->sa_family == AF_LINK) { + if (rt1->rt_ifa->ifa_addr->sa_len != rt->rt_ifa->ifa_addr->sa_len || + bcmp(rt1->rt_ifa->ifa_addr, rt->rt_ifa->ifa_addr, + rt1->rt_ifa->ifa_addr->sa_len)) + continue; + } else { + if (rt1->rt_gateway->sa_len != rt->rt_gateway->sa_len || + bcmp(rt1->rt_gateway, rt->rt_gateway, + rt1->rt_gateway->sa_len)) + continue; + } /* all key/mask/gateway are the same. conflicting entry. */ return EEXIST; } while ((rn1 = rn_mpath_next(rn1)) != NULL); - different: +different: return 0; } @@ -315,6 +320,7 @@ return 0; } +#ifdef INET6 int rn6_mpath_inithead(void **head, int off) { @@ -329,3 +335,4 @@ return 0; } +#endif ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#4 (text+ko) ==== @@ -32,6 +32,7 @@ * BE LIABLE FOR ANY INFRINGEMENT OF ANY OTHERS' INTELLECTUAL * PROPERTIES. */ +/* $FreeBSD: src/sys/net/radix_mpath.h,v 1.1 2008/04/13 06:12:13 qingli Exp $ */ #ifndef _NET_RADIX_MPATH_H_ #define _NET_RADIX_MPATH_H_ ==== //depot/projects/qingli_mpath/src/sys/net/route.c#7 (text+ko) ==== @@ -763,6 +763,7 @@ rt->rt_flags &= ~RTF_UP; goto deldone; /* done with the RTM_DELETE command */ } + normal_rtdel: #endif /* From owner-p4-projects@FreeBSD.ORG Mon Apr 14 23:39:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26BD61065675; Mon, 14 Apr 2008 23:39:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD7CA1065670 for ; Mon, 14 Apr 2008 23:39:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3B2E8FC19 for ; Mon, 14 Apr 2008 23:39:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ENdMAo078437 for ; Mon, 14 Apr 2008 23:39:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ENdM32078435 for perforce@freebsd.org; Mon, 14 Apr 2008 23:39:22 GMT (envelope-from julian@freebsd.org) Date: Mon, 14 Apr 2008 23:39:22 GMT Message-Id: <200804142339.m3ENdM32078435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Apr 2008 23:39:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=140054 Change 140054 by julian@julian_trafmon1 on 2008/04/14 23:38:42 loop back Affected files ... .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#7 integrate .. //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#5 integrate Differences ... ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.c#7 (text+ko) ==== ==== //depot/projects/qingli_mpath/src/sys/net/radix_mpath.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Apr 15 00:26:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 896AA1065671; Tue, 15 Apr 2008 00:26:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BF0F106566C for ; Tue, 15 Apr 2008 00:26:17 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21D228FC1A for ; Tue, 15 Apr 2008 00:26:17 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F0QHdH081231 for ; Tue, 15 Apr 2008 00:26:17 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F0QGdL081229 for perforce@freebsd.org; Tue, 15 Apr 2008 00:26:16 GMT (envelope-from julian@freebsd.org) Date: Tue, 15 Apr 2008 00:26:16 GMT Message-Id: <200804150026.m3F0QGdL081229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 00:26:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=140056 Change 140056 by julian@julian_trafmon1 on 2008/04/15 00:25:18 MFC@140055 Affected files ... .. //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#2 integrate Differences ... ==== //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#2 (text) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4$ + * $P4: //depot/user/rpaulo/k8temp/k8temp.c#8 $ */ /* From owner-p4-projects@FreeBSD.ORG Tue Apr 15 04:42:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46C7F1065673; Tue, 15 Apr 2008 04:42:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C97106566B for ; Tue, 15 Apr 2008 04:42:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0D608FC1D for ; Tue, 15 Apr 2008 04:42:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F4gul0007550 for ; Tue, 15 Apr 2008 04:42:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F4gubo007548 for perforce@freebsd.org; Tue, 15 Apr 2008 04:42:56 GMT (envelope-from julian@freebsd.org) Date: Tue, 15 Apr 2008 04:42:56 GMT Message-Id: <200804150442.m3F4gubo007548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 04:42:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=140062 Change 140062 by julian@julian_trafmon1 on 2008/04/15 04:42:50 IFC to 140061 Affected files ... .. //depot/projects/arp-v2/src/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/arp-v2/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/arp-v2/src/sys/mips/include/ns16550.h#2 delete .. //depot/projects/arp-v2/src/sys/mips/include/pcb_ext.h#2 delete .. //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/arp-v2/src/sys/net/bpf.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/arp-v2/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/arp-v2/src/sys/sys/protosw.h#2 integrate .. //depot/projects/arp-v2/src/sys/sys/socket.h#4 integrate Differences ... ==== //depot/projects/arp-v2/src/sys/dev/re/if_re.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.113 2008/03/31 04:03:14 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.114 2008/04/15 00:46:15 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -1185,23 +1185,17 @@ device_printf(dev, "Using %d MSI messages\n", msic); sc->rl_msi = 1; + /* Explicitly set MSI enable bit. */ + CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); + cfg = CSR_READ_1(sc, RL_CFG2); + cfg |= RL_CFG2_MSI; + CSR_WRITE_1(sc, RL_CFG2, cfg); + CSR_WRITE_1(sc, RL_EECMD, 0); } else pci_release_msi(dev); } } - /* For MSI capable hardwares, explicitily set/clear MSI enable bit. */ - if (msic != 0) { - CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); - cfg = CSR_READ_1(sc, RL_CFG2); - if (sc->rl_msi != 0) - cfg |= RL_CFG2_MSI; - else - cfg &= ~RL_CFG2_MSI; - CSR_WRITE_1(sc, RL_CFG2, cfg); - CSR_WRITE_1(sc, RL_EECMD, 0); - } - /* Allocate interrupt */ if (sc->rl_msi == 0) { rid = 0; ==== //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/machdep.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/machdep.c,v 1.2 2008/04/15 02:50:07 imp Exp $"); #include "opt_md.h" #include "opt_ddb.h" @@ -93,7 +93,6 @@ #endif #include -#include #include #define BOOTINFO_DEBUG 0 @@ -293,19 +292,6 @@ PCPU_SET(curpcb, thread0.td_pcb); } -#ifdef DEBUG_UART_POLLED -void -init_bootstrap_console() -{ - /* - * Initalize the (temporary) bootstrap console interface, so - * we can use printf until the VM system starts being setup. - * The real console is initialized before then. - */ - uart_post_init(PA_2_K1VA(ADDR_NS16550_UART1)); -} -#endif - struct msgbuf *msgbufp=0; #if 0 ==== //depot/projects/arp-v2/src/sys/mips/mips/mainbus.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/mainbus.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/mainbus.c,v 1.2 2008/04/15 02:50:07 imp Exp $"); #include #include @@ -60,11 +60,6 @@ #include #include -#ifdef DCHU_DEBUG_UART -#include -#include -#endif - static struct rman irq_rman, port_rman, mem_rman; static int mainbus_probe(device_t); @@ -116,10 +111,6 @@ }; static devclass_t mainbus_devclass; -#ifdef DEBUG_UART -#define printf(s) puts_post(PA_2_K1VA(ADDR_NS16550_UART1), s) -#endif - DRIVER_MODULE(mainbus, root, mainbus_driver, mainbus_devclass, 0, 0); static int @@ -179,9 +170,7 @@ int retval = 0; retval += bus_print_child_header(bus, child); -#ifndef DEBUG_UART retval += printf(" on motherboard\n"); -#endif return (retval); } ==== //depot/projects/arp-v2/src/sys/net/bpf.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.191 2008/04/07 02:51:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.192 2008/04/15 00:50:01 jkim Exp $"); #include "opt_bpf.h" #include "opt_mac.h" @@ -88,8 +88,6 @@ #define PRINET 26 /* interruptible */ -#define M_SKIP_BPF M_SKIP_FIREWALL - /* * bpf_iflist is a list of BPF interface structures, each corresponding to a * specific DLT. The same network interface might have several BPF interface @@ -843,9 +841,6 @@ mc = m_dup(m, M_DONTWAIT); if (mc != NULL) mc->m_pkthdr.rcvif = ifp; - /* XXX Do not return the same packet twice. */ - if (d->bd_direction == BPF_D_INOUT) - m->m_flags |= M_SKIP_BPF; } else mc = NULL; @@ -1573,9 +1568,12 @@ BPFIF_UNLOCK(bp); } -#define BPF_CHECK_DIRECTION(d, m) \ - if (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \ - ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL)) +#define BPF_CHECK_DIRECTION(d, i) \ + (((d)->bd_direction == BPF_D_IN && (i) == NULL) || \ + ((d)->bd_direction == BPF_D_OUT && (i) != NULL)) +#define BPF_CHECK_DUPLICATE(d, i) \ + ((d)->bd_feedback && \ + (d)->bd_direction == BPF_D_INOUT && (i) == NULL) /* * Incoming linkage from device drivers, when packet is in an mbuf chain. @@ -1588,18 +1586,14 @@ int gottime; struct timeval tv; - if (m->m_flags & M_SKIP_BPF) { - m->m_flags &= ~M_SKIP_BPF; - return; - } - gottime = 0; pktlen = m_length(m, NULL); BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || + BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1642,11 +1636,6 @@ int gottime; struct timeval tv; - if (m->m_flags & M_SKIP_BPF) { - m->m_flags &= ~M_SKIP_BPF; - return; - } - gottime = 0; pktlen = m_length(m, NULL); @@ -1662,7 +1651,8 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || + BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1685,6 +1675,7 @@ } #undef BPF_CHECK_DIRECTION +#undef BPF_CHECK_DUPLICATE /* * Move the packet data from interface memory (pkt) into the ==== //depot/projects/arp-v2/src/sys/netinet/sctp_constants.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_constants.h,v 1.17 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_constants.h,v 1.34 2007/10/30 14:09:23 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_constants.h,v 1.35 2008/04/14 14:33:07 rrs Exp $"); #ifndef __sctp_constants_h__ #define __sctp_constants_h__ @@ -190,35 +190,36 @@ #define SCTP_MBUF_IALLOC 91 #define SCTP_MBUF_IFREE 92 #define SCTP_MBUF_ICOPY 93 -#define SCTP_SORCV_FREECTL 94 -#define SCTP_SORCV_DOESCPY 95 -#define SCTP_SORCV_DOESLCK 96 -#define SCTP_SORCV_DOESADJ 97 -#define SCTP_SORCV_BOTWHILE 98 -#define SCTP_SORCV_PASSBF 99 -#define SCTP_SORCV_ADJD 100 -#define SCTP_UNKNOWN_MAX 101 -#define SCTP_RANDY_STUFF 102 -#define SCTP_RANDY_STUFF1 103 -#define SCTP_STRMOUT_LOG_ASSIGN 104 -#define SCTP_STRMOUT_LOG_SEND 105 -#define SCTP_FLIGHT_LOG_DOWN_CA 106 -#define SCTP_FLIGHT_LOG_UP 107 -#define SCTP_FLIGHT_LOG_DOWN_GAP 108 -#define SCTP_FLIGHT_LOG_DOWN_RSND 109 -#define SCTP_FLIGHT_LOG_UP_RSND 110 -#define SCTP_FLIGHT_LOG_DOWN_RSND_TO 111 -#define SCTP_FLIGHT_LOG_DOWN_WP 112 -#define SCTP_FLIGHT_LOG_UP_REVOKE 113 -#define SCTP_FLIGHT_LOG_DOWN_PDRP 114 -#define SCTP_FLIGHT_LOG_DOWN_PMTU 115 -#define SCTP_SACK_LOG_NORMAL 116 -#define SCTP_SACK_LOG_EXPRESS 117 -#define SCTP_MAP_TSN_ENTERS 118 -#define SCTP_THRESHOLD_CLEAR 119 -#define SCTP_THRESHOLD_INCR 120 +#define SCTP_MBUF_SPLIT 94 +#define SCTP_SORCV_FREECTL 95 +#define SCTP_SORCV_DOESCPY 96 +#define SCTP_SORCV_DOESLCK 97 +#define SCTP_SORCV_DOESADJ 98 +#define SCTP_SORCV_BOTWHILE 99 +#define SCTP_SORCV_PASSBF 100 +#define SCTP_SORCV_ADJD 101 +#define SCTP_UNKNOWN_MAX 102 +#define SCTP_RANDY_STUFF 103 +#define SCTP_RANDY_STUFF1 104 +#define SCTP_STRMOUT_LOG_ASSIGN 105 +#define SCTP_STRMOUT_LOG_SEND 106 +#define SCTP_FLIGHT_LOG_DOWN_CA 107 +#define SCTP_FLIGHT_LOG_UP 108 +#define SCTP_FLIGHT_LOG_DOWN_GAP 109 +#define SCTP_FLIGHT_LOG_DOWN_RSND 110 +#define SCTP_FLIGHT_LOG_UP_RSND 111 +#define SCTP_FLIGHT_LOG_DOWN_RSND_TO 112 +#define SCTP_FLIGHT_LOG_DOWN_WP 113 +#define SCTP_FLIGHT_LOG_UP_REVOKE 114 +#define SCTP_FLIGHT_LOG_DOWN_PDRP 115 +#define SCTP_FLIGHT_LOG_DOWN_PMTU 116 +#define SCTP_SACK_LOG_NORMAL 117 +#define SCTP_SACK_LOG_EXPRESS 118 +#define SCTP_MAP_TSN_ENTERS 119 +#define SCTP_THRESHOLD_CLEAR 120 +#define SCTP_THRESHOLD_INCR 121 -#define SCTP_LOG_MAX_TYPES 121 +#define SCTP_LOG_MAX_TYPES 122 /* * To turn on various logging, you must first enable 'options KTR' and * you might want to bump the entires 'options KTR_ENTRIES=80000'. ==== //depot/projects/arp-v2/src/sys/netinet/sctp_indata.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.48 2008/01/28 10:25:43 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.49 2008/04/14 14:34:29 rrs Exp $"); #include #include @@ -582,6 +582,7 @@ /* The incoming sseq is behind where we last delivered? */ SCTPDBG(SCTP_DEBUG_INDATA1, "Duplicate S-SEQ:%d delivered:%d from peer, Abort association\n", control->sinfo_ssn, strm->last_sequence_delivered); +protocol_error: /* * throw it in the stream so it gets cleaned up in * association destruction @@ -659,6 +660,11 @@ * Ok, we did not deliver this guy, find the correct place * to put it on the queue. */ + if ((compare_with_wrap(asoc->cumulative_tsn, + control->sinfo_tsn, MAX_TSN)) || + (control->sinfo_tsn == asoc->cumulative_tsn)) { + goto protocol_error; + } if (TAILQ_EMPTY(&strm->inqueue)) { /* Empty queue */ if (sctp_logging_level & SCTP_STR_LOGGING_ENABLE) { @@ -3343,7 +3349,7 @@ tp1->sent++; } } - } else if (tp1->rec.data.doing_fast_retransmit) { + } else if ((tp1->rec.data.doing_fast_retransmit) && (sctp_cmt_on_off == 0)) { /* * For those that have done a FR we must take * special consideration if we strike. I.e the ==== //depot/projects/arp-v2/src/sys/netinet/sctp_input.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.67 2008/01/31 08:22:24 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.68 2008/04/14 18:13:33 rrs Exp $"); #include #include @@ -2182,6 +2182,20 @@ /* out of memory or ?? */ return (NULL); } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = m_sig; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_SPLIT); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif + /* * compute the signature/digest for the cookie */ @@ -2795,7 +2809,7 @@ } } /* stop the timer */ - sctp_timer_stop(SCTP_TIMER_TYPE_SHUTDOWN, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_22); + sctp_timer_stop(SCTP_TIMER_TYPE_SHUTDOWNACK, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_22); SCTP_STAT_INCR_COUNTER32(sctps_shutdown); /* free the TCB */ SCTPDBG(SCTP_DEBUG_INPUT2, @@ -4807,6 +4821,19 @@ SCTP_BUF_NEXT(mm) = SCTP_M_COPYM(m, *offset, SCTP_SIZE32(chk_length), M_DONTWAIT); if (SCTP_BUF_NEXT(mm)) { +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = SCTP_BUF_NEXT(mm); + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif sctp_queue_op_err(stcb, mm); } else { sctp_m_freem(mm); ==== //depot/projects/arp-v2/src/sys/netinet/sctp_output.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.67 2008/02/22 15:06:25 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_output.c,v 1.68 2008/04/14 14:32:32 rrs Exp $"); #include #include @@ -3157,6 +3157,19 @@ sctp_m_freem(mret); return (NULL); } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = copy_init; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif copy_initack = SCTP_M_COPYM(initack, initack_offset, M_COPYALL, M_DONTWAIT); if (copy_initack == NULL) { @@ -3164,6 +3177,19 @@ sctp_m_freem(copy_init); return (NULL); } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = copy_initack; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif /* easy side we just drop it on the end */ ph = mtod(mret, struct sctp_paramhdr *); SCTP_BUF_LEN(mret) = sizeof(struct sctp_state_cookie) + @@ -5665,6 +5691,19 @@ } else { /* copy the old fashion way */ appendchain = SCTP_M_COPYM(clonechain, 0, M_COPYALL, M_DONTWAIT); +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = appendchain; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif } } if (appendchain == NULL) { @@ -5752,6 +5791,19 @@ ca->cnt_failed++; return; } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = m; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif } else { m = NULL; } @@ -6490,6 +6542,19 @@ to_move = 0; goto out_of; } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = chk->data; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif /* Pull off the data */ m_adj(sp->data, to_move); /* Now lets work our way down and compact it */ @@ -7859,6 +7924,19 @@ /* No memory */ return (-2); } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = cookie; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif break; } at += SCTP_SIZE32(plen); @@ -7920,6 +7998,19 @@ /* gak out of memory */ return; } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = outchain; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif chdr = mtod(outchain, struct sctp_chunkhdr *); chdr->chunk_type = SCTP_HEARTBEAT_ACK; chdr->chunk_flags = 0; @@ -8175,6 +8266,20 @@ /* couldn't copy it */ return; } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = m_ack; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif + sctp_alloc_a_chunk(stcb, chk); if (chk == NULL) { /* no memory */ @@ -11591,7 +11696,7 @@ /* we already checked for non-blocking above. */ max_len = sndlen; } else { - max_len = SCTP_SB_LIMIT_SND(so) - stcb->asoc.total_output_queue_size; + max_len = SCTP_SB_LIMIT_SND(so) - inqueue_bytes; } } else { max_len = 0; ==== //depot/projects/arp-v2/src/sys/netinet/sctp_usrreq.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_usrreq.c,v 1.48 2005/03/07 23:26:08 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.52 2007/12/07 01:32:13 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_usrreq.c,v 1.53 2008/04/14 18:13:33 rrs Exp $"); #include #include #include @@ -919,6 +919,37 @@ } int +sctp_flush(struct socket *so, int how) +{ + /* + * We will just clear out the values and let subsequent close clear + * out the data, if any. Note if the user did a shutdown(SHUT_RD) + * they will not be able to read the data, the socket will block + * that from happening. + */ + if ((how == PRU_FLUSH_RD) || (how == PRU_FLUSH_RDWR)) { + /* + * First make sure the sb will be happy, we don't use these + * except maybe the count + */ + so->so_rcv.sb_cc = 0; + so->so_rcv.sb_mbcnt = 0; + so->so_rcv.sb_mb = NULL; + } + if ((how == PRU_FLUSH_WR) || (how == PRU_FLUSH_RDWR)) { + /* + * First make sure the sb will be happy, we don't use these + * except maybe the count + */ + so->so_snd.sb_cc = 0; + so->so_snd.sb_mbcnt = 0; + so->so_snd.sb_mb = NULL; + + } + return (0); +} + +int sctp_shutdown(struct socket *so) { struct sctp_inpcb *inp; @@ -4008,10 +4039,11 @@ SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); return (EINVAL); } + SCTP_INP_INCR_REF(inp); SCTP_ASOC_CREATE_LOCK(inp); create_lock_on = 1; - SCTP_INP_INCR_REF(inp); + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) { /* Should I really unlock ? */ @@ -4063,7 +4095,7 @@ if (stcb == NULL) { SCTP_INP_DECR_REF(inp); } else { - SCTP_TCB_LOCK(stcb); + SCTP_TCB_UNLOCK(stcb); } } if (stcb != NULL) { @@ -4433,6 +4465,7 @@ .pru_close = sctp_close, .pru_detach = sctp_close, .pru_sopoll = sopoll_generic, + .pru_flush = sctp_flush, .pru_disconnect = sctp_disconnect, .pru_listen = sctp_listen, .pru_peeraddr = sctp_peeraddr, ==== //depot/projects/arp-v2/src/sys/netinet/sctp_var.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.21 2007/10/16 14:05:51 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_var.h,v 1.22 2008/04/14 18:13:33 rrs Exp $"); #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ @@ -307,6 +307,8 @@ void sctp_pcbinfo_cleanup(void); +int sctp_flush(struct socket *, int); + int sctp_shutdown __P((struct socket *)); void sctp_notify __P((struct sctp_inpcb *, struct ip *ip, struct sctphdr *, ==== //depot/projects/arp-v2/src/sys/netinet6/sctp6_usrreq.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ /* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.42 2007/12/10 16:03:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.43 2008/04/14 18:12:37 rrs Exp $"); #include #include @@ -1260,6 +1260,7 @@ .pru_close = sctp6_close, .pru_detach = sctp6_close, .pru_sopoll = sopoll_generic, + .pru_flush = sctp_flush, .pru_disconnect = sctp6_disconnect, .pru_listen = sctp_listen, .pru_peeraddr = sctp6_getpeeraddr, ==== //depot/projects/arp-v2/src/sys/sys/protosw.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.57 2006/07/24 15:20:08 rwatson Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.58 2008/04/14 18:06:04 rrs Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -226,7 +226,8 @@ #define PRUS_EOF 0x2 #define PRUS_MORETOCOME 0x4 int (*pru_sense)(struct socket *so, struct stat *sb); - int (*pru_shutdown)(struct socket *so); + int (*pru_shutdown)(struct socket *so); + int (*pru_flush)(struct socket *so, int direction); int (*pru_sockaddr)(struct socket *so, struct sockaddr **nam); int (*pru_sosend)(struct socket *so, struct sockaddr *addr, struct uio *uio, struct mbuf *top, struct mbuf *control, ==== //depot/projects/arp-v2/src/sys/sys/socket.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/sys/socket.h,v 1.98 2008/02/03 15:54:41 phk Exp $ + * $FreeBSD: src/sys/sys/socket.h,v 1.99 2008/04/14 18:06:04 rrs Exp $ */ #ifndef _SYS_SOCKET_H_ @@ -593,6 +593,12 @@ #define SHUT_WR 1 /* shut down the writing side */ #define SHUT_RDWR 2 /* shut down both sides */ +/* we cheat and use the SHUT_XX defines for these */ +#define PRU_FLUSH_RD SHUT_RD +#define PRU_FLUSH_WR SHUT_WR +#define PRU_FLUSH_RDWR SHUT_RDWR + + #if __BSD_VISIBLE /* * sendfile(2) header/trailer struct From owner-p4-projects@FreeBSD.ORG Tue Apr 15 05:06:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 395B71065670; Tue, 15 Apr 2008 05:06:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E202D106566B for ; Tue, 15 Apr 2008 05:06:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF51F8FC15 for ; Tue, 15 Apr 2008 05:06:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F56K9V024520 for ; Tue, 15 Apr 2008 05:06:20 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F56KB1024518 for perforce@freebsd.org; Tue, 15 Apr 2008 05:06:20 GMT (envelope-from julian@freebsd.org) Date: Tue, 15 Apr 2008 05:06:20 GMT Message-Id: <200804150506.m3F56KB1024518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 05:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=140065 Change 140065 by julian@julian_trafmon1 on 2008/04/15 05:06:12 Allow this to compile when IPV6 is not defined. Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#2 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#2 (text+ko) ==== @@ -280,7 +280,9 @@ struct lltable *llt; struct rtentry *rt; u_int hashkey; +#ifdef INET6 char ip6buf[INET6_ADDRSTRLEN]; +#endif KASSERT(ifp != NULL, ("%s: ifp is NULL", __func__)); KASSERT(l3addr != NULL, ("%s: L3 address is NULL", __func__)); @@ -340,10 +342,12 @@ log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", \ inet_ntoa(((struct sockaddr_in *)l3addr)->sin_addr)); break; +#ifdef INET6 case AF_INET6: log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", \ ip6_sprintf(ip6buf, &((struct sockaddr_in6 *)l3addr)->sin6_addr)); break; +#endif } if (rt) From owner-p4-projects@FreeBSD.ORG Tue Apr 15 05:13:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC0C51065673; Tue, 15 Apr 2008 05:13:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E43B1065671 for ; Tue, 15 Apr 2008 05:13:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 725BB8FC18 for ; Tue, 15 Apr 2008 05:13:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F5DS56024696 for ; Tue, 15 Apr 2008 05:13:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F5DSeg024694 for perforce@freebsd.org; Tue, 15 Apr 2008 05:13:28 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Apr 2008 05:13:28 GMT Message-Id: <200804150513.m3F5DSeg024694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 05:13:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=140066 Change 140066 by sam@sam_ebb on 2008/04/15 05:13:06 fix debug msg for 64-bit machines Affected files ... .. //depot/projects/vap/sys/dev/malo/if_malo.c#4 edit Differences ... ==== //depot/projects/vap/sys/dev/malo/if_malo.c#4 (text+ko) ==== @@ -169,7 +169,7 @@ static void malo_bar0_write4(struct malo_softc *sc, bus_size_t off, uint32_t val) { - DPRINTF(sc, MALO_DEBUG_FW, "%s: off 0x%x val 0x%x\n", + DPRINTF(sc, MALO_DEBUG_FW, "%s: off 0x%zx val 0x%x\n", __func__, off, val); bus_space_write_4(sc->malo_io0t, sc->malo_io0h, off, val); From owner-p4-projects@FreeBSD.ORG Tue Apr 15 05:14:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C67F91065672; Tue, 15 Apr 2008 05:14:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88817106566C for ; Tue, 15 Apr 2008 05:14:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73F2A8FC1A for ; Tue, 15 Apr 2008 05:14:31 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F5EVCr024723 for ; Tue, 15 Apr 2008 05:14:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F5EU46024720 for perforce@freebsd.org; Tue, 15 Apr 2008 05:14:30 GMT (envelope-from sam@freebsd.org) Date: Tue, 15 Apr 2008 05:14:30 GMT Message-Id: <200804150514.m3F5EU46024720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 05:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=140067 Change 140067 by sam@sam_ebb on 2008/04/15 05:13:52 IFC @ 140064 Affected files ... .. //depot/projects/vap/sbin/restore/dirs.c#5 integrate .. //depot/projects/vap/sys/amd64/include/pcb_ext.h#3 delete .. //depot/projects/vap/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#11 integrate .. //depot/projects/vap/sys/ia64/conf/GENERIC#9 integrate .. //depot/projects/vap/sys/ia64/conf/SKI#5 integrate .. //depot/projects/vap/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/vap/sys/ia64/ia64/sapic.c#5 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#13 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/vap/sys/mips/include/ns16550.h#2 delete .. //depot/projects/vap/sys/mips/include/pcb_ext.h#2 delete .. //depot/projects/vap/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vap/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/vap/sys/net/bpf.c#12 integrate .. //depot/projects/vap/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/vap/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/vap/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/vap/sys/sys/protosw.h#5 integrate .. //depot/projects/vap/sys/sys/socket.h#8 integrate .. //depot/projects/vap/usr.sbin/ndiscvt/ndiscvt.c#3 integrate .. //depot/projects/vap/usr.sbin/ndiscvt/ndisgen.sh#3 integrate Differences ... ==== //depot/projects/vap/sbin/restore/dirs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.34 2008/04/14 20:15:53 mckusick Exp $"; #endif /* not lint */ #include @@ -120,6 +120,7 @@ static void rst_seekdir(RST_DIR *, long, long); static long rst_telldir(RST_DIR *); static struct direct *searchdir(ino_t, char *); +static void fail_dirtmp(char *); /* * Extract directory contents, building up a directory structure @@ -147,7 +148,7 @@ if (fd == -1 || (df = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create directory temporary\nfopen", dirfile); + warn("%s: cannot create directory database", dirfile); done(1); } if (genmode != 0) { @@ -160,7 +161,7 @@ if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create modefile\nfopen", modefile); + warn("%s: cannot create modefile", modefile); done(1); } } @@ -172,25 +173,24 @@ for (;;) { curfile.name = ""; curfile.action = USING; - if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) { - (void) fclose(df); - dirp = opendirfile(dirfile); - if (dirp == NULL) - fprintf(stderr, "opendirfile: %s\n", - strerror(errno)); - if (mf != NULL) - (void) fclose(mf); - i = dirlookup(dot); - if (i == 0) - panic("Root directory is not on tape\n"); - return; - } + if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) + break; itp = allocinotab(&curfile, seekpt); getfile(putdir, putdirattrs, xtrnull); putent(&nulldir); flushent(); itp->t_size = seekpt - itp->t_seekpt; } + if (fclose(df) != 0) + fail_dirtmp(dirfile); + dirp = opendirfile(dirfile); + if (dirp == NULL) + fprintf(stderr, "opendirfile: %s\n", strerror(errno)); + if (mf != NULL && fclose(mf) != 0) + fail_dirtmp(modefile); + i = dirlookup(dot); + if (i == 0) + panic("Root directory is not on tape\n"); } /* @@ -390,7 +390,8 @@ if (dirloc + dp->d_reclen > DIRBLKSIZ) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, 1, DIRBLKSIZ, df); + if (fwrite(dirbuf, DIRBLKSIZ, 1, df) != 1) + fail_dirtmp(dirfile); dirloc = 0; } memmove(dirbuf + dirloc, dp, (long)dp->d_reclen); @@ -405,7 +406,8 @@ flushent(void) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, (int)dirloc, 1, df); + if (fwrite(dirbuf, (int)dirloc, 1, df) != 1) + fail_dirtmp(dirfile); seekpt = ftell(df); dirloc = 0; } @@ -417,8 +419,8 @@ putdirattrs(char *buf, long size) { - if (mf != NULL) - (void) fwrite(buf, 1, size, mf); + if (mf != NULL && fwrite(buf, size, 1, mf) != 1) + fail_dirtmp(modefile); } /* @@ -582,6 +584,11 @@ myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", modefile); + fprintf(stderr, "Mode, owner, and times not set.\n"); + break; + } if (feof(mf)) break; if (node.extsize > 0) { @@ -596,8 +603,22 @@ } if (bufsize >= node.extsize) { (void) fread(buf, 1, node.extsize, mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", + modefile); + fprintf(stderr, "Not all external "); + fprintf(stderr, "attributes set.\n"); + break; + } } else { (void) fseek(mf, node.extsize, SEEK_CUR); + if (ferror(mf)) { + warn("%s: cannot seek in modefile.", + modefile); + fprintf(stderr, "Not all directory "); + fprintf(stderr, "attributes set.\n"); + break; + } } } ep = lookupino(node.ino); @@ -639,8 +660,6 @@ } if (bufsize > 0) free(buf); - if (ferror(mf)) - panic("error setting directory modes\n"); (void) fclose(mf); } @@ -734,7 +753,8 @@ node.flags = ctxp->file_flags; node.uid = ctxp->uid; node.gid = ctxp->gid; - (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf); + if (fwrite((char *)&node, sizeof(struct modeinfo), 1, mf) != 1) + fail_dirtmp(modefile); return (itp); } @@ -760,9 +780,33 @@ { closemt(); - if (modefile[0] != '#') + if (modefile[0] != '#') { + (void) truncate(modefile, 0); (void) unlink(modefile); - if (dirfile[0] != '#') + } + if (dirfile[0] != '#') { + (void) truncate(dirfile, 0); (void) unlink(dirfile); + } exit(exitcode); } + +/* + * Print out information about the failure to save directory, + * extended attribute, and mode information. + */ +static void +fail_dirtmp(char *filename) +{ + const char *tmpdir; + + warn("%s: cannot write directory database", filename); + if (errno == ENOSPC) { + if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') + tmpdir = _PATH_TMP; + fprintf(stderr, "Try making space in %s, %s\n%s\n", tmpdir, + "or set environment variable TMPDIR", + "to an alternate location with more disk space."); + } + done(1); +} ==== //depot/projects/vap/sys/dev/ata/ata-all.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.131 2008/04/13 16:05:34 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.132 2008/04/14 18:34:24 sos Exp $ */ /* ATA register defines */ @@ -418,8 +418,8 @@ device_t dev; /* device handle */ int unit; /* physical unit */ #define ATA_MASTER 0x00 +#define ATA_SLAVE 0x01 #define ATA_PM 0x0f -#define ATA_SLAVE 0x10 struct ata_params param; /* ata param structure */ int mode; /* current transfermode */ ==== //depot/projects/vap/sys/dev/ata/ata-chipset.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.215 2008/04/12 17:21:22 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.216 2008/04/14 18:34:24 sos Exp $"); #include "opt_ata.h" #include @@ -1055,9 +1055,10 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); + int offset = ch->unit << 7; +#ifdef AHCI_PM struct ata_ahci_cmd_tab *ctp = (struct ata_ahci_cmd_tab *)(ch->dma.work + ATA_AHCI_CT_OFFSET); - int offset = ch->unit << 7; int timeout = 0; /* kick controller into sane state if needed */ @@ -1097,7 +1098,7 @@ } while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + offset) & ATA_S_BUSY); if (bootverbose) device_printf(dev, "BUSY wait time=%dms\n", timeout); - +#endif return ATA_INL(ctlr->r_res2, ATA_AHCI_P_SIG + offset); } @@ -4306,7 +4307,7 @@ ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), port & 0x0f); /* softreset device on this channel */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_IDS | ATA_A_RESET); ata_udelay(10000); ==== //depot/projects/vap/sys/dev/ata/ata-dma.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.152 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.153 2008/04/14 18:34:24 sos Exp $"); #include #include @@ -112,8 +112,8 @@ &ch->dma.work_map)) goto error; - if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map ,ch->dma.work, - MAXWSPCSZ, ata_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT) || + if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map, ch->dma.work, + MAXWSPCSZ, ata_dmasetupc_cb, &dcba, 0) || dcba.error) { bus_dmamem_free(ch->dma.work_tag, ch->dma.work, ch->dma.work_map); goto error; @@ -202,8 +202,8 @@ } if (bus_dmamap_load(request->dma.sg_tag, request->dma.sg_map, - request->dma.sg, MAXTABSZ, - ata_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT) || dcba.error){ + request->dma.sg, MAXTABSZ, ata_dmasetupc_cb, &dcba, 0)|| + dcba.error) { bus_dmamem_free(request->dma.sg_tag, request->dma.sg, request->dma.sg_map); device_printf(request->dev, "FAILURE - load sg\n"); ==== //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.81 2008/04/10 13:05:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.82 2008/04/14 18:34:24 sos Exp $"); #include "opt_ata.h" #include @@ -463,7 +463,7 @@ int mask = 0, timeout; /* do we have any signs of ATA/ATAPI HW being present ? */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { @@ -473,7 +473,7 @@ /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_SLAVE); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_SLAVE)); DELAY(10); ostat1 = ATA_IDX_INB(ch, ATA_STATUS); if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { @@ -493,7 +493,7 @@ return; /* reset (both) devices on this channel */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_IDS | ATA_A_RESET); ata_udelay(10000); @@ -504,7 +504,7 @@ /* wait for BUSY to go inactive */ for (timeout = 0; timeout < 310; timeout++) { if ((mask & 0x01) && (stat0 & ATA_S_BUSY)) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_DEV(ATA_MASTER)); DELAY(10); err = ATA_IDX_INB(ch, ATA_ERROR); lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); @@ -534,7 +534,7 @@ if ((mask & 0x02) && (stat1 & ATA_S_BUSY) && !((mask & 0x01) && (stat0 & ATA_S_BUSY))) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_DEV(ATA_SLAVE)); DELAY(10); err = ATA_IDX_INB(ch, ATA_ERROR); lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); @@ -582,9 +582,8 @@ } if (bootverbose) - device_printf(dev, "reset tp2 stat0=%02x stat1=%02x devices=0x%b\n", - stat0, stat1, ch->devices, - "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); + device_printf(dev, "reset tp2 stat0=%02x stat1=%02x devices=0x%x\n", + stat0, stat1, ch->devices); } /* must be called with ATA channel locked and state_mtx held */ ==== //depot/projects/vap/sys/dev/k8temp/k8temp.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/vap/sys/dev/k8temp/k8temp.c#1 $ + * $P4: //depot/projects/vap/sys/dev/k8temp/k8temp.c#2 $ */ /* ==== //depot/projects/vap/sys/dev/re/if_re.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.113 2008/03/31 04:03:14 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.114 2008/04/15 00:46:15 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -1185,23 +1185,17 @@ device_printf(dev, "Using %d MSI messages\n", msic); sc->rl_msi = 1; + /* Explicitly set MSI enable bit. */ + CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); + cfg = CSR_READ_1(sc, RL_CFG2); + cfg |= RL_CFG2_MSI; + CSR_WRITE_1(sc, RL_CFG2, cfg); + CSR_WRITE_1(sc, RL_EECMD, 0); } else pci_release_msi(dev); } } - /* For MSI capable hardwares, explicitily set/clear MSI enable bit. */ - if (msic != 0) { - CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); - cfg = CSR_READ_1(sc, RL_CFG2); - if (sc->rl_msi != 0) - cfg |= RL_CFG2_MSI; - else - cfg &= ~RL_CFG2_MSI; - CSR_WRITE_1(sc, RL_CFG2, cfg); - CSR_WRITE_1(sc, RL_EECMD, 0); - } - /* Allocate interrupt */ if (sc->rl_msi == 0) { rid = 0; ==== //depot/projects/vap/sys/ia64/conf/GENERIC#9 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.96 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.97 2008/04/15 05:02:41 marcel Exp $ cpu ITANIUM ident GENERIC @@ -48,7 +48,7 @@ options NFS_ROOT # NFS usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_4BSD # 4BSD scheduler +options SCHED_ULE # ULE scheduler options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options SCTP # Stream Control Transmission Protocol options SMP # Symmetric Multi-Processor support ==== //depot/projects/vap/sys/ia64/conf/SKI#5 (text+ko) ==== @@ -17,7 +17,7 @@ # If you are in doubt as to the purpose or necessity of a line, check # first in NOTES. # -# $FreeBSD: src/sys/ia64/conf/SKI,v 1.24 2006/06/15 19:58:53 netchild Exp $ +# $FreeBSD: src/sys/ia64/conf/SKI,v 1.25 2008/04/15 05:02:41 marcel Exp $ cpu ITANIUM ident SKI @@ -35,8 +35,8 @@ options MD_ROOT # MD usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_4BSD # 4BSD scheduler -#options SCHED_ULE # ULE scheduler +#options SCHED_4BSD # 4BSD scheduler +options SCHED_ULE # ULE scheduler options SKI # Include SKI support code options SOFTUPDATES # Enable FFS soft updates support options SYSVMSG # SYSV-style message queues ==== //depot/projects/vap/sys/ia64/ia64/interrupt.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.67 2008/04/11 23:10:39 jeff Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.68 2008/04/15 05:02:42 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -241,6 +242,9 @@ } else if (vector == ipi_vector[IPI_TEST]) { CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; + } else if (vector == ipi_vector[IPI_PREEMPT]) { + CTR1(KTR_SMP, "IPI_PREEMPT, cpuid=%d", PCPU_GET(cpuid)); + sched_preempt(curthread); #endif } else { ints[PCPU_GET(cpuid)]++; ==== //depot/projects/vap/sys/ia64/ia64/machdep.c#12 (text+ko) ==== @@ -26,12 +26,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.235 2008/03/30 23:09:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.236 2008/04/15 05:02:42 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" +#include "opt_sched.h" #include #include @@ -370,6 +371,12 @@ if (PCPU_GET(fpcurthread) == old) old->td_frame->tf_special.psr |= IA64_PSR_DFH; if (!savectx(oldpcb)) { + old->td_lock = mtx; +#if defined(SCHED_ULE) && defined(SMP) + /* td_lock is volatile */ + while (new->td_lock == &blocked_lock) + ; +#endif newpcb = new->td_pcb; oldpcb->pcb_current_pmap = pmap_switch(newpcb->pcb_current_pmap); @@ -890,12 +897,16 @@ { u_int64_t start, end, now; + sched_pin(); + start = ia64_get_itc(); end = start + (itc_frequency * n) / 1000000; /* printf("DELAY from 0x%lx to 0x%lx\n", start, end); */ do { now = ia64_get_itc(); } while (now < end || (now > start && end < start)); + + sched_unpin(); } /* ==== //depot/projects/vap/sys/ia64/ia64/sapic.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.14 2007/07/30 22:29:33 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/sapic.c,v 1.15 2008/04/14 20:34:45 marcel Exp $ */ #include "opt_ddb.h" @@ -202,7 +202,7 @@ sapic_read_rte(sa, irq - sa->sa_base, &rte); rte.rte_destination_id = (lid >> 24) & 255; rte.rte_destination_eid = (lid >> 16) & 255; - rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; + rte.rte_delivery_mode = SAPIC_DELMODE_FIXED; rte.rte_vector = vector; rte.rte_mask = 0; sapic_write_rte(sa, irq - sa->sa_base, &rte); ==== //depot/projects/vap/sys/kern/sched_ule.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.240 2008/04/04 01:16:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.241 2008/04/15 05:02:42 marcel Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -72,7 +72,7 @@ #include #include -#if !defined(__i386__) && !defined(__amd64__) && !defined(__powerpc__) && !defined(__arm__) +#if defined(__sparc64__) || defined(__mips__) #error "This architecture is not currently compatible with ULE" #endif ==== //depot/projects/vap/sys/kern/uipc_socket.c#10 (text+ko) ==== @@ -95,7 +95,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.308 2008/03/25 09:38:59 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.309 2008/04/14 18:06:04 rrs Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1859,7 +1859,9 @@ if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) return (EINVAL); - + if (pr->pr_usrreqs->pru_flush != NULL) { + (*pr->pr_usrreqs->pru_flush)(so, how); + } if (how != SHUT_WR) sorflush(so); if (how != SHUT_RD) ==== //depot/projects/vap/sys/mips/mips/machdep.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/machdep.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/machdep.c,v 1.2 2008/04/15 02:50:07 imp Exp $"); #include "opt_md.h" #include "opt_ddb.h" @@ -93,7 +93,6 @@ #endif #include -#include #include #define BOOTINFO_DEBUG 0 @@ -293,19 +292,6 @@ PCPU_SET(curpcb, thread0.td_pcb); } -#ifdef DEBUG_UART_POLLED -void -init_bootstrap_console() -{ - /* - * Initalize the (temporary) bootstrap console interface, so - * we can use printf until the VM system starts being setup. - * The real console is initialized before then. - */ - uart_post_init(PA_2_K1VA(ADDR_NS16550_UART1)); -} -#endif - struct msgbuf *msgbufp=0; #if 0 ==== //depot/projects/vap/sys/mips/mips/mainbus.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/mainbus.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/mainbus.c,v 1.2 2008/04/15 02:50:07 imp Exp $"); #include #include @@ -60,11 +60,6 @@ #include #include -#ifdef DCHU_DEBUG_UART -#include -#include -#endif - static struct rman irq_rman, port_rman, mem_rman; static int mainbus_probe(device_t); @@ -116,10 +111,6 @@ }; static devclass_t mainbus_devclass; -#ifdef DEBUG_UART -#define printf(s) puts_post(PA_2_K1VA(ADDR_NS16550_UART1), s) -#endif - DRIVER_MODULE(mainbus, root, mainbus_driver, mainbus_devclass, 0, 0); static int @@ -179,9 +170,7 @@ int retval = 0; retval += bus_print_child_header(bus, child); -#ifndef DEBUG_UART retval += printf(" on motherboard\n"); -#endif return (retval); } ==== //depot/projects/vap/sys/net/bpf.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.191 2008/04/07 02:51:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.192 2008/04/15 00:50:01 jkim Exp $"); #include "opt_bpf.h" #include "opt_mac.h" @@ -88,8 +88,6 @@ #define PRINET 26 /* interruptible */ -#define M_SKIP_BPF M_SKIP_FIREWALL - /* * bpf_iflist is a list of BPF interface structures, each corresponding to a * specific DLT. The same network interface might have several BPF interface @@ -843,9 +841,6 @@ mc = m_dup(m, M_DONTWAIT); if (mc != NULL) mc->m_pkthdr.rcvif = ifp; - /* XXX Do not return the same packet twice. */ - if (d->bd_direction == BPF_D_INOUT) - m->m_flags |= M_SKIP_BPF; } else mc = NULL; @@ -1573,9 +1568,12 @@ BPFIF_UNLOCK(bp); } -#define BPF_CHECK_DIRECTION(d, m) \ - if (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \ - ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL)) +#define BPF_CHECK_DIRECTION(d, i) \ + (((d)->bd_direction == BPF_D_IN && (i) == NULL) || \ + ((d)->bd_direction == BPF_D_OUT && (i) != NULL)) +#define BPF_CHECK_DUPLICATE(d, i) \ + ((d)->bd_feedback && \ + (d)->bd_direction == BPF_D_INOUT && (i) == NULL) /* * Incoming linkage from device drivers, when packet is in an mbuf chain. @@ -1588,18 +1586,14 @@ int gottime; struct timeval tv; - if (m->m_flags & M_SKIP_BPF) { - m->m_flags &= ~M_SKIP_BPF; - return; - } - gottime = 0; pktlen = m_length(m, NULL); BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || + BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1642,11 +1636,6 @@ int gottime; struct timeval tv; - if (m->m_flags & M_SKIP_BPF) { - m->m_flags &= ~M_SKIP_BPF; - return; - } - gottime = 0; pktlen = m_length(m, NULL); @@ -1662,7 +1651,8 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || + BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1685,6 +1675,7 @@ } #undef BPF_CHECK_DIRECTION +#undef BPF_CHECK_DUPLICATE /* * Move the packet data from interface memory (pkt) into the ==== //depot/projects/vap/sys/netinet/sctp_constants.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_constants.h,v 1.17 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_constants.h,v 1.34 2007/10/30 14:09:23 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_constants.h,v 1.35 2008/04/14 14:33:07 rrs Exp $"); #ifndef __sctp_constants_h__ #define __sctp_constants_h__ @@ -190,35 +190,36 @@ #define SCTP_MBUF_IALLOC 91 #define SCTP_MBUF_IFREE 92 #define SCTP_MBUF_ICOPY 93 -#define SCTP_SORCV_FREECTL 94 -#define SCTP_SORCV_DOESCPY 95 -#define SCTP_SORCV_DOESLCK 96 -#define SCTP_SORCV_DOESADJ 97 -#define SCTP_SORCV_BOTWHILE 98 -#define SCTP_SORCV_PASSBF 99 -#define SCTP_SORCV_ADJD 100 -#define SCTP_UNKNOWN_MAX 101 -#define SCTP_RANDY_STUFF 102 -#define SCTP_RANDY_STUFF1 103 -#define SCTP_STRMOUT_LOG_ASSIGN 104 -#define SCTP_STRMOUT_LOG_SEND 105 -#define SCTP_FLIGHT_LOG_DOWN_CA 106 -#define SCTP_FLIGHT_LOG_UP 107 -#define SCTP_FLIGHT_LOG_DOWN_GAP 108 -#define SCTP_FLIGHT_LOG_DOWN_RSND 109 -#define SCTP_FLIGHT_LOG_UP_RSND 110 -#define SCTP_FLIGHT_LOG_DOWN_RSND_TO 111 -#define SCTP_FLIGHT_LOG_DOWN_WP 112 -#define SCTP_FLIGHT_LOG_UP_REVOKE 113 -#define SCTP_FLIGHT_LOG_DOWN_PDRP 114 -#define SCTP_FLIGHT_LOG_DOWN_PMTU 115 -#define SCTP_SACK_LOG_NORMAL 116 -#define SCTP_SACK_LOG_EXPRESS 117 -#define SCTP_MAP_TSN_ENTERS 118 -#define SCTP_THRESHOLD_CLEAR 119 -#define SCTP_THRESHOLD_INCR 120 +#define SCTP_MBUF_SPLIT 94 +#define SCTP_SORCV_FREECTL 95 +#define SCTP_SORCV_DOESCPY 96 +#define SCTP_SORCV_DOESLCK 97 +#define SCTP_SORCV_DOESADJ 98 +#define SCTP_SORCV_BOTWHILE 99 +#define SCTP_SORCV_PASSBF 100 +#define SCTP_SORCV_ADJD 101 +#define SCTP_UNKNOWN_MAX 102 +#define SCTP_RANDY_STUFF 103 +#define SCTP_RANDY_STUFF1 104 +#define SCTP_STRMOUT_LOG_ASSIGN 105 +#define SCTP_STRMOUT_LOG_SEND 106 +#define SCTP_FLIGHT_LOG_DOWN_CA 107 +#define SCTP_FLIGHT_LOG_UP 108 +#define SCTP_FLIGHT_LOG_DOWN_GAP 109 +#define SCTP_FLIGHT_LOG_DOWN_RSND 110 +#define SCTP_FLIGHT_LOG_UP_RSND 111 +#define SCTP_FLIGHT_LOG_DOWN_RSND_TO 112 +#define SCTP_FLIGHT_LOG_DOWN_WP 113 +#define SCTP_FLIGHT_LOG_UP_REVOKE 114 +#define SCTP_FLIGHT_LOG_DOWN_PDRP 115 +#define SCTP_FLIGHT_LOG_DOWN_PMTU 116 +#define SCTP_SACK_LOG_NORMAL 117 +#define SCTP_SACK_LOG_EXPRESS 118 +#define SCTP_MAP_TSN_ENTERS 119 +#define SCTP_THRESHOLD_CLEAR 120 +#define SCTP_THRESHOLD_INCR 121 -#define SCTP_LOG_MAX_TYPES 121 +#define SCTP_LOG_MAX_TYPES 122 /* * To turn on various logging, you must first enable 'options KTR' and * you might want to bump the entires 'options KTR_ENTRIES=80000'. ==== //depot/projects/vap/sys/netinet/sctp_indata.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.48 2008/01/28 10:25:43 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.49 2008/04/14 14:34:29 rrs Exp $"); #include #include @@ -582,6 +582,7 @@ /* The incoming sseq is behind where we last delivered? */ SCTPDBG(SCTP_DEBUG_INDATA1, "Duplicate S-SEQ:%d delivered:%d from peer, Abort association\n", control->sinfo_ssn, strm->last_sequence_delivered); +protocol_error: /* * throw it in the stream so it gets cleaned up in * association destruction @@ -659,6 +660,11 @@ * Ok, we did not deliver this guy, find the correct place * to put it on the queue. */ + if ((compare_with_wrap(asoc->cumulative_tsn, + control->sinfo_tsn, MAX_TSN)) || + (control->sinfo_tsn == asoc->cumulative_tsn)) { + goto protocol_error; + } if (TAILQ_EMPTY(&strm->inqueue)) { /* Empty queue */ if (sctp_logging_level & SCTP_STR_LOGGING_ENABLE) { @@ -3343,7 +3349,7 @@ tp1->sent++; } } - } else if (tp1->rec.data.doing_fast_retransmit) { + } else if ((tp1->rec.data.doing_fast_retransmit) && (sctp_cmt_on_off == 0)) { /* * For those that have done a FR we must take * special consideration if we strike. I.e the ==== //depot/projects/vap/sys/netinet/sctp_input.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.67 2008/01/31 08:22:24 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_input.c,v 1.68 2008/04/14 18:13:33 rrs Exp $"); #include #include @@ -2182,6 +2182,20 @@ /* out of memory or ?? */ return (NULL); } +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = m_sig; + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_SPLIT); + } + mat = SCTP_BUF_NEXT(mat); + } + } +#endif + /* * compute the signature/digest for the cookie */ @@ -2795,7 +2809,7 @@ } } /* stop the timer */ - sctp_timer_stop(SCTP_TIMER_TYPE_SHUTDOWN, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_22); + sctp_timer_stop(SCTP_TIMER_TYPE_SHUTDOWNACK, stcb->sctp_ep, stcb, net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_22); SCTP_STAT_INCR_COUNTER32(sctps_shutdown); /* free the TCB */ SCTPDBG(SCTP_DEBUG_INPUT2, @@ -4807,6 +4821,19 @@ SCTP_BUF_NEXT(mm) = SCTP_M_COPYM(m, *offset, SCTP_SIZE32(chk_length), M_DONTWAIT); if (SCTP_BUF_NEXT(mm)) { +#ifdef SCTP_MBUF_LOGGING + if (sctp_logging_level & SCTP_MBUF_LOGGING_ENABLE) { + struct mbuf *mat; + + mat = SCTP_BUF_NEXT(mm); + while (mat) { + if (SCTP_BUF_IS_EXTENDED(mat)) { + sctp_log_mb(mat, SCTP_MBUF_ICOPY); + } + mat = SCTP_BUF_NEXT(mat); + } + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 15 07:27:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A99A21065671; Tue, 15 Apr 2008 07:27:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B8B6106566B for ; Tue, 15 Apr 2008 07:27:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56F6C8FC0A for ; Tue, 15 Apr 2008 07:27:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3F7Rqls036053 for ; Tue, 15 Apr 2008 07:27:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3F7Rquw036051 for perforce@freebsd.org; Tue, 15 Apr 2008 07:27:52 GMT (envelope-from imp@freebsd.org) Date: Tue, 15 Apr 2008 07:27:52 GMT Message-Id: <200804150727.m3F7Rquw036051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 140072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 07:27:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=140072 Change 140072 by imp@imp_paco-paco on 2008/04/15 07:27:44 IFC @140069 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#37 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/arm/src/sbin/restore/dirs.c#5 integrate .. //depot/projects/arm/src/sys/amd64/include/clock.h#9 integrate .. //depot/projects/arm/src/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/arm/src/sys/amd64/isa/clock.c#19 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#32 integrate .. //depot/projects/arm/src/sys/conf/files.i386#34 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#21 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#45 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#14 integrate .. //depot/projects/arm/src/sys/dev/fb/vga.c#5 integrate .. //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/arm/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#33 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/arm/src/sys/i386/include/clock.h#11 integrate .. //depot/projects/arm/src/sys/i386/isa/clock.c#20 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/arm/src/sys/ia64/conf/SKI#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/interrupt.c#14 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/arm/src/sys/ia64/ia64/sapic.c#3 integrate .. //depot/projects/arm/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/arm/src/sys/isa/rtc.h#2 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#34 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#43 integrate .. //depot/projects/arm/src/sys/mips/include/ns16550.h#2 delete .. //depot/projects/arm/src/sys/mips/include/pcb_ext.h#2 delete .. //depot/projects/arm/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/arm/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/arm/src/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/arm/src/sys/net/bpf.c#28 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#21 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#24 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#25 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#25 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#25 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#15 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#20 integrate .. //depot/projects/arm/src/sys/sys/protosw.h#9 integrate .. //depot/projects/arm/src/sys/sys/socket.h#10 integrate .. //depot/projects/arm/src/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ndiscvt/ndiscvt.c#3 integrate .. //depot/projects/arm/src/usr.sbin/ndiscvt/ndisgen.sh#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -965,10 +965,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif ==== //depot/projects/arm/src/lib/libthr/thread/thr_rwlock.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $ */ #include @@ -32,7 +32,6 @@ #include "namespace.h" #include -#include #include "un-namespace.h" #include "thr_private.h" ==== //depot/projects/arm/src/sbin/restore/dirs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.34 2008/04/14 20:15:53 mckusick Exp $"; #endif /* not lint */ #include @@ -120,6 +120,7 @@ static void rst_seekdir(RST_DIR *, long, long); static long rst_telldir(RST_DIR *); static struct direct *searchdir(ino_t, char *); +static void fail_dirtmp(char *); /* * Extract directory contents, building up a directory structure @@ -147,7 +148,7 @@ if (fd == -1 || (df = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create directory temporary\nfopen", dirfile); + warn("%s: cannot create directory database", dirfile); done(1); } if (genmode != 0) { @@ -160,7 +161,7 @@ if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) { if (fd != -1) close(fd); - warn("%s - cannot create modefile\nfopen", modefile); + warn("%s: cannot create modefile", modefile); done(1); } } @@ -172,25 +173,24 @@ for (;;) { curfile.name = ""; curfile.action = USING; - if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) { - (void) fclose(df); - dirp = opendirfile(dirfile); - if (dirp == NULL) - fprintf(stderr, "opendirfile: %s\n", - strerror(errno)); - if (mf != NULL) - (void) fclose(mf); - i = dirlookup(dot); - if (i == 0) - panic("Root directory is not on tape\n"); - return; - } + if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) + break; itp = allocinotab(&curfile, seekpt); getfile(putdir, putdirattrs, xtrnull); putent(&nulldir); flushent(); itp->t_size = seekpt - itp->t_seekpt; } + if (fclose(df) != 0) + fail_dirtmp(dirfile); + dirp = opendirfile(dirfile); + if (dirp == NULL) + fprintf(stderr, "opendirfile: %s\n", strerror(errno)); + if (mf != NULL && fclose(mf) != 0) + fail_dirtmp(modefile); + i = dirlookup(dot); + if (i == 0) + panic("Root directory is not on tape\n"); } /* @@ -390,7 +390,8 @@ if (dirloc + dp->d_reclen > DIRBLKSIZ) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, 1, DIRBLKSIZ, df); + if (fwrite(dirbuf, DIRBLKSIZ, 1, df) != 1) + fail_dirtmp(dirfile); dirloc = 0; } memmove(dirbuf + dirloc, dp, (long)dp->d_reclen); @@ -405,7 +406,8 @@ flushent(void) { ((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev; - (void) fwrite(dirbuf, (int)dirloc, 1, df); + if (fwrite(dirbuf, (int)dirloc, 1, df) != 1) + fail_dirtmp(dirfile); seekpt = ftell(df); dirloc = 0; } @@ -417,8 +419,8 @@ putdirattrs(char *buf, long size) { - if (mf != NULL) - (void) fwrite(buf, 1, size, mf); + if (mf != NULL && fwrite(buf, size, 1, mf) != 1) + fail_dirtmp(modefile); } /* @@ -582,6 +584,11 @@ myuid = getuid(); for (;;) { (void) fread((char *)&node, 1, sizeof(struct modeinfo), mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", modefile); + fprintf(stderr, "Mode, owner, and times not set.\n"); + break; + } if (feof(mf)) break; if (node.extsize > 0) { @@ -596,8 +603,22 @@ } if (bufsize >= node.extsize) { (void) fread(buf, 1, node.extsize, mf); + if (ferror(mf)) { + warn("%s: cannot read modefile.", + modefile); + fprintf(stderr, "Not all external "); + fprintf(stderr, "attributes set.\n"); + break; + } } else { (void) fseek(mf, node.extsize, SEEK_CUR); + if (ferror(mf)) { + warn("%s: cannot seek in modefile.", + modefile); + fprintf(stderr, "Not all directory "); + fprintf(stderr, "attributes set.\n"); + break; + } } } ep = lookupino(node.ino); @@ -639,8 +660,6 @@ } if (bufsize > 0) free(buf); - if (ferror(mf)) - panic("error setting directory modes\n"); (void) fclose(mf); } @@ -734,7 +753,8 @@ node.flags = ctxp->file_flags; node.uid = ctxp->uid; node.gid = ctxp->gid; - (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf); + if (fwrite((char *)&node, sizeof(struct modeinfo), 1, mf) != 1) + fail_dirtmp(modefile); return (itp); } @@ -760,9 +780,33 @@ { closemt(); - if (modefile[0] != '#') + if (modefile[0] != '#') { + (void) truncate(modefile, 0); (void) unlink(modefile); - if (dirfile[0] != '#') + } + if (dirfile[0] != '#') { + (void) truncate(dirfile, 0); (void) unlink(dirfile); + } exit(exitcode); } + +/* + * Print out information about the failure to save directory, + * extended attribute, and mode information. + */ +static void +fail_dirtmp(char *filename) +{ + const char *tmpdir; + + warn("%s: cannot write directory database", filename); + if (errno == ENOSPC) { + if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0') + tmpdir = _PATH_TMP; + fprintf(stderr, "Try making space in %s, %s\n%s\n", tmpdir, + "or set environment variable TMPDIR", + "to an alternate location with more disk space."); + } + done(1); +} ==== //depot/projects/arm/src/sys/amd64/include/clock.h#9 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/arm/src/sys/amd64/isa/clock.c#19 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" @@ -62,7 +55,6 @@ #include #include #include -#include #include #include @@ -78,13 +70,6 @@ #include #endif -/* - * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we - * can use a simple formula for leap years. - */ -#define LEAPYEAR(y) (((u_int)(y) % 4 == 0) ? 1 : 0) -#define DAYSPERYEAR (31+28+31+30+31+30+31+31+30+31+30+31) - #define TIMER_DIV(x) ((i8254_freq + (x) / 2) / (x)) int clkintr_pending; @@ -98,20 +83,14 @@ TUNABLE_INT("hw.i8254.freq", &i8254_freq); int i8254_max_count; static int i8254_real_max_count; -#define RTC_LOCK mtx_lock_spin(&clock_lock) -#define RTC_UNLOCK mtx_unlock_spin(&clock_lock) -static struct mtx clock_lock; -static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +struct mtx clock_lock; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; static int (*i8254_pending)(struct intsrc *); static int i8254_ticked; static int using_lapic_timer; -static int rtc_reg = -1; -static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; -static u_char rtc_statusb = RTCSB_24HR; /* Values for timerX_state: */ #define RELEASED 0 @@ -239,19 +218,6 @@ return(flag ? FILTER_HANDLED : FILTER_STRAY); } -#include "opt_ddb.h" -#ifdef DDB -#include - -DB_SHOW_COMMAND(rtc, rtc) -{ - printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n", - rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY), - rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC), - rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR)); -} -#endif /* DDB */ - static int getit(void) { @@ -386,50 +352,6 @@ #endif } -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - val = inb(IO_RTC + 1); - RTC_UNLOCK; - return (val); -} - -void -writertc(int reg, u_char val) -{ - - RTC_LOCK; - if (rtc_reg != reg) { - inb(0x84); - outb(IO_RTC, reg); - rtc_reg = reg; - inb(0x84); - } - outb(IO_RTC + 1, val); - inb(0x84); - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - static void set_i8254_freq(u_int freq, int intr_freq) { @@ -468,8 +390,7 @@ startrtclock() { - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); set_i8254_freq(i8254_freq, hz); tc_init(&i8254_timecounter); @@ -478,140 +399,6 @@ } /* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec, days; - int year, month; - int y, m, s; - struct timespec ts; - - if (base) { - s = splclock(); - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - splx(s); - } - - /* Look if we have a RTC present and the time is valid */ - if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) - goto wrong_time; - - /* wait for time update to complete */ - /* If RTCSA_TUP is zero, we have at least 244us before next update */ - s = splhigh(); - while (rtcin(RTC_STATUSA) & RTCSA_TUP) { - splx(s); - s = splhigh(); - } - - days = 0; -#ifdef USE_RTC_CENTURY - year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; -#else - year = readrtc(RTC_YEAR) + 1900; - if (year < 1970) - year += 100; -#endif - if (year < 1970) { - splx(s); - goto wrong_time; - } - month = readrtc(RTC_MONTH); - for (m = 1; m < month; m++) - days += daysinmonth[m-1]; - if ((month > 2) && LEAPYEAR(year)) - days ++; - days += readrtc(RTC_DAY) - 1; - for (y = 1970; y < year; y++) - days += DAYSPERYEAR + LEAPYEAR(y); - sec = ((( days * 24 + - readrtc(RTC_HRS)) * 60 + - readrtc(RTC_MIN)) * 60 + - readrtc(RTC_SEC)); - /* sec now contains the number of seconds, since Jan 1 1970, - in the local time zone */ - - sec += utc_offset(); - - y = time_second - sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - ts.tv_sec = sec; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - splx(s); - return; - -wrong_time: - printf("Invalid time in clock: check and reset the date!\n"); -} - -/* - * Write system time back to RTC - */ -void -resettodr() -{ - unsigned long tm; - int y, m, s; - - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - /* Disable RTC updates and interrupts. */ - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - - /* Calculate local time to put in RTC */ - - tm -= utc_offset(); - - writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ - writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ - writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ - - /* We have now the days since 01-01-1970 in tm */ - writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ - for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); - tm >= m; - y++, m = DAYSPERYEAR + LEAPYEAR(y)) - tm -= m; - - /* Now we have the years in y and the day-of-the-year in tm */ - writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ -#ifdef USE_RTC_CENTURY - writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ -#endif - for (m = 0; ; m++) { - int ml; - - ml = daysinmonth[m]; - if (m == 1 && LEAPYEAR(y)) - ml++; - if (tm < ml) - break; - tm -= ml; - } - - writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ - writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ - - /* Reenable RTC updates and interrupts. */ - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); -} - - -/* * Start both clocks running. */ void @@ -627,8 +414,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, - INTR_TYPE_CLK, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, + NULL, INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -641,8 +428,7 @@ } /* Initialize RTC. */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_24HR); + atrtc_start(); /* * If the separate statistics clock hasn't been explicility disabled @@ -653,19 +439,18 @@ if (!statclock_disable && !using_lapic_timer) { diag = rtcin(RTC_DIAG); if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + printf("RTC BIOS diagnostic error %b\n", + diag, RTCDG_BITS); /* Setting stathz to nonzero early helps avoid races. */ stathz = RTC_NOPROFRATE; profhz = RTC_PROFRATE; /* Enable periodic interrupts from the RTC. */ - rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + intr_add_handler("rtc", 8, + (driver_filter_t *)rtcintr, NULL, NULL, INTR_TYPE_CLK, NULL); - - writertc(RTC_STATUSB, rtc_statusb); - rtcin(RTC_INTR); + atrtc_enable_intr(); } init_TSC_tc(); @@ -677,8 +462,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_PROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_PROF); psdiv = pscnt = psratio; } @@ -688,8 +472,7 @@ if (using_lapic_timer) return; - rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; - writertc(RTC_STATUSA, rtc_statusa); + atrtc_rate(RTCSA_NOPROF); psdiv = pscnt = 1; } @@ -738,7 +521,8 @@ count = i8254_max_count - ((high << 8) | low); if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || - ((count < 20 || (!(rflags & PSL_I) && count < i8254_max_count / 2u)) && + ((count < 20 || (!(rflags & PSL_I) && + count < i8254_max_count / 2u)) && i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += i8254_max_count; @@ -751,11 +535,10 @@ #ifdef DEV_ISA /* - * Attach to the ISA PnP descriptors for the timer and realtime clock. + * Attach to the ISA PnP descriptors for the timer */ static struct isa_pnp_id attimer_ids[] = { { 0x0001d041 /* PNP0100 */, "AT timer" }, - { 0x000bd041 /* PNP0B00 */, "AT realtime clock" }, { 0 } }; @@ -764,7 +547,8 @@ { int result; - if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids)) <= 0) + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); + if (result <= 0) device_quiet(dev); return(result); } @@ -781,8 +565,8 @@ DEVMETHOD(device_attach, attimer_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ - DEVMETHOD(device_resume, bus_generic_resume), /* XXX restart statclock? */ + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; ==== //depot/projects/arm/src/sys/conf/files.amd64#32 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.119 2008/04/12 14:20:22 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -207,9 +207,12 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart dev/wpi/if_wpi.c optional wpi +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga +kern/clock_if.m standard kern/link_elf_obj.c standard +kern/subr_rtc.c standard # # IA32 binary support # ==== //depot/projects/arm/src/sys/conf/files.i386#34 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.593 2008/04/12 20:46:06 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -443,6 +443,7 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # +isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/clock_if.m standard ==== //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.15 2007/10/25 17:30:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.16 2008/04/14 08:00:00 phk Exp $"); /* * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops. @@ -48,7 +48,7 @@ #include #include #include -#include +#include #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("IBM") ==== //depot/projects/arm/src/sys/dev/ata/ata-all.h#21 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.131 2008/04/13 16:05:34 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.132 2008/04/14 18:34:24 sos Exp $ */ /* ATA register defines */ @@ -418,8 +418,8 @@ device_t dev; /* device handle */ int unit; /* physical unit */ #define ATA_MASTER 0x00 +#define ATA_SLAVE 0x01 #define ATA_PM 0x0f -#define ATA_SLAVE 0x10 struct ata_params param; /* ata param structure */ int mode; /* current transfermode */ ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#45 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.215 2008/04/12 17:21:22 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.216 2008/04/14 18:34:24 sos Exp $"); #include "opt_ata.h" #include @@ -1055,9 +1055,10 @@ { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ata_channel *ch = device_get_softc(dev); + int offset = ch->unit << 7; +#ifdef AHCI_PM struct ata_ahci_cmd_tab *ctp = (struct ata_ahci_cmd_tab *)(ch->dma.work + ATA_AHCI_CT_OFFSET); - int offset = ch->unit << 7; int timeout = 0; /* kick controller into sane state if needed */ @@ -1097,7 +1098,7 @@ } while (ATA_INL(ctlr->r_res2, ATA_AHCI_P_TFD + offset) & ATA_S_BUSY); if (bootverbose) device_printf(dev, "BUSY wait time=%dms\n", timeout); - +#endif return ATA_INL(ctlr->r_res2, ATA_AHCI_P_SIG + offset); } @@ -4306,7 +4307,7 @@ ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), port & 0x0f); /* softreset device on this channel */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_IDS | ATA_A_RESET); ata_udelay(10000); ==== //depot/projects/arm/src/sys/dev/ata/ata-dma.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.152 2008/04/11 11:30:27 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.153 2008/04/14 18:34:24 sos Exp $"); #include #include @@ -112,8 +112,8 @@ &ch->dma.work_map)) goto error; - if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map ,ch->dma.work, - MAXWSPCSZ, ata_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT) || + if (bus_dmamap_load(ch->dma.work_tag, ch->dma.work_map, ch->dma.work, + MAXWSPCSZ, ata_dmasetupc_cb, &dcba, 0) || dcba.error) { bus_dmamem_free(ch->dma.work_tag, ch->dma.work, ch->dma.work_map); goto error; @@ -202,8 +202,8 @@ } if (bus_dmamap_load(request->dma.sg_tag, request->dma.sg_map, - request->dma.sg, MAXTABSZ, - ata_dmasetupc_cb, &dcba, BUS_DMA_NOWAIT) || dcba.error){ + request->dma.sg, MAXTABSZ, ata_dmasetupc_cb, &dcba, 0)|| + dcba.error) { bus_dmamem_free(request->dma.sg_tag, request->dma.sg, request->dma.sg_map); device_printf(request->dev, "FAILURE - load sg\n"); ==== //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.81 2008/04/10 13:05:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.82 2008/04/14 18:34:24 sos Exp $"); #include "opt_ata.h" #include @@ -463,7 +463,7 @@ int mask = 0, timeout; /* do we have any signs of ATA/ATAPI HW being present ? */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { @@ -473,7 +473,7 @@ /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_SLAVE); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_SLAVE)); DELAY(10); ostat1 = ATA_IDX_INB(ch, ATA_STATUS); if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { @@ -493,7 +493,7 @@ return; /* reset (both) devices on this channel */ - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | ATA_DEV(ATA_MASTER)); DELAY(10); ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_IDS | ATA_A_RESET); ata_udelay(10000); @@ -504,7 +504,7 @@ /* wait for BUSY to go inactive */ for (timeout = 0; timeout < 310; timeout++) { if ((mask & 0x01) && (stat0 & ATA_S_BUSY)) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_DEV(ATA_MASTER)); DELAY(10); err = ATA_IDX_INB(ch, ATA_ERROR); lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); @@ -534,7 +534,7 @@ if ((mask & 0x02) && (stat1 & ATA_S_BUSY) && !((mask & 0x01) && (stat0 & ATA_S_BUSY))) { - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_DEV(ATA_SLAVE)); DELAY(10); err = ATA_IDX_INB(ch, ATA_ERROR); lsb = ATA_IDX_INB(ch, ATA_CYL_LSB); @@ -582,9 +582,8 @@ } if (bootverbose) - device_printf(dev, "reset tp2 stat0=%02x stat1=%02x devices=0x%b\n", - stat0, stat1, ch->devices, - "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); + device_printf(dev, "reset tp2 stat0=%02x stat1=%02x devices=0x%x\n", + stat0, stat1, ch->devices); } /* must be called with ATA channel locked and state_mtx held */ ==== //depot/projects/arm/src/sys/dev/fb/vga.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.37 2007/12/29 23:26:55 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.38 2008/04/14 08:00:00 phk Exp $"); #include "opt_vga.h" #include "opt_fb.h" @@ -154,7 +154,7 @@ /* LOW-LEVEL */ -#include +#include #ifdef __i386__ #include #endif ==== //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#1 $ + * $P4: //depot/projects/arm/src/sys/dev/k8temp/k8temp.c#2 $ */ /* ==== //depot/projects/arm/src/sys/dev/nvram/nvram.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.1 2007/10/26 03:23:53 peter Exp $ + * $FreeBSD: src/sys/dev/nvram/nvram.c,v 1.2 2008/04/14 08:00:00 phk Exp $ */ #include @@ -35,7 +35,6 @@ #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 15 17:20:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C700B1065671; Tue, 15 Apr 2008 17:20:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 877661065670 for ; Tue, 15 Apr 2008 17:20:19 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7488E8FC1D for ; Tue, 15 Apr 2008 17:20:19 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3FHKJwo001536 for ; Tue, 15 Apr 2008 17:20:19 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3FHKJIl001508 for perforce@freebsd.org; Tue, 15 Apr 2008 17:20:19 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 15 Apr 2008 17:20:19 GMT Message-Id: <200804151720.m3FHKJIl001508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 17:20:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=140082 Change 140082 by thompsa@thompsa_burger on 2008/04/15 17:19:44 - Fix up ndis_ioctl logic - The ic now lives at ifp->if_l2com Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#11 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#11 (text+ko) ==== @@ -700,7 +700,7 @@ /* Do media setup */ if (sc->ndis_80211) { - struct ieee80211com *ic = (void *)&sc->ic; + struct ieee80211com *ic = ifp->if_l2com; ndis_80211_rates_ex rates; struct ndis_80211_nettype_list *ntl; uint32_t arg; @@ -991,7 +991,7 @@ NDIS_UNLOCK(sc); ndis_stop(sc); if (sc->ndis_80211) - ieee80211_ifdetach(&sc->ic); + ieee80211_ifdetach(ifp->if_l2com); else ether_ifdetach(ifp); } else @@ -1467,7 +1467,7 @@ ifp = arg; sc = ifp->if_softc; - ic = &sc->ic; + ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); block = dobj->do_devext; @@ -1654,7 +1654,7 @@ uint8_t rval; sc = xsc; - ic = &sc->ic; + ic = sc->ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); NDIS_LOCK(sc); @@ -1891,8 +1891,8 @@ void *xsc; { struct ndis_softc *sc = xsc; - struct ieee80211com *ic = (void *)&sc->ic; struct ifnet *ifp = sc->ifp; + struct ieee80211com *ic = ifp->if_l2com; int i, len, error; /* @@ -2058,7 +2058,7 @@ int rval = 0, len; uint32_t arg, save; - ic = &sc->ic; + ic = sc->ifp->if_l2com; len = sizeof(arg); @@ -2200,8 +2200,8 @@ uint32_t arg; struct ifnet *ifp; - ic = &sc->ic; ifp = sc->ifp; + ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); ni = vap->iv_bss; @@ -2555,9 +2555,9 @@ uint32_t arg; struct ifnet *ifp; - ic = &sc->ic; + ifp = sc->ifp; + ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); - ifp = sc->ifp; ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) @@ -2693,6 +2693,7 @@ caddr_t data; { struct ndis_softc *sc = ifp->if_softc; + struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; struct ndis_oid_data oid; struct ndis_evt evt; @@ -2738,7 +2739,9 @@ break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: - if (!sc->ndis_80211) + if (sc->ndis_80211) + error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, command); + else error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command); break; case SIOCSIFCAP: @@ -2849,8 +2852,7 @@ NDIS_UNLOCK(sc); break; default: - if (!sc->ndis_80211) - error = ether_ioctl(ifp, command, data); + error = ether_ioctl(ifp, command, data); break; } @@ -3022,9 +3024,8 @@ struct ieee80211com *ic; int i; - ic = &sc->ic; - ifp = sc->ifp; + ic = ifp->if_l2com; untimeout(ndis_tick, sc, sc->ndis_stat_ch); NDIS_LOCK(sc); @@ -3106,12 +3107,14 @@ ndis_scan(void *arg, int npending) { struct ndis_softc *sc = arg; - struct ieee80211com *ic = (void *)&sc->ic; + struct ieee80211com *ic; struct ieee80211vap *vap; - struct ieee80211_scan_state *ss = ic->ic_scan; + struct ieee80211_scan_state *ss; ndis_80211_ssid ssid; int error, len; + ic = sc->ifp->if_l2com; + ss = ic->ic_scan; vap = TAILQ_FIRST(&ic->ic_vaps); if (!NDIS_INITIALIZED(sc)) { @@ -3153,7 +3156,7 @@ static void ndis_scan_results(struct ndis_softc *sc) { - struct ieee80211com *ic = (void *)&sc->ic; + struct ieee80211com *ic; struct ieee80211vap *vap; ndis_80211_bssid_list_ex *bl; ndis_wlan_bssid_ex *wb; @@ -3166,6 +3169,7 @@ uint8_t rates[2+IEEE80211_RATE_MAXSIZE]; uint8_t *frm, *efrm; + ic = sc->ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); noise = -96; ==== //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#8 (text+ko) ==== @@ -108,7 +108,6 @@ #define NDIS_VAP(vap) ((struct ndis_vap *)(vap)) struct ndis_softc { - struct ieee80211com ic; /* interface info */ struct ifnet *ifp; struct ifmedia ifmedia; /* media info */ u_long ndis_hwassist; From owner-p4-projects@FreeBSD.ORG Tue Apr 15 21:46:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB8941065674; Tue, 15 Apr 2008 21:46:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADE351065670 for ; Tue, 15 Apr 2008 21:46:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BD9B8FC1E for ; Tue, 15 Apr 2008 21:46:03 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3FLk3Ue030261 for ; Tue, 15 Apr 2008 21:46:03 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3FLk3Mn030259 for perforce@freebsd.org; Tue, 15 Apr 2008 21:46:03 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 15 Apr 2008 21:46:03 GMT Message-Id: <200804152146.m3FLk3Mn030259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 21:46:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=140088 Change 140088 by thompsa@thompsa_burger on 2008/04/15 21:45:19 Add enough goo to get NDIS working, tested with WPA. Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#12 edit .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#9 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#54 edit .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#12 (text+ko) ==== @@ -140,6 +140,8 @@ static void ndis_vap_delete (struct ieee80211vap *); static void ndis_tick (void *); static void ndis_ticktask (device_object *, void *); +static int ndis_raw_xmit (struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); static void ndis_start (struct ifnet *); static void ndis_starttask (device_object *, void *); static void ndis_resettask (device_object *, void *); @@ -713,6 +715,7 @@ TASK_INIT(&sc->ndis_scantask, 0, ndis_scan, sc); ic->ic_ifp = ifp; + ic->ic_opmode = IEEE80211_M_STA; ic->ic_phytype = IEEE80211_T_DS; ic->ic_caps = IEEE80211_C_IBSS; setbit(ic->ic_modecaps, IEEE80211_MODE_AUTO); @@ -895,6 +898,7 @@ ic->ic_caps |= IEEE80211_C_PMGT; bcopy(eaddr, &ic->ic_myaddr, sizeof(eaddr)); ieee80211_ifattach(ic); + ic->ic_raw_xmit = ndis_raw_xmit; ic->ic_scan_start = ndis_scan_start; ic->ic_scan_end = ndis_scan_end; ic->ic_set_channel = ndis_set_channel; @@ -1728,6 +1732,16 @@ return; } +static int +ndis_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, + const struct ieee80211_bpf_params *params) +{ + /* no support; just discard */ + m_freem(m); + ieee80211_free_node(ni); + return 0; +} + static void ndis_starttask(d, arg) device_object *d; @@ -1842,7 +1856,8 @@ * to him. */ - BPF_MTAP(ifp, m); + if (!sc->ndis_80211) /* XXX handle 80211 */ + BPF_MTAP(ifp, m); /* * The array that p0 points to must appear contiguous, ==== //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#9 (text+ko) ==== ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#54 (text+ko) ==== @@ -3232,6 +3232,14 @@ break; } break; + /* Pass NDIS ioctls up to the driver */ + case SIOCGDRVSPEC: + case SIOCSDRVSPEC: + case SIOCGPRIVATE_0: { + struct ifnet *parent = vap->iv_ic->ic_ifp; + error = parent->if_ioctl(parent, cmd, data); + break; + } default: error = ether_ioctl(ifp, cmd, data); break; ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 (text+ko) ==== @@ -286,7 +286,7 @@ ifm = (struct if_msghdr *)next; if (ifm->ifm_type == RTM_IFINFO) { sdl = (struct sockaddr_dl *)(ifm + 1); - if (strnstr(sdl->sdl_data, "ndis", sdl->sdl_nlen)) { + if (strnstr(sdl->sdl_data, "wlan", sdl->sdl_nlen)) { if ((spc + sdl->sdl_nlen) > *len) { free(buf); return(FALSE); @@ -319,7 +319,7 @@ ifm = (struct if_msghdr *)next; if (ifm->ifm_type == RTM_IFINFO) { sdl = (struct sockaddr_dl *)(ifm + 1); - if (strnstr(sdl->sdl_data, "ndis", sdl->sdl_nlen)) { + if (strnstr(sdl->sdl_data, "wlan", sdl->sdl_nlen)) { if ((spc + sdl->sdl_nlen) > *len) { free(buf); return(FALSE); From owner-p4-projects@FreeBSD.ORG Tue Apr 15 21:55:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50650106564A; Tue, 15 Apr 2008 21:55:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12540106567D for ; Tue, 15 Apr 2008 21:55:13 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F306B8FC18 for ; Tue, 15 Apr 2008 21:55:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3FLtDu4031284 for ; Tue, 15 Apr 2008 21:55:13 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3FLtDbp031282 for perforce@freebsd.org; Tue, 15 Apr 2008 21:55:13 GMT (envelope-from julian@freebsd.org) Date: Tue, 15 Apr 2008 21:55:13 GMT Message-Id: <200804152155.m3FLtDbp031282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 140089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2008 21:55:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=140089 Change 140089 by julian@julian_trafmon1 on 2008/04/15 21:54:58 IFC to 140087 Affected files ... .. //depot/projects/arp-v2/src/Makefile.inc1#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/arp-v2/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/arp-v2/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/arp-v2/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/tty.c#4 integrate .. //depot/projects/arp-v2/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/arp-v2/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/arp-v2/src/sys/net/bpf.c#5 integrate .. //depot/projects/arp-v2/src/sys/net/if_tap.c#2 integrate .. //depot/projects/arp-v2/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/arp-v2/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/arp-v2/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/arp-v2/src/usr.sbin/ndiscvt/ndisgen.sh#2 integrate Differences ... ==== //depot/projects/arp-v2/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,10 +963,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif ==== //depot/projects/arp-v2/src/lib/libc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.133 2008/03/29 16:19:35 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.134 2008/04/15 08:33:32 davidxu Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -63,7 +63,7 @@ setjmp.3 setmode.3 setproctitle.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ - strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ + strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 tcgetsid.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3 ==== //depot/projects/arp-v2/src/lib/libc/gen/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.8 2008/01/26 17:09:40 yar Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.9 2008/04/15 08:33:32 davidxu Exp $ */ FBSD_1.0 { @@ -337,6 +337,7 @@ fts_get_clientptr; fts_get_stream; fts_set_clientptr; + tcgetsid; }; FBSDprivate_1.0 { ==== //depot/projects/arp-v2/src/lib/libc/gen/termios.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.14 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.15 2008/04/15 08:33:32 davidxu Exp $"); #include "namespace.h" #include @@ -99,6 +99,17 @@ return ((pid_t)s); } +pid_t +tcgetsid(int fd) +{ + int s; + + if (_ioctl(fd, TIOCGSID, &s) < 0) + return ((pid_t)-1); + + return ((pid_t)s); +} + speed_t cfgetospeed(t) const struct termios *t; ==== //depot/projects/arp-v2/src/sys/ia64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/ia64 # -# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.13 2008/03/12 10:11:58 jeff Exp $ +# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.14 2008/04/15 17:02:23 marcel Exp $ machine ia64 @@ -9,6 +9,7 @@ device acpi # ACPI support # Pseudo devices. +device genclock # Real-time clock device mem # Memory and kernel memory devices # UART chips on this platform ==== //depot/projects/arp-v2/src/sys/ia64/conf/GENERIC#4 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.96 2008/03/27 11:54:18 dfr Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.97 2008/04/15 05:02:41 marcel Exp $ cpu ITANIUM ident GENERIC @@ -48,7 +48,7 @@ options NFS_ROOT # NFS usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_4BSD # 4BSD scheduler +options SCHED_ULE # ULE scheduler options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options SCTP # Stream Control Transmission Protocol options SMP # Symmetric Multi-Processor support ==== //depot/projects/arp-v2/src/sys/ia64/conf/SKI#2 (text+ko) ==== @@ -17,7 +17,7 @@ # If you are in doubt as to the purpose or necessity of a line, check # first in NOTES. # -# $FreeBSD: src/sys/ia64/conf/SKI,v 1.24 2006/06/15 19:58:53 netchild Exp $ +# $FreeBSD: src/sys/ia64/conf/SKI,v 1.25 2008/04/15 05:02:41 marcel Exp $ cpu ITANIUM ident SKI @@ -35,8 +35,8 @@ options MD_ROOT # MD usable as root device options PROCFS # Process filesystem (/proc) options PSEUDOFS # Pseudo-filesystem framework -options SCHED_4BSD # 4BSD scheduler -#options SCHED_ULE # ULE scheduler +#options SCHED_4BSD # 4BSD scheduler +options SCHED_ULE # ULE scheduler options SKI # Include SKI support code options SOFTUPDATES # Enable FFS soft updates support options SYSVMSG # SYSV-style message queues ==== //depot/projects/arp-v2/src/sys/ia64/ia64/clock.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.32 2007/08/04 19:28:19 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.33 2008/04/15 17:02:23 marcel Exp $"); #include #include @@ -44,8 +44,6 @@ uint64_t ia64_clock_reload; -static int clock_initialized = 0; - #ifndef SMP static timecounter_get_t ia64_get_timecount; @@ -110,93 +108,3 @@ /* nothing to do */ } - -void -inittodr(time_t base) -{ - long days; - struct efi_tm tm; - struct timespec ts; - struct clocktime ct; - - efi_get_time(&tm); - - /* - * This code was written in 2005, so logically EFI cannot return - * a year smaller than that. Assume the EFI clock is out of whack - * in that case and reset the EFI clock. - */ - if (tm.tm_year < 2005) { - printf("WARNING: CHECK AND RESET THE DATE!\n"); - memset(&tm, 0, sizeof(tm)); - tm.tm_year = 2005; - tm.tm_mon = tm.tm_mday = 1; - if (efi_set_time(&tm)) - printf("ERROR: COULD NOT RESET EFI CLOCK!\n"); - } - - ct.nsec = tm.tm_nsec; - ct.sec = tm.tm_sec; - ct.min = tm.tm_min; - ct.hour = tm.tm_hour; - ct.day = tm.tm_mday; - ct.mon = tm.tm_mon; - ct.year = tm.tm_year; - ct.dow = -1; - if (clock_ct_to_ts(&ct, &ts)) - printf("Invalid time in clock: check and reset the date!\n"); - ts.tv_sec += utc_offset(); - - /* - * The EFI clock is supposed to be a real-time clock, whereas the - * base argument is coming from a saved (as on disk) time. It's - * impossible for a saved time to represent a time in the future, - * so we expect the EFI clock to be larger. If not, the EFI clock - * may not be reliable and we trust the base. - * Warn if the EFI clock was off by 2 or more days. - */ - if (ts.tv_sec < base) { - days = (base - ts.tv_sec) / (60L * 60L * 24L); - if (days >= 2) - printf("WARNING: EFI clock lost %ld days!\n", days); - ts.tv_sec = base; - ts.tv_nsec = 0; - } - - tc_setclock(&ts); - clock_initialized = 1; -} - -/* - * Reset the TODR based on the time value; used when the TODR has a - * preposterous value and also when the time is reset by the stime - * system call. Also called when the TODR goes past - * TODRZERO + 100*(SECYEAR+2*SECDAY) (e.g. on Jan 2 just after midnight) - * to wrap the TODR around. - */ -void -resettodr() -{ - struct timespec ts; - struct clocktime ct; - struct efi_tm tm; - - if (!clock_initialized || disable_rtc_set) - return; - - efi_get_time(&tm); - getnanotime(&ts); - ts.tv_sec -= utc_offset(); - clock_ts_to_ct(&ts, &ct); - - tm.tm_nsec = ts.tv_nsec; - tm.tm_sec = ct.sec; - tm.tm_min = ct.min; - tm.tm_hour = ct.hour; - - tm.tm_year = ct.year; - tm.tm_mon = ct.mon; - tm.tm_mday = ct.day; - if (efi_set_time(&tm)) - printf("ERROR: COULD NOT RESET EFI CLOCK!\n"); -} ==== //depot/projects/arp-v2/src/sys/ia64/ia64/interrupt.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.67 2008/04/11 23:10:39 jeff Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.68 2008/04/15 05:02:42 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -241,6 +242,9 @@ } else if (vector == ipi_vector[IPI_TEST]) { CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; + } else if (vector == ipi_vector[IPI_PREEMPT]) { + CTR1(KTR_SMP, "IPI_PREEMPT, cpuid=%d", PCPU_GET(cpuid)); + sched_preempt(curthread); #endif } else { ints[PCPU_GET(cpuid)]++; ==== //depot/projects/arp-v2/src/sys/ia64/ia64/machdep.c#4 (text+ko) ==== @@ -26,12 +26,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.235 2008/03/30 23:09:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.236 2008/04/15 05:02:42 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" +#include "opt_sched.h" #include #include @@ -370,6 +371,12 @@ if (PCPU_GET(fpcurthread) == old) old->td_frame->tf_special.psr |= IA64_PSR_DFH; if (!savectx(oldpcb)) { + old->td_lock = mtx; +#if defined(SCHED_ULE) && defined(SMP) + /* td_lock is volatile */ + while (new->td_lock == &blocked_lock) + ; +#endif newpcb = new->td_pcb; oldpcb->pcb_current_pmap = pmap_switch(newpcb->pcb_current_pmap); @@ -890,12 +897,16 @@ { u_int64_t start, end, now; + sched_pin(); + start = ia64_get_itc(); end = start + (itc_frequency * n) / 1000000; /* printf("DELAY from 0x%lx to 0x%lx\n", start, end); */ do { now = ia64_get_itc(); } while (now < end || (now > start && end < start)); + + sched_unpin(); } /* ==== //depot/projects/arp-v2/src/sys/ia64/ia64/nexus.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.19 2008/03/13 20:39:04 jhb Exp $ + * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.20 2008/04/15 17:02:23 marcel Exp $ */ /* @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,7 @@ #include #include +#include #include #include #include @@ -66,6 +68,8 @@ #include #include +#include "clock_if.h" + static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { struct resource_list nx_resources; @@ -104,6 +108,9 @@ static int nexus_config_intr(device_t, int, enum intr_trigger, enum intr_polarity); +static int nexus_gettime(device_t, struct timespec *); +static int nexus_settime(device_t, struct timespec *); + static device_method_t nexus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nexus_probe), @@ -130,6 +137,10 @@ DEVMETHOD(bus_delete_resource, nexus_delete_resource), DEVMETHOD(bus_config_intr, nexus_config_intr), + /* Clock interface */ + DEVMETHOD(clock_gettime, nexus_gettime), + DEVMETHOD(clock_settime, nexus_settime), + { 0, 0 } }; @@ -229,6 +240,7 @@ if (acpi_identify() == 0) BUS_ADD_CHILD(dev, 10, "acpi", 0); + clock_register(dev, 1000); bus_generic_attach(dev); return 0; } @@ -521,54 +533,49 @@ return (sapic_config_intr(irq, trig, pol)); } -#if 0 +static int +nexus_gettime(device_t dev, struct timespec *ts) +{ + struct clocktime ct; + struct efi_tm tm; + + efi_get_time(&tm); -/* - * Placeholder which claims PnP 'devices' which describe system - * resources. - */ -static struct isa_pnp_id sysresource_ids[] = { - { 0x010cd041 /* PNP0c01 */, "System Memory" }, - { 0x020cd041 /* PNP0c02 */, "System Resource" }, - { 0 } -}; + /* + * This code was written in 2005, so logically EFI cannot return + * a year smaller than that. Assume the EFI clock is out of whack + * in that case and reset the EFI clock. + */ + if (tm.tm_year < 2005) + return (EINVAL); -static int -sysresource_probe(device_t dev) -{ - int result; - - if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, sysresource_ids)) <= 0) { - device_quiet(dev); - } - return(result); + ct.nsec = tm.tm_nsec; + ct.sec = tm.tm_sec; + ct.min = tm.tm_min; + ct.hour = tm.tm_hour; + ct.day = tm.tm_mday; + ct.mon = tm.tm_mon; + ct.year = tm.tm_year; + ct.dow = -1; + return (clock_ct_to_ts(&ct, ts)); } static int -sysresource_attach(device_t dev) +nexus_settime(device_t dev, struct timespec *ts) { - return(0); -} + struct clocktime ct; + struct efi_tm tm; -static device_method_t sysresource_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, sysresource_probe), - DEVMETHOD(device_attach, sysresource_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } -}; + efi_get_time(&tm); -static driver_t sysresource_driver = { - "sysresource", - sysresource_methods, - 1, /* no softc */ -}; + clock_ts_to_ct(ts, &ct); + tm.tm_nsec = ts->tv_nsec; + tm.tm_sec = ct.sec; + tm.tm_min = ct.min; + tm.tm_hour = ct.hour; + tm.tm_year = ct.year; + tm.tm_mon = ct.mon; + tm.tm_mday = ct.day; + return (efi_set_time(&tm)); +} -static devclass_t sysresource_devclass; - -DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, 0, 0); - -#endif ==== //depot/projects/arp-v2/src/sys/kern/sched_ule.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.240 2008/04/04 01:16:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.241 2008/04/15 05:02:42 marcel Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -72,7 +72,7 @@ #include #include -#if !defined(__i386__) && !defined(__amd64__) && !defined(__powerpc__) && !defined(__arm__) +#if defined(__sparc64__) || defined(__mips__) #error "This architecture is not currently compatible with ULE" #endif ==== //depot/projects/arp-v2/src/sys/kern/tty.c#4 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.275 2008/03/19 06:19:00 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.276 2008/04/15 08:33:32 davidxu Exp $"); #include "opt_compat.h" #include "opt_tty.h" @@ -1010,6 +1010,11 @@ return (ENOTTY); *(int *)data = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID; break; + case TIOCGSID: /* get sid of tty */ + if (!isctty(p, tp)) + return (ENOTTY); + *(int *)data = tp->t_session->s_sid; + break; #ifdef TIOCHPCL case TIOCHPCL: /* hang up on last close */ s = spltty(); ==== //depot/projects/arp-v2/src/sys/mips/mips/cache.c#2 (text+ko) ==== @@ -1,32 +1,74 @@ +/* $NetBSD: cache.c,v 1.33 2005/12/24 23:24:01 perry Exp $ */ + /*- - * Copyright (c) 2006 Fill this file and put your name here + * Copyright 2001, 2002 Wasabi Systems, Inc. * All rights reserved. * + * Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer, - * without modification, immediately at the beginning of the file. - * 2. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Wasabi Systems, Inc. + * 4. The name of Wasabi Systems, Inc. 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 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/*- + * Copyright 2000, 2001 + * Broadcom Corporation. All rights reserved. + * + * This software is furnished under license and may be used and copied only + * in accordance with the following terms and conditions. Subject to these + * conditions, you may download, copy, install, use, modify and distribute + * modified or unmodified copies of this software in source and/or binary + * form. No title or ownership is transferred hereby. + * + * 1) Any source code used, modified or distributed must reproduce and + * retain this copyright notice and list of conditions as they appear in + * the source file. + * + * 2) No right is granted to use any trade name, trademark, or logo of + * Broadcom Corporation. The "Broadcom Corporation" name may not be + * used to endorse or promote products derived from this software + * without the prior written permission of Broadcom Corporation. * + * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR + * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE + * FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE + * LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/cache.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/cache.c,v 1.2 2008/04/15 05:35:00 imp Exp $"); #include #include ==== //depot/projects/arp-v2/src/sys/mips/mips/copystr.S#2 (text+ko) ==== @@ -1,6 +1,11 @@ +/* $NetBSD: copy.S,v 1.5 2007/10/17 19:55:37 garbled Exp $ */ + /*- - * Copyright (c) [year] [your name] - * All rights reserved. + * Copyright (c) 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Digital Equipment Corporation and Ralph Campbell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,11 +15,14 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may 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 + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -23,13 +31,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * Copyright (C) 1989 Digital Equipment Corporation. + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appears in all copies. + * Digital Equipment Corporation makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/loMem.s, + * v 1.1 89/07/11 17:55:04 nelson Exp SPRITE (DECWRL) + * from: Header: /sprite/src/kernel/mach/ds3100.md/RCS/machAsm.s, + * v 9.2 90/01/29 18:00:39 shirriff Exp SPRITE (DECWRL) + * from: Header: /sprite/src/kernel/vm/ds3100.md/vmPmaxAsm.s, + * v 1.1 89/07/10 14:27:41 nelson Exp SPRITE (DECWRL) + * + * @(#)locore.s 8.5 (Berkeley) 1/4/94 */ #include "assym.s" #include #include -__FBSDID("$FreeBSD: src/sys/mips/mips/copystr.S,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/copystr.S,v 1.2 2008/04/15 05:31:19 imp Exp $"); #include ==== //depot/projects/arp-v2/src/sys/net/bpf.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.192 2008/04/15 00:50:01 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.193 2008/04/15 17:08:24 jkim Exp $"); #include "opt_bpf.h" #include "opt_mac.h" @@ -841,6 +841,9 @@ mc = m_dup(m, M_DONTWAIT); if (mc != NULL) mc->m_pkthdr.rcvif = ifp; + /* Set M_PROMISC for outgoing packets to be discarded. */ + if (d->bd_direction == BPF_D_INOUT) + m->m_flags |= M_PROMISC; } else mc = NULL; @@ -1571,9 +1574,6 @@ #define BPF_CHECK_DIRECTION(d, i) \ (((d)->bd_direction == BPF_D_IN && (i) == NULL) || \ ((d)->bd_direction == BPF_D_OUT && (i) != NULL)) -#define BPF_CHECK_DUPLICATE(d, i) \ - ((d)->bd_feedback && \ - (d)->bd_direction == BPF_D_INOUT && (i) == NULL) /* * Incoming linkage from device drivers, when packet is in an mbuf chain. @@ -1586,14 +1586,19 @@ int gottime; struct timeval tv; + /* Skip outgoing duplicate packets. */ + if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { + m->m_flags &= ~M_PROMISC; + return; + } + gottime = 0; pktlen = m_length(m, NULL); BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || - BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1636,6 +1641,12 @@ int gottime; struct timeval tv; + /* Skip outgoing duplicate packets. */ + if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) { + m->m_flags &= ~M_PROMISC; + return; + } + gottime = 0; pktlen = m_length(m, NULL); @@ -1651,8 +1662,7 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif) || - BPF_CHECK_DUPLICATE(d, m->m_pkthdr.rcvif)) + if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1675,7 +1685,6 @@ } #undef BPF_CHECK_DIRECTION -#undef BPF_CHECK_DUPLICATE /* * Move the packet data from interface memory (pkt) into the ==== //depot/projects/arp-v2/src/sys/net/if_tap.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tap.c,v 1.71 2007/03/19 18:17:31 bms Exp $ + * $FreeBSD: src/sys/net/if_tap.c,v 1.72 2008/04/15 16:54:39 emax Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -404,6 +404,7 @@ struct ifnet *ifp = NULL; struct tap_softc *tp = NULL; unsigned short macaddr_hi; + uint32_t macaddr_mid; int unit, s; char *name = NULL; u_char eaddr[6]; @@ -432,8 +433,9 @@ /* generate fake MAC address: 00 bd xx xx xx unit_no */ macaddr_hi = htons(0x00bd); + macaddr_mid = (uint32_t) ticks; bcopy(&macaddr_hi, eaddr, sizeof(short)); - bcopy(&ticks, &eaddr[2], sizeof(long)); + bcopy(&macaddr_mid, &eaddr[2], sizeof(uint32_t)); eaddr[5] = (u_char)unit; /* fill the rest and attach interface */ ==== //depot/projects/arp-v2/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 (text+ko) ==== @@ -28,12 +28,14 @@ * SUCH DAMAGE. * * $Id: ng_bluetooth.h,v 1.4 2003/04/26 22:32:34 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bluetooth.h,v 1.4 2005/01/07 01:45:43 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_bluetooth.h,v 1.5 2008/04/15 21:15:32 mav Exp $ */ #ifndef _NETGRAPH_BLUETOOTH_H_ #define _NETGRAPH_BLUETOOTH_H_ +#include + /* * Version of the stack */ @@ -147,8 +149,7 @@ struct ng_item; struct ng_bt_itemq { - struct ng_item *head; /* first item in the queue */ - struct ng_item *tail; /* last item in the queue */ + STAILQ_HEAD(, ng_item) queue; /* actually items queue */ u_int32_t len; /* number of items in the queue */ u_int32_t maxlen; /* maximal number of items in the queue */ u_int32_t drops; /* number if dropped items */ @@ -156,14 +157,20 @@ typedef struct ng_bt_itemq ng_bt_itemq_t; typedef struct ng_bt_itemq * ng_bt_itemq_p; -#define NG_BT_ITEMQ_INIT(q, _maxlen) NG_BT_MBUFQ_INIT((q), (_maxlen)) +#define NG_BT_ITEMQ_INIT(q, _maxlen) \ + do { \ + STAILQ_INIT(&(q)->queue); \ + (q)->len = 0; \ + (q)->maxlen = (_maxlen); \ + (q)->drops = 0; \ + } while (0) #define NG_BT_ITEMQ_DESTROY(q) \ do { \ NG_BT_ITEMQ_DRAIN((q)); \ } while (0) -#define NG_BT_ITEMQ_FIRST(q) NG_BT_MBUFQ_FIRST((q)) +#define NG_BT_ITEMQ_FIRST(q) STAILQ_FIRST(&(q)->queue) #define NG_BT_ITEMQ_LEN(q) NG_BT_MBUFQ_LEN((q)) @@ -173,37 +180,22 @@ #define NG_BT_ITEMQ_ENQUEUE(q, i) \ do { \ - (i)->el_next = NULL; \ - \ - if ((q)->tail == NULL) \ - (q)->head = (i); \ - else \ - (q)->tail->el_next = (i); \ - \ - (q)->tail = (i); \ + STAILQ_INSERT_TAIL(&(q)->queue, (i), el_next); \ (q)->len ++; \ } while (0) #define NG_BT_ITEMQ_DEQUEUE(q, i) \ do { \ - (i) = (q)->head; \ + (i) = STAILQ_FIRST(&(q)->queue); \ if ((i) != NULL) { \ - (q)->head = (q)->head->el_next; \ - if ((q)->head == NULL) \ - (q)->tail = NULL; \ - \ + STAILQ_REMOVE_HEAD(&(q)->queue, el_next); \ (q)->len --; \ - (i)->el_next = NULL; \ } \ } while (0) #define NG_BT_ITEMQ_PREPEND(q, i) \ do { \ - (i)->el_next = (q)->head; \ - if ((q)->tail == NULL) \ - (q)->tail = (i); \ - \ - (q)->head = (i); \ + STAILQ_INSERT_HEAD(&(q)->queue, (i), el_next); \ (q)->len ++; \ } while (0) ==== //depot/projects/arp-v2/src/sys/netgraph/netgraph.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.72 2008/03/11 21:58:48 mav Exp $ + * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.73 2008/04/15 21:15:31 mav Exp $ * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $ */ @@ -66,7 +66,7 @@ * Change it for NETGRAPH_DEBUG version so we cannot mix debug and non debug * modules. */ -#define _NG_ABI_VERSION 11 +#define _NG_ABI_VERSION 12 #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ #define NG_ABI_VERSION (_NG_ABI_VERSION + 0x10000) #else /* NETGRAPH_DEBUG */ /*----------------------------------------------*/ @@ -107,13 +107,13 @@ char hk_name[NG_HOOKSIZ]; /* what this node knows this link as */ void *hk_private; /* node dependant ID for this hook */ int hk_flags; /* info about this hook/link */ - int hk_refs; /* dont actually free this till 0 */ int hk_type; /* tbd: hook data link type */ struct ng_hook *hk_peer; /* the other end of this link */ struct ng_node *hk_node; /* The node this hook is attached to */ LIST_ENTRY(ng_hook) hk_hooks; /* linked list of all hooks on node */ ng_rcvmsg_t *hk_rcvmsg; /* control messages come here */ ng_rcvdata_t *hk_rcvdata; /* data comes here */ + int hk_refs; /* dont actually free this till 0 */ #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ #define HK_MAGIC 0x78573011 int hk_magic; @@ -331,26 +331,25 @@ * embedded in the node structure */ struct ng_queue { - u_long q_flags; + u_int q_flags; /* Current r/w/q lock flags */ + u_int q_flags2; /* Other queue flags */ struct mtx q_mtx; - item_p queue; - item_p *last; - struct ng_node *q_node; /* find the front of the node.. */ + STAILQ_ENTRY(ng_node) q_work; /* nodes with work to do */ + STAILQ_HEAD(, ng_item) queue; /* actually items queue */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 16 03:51:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D98F2106567B; Wed, 16 Apr 2008 03:51:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BFEB1065678 for ; Wed, 16 Apr 2008 03:51:27 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B9428FC1D for ; Wed, 16 Apr 2008 03:51:27 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3G3pRh2063774 for ; Wed, 16 Apr 2008 03:51:27 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3G3pRfE063772 for perforce@freebsd.org; Wed, 16 Apr 2008 03:51:27 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 16 Apr 2008 03:51:27 GMT Message-Id: <200804160351.m3G3pRfE063772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 140097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2008 03:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=140097 Change 140097 by thompsa@thompsa_burger on 2008/04/16 03:50:53 Add a test for the vap parent being a ndis interface and use the appropriate wpa_supplicant driver. Affected files ... .. //depot/projects/vap/etc/rc.d/wpa_supplicant#8 edit Differences ... ==== //depot/projects/vap/etc/rc.d/wpa_supplicant#8 (text+ko) ==== @@ -30,18 +30,21 @@ test "$media" = "Ethernet" } -case ${ifn} in -ndis*) +is_ndis_interface() +{ + case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in + ndis*) true ;; + *) false ;; + esac +} + +if is_wired_interface ${ifn} ; then + driver="wired" +elif is_ndis_interface ${ifn} ; then driver="ndis" - ;; -*) - if is_wired_interface ${ifn} ; then - driver="wired" - else - driver="bsd" - fi - ;; -esac +else + driver="bsd" +fi load_rc_config $name From owner-p4-projects@FreeBSD.ORG Wed Apr 16 04:21:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 877711065675; Wed, 16 Apr 2008 04:21:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49E8D106566B for ; Wed, 16 Apr 2008 04:21:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 397598FC13 for ; Wed, 16 Apr 2008 04:21:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3G4L0Dh065947 for ; Wed, 16 Apr 2008 04:21:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3G4L0VL065935 for perforce@freebsd.org; Wed, 16 Apr 2008 04:21:00 GMT (envelope-from sam@freebsd.org) Date: Wed, 16 Apr 2008 04:21:00 GMT Message-Id: <200804160421.m3G4L0VL065935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2008 04:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=140098 Change 140098 by sam@sam_ebb on 2008/04/16 04:20:41 unbreak now that I have a card to test with Affected files ... .. //depot/projects/vap/sys/dev/usb/if_rum.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_rum.c#15 (text+ko) ==== @@ -1088,7 +1088,7 @@ usbd_status error; int xferlen; - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; data->m = m0; data->ni = ni; desc = (struct rum_tx_desc *)data->buf; @@ -1178,7 +1178,7 @@ KASSERT(params != NULL, ("no raw xmit params")); - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; desc = (struct rum_tx_desc *)data->buf; rate = params->ibp_rate0 & IEEE80211_RATE_VAL; @@ -1304,7 +1304,7 @@ } } - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; desc = (struct rum_tx_desc *)data->buf; data->m = m0; From owner-p4-projects@FreeBSD.ORG Wed Apr 16 06:32:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49FBE1065672; Wed, 16 Apr 2008 06:32:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7AB41065670 for ; Wed, 16 Apr 2008 06:32:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4B268FC1A for ; Wed, 16 Apr 2008 06:32:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3G6WFFL082473 for ; Wed, 16 Apr 2008 06:32:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3G6WFg2082471 for perforce@freebsd.org; Wed, 16 Apr 2008 06:32:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Apr 2008 06:32:15 GMT Message-Id: <200804160632.m3G6WFg2082471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2008 06:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=140099 Change 140099 by jb@jb_freebsd1 on 2008/04/16 06:32:06 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/dtrace/ports/CHANGES#12 integrate .. //depot/projects/dtrace/ports/MOVED#76 integrate .. //depot/projects/dtrace/ports/Mk/bsd.commands.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#16 integrate .. //depot/projects/dtrace/ports/UPDATING#66 integrate .. //depot/projects/dtrace/src/Makefile.inc1#44 integrate .. //depot/projects/dtrace/src/etc/rc.d/dhclient#10 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/dtrace/src/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/dtrace/src/lib/libc/gen/termios.c#5 integrate .. //depot/projects/dtrace/src/lib/libfetch/common.c#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#16 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_rwlock.c#6 integrate .. //depot/projects/dtrace/src/sbin/dhclient/bpf.c#5 integrate .. //depot/projects/dtrace/src/sbin/restore/dirs.c#7 integrate .. //depot/projects/dtrace/src/share/man/man4/nfe.4#6 integrate .. //depot/projects/dtrace/src/sys/amd64/include/clock.h#9 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pcb_ext.h#4 delete .. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#28 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#33 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/fb/vga.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#20 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/include/clock.h#9 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#14 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#13 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/SKI#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#8 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#11 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#19 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/nexus.c#8 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/sapic.c#5 integrate .. //depot/projects/dtrace/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/dtrace/src/sys/isa/rtc.h#4 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#33 integrate .. //depot/projects/dtrace/src/sys/kern/tty.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/dtrace/src/sys/mips/include/ns16550.h#2 delete .. //depot/projects/dtrace/src/sys/mips/include/pcb_ext.h#2 delete .. //depot/projects/dtrace/src/sys/mips/mips/cache.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/mips/mips/mainbus.c#2 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#20 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#11 integrate .. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/dtrace/src/sys/sys/protosw.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/socket.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/ttycom.h#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ndiscvt/inf.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndiscvt.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndisgen.sh#4 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#9 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#15 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#29 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#31 integrate .. //depot/projects/dtrace/www/en/internet.sgml#6 integrate .. //depot/projects/dtrace/www/en/projects/projects.sgml#13 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.hardware.xml#7 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#11 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#19 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#2 (text+ko) ==== @@ -19,7 +19,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.1 2008/03/11 11:35:43 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.2 2008/04/14 13:08:18 jkois Exp $ &tm-attrib.freebsd; @@ -122,7 +122,7 @@ version of the application. You can use the PACKAGESITE variable to override this default behavior. For example, set PACKAGESITE to - + to download the most recent packages built for the 6.X series. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#2 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.1 2008/04/11 00:18:27 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.2 2008/04/15 18:33:21 remko Exp $ &tm-attrib.freebsd; @@ -336,7 +336,7 @@ &prompt.root; bsdlabel -wB /dev/ad0s1 &prompt.root; bsdlabel -wB /dev/ad1s1 &prompt.root; bsdlabel -e /dev/ad0s1 -&prompt.root; bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /tmp/bsdlabel.txt +&prompt.root; bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt &prompt.root; gmirror label root /dev/ad[01]s1a &prompt.root; gmirror label var /dev/ad[01]s1d &prompt.root; gmirror label usr /dev/ad[01]s1e ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 (text+ko) ==== @@ -1,7 +1,7 @@ Getting fake DISPLAY using Xvfb Some applications require a working X11 display for compilation to - succeed. This pose a problem for the FreeBSD package building - cluster, which operates headless. When the following canonical hack - is used, the package cluster will start the virtual framebuffer + succeed. This pose a problem for machines which operates headless. + When the following variable is used, the build infrastructure will + start the virtual framebuffer X server. The working DISPLAY is then passed to the build. ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -1348,7 +1348,7 @@ Ð¥ÑÑ€Ñв Ñмар нÑг юм буруутвал - Өөрчлөн тохируулÑан цөмийг бүтÑÑж байх үед 5 төрлийн аÑуудал гарч + Өөрчлөн тохируулÑан цөмийг бүтÑÑж байх үед 4 төрлийн аÑуудал гарч болзошгүй байдаг. ТÑдгÑÑÑ€ нь: ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#7 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -2327,9 +2327,9 @@ шүүлтүүр apsfilter - FreeBSD-н портын цуглуулга дотор apsfilter + FreeBSD-н портын цуглуулга дотор apsfilter (print/apsfilter) нÑртÑй автомат хувиргалт хийдÑг текÑÑ‚ шүүлтүүр бий. Ð­Ð½Ñ ÑˆÒ¯Ò¯Ð»Ñ‚Ò¯Ò¯Ñ€ нь - Ñнгийн текÑÑ‚, &postscript;, мөн DVI файлуудыг таньж Ñ‚ÑдÑнд + Ñнгийн текÑÑ‚, &postscript;, DVI болон бараг бүх л төрлийн файлуудыг таньж Ñ‚ÑдÑнд тохирÑон шүүлтүүрийг нь автоматаар ажиллуулдаг. @@ -2553,8 +2553,8 @@ Толгой хуудаÑнуудыг идÑвхжүүлÑнÑÑÑ€ LPD нь Ñ…ÑÑ€ÑглÑгч, хоÑÑ‚, болон ажлыг таниулах том Ò¯ÑгүүдтÑй урт - толгой бүхий хуудÑыг Ò¯Ò¯ÑгÑÑ… болно. Энд жишÑÑ Ð±Ð°Ð¹Ð½Ð° (kelly нь - outline гÑÑÑн нÑртÑй ажлыг rose-Ñ Ñ…ÑвлÑжÑÑ): + толгой бүхий хуудÑыг Ò¯Ò¯ÑгÑÑ… болно. Энд жишÑÑ Ð±Ð°Ð¹Ð½Ð° (kelly нь + outline гÑÑÑн нÑртÑй ажлыг rose-Ñ Ñ…ÑвлÑжÑÑ): k ll ll k l l @@ -3069,11 +3069,11 @@ Одоо orchid дÑÑрх Ñ…ÑÑ€ÑглÑгчид rattan болон bamboo Ñ…ÑвлÑгчдийг Ñ…ÑÑ€ÑглÑж чадна. ЖишÑÑ Ð½ÑŒ orchid дÑÑрх Ñ…ÑÑ€ÑглÑгч - дараах тушаал өгвөл + дараах тушаал өгвөл: &prompt.user; lpr -P bamboo -d sushi-review.dvi - orchid дÑÑрх LPD + orchid дÑÑрх LPD ÑиÑтем Ñ…ÑвлÑÑ… ажлуудыг /var/spool/lpd/bamboo гÑÑÑн түр хадгалагч руу хуулна. Ð­Ð½Ñ Ñ…ÑвлÑгдÑÑ… ажил нь DVI файл байÑныг та анзаарна уу. rose машинд ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ - + The BTX kernel used by the boot + loader has been changed to invoke BIOS routines from real + mode. This change makes it possible to boot &os; from USB + devices. @@ -196,7 +199,9 @@ Contributed Software - + The timezone database has been updated from + the tzdata2007k release to + the tzdata2008b release. @@ -210,7 +215,11 @@ Release Engineering and Integration - + The supported version of + the GNOME desktop environment + (x11/gnome2) has been + updated from 2.20.1 to 2.22. + ==== //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4.2.7 2008/03/12 17:29:42 brooks Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4.2.8 2008/04/11 00:18:37 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -20,10 +20,8 @@ # ARP=/usr/sbin/arp -AWK=/usr/bin/awk HOSTNAME=/bin/hostname IFCONFIG='/sbin/ifconfig -n' -NETSTAT=/usr/bin/netstat LOCALHOST=127.0.0.1 @@ -124,11 +122,12 @@ return 0; fi - for router in $old_routers; do - if [ $if_defaultroute = x -o $if_defaultroute = $interface ]; then - route delete default $route >/dev/null 2>&1 - fi - done + # If we supported multiple default routes, we'd be removing each + # one here. We don't so just delete the default route if it's + # through our interface. + if is_default_interface; then + route delete default >/dev/null 2>&1 + fi if [ -n "$old_static_routes" ]; then set $old_static_routes @@ -169,10 +168,13 @@ fi for router in $new_routers; do - if [ "$new_ip_address" = "$router" ]; then - route add default -iface $router >/dev/null 2>&1 - else - route add default $router >/dev/null 2>&1 + if is_default_interface; then + + if [ "$new_ip_address" = "$router" ]; then + route add default -iface $router >/dev/null 2>&1 + else + route add default $router >/dev/null 2>&1 + fi fi # 2nd and subsequent default routers error out, so explicitly # stop processing the list after the first one. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 16 22:45:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACEF1065674; Wed, 16 Apr 2008 22:45:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6ADBE106566B for ; Wed, 16 Apr 2008 22:45:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 573FA8FC15 for ; Wed, 16 Apr 2008 22:45:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3GMjVbX086106 for ; Wed, 16 Apr 2008 22:45:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3GMjTg4086102 for perforce@freebsd.org; Wed, 16 Apr 2008 22:45:29 GMT (envelope-from marcel@freebsd.org) Date: Wed, 16 Apr 2008 22:45:29 GMT Message-Id: <200804162245.m3GMjTg4086102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2008 22:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=140134 Change 140134 by marcel@marcel_xcllnt on 2008/04/16 22:45:15 IFC @140133 Affected files ... .. //depot/projects/powerpc/Makefile#8 integrate .. //depot/projects/powerpc/Makefile.inc1#14 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#19 integrate .. //depot/projects/powerpc/UPDATING#18 integrate .. //depot/projects/powerpc/bin/ls/ls.1#2 integrate .. //depot/projects/powerpc/bin/ls/ls.c#2 integrate .. //depot/projects/powerpc/bin/ls/ls.h#2 integrate .. //depot/projects/powerpc/bin/ls/print.c#2 integrate .. //depot/projects/powerpc/bin/ls/util.c#2 integrate .. //depot/projects/powerpc/cddl/lib/Makefile#5 integrate .. //depot/projects/powerpc/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/powerpc/contrib/netcat/nc.1#3 integrate .. //depot/projects/powerpc/contrib/netcat/netcat.c#4 integrate .. //depot/projects/powerpc/contrib/top/machine.h#5 integrate .. //depot/projects/powerpc/etc/defaults/rc.conf#12 integrate .. //depot/projects/powerpc/etc/rc.d/Makefile#7 integrate .. //depot/projects/powerpc/etc/rc.d/dhclient#6 integrate .. //depot/projects/powerpc/etc/rc.d/ppp#6 integrate .. //depot/projects/powerpc/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/powerpc/etc/rc.d/wpa_supplicant#2 integrate .. //depot/projects/powerpc/etc/rc.d/zfs#5 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/powerpc/include/complex.h#4 integrate .. //depot/projects/powerpc/include/dirent.h#3 integrate .. //depot/projects/powerpc/include/stdio.h#4 integrate .. //depot/projects/powerpc/include/string.h#2 integrate .. //depot/projects/powerpc/include/unistd.h#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/powerpc/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/powerpc/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/powerpc/lib/libc/gen/directory.3#3 integrate .. //depot/projects/powerpc/lib/libc/gen/err.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/modf.3#3 integrate .. //depot/projects/powerpc/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/powerpc/lib/libc/gen/termios.c#3 integrate .. //depot/projects/powerpc/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/powerpc/lib/libc/include/namespace.h#4 integrate .. //depot/projects/powerpc/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/powerpc/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/powerpc/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/powerpc/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/powerpc/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/powerpc/lib/libc/string/memchr.3#3 integrate .. //depot/projects/powerpc/lib/libc/string/memrchr.c#1 branch .. //depot/projects/powerpc/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/powerpc/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/powerpc/lib/libc/sys/access.2#6 integrate .. //depot/projects/powerpc/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/powerpc/lib/libc/sys/chmod.2#4 integrate .. //depot/projects/powerpc/lib/libc/sys/chown.2#4 integrate .. //depot/projects/powerpc/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/powerpc/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/powerpc/lib/libc/sys/execve.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/powerpc/lib/libc/sys/link.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/mkdir.2#5 integrate .. //depot/projects/powerpc/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/powerpc/lib/libc/sys/mknod.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/open.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/readlink.2#5 integrate .. //depot/projects/powerpc/lib/libc/sys/rename.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/stat.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/symlink.2#5 integrate .. //depot/projects/powerpc/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/powerpc/lib/libc/xdr/xdr_rec.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/common.c#6 integrate .. //depot/projects/powerpc/lib/libstand/nfs.c#2 integrate .. //depot/projects/powerpc/lib/libthr/Makefile#10 integrate .. //depot/projects/powerpc/lib/libthr/arch/amd64/Makefile.inc#3 integrate .. //depot/projects/powerpc/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/powerpc/lib/libthr/arch/amd64/include/pthread_md.h#3 integrate .. //depot/projects/powerpc/lib/libthr/arch/i386/Makefile.inc#3 integrate .. //depot/projects/powerpc/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/powerpc/lib/libthr/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_rwlock.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/powerpc/lib/msun/Makefile#10 integrate .. //depot/projects/powerpc/lib/msun/Symbol.map#10 integrate .. //depot/projects/powerpc/lib/msun/amd64/Makefile.inc#6 integrate .. //depot/projects/powerpc/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/powerpc/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/powerpc/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/powerpc/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/powerpc/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/powerpc/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/powerpc/lib/msun/man/hypot.3#4 integrate .. //depot/projects/powerpc/lib/msun/man/remainder.3#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_hypot.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_hypotf.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/e_log.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/e_logf.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_remainder.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/math.h#7 integrate .. //depot/projects/powerpc/lib/msun/src/s_csqrt.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_expm1.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_expm1f.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_log1pf.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/powerpc/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/powerpc/lib/msun/src/w_cabs.c#4 integrate .. //depot/projects/powerpc/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/powerpc/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/powerpc/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#18 integrate .. //depot/projects/powerpc/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/powerpc/rescue/rescue/Makefile#7 integrate .. //depot/projects/powerpc/sbin/ddb/ddb.8#3 integrate .. //depot/projects/powerpc/sbin/ddb/ddb.c#3 integrate .. //depot/projects/powerpc/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/powerpc/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/powerpc/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/powerpc/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/powerpc/sbin/ggate/Makefile#3 integrate .. //depot/projects/powerpc/sbin/gpt/gpt.c#4 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/powerpc/sbin/restore/dirs.c#3 integrate .. //depot/projects/powerpc/sbin/restore/interactive.c#2 integrate .. //depot/projects/powerpc/sbin/restore/tape.c#3 integrate .. //depot/projects/powerpc/sbin/route/route.c#4 integrate .. //depot/projects/powerpc/share/man/man3/Makefile#4 integrate .. //depot/projects/powerpc/share/man/man4/Makefile#20 integrate .. //depot/projects/powerpc/share/man/man4/asmc.4#2 integrate .. //depot/projects/powerpc/share/man/man4/bpf.4#4 integrate .. //depot/projects/powerpc/share/man/man4/ddb.4#5 integrate .. //depot/projects/powerpc/share/man/man4/k8temp.4#1 branch .. //depot/projects/powerpc/share/man/man4/nfe.4#6 integrate .. //depot/projects/powerpc/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/powerpc/share/man/man4/psm.4#2 integrate .. //depot/projects/powerpc/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/powerpc/share/man/man5/src.conf.5#11 integrate .. //depot/projects/powerpc/share/man/man8/rc.subr.8#5 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#15 integrate .. //depot/projects/powerpc/share/man/man9/lock.9#10 integrate .. //depot/projects/powerpc/share/man/man9/rwlock.9#5 integrate .. //depot/projects/powerpc/share/man/man9/sleep.9#3 integrate .. //depot/projects/powerpc/share/mk/bsd.lib.mk#6 integrate .. //depot/projects/powerpc/share/mk/bsd.own.mk#11 integrate .. //depot/projects/powerpc/share/mk/sys.mk#7 integrate .. //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#10 integrate .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/powerpc/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/powerpc/sys/amd64/include/clock.h#5 integrate .. //depot/projects/powerpc/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/powerpc/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/powerpc/sys/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/powerpc/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/powerpc/sys/arm/arm/exception.S#2 integrate .. //depot/projects/powerpc/sys/arm/arm/intr.c#8 integrate .. //depot/projects/powerpc/sys/arm/arm/locore.S#6 integrate .. //depot/projects/powerpc/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/powerpc/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/powerpc/sys/arm/include/machdep.h#2 integrate .. //depot/projects/powerpc/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/powerpc/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/powerpc/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/powerpc/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/powerpc/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/powerpc/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/powerpc/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/powerpc/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/powerpc/sys/conf/Makefile.arm#5 integrate .. //depot/projects/powerpc/sys/conf/Makefile.mips#1 branch .. //depot/projects/powerpc/sys/conf/NOTES#24 integrate .. //depot/projects/powerpc/sys/conf/files#28 integrate .. //depot/projects/powerpc/sys/conf/files.amd64#11 integrate .. //depot/projects/powerpc/sys/conf/files.i386#15 integrate .. //depot/projects/powerpc/sys/conf/files.mips#1 branch .. //depot/projects/powerpc/sys/conf/files.pc98#11 integrate .. //depot/projects/powerpc/sys/conf/ldscript.mips#1 branch .. //depot/projects/powerpc/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/powerpc/sys/conf/options#26 integrate .. //depot/projects/powerpc/sys/conf/options.mips#1 branch .. //depot/projects/powerpc/sys/dev/aac/aac.c#13 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_disk.c#6 integrate .. //depot/projects/powerpc/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/powerpc/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/powerpc/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/powerpc/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/powerpc/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.h#7 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/powerpc/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-cd.h#7 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/powerpc/sys/dev/ata/atapi-tape.h#6 integrate .. //depot/projects/powerpc/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/powerpc/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/powerpc/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/powerpc/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/powerpc/sys/dev/de/if_de.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/powerpc/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/powerpc/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/powerpc/sys/dev/em/if_em.c#10 integrate .. //depot/projects/powerpc/sys/dev/em/if_em.h#7 integrate .. //depot/projects/powerpc/sys/dev/fb/vga.c#6 integrate .. //depot/projects/powerpc/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/powerpc/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/powerpc/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/powerpc/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/powerpc/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/powerpc/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/powerpc/sys/dev/mfi/mfi.c#12 integrate .. //depot/projects/powerpc/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/powerpc/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/powerpc/sys/dev/mii/miidevs#13 integrate .. //depot/projects/powerpc/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/powerpc/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/powerpc/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/powerpc/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/powerpc/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/powerpc/sys/dev/ral/rt2661.c#7 integrate .. //depot/projects/powerpc/sys/dev/re/if_re.c#14 integrate .. //depot/projects/powerpc/sys/dev/sound/midi/mpu401.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/powerpc/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/powerpc/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/powerpc/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/powerpc/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/powerpc/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/powerpc/sys/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/powerpc/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/denode.h#8 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/powerpc/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_subr.c#8 integrate .. //depot/projects/powerpc/sys/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_node.h#4 integrate .. //depot/projects/powerpc/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/powerpc/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/powerpc/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/powerpc/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/powerpc/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/powerpc/sys/geom/part/g_part.c#7 integrate .. //depot/projects/powerpc/sys/geom/part/g_part.h#7 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/powerpc/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/powerpc/sys/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/powerpc/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/powerpc/sys/i386/conf/GENERIC.hints#6 integrate .. //depot/projects/powerpc/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/powerpc/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/powerpc/sys/i386/ibcs2/ibcs2_util.c#5 integrate .. //depot/projects/powerpc/sys/i386/include/clock.h#8 integrate .. //depot/projects/powerpc/sys/i386/isa/clock.c#12 integrate .. //depot/projects/powerpc/sys/i386/linux/linux.h#9 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_syscall.h#10 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/powerpc/sys/i386/linux/syscalls.master#10 integrate .. //depot/projects/powerpc/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/powerpc/sys/ia64/conf/GENERIC#13 integrate .. //depot/projects/powerpc/sys/ia64/conf/SKI#4 integrate .. //depot/projects/powerpc/sys/ia64/ia64/clock.c#6 integrate .. //depot/projects/powerpc/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/powerpc/sys/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/powerpc/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/powerpc/sys/ia64/ia64/nexus.c#7 integrate .. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/powerpc/sys/ia64/ia64/sapic.c#5 integrate .. //depot/projects/powerpc/sys/ia64/ia64/sscdisk.c#6 integrate .. //depot/projects/powerpc/sys/ia64/include/md_var.h#7 integrate .. //depot/projects/powerpc/sys/isa/atrtc.c#1 branch .. //depot/projects/powerpc/sys/isa/rtc.h#4 integrate .. //depot/projects/powerpc/sys/kern/init_sysent.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_clock.c#15 integrate .. //depot/projects/powerpc/sys/kern/kern_conf.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/powerpc/sys/kern/kern_event.c#12 integrate .. //depot/projects/powerpc/sys/kern/kern_exec.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#16 integrate .. //depot/projects/powerpc/sys/kern/kern_jail.c#12 integrate .. //depot/projects/powerpc/sys/kern/kern_lock.c#12 integrate .. //depot/projects/powerpc/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/powerpc/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/powerpc/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/powerpc/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/powerpc/sys/kern/sched_ule.c#18 integrate .. //depot/projects/powerpc/sys/kern/subr_clock.c#4 integrate .. //depot/projects/powerpc/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/powerpc/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#21 integrate .. //depot/projects/powerpc/sys/kern/syscalls.c#13 integrate .. //depot/projects/powerpc/sys/kern/syscalls.master#14 integrate .. //depot/projects/powerpc/sys/kern/systrace_args.c#10 integrate .. //depot/projects/powerpc/sys/kern/tty.c#10 integrate .. //depot/projects/powerpc/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/powerpc/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/powerpc/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/powerpc/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/powerpc/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/powerpc/sys/kern/vfs_default.c#12 integrate .. //depot/projects/powerpc/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/powerpc/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/powerpc/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/powerpc/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/powerpc/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/powerpc/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/powerpc/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/powerpc/sys/mips/conf/ADM5120#1 branch .. //depot/projects/powerpc/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/powerpc/sys/mips/conf/IDT#1 branch .. //depot/projects/powerpc/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/powerpc/sys/mips/conf/MALTA#1 branch .. //depot/projects/powerpc/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/powerpc/sys/mips/conf/QEMU#1 branch .. //depot/projects/powerpc/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/powerpc/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/powerpc/sys/mips/include/_bus.h#1 branch .. //depot/projects/powerpc/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/powerpc/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/powerpc/sys/mips/include/_limits.h#1 branch .. //depot/projects/powerpc/sys/mips/include/_stdint.h#1 branch .. //depot/projects/powerpc/sys/mips/include/_types.h#1 branch .. //depot/projects/powerpc/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/powerpc/sys/mips/include/archtype.h#1 branch .. //depot/projects/powerpc/sys/mips/include/asm.h#1 branch .. //depot/projects/powerpc/sys/mips/include/asmacros.h#1 branch .. //depot/projects/powerpc/sys/mips/include/atomic.h#1 branch .. //depot/projects/powerpc/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/powerpc/sys/mips/include/bswap.h#1 branch .. //depot/projects/powerpc/sys/mips/include/bus.h#1 branch .. //depot/projects/powerpc/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/powerpc/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cache.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/powerpc/sys/mips/include/clock.h#1 branch .. //depot/projects/powerpc/sys/mips/include/clockvar.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cp0.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cpu.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/powerpc/sys/mips/include/cputypes.h#1 branch .. //depot/projects/powerpc/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/powerpc/sys/mips/include/defs.h#1 branch .. //depot/projects/powerpc/sys/mips/include/elf.h#1 branch .. //depot/projects/powerpc/sys/mips/include/endian.h#1 branch .. //depot/projects/powerpc/sys/mips/include/exec.h#1 branch .. //depot/projects/powerpc/sys/mips/include/float.h#1 branch .. //depot/projects/powerpc/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/powerpc/sys/mips/include/fpu.h#1 branch .. //depot/projects/powerpc/sys/mips/include/frame.h#1 branch .. //depot/projects/powerpc/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/powerpc/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/powerpc/sys/mips/include/ieee.h#1 branch .. //depot/projects/powerpc/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/powerpc/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/powerpc/sys/mips/include/intr.h#1 branch .. //depot/projects/powerpc/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/powerpc/sys/mips/include/iodev.h#1 branch .. //depot/projects/powerpc/sys/mips/include/kdb.h#1 branch .. //depot/projects/powerpc/sys/mips/include/limits.h#1 branch .. //depot/projects/powerpc/sys/mips/include/locore.h#1 branch .. //depot/projects/powerpc/sys/mips/include/md_var.h#1 branch .. //depot/projects/powerpc/sys/mips/include/memdev.h#1 branch .. //depot/projects/powerpc/sys/mips/include/metadata.h#1 branch .. //depot/projects/powerpc/sys/mips/include/minidump.h#1 branch .. //depot/projects/powerpc/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/powerpc/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/powerpc/sys/mips/include/mutex.h#1 branch .. //depot/projects/powerpc/sys/mips/include/param.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pcb.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pcpu.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pltfm.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pmap.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/powerpc/sys/mips/include/ppireg.h#1 branch .. //depot/projects/powerpc/sys/mips/include/proc.h#1 branch .. //depot/projects/powerpc/sys/mips/include/profile.h#1 branch .. //depot/projects/powerpc/sys/mips/include/psl.h#1 branch .. //depot/projects/powerpc/sys/mips/include/pte.h#1 branch .. //depot/projects/powerpc/sys/mips/include/ptrace.h#1 branch .. //depot/projects/powerpc/sys/mips/include/queue.h#1 branch .. //depot/projects/powerpc/sys/mips/include/reg.h#1 branch .. //depot/projects/powerpc/sys/mips/include/regdef.h#1 branch .. //depot/projects/powerpc/sys/mips/include/regnum.h#1 branch .. //depot/projects/powerpc/sys/mips/include/reloc.h#1 branch .. //depot/projects/powerpc/sys/mips/include/resource.h#1 branch .. //depot/projects/powerpc/sys/mips/include/rm7000.h#1 branch .. //depot/projects/powerpc/sys/mips/include/runq.h#1 branch .. //depot/projects/powerpc/sys/mips/include/segments.h#1 branch .. //depot/projects/powerpc/sys/mips/include/setjmp.h#1 branch .. //depot/projects/powerpc/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/powerpc/sys/mips/include/sigframe.h#1 branch .. //depot/projects/powerpc/sys/mips/include/signal.h#1 branch .. //depot/projects/powerpc/sys/mips/include/smp.h#1 branch .. //depot/projects/powerpc/sys/mips/include/stdarg.h#1 branch .. //depot/projects/powerpc/sys/mips/include/sysarch.h#1 branch .. //depot/projects/powerpc/sys/mips/include/timerreg.h#1 branch .. //depot/projects/powerpc/sys/mips/include/trap.h#1 branch .. //depot/projects/powerpc/sys/mips/include/ucontext.h#1 branch .. //depot/projects/powerpc/sys/mips/include/varargs.h#1 branch .. //depot/projects/powerpc/sys/mips/include/vmparam.h#1 branch .. //depot/projects/powerpc/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/cache.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/copystr.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/cpu.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/exception.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/fp.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/genassym.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/locore.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/mem.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/nexus.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/pmap.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/support.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/swtch.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/tick.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/tlb.S#1 branch .. //depot/projects/powerpc/sys/mips/mips/trap.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/powerpc/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/powerpc/sys/modules/Makefile#20 integrate .. //depot/projects/powerpc/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/powerpc/sys/modules/em/Makefile#6 integrate .. //depot/projects/powerpc/sys/modules/igb/Makefile#3 integrate .. //depot/projects/powerpc/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/powerpc/sys/modules/zfs/Makefile#9 integrate .. //depot/projects/powerpc/sys/net/bpf.c#14 integrate .. //depot/projects/powerpc/sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/powerpc/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/powerpc/sys/net/if_loop.c#8 integrate .. //depot/projects/powerpc/sys/net/if_tap.c#7 integrate .. //depot/projects/powerpc/sys/net/radix.c#4 integrate .. //depot/projects/powerpc/sys/net/radix.h#4 integrate .. //depot/projects/powerpc/sys/net/radix_mpath.c#1 branch .. //depot/projects/powerpc/sys/net/radix_mpath.h#1 branch .. //depot/projects/powerpc/sys/net/route.c#12 integrate .. //depot/projects/powerpc/sys/net/route.h#8 integrate .. //depot/projects/powerpc/sys/net/rtsock.c#8 integrate .. //depot/projects/powerpc/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/powerpc/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/powerpc/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/powerpc/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/powerpc/sys/netgraph/ng_car.c#5 integrate .. //depot/projects/powerpc/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/powerpc/sys/netinet/in_proto.c#8 integrate .. //depot/projects/powerpc/sys/netinet/ip_input.c#12 integrate .. //depot/projects/powerpc/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/powerpc/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/powerpc/sys/netinet/ip_output.c#12 integrate .. //depot/projects/powerpc/sys/netinet/sctp_asconf.c#12 integrate .. //depot/projects/powerpc/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/powerpc/sys/netinet/sctp_bsd_addr.h#7 integrate .. //depot/projects/powerpc/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/powerpc/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/powerpc/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/powerpc/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/powerpc/sys/netinet/sctp_pcb.h#12 integrate .. //depot/projects/powerpc/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/powerpc/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/powerpc/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.c#17 integrate .. //depot/projects/powerpc/sys/netinet/sctputil.h#12 integrate .. //depot/projects/powerpc/sys/netinet/tcp.h#10 integrate .. //depot/projects/powerpc/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/powerpc/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/powerpc/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#12 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#15 integrate .. //depot/projects/powerpc/sys/netncp/ncp_conn.c#9 integrate .. //depot/projects/powerpc/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/powerpc/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/powerpc/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/powerpc/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/powerpc/sys/pc98/cbus/clock.c#7 integrate .. //depot/projects/powerpc/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/powerpc/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/powerpc/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/powerpc/sys/pci/if_rl.c#10 integrate .. //depot/projects/powerpc/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/powerpc/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/powerpc/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/include/asm.h#4 integrate .. //depot/projects/powerpc/sys/powerpc/include/atomic.h#7 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/powerpc/sys/powerpc/psim/openpic_iobus.c#6 integrate .. //depot/projects/powerpc/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/powerpc/sys/security/audit/audit.c#12 integrate .. //depot/projects/powerpc/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/powerpc/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/powerpc/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/powerpc/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/powerpc/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/powerpc/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/powerpc/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/powerpc/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/powerpc/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/powerpc/sys/security/mac/mac_syscalls.c#6 integrate .. //depot/projects/powerpc/sys/sparc64/include/intr_machdep.h#8 integrate .. //depot/projects/powerpc/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/intr_machdep.c#7 integrate .. //depot/projects/powerpc/sys/sys/_lockmgr.h#1 branch .. //depot/projects/powerpc/sys/sys/_stack.h#1 branch .. //depot/projects/powerpc/sys/sys/ata.h#10 integrate .. //depot/projects/powerpc/sys/sys/callout.h#8 integrate .. //depot/projects/powerpc/sys/sys/cpuset.h#5 integrate .. //depot/projects/powerpc/sys/sys/eventhandler.h#10 integrate .. //depot/projects/powerpc/sys/sys/fcntl.h#7 integrate .. //depot/projects/powerpc/sys/sys/imgact.h#4 integrate .. //depot/projects/powerpc/sys/sys/interrupt.h#11 integrate .. //depot/projects/powerpc/sys/sys/jail.h#6 integrate .. //depot/projects/powerpc/sys/sys/kernel.h#10 integrate .. //depot/projects/powerpc/sys/sys/lock.h#11 integrate .. //depot/projects/powerpc/sys/sys/lockf.h#6 integrate .. //depot/projects/powerpc/sys/sys/lockmgr.h#12 integrate .. //depot/projects/powerpc/sys/sys/namei.h#5 integrate .. //depot/projects/powerpc/sys/sys/param.h#19 integrate .. //depot/projects/powerpc/sys/sys/proc.h#23 integrate .. //depot/projects/powerpc/sys/sys/protosw.h#5 integrate .. //depot/projects/powerpc/sys/sys/rwlock.h#8 integrate .. //depot/projects/powerpc/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/powerpc/sys/sys/socket.h#10 integrate .. //depot/projects/powerpc/sys/sys/stack.h#3 integrate .. //depot/projects/powerpc/sys/sys/stat.h#5 integrate .. //depot/projects/powerpc/sys/sys/syscall.h#13 integrate .. //depot/projects/powerpc/sys/sys/syscall.mk#13 integrate .. //depot/projects/powerpc/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/powerpc/sys/sys/sysproto.h#13 integrate .. //depot/projects/powerpc/sys/sys/time.h#7 integrate .. //depot/projects/powerpc/sys/sys/ttycom.h#4 integrate .. //depot/projects/powerpc/sys/sys/umtx.h#5 integrate .. //depot/projects/powerpc/sys/sys/vnode.h#16 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/powerpc/sys/ufs/ufs/dirhash.h#4 integrate .. //depot/projects/powerpc/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/powerpc/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/powerpc/sys/vm/uma.h#5 integrate .. //depot/projects/powerpc/sys/vm/uma_core.c#8 integrate .. //depot/projects/powerpc/sys/vm/vm_kern.c#9 integrate .. //depot/projects/powerpc/sys/vm/vm_map.c#12 integrate .. //depot/projects/powerpc/sys/vm/vm_object.c#16 integrate .. //depot/projects/powerpc/sys/vm/vm_page.c#18 integrate .. //depot/projects/powerpc/sys/vm/vm_phys.c#5 integrate .. //depot/projects/powerpc/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/powerpc/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/powerpc/tools/build/mk/OptionalObsoleteFiles.inc#10 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_LIBKSE#2 delete .. //depot/projects/powerpc/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/Makefile#5 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/test-csqrt.c#2 integrate .. //depot/projects/powerpc/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/powerpc/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/powerpc/tools/regression/lib/msun/test-rem.c#3 integrate .. //depot/projects/powerpc/tools/tools/README#5 integrate .. //depot/projects/powerpc/tools/tools/mctest/Makefile#1 branch .. //depot/projects/powerpc/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/powerpc/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/powerpc/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/powerpc/usr.bin/Makefile#10 integrate .. //depot/projects/powerpc/usr.bin/cpuset/cpuset.c#4 integrate .. //depot/projects/powerpc/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/powerpc/usr.bin/gprof/gprof.h#2 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.1#3 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.c#10 integrate .. //depot/projects/powerpc/usr.bin/ktrace/ktrace.1#3 integrate .. //depot/projects/powerpc/usr.bin/ktrace/ktrace.c#4 integrate .. //depot/projects/powerpc/usr.bin/netstat/sctp.c#5 integrate .. //depot/projects/powerpc/usr.bin/top/machine.c#7 integrate .. //depot/projects/powerpc/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/powerpc/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/powerpc/usr.sbin/Makefile#10 integrate .. //depot/projects/powerpc/usr.sbin/amd/amd/Makefile#3 integrate .. //depot/projects/powerpc/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/powerpc/usr.sbin/clear_locks/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/config/main.c#5 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_reader/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ndiscvt/ndiscvt.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ndiscvt/ndisgen.sh#2 integrate .. //depot/projects/powerpc/usr.sbin/ngctl/Makefile#4 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/delete/perform.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/lib/match.c#3 integrate .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/Makefile#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/README#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/check.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/common.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/extern.h#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/gzip.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/gzip.h#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/main.c#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/pgp.h#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/pgp_check.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/pgp_sign.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/pkg_sign.1#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/sha1.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/sign.c#2 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/stand.c#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/stand.h#3 delete .. //depot/projects/powerpc/usr.sbin/pkg_install/sign/x509.c#2 delete .. //depot/projects/powerpc/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/powerpc/usr.sbin/rpc.statd/statd.c#5 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/powerpc/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/powerpc/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.346 2008/03/25 15:47:22 ru Exp $ +# $FreeBSD: src/Makefile,v 1.347 2008/03/31 13:32:55 pav Exp $ # # The user-driven targets are: # @@ -36,7 +36,7 @@ # The user-driven targets (as listed above) are implemented in Makefile.inc1. # # If you want to build your system from source be sure that /usr/obj has -# at least 400MB of diskspace available. +# at least 800MB of diskspace available. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: ==== //depot/projects/powerpc/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,10 +963,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif @@ -1039,18 +1041,14 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_default_thread_lib} \ + lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" -_default_thread_lib= lib/${DEFAULT_THREAD_LIB} -.elif ${MK_LIBTHR} != "no" -_default_thread_lib= lib/libthr -.elif ${MK_LIBKSE} != "no" -_default_thread_lib= lib/libkse +.if ${MK_LIBTHR} != "no" +_lib_libthr= lib/libthr .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/powerpc/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080331: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal @@ -30,7 +35,6 @@ # 20071201: Removal of XRPU driver OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default -.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a @@ -39,7 +43,6 @@ OLD_FILES+=usr/lib32/libkse_p.a OLD_FILES+=usr/lib32/libkse_pic.a .endif -.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071125: Renamed to pmc_get_msr() ==== //depot/projects/powerpc/UPDATING#18 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/powerpc/bin/ls/ls.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 17 00:46:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1947C1065688; Thu, 17 Apr 2008 00:46:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF1A01065679 for ; Thu, 17 Apr 2008 00:46:42 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB5B38FC2B for ; Thu, 17 Apr 2008 00:46:42 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H0kg7K093256 for ; Thu, 17 Apr 2008 00:46:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H0kgpF093254 for perforce@freebsd.org; Thu, 17 Apr 2008 00:46:42 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 00:46:42 GMT Message-Id: <200804170046.m3H0kgpF093254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 00:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=140141 Change 140141 by marcel@marcel_xcllnt on 2008/04/17 00:45:44 IFC @140140 Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/locore.S#8 integrate .. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#3 integrate Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/locore.S#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/aim/locore.S,v 1.25 2008/03/07 22:27:05 marcel Exp $ */ +/* $FreeBSD: src/sys/powerpc/aim/locore.S,v 1.26 2008/04/16 23:28:11 marcel Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /*- @@ -183,6 +183,9 @@ mr 7,21 bl powerpc_init + mr %r1, %r3 + li %r3, 0 + stw %r3, 0(%r1) bl mi_startup b OF_exit ==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#3 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea.c,v 1.117 2007/12/14 22:39:34 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/mmu_oea.c,v 1.119 2008/04/17 00:37:40 marcel Exp $"); /* * Manages physical address maps. @@ -262,12 +262,6 @@ SYSCTL_INT(_machdep, OID_AUTO, moea_pte_spills, CTLFLAG_RD, &moea_pte_spills, 0, ""); -struct pvo_entry *moea_pvo_zeropage; -struct mtx moea_pvo_zeropage_mtx; - -vm_offset_t moea_rkva_start = VM_MIN_KERNEL_ADDRESS; -u_int moea_rkva_count = 4; - /* * Allocate physical memory for use in moea_bootstrap. */ @@ -292,10 +286,6 @@ */ static void moea_enter_locked(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); -static struct pvo_entry *moea_rkva_alloc(mmu_t); -static void moea_pa_map(struct pvo_entry *, vm_offset_t, - struct pte *, int *); -static void moea_pa_unmap(struct pvo_entry *, struct pte *, int *); static void moea_syncicache(vm_offset_t, vm_size_t); static boolean_t moea_query_bit(vm_page_t, int); static u_int moea_clear_bit(vm_page_t, int, int *); @@ -674,7 +664,7 @@ int sz; int i, j; int ofw_mappings; - uint32_t trace; + uint32_t trace[2]; vm_size_t size, physsz, hwphyssz; vm_offset_t pa, va, off; @@ -719,12 +709,6 @@ __asm __volatile("mtdbatl 1,%0" :: "r"(battable[8].batl)); isync(); - /* - * Set the start and end of kva. - */ - virtual_avail = VM_MIN_KERNEL_ADDRESS; - virtual_end = VM_MAX_KERNEL_ADDRESS; - mem_regions(&pregions, &pregions_sz, ®ions, ®ions_sz); CTR0(KTR_PMAP, "moea_bootstrap: physical memory"); @@ -824,11 +808,6 @@ MTX_RECURSE); /* - * Allocate the message buffer. - */ - msgbuf_phys = moea_bootstrap_alloc(MSGBUF_SIZE, 0); - - /* * Initialise the unmanaged pvo pool. */ moea_bpvo_pool = (struct pvo_entry *)moea_bootstrap_alloc( @@ -895,9 +874,13 @@ ofw_mappings++; } } -#ifdef SMP - TLBSYNC(); -#endif + + /* + * Calculate the last available physical address. + */ + for (i = 0; phys_avail[i + 2] != 0; i += 2) + ; + Maxmem = powerpc_btop(phys_avail[i + 1]); /* * Initialize the kernel pmap (which is statically allocated). @@ -910,39 +893,69 @@ kernel_pmap->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT; kernel_pmap->pm_active = ~0; + pmap_cpu_bootstrap(trace, 0); + /* + * Initialize hardware. + */ + for (i = 0; i < 16; i++) { + mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); + } + __asm __volatile ("mtsr %0,%1" + :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); + __asm __volatile ("mtsr %0,%1" + :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT)); + __asm __volatile ("sync; mtsdr1 %0; isync" + :: "r"((u_int)moea_pteg_table | (moea_pteg_mask >> 10))); + tlbia(); + + pmap_bootstrapped++; + + /* + * Set the start and end of kva. + */ + virtual_avail = VM_MIN_KERNEL_ADDRESS; + virtual_end = VM_MAX_KERNEL_ADDRESS; + + moea_rkva_start = virtual_avail; + moea_rkva_count = 4; + virtual_avail += moea_rkva_count * PAGE_SIZE; + + /* + + /* + * Set the start and end of kva. + */ + virtual_avail = VM_MIN_KERNEL_ADDRESS; + virtual_end = VM_MAX_KERNEL_ADDRESS; + /* * Allocate a kernel stack with a guard page for thread0 and map it * into the kernel page map. */ - pa = moea_bootstrap_alloc(KSTACK_PAGES * PAGE_SIZE, 0); - kstack0_phys = pa; - kstack0 = virtual_avail + (KSTACK_GUARD_PAGES * PAGE_SIZE); - CTR2(KTR_PMAP, "moea_bootstrap: kstack0 at %#x (%#x)", kstack0_phys, - kstack0); - virtual_avail += (KSTACK_PAGES + KSTACK_GUARD_PAGES) * PAGE_SIZE; + pa = moea_bootstrap_alloc(KSTACK_PAGES * PAGE_SIZE, PAGE_SIZE); + va = virtual_avail + KSTACK_GUARD_PAGES * PAGE_SIZE; + virtual_avail = va + KSTACK_PAGES * PAGE_SIZE; + CTR2(KTR_PMAP, "moea_bootstrap: kstack0 at %#x (%#x)", pa, va); + thread0.td_kstack = va; + thread0.td_kstack_pages = KSTACK_PAGES; for (i = 0; i < KSTACK_PAGES; i++) { - pa = kstack0_phys + i * PAGE_SIZE; - va = kstack0 + i * PAGE_SIZE; - moea_kenter(mmup, va, pa); - TLBIE(va); + moea_kenter(mmup, va, pa);; + pa += PAGE_SIZE; + va += PAGE_SIZE; } /* - * Calculate the last available physical address. - */ - for (i = 0; phys_avail[i + 2] != 0; i += 2) - ; - Maxmem = powerpc_btop(phys_avail[i + 1]); - - /* * Allocate virtual address space for the message buffer. */ + pa = msgbuf_phys = moea_bootstrap_alloc(MSGBUF_SIZE, PAGE_SIZE); msgbufp = (struct msgbuf *)virtual_avail; + va = virtual_avail; virtual_avail += round_page(MSGBUF_SIZE); - - pmap_cpu_bootstrap(&trace, 0); - tlbia(); - pmap_bootstrapped++; + while (va < virtual_avail) { + moea_kenter(mmup, va, pa);; + pa += PAGE_SIZE; + va += PAGE_SIZE; + } } /* @@ -1018,65 +1031,27 @@ moea_zero_page(mmu_t mmu, vm_page_t m) { vm_offset_t pa = VM_PAGE_TO_PHYS(m); - caddr_t va; - - if (pa < SEGMENT_LENGTH) { - va = (caddr_t) pa; - } else if (moea_initialized) { - if (moea_pvo_zeropage == NULL) { - moea_pvo_zeropage = moea_rkva_alloc(mmu); - mtx_init(&moea_pvo_zeropage_mtx, "pvo zero page", - NULL, MTX_DEF); - } - mtx_lock(&moea_pvo_zeropage_mtx); - moea_pa_map(moea_pvo_zeropage, pa, NULL, NULL); - va = (caddr_t)PVO_VADDR(moea_pvo_zeropage); - } else { - panic("moea_zero_page: can't zero pa %#x", pa); - } + void *va = (void *)pa; bzero(va, PAGE_SIZE); - - if (pa >= SEGMENT_LENGTH) { - moea_pa_unmap(moea_pvo_zeropage, NULL, NULL); - mtx_unlock(&moea_pvo_zeropage_mtx); - } } void moea_zero_page_area(mmu_t mmu, vm_page_t m, int off, int size) { vm_offset_t pa = VM_PAGE_TO_PHYS(m); - caddr_t va; + void *va = (void *)(pa + off); - if (pa < SEGMENT_LENGTH) { - va = (caddr_t) pa; - } else if (moea_initialized) { - if (moea_pvo_zeropage == NULL) { - moea_pvo_zeropage = moea_rkva_alloc(mmu); - mtx_init(&moea_pvo_zeropage_mtx, "pvo zero page", - NULL, MTX_DEF); - } - mtx_lock(&moea_pvo_zeropage_mtx); - moea_pa_map(moea_pvo_zeropage, pa, NULL, NULL); - va = (caddr_t)PVO_VADDR(moea_pvo_zeropage); - } else { - panic("moea_zero_page: can't zero pa %#x", pa); - } - - bzero(va + off, size); - - if (pa >= SEGMENT_LENGTH) { - moea_pa_unmap(moea_pvo_zeropage, NULL, NULL); - mtx_unlock(&moea_pvo_zeropage_mtx); - } + bzero(va, size); } void moea_zero_page_idle(mmu_t mmu, vm_page_t m) { + vm_offset_t pa = VM_PAGE_TO_PHYS(m); + void *va = (void *)pa; - moea_zero_page(mmu, m); + bzero(va, PAGE_SIZE); } /* @@ -1804,108 +1779,6 @@ panic("moea_bootstrap_alloc: could not allocate memory"); } -/* - * Return an unmapped pvo for a kernel virtual address. - * Used by pmap functions that operate on physical pages. - */ -static struct pvo_entry * -moea_rkva_alloc(mmu_t mmu) -{ - struct pvo_entry *pvo; - struct pte *pt; - vm_offset_t kva; - int pteidx; - - if (moea_rkva_count == 0) - panic("moea_rkva_alloc: no more reserved KVAs"); - - kva = moea_rkva_start + (PAGE_SIZE * --moea_rkva_count); - moea_kenter(mmu, kva, 0); - - pvo = moea_pvo_find_va(kernel_pmap, kva, &pteidx); - - if (pvo == NULL) - panic("moea_kva_alloc: moea_pvo_find_va failed"); - - pt = moea_pvo_to_pte(pvo, pteidx); - - if (pt == NULL) - panic("moea_kva_alloc: moea_pvo_to_pte failed"); - - moea_pte_unset(pt, &pvo->pvo_pte, pvo->pvo_vaddr); - mtx_unlock(&moea_table_mutex); - PVO_PTEGIDX_CLR(pvo); - - moea_pte_overflow++; - - return (pvo); -} - -static void -moea_pa_map(struct pvo_entry *pvo, vm_offset_t pa, struct pte *saved_pt, - int *depth_p) -{ - struct pte *pt; - - /* - * If this pvo already has a valid pte, we need to save it so it can - * be restored later. We then just reload the new PTE over the old - * slot. - */ - if (saved_pt != NULL) { - pt = moea_pvo_to_pte(pvo, -1); - - if (pt != NULL) { - moea_pte_unset(pt, &pvo->pvo_pte, pvo->pvo_vaddr); - mtx_unlock(&moea_table_mutex); - PVO_PTEGIDX_CLR(pvo); - moea_pte_overflow++; - } - - *saved_pt = pvo->pvo_pte; - - pvo->pvo_pte.pte_lo &= ~PTE_RPGN; - } - - pvo->pvo_pte.pte_lo |= pa; - - if (!moea_pte_spill(pvo->pvo_vaddr)) - panic("moea_pa_map: could not spill pvo %p", pvo); - - if (depth_p != NULL) - (*depth_p)++; -} - -static void -moea_pa_unmap(struct pvo_entry *pvo, struct pte *saved_pt, int *depth_p) -{ - struct pte *pt; - - pt = moea_pvo_to_pte(pvo, -1); - - if (pt != NULL) { - moea_pte_unset(pt, &pvo->pvo_pte, pvo->pvo_vaddr); - mtx_unlock(&moea_table_mutex); - PVO_PTEGIDX_CLR(pvo); - moea_pte_overflow++; - } - - pvo->pvo_pte.pte_lo &= ~PTE_RPGN; - - /* - * If there is a saved PTE and it's valid, restore it and return. - */ - if (saved_pt != NULL && (saved_pt->pte_lo & PTE_RPGN) != 0) { - if (depth_p != NULL && --(*depth_p) == 0) - panic("moea_pa_unmap: restoring but depth == 0"); - - pvo->pvo_pte = *saved_pt; - - if (!moea_pte_spill(pvo->pvo_vaddr)) - panic("moea_pa_unmap: could not spill pvo %p", pvo); - } -} - static void moea_syncicache(vm_offset_t pa, vm_size_t len) { From owner-p4-projects@FreeBSD.ORG Thu Apr 17 00:48:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B02310656C9; Thu, 17 Apr 2008 00:48:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B82C10656C3 for ; Thu, 17 Apr 2008 00:48:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC3D28FC1B for ; Thu, 17 Apr 2008 00:48:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H0mitc002625 for ; Thu, 17 Apr 2008 00:48:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H0miGF002623 for perforce@freebsd.org; Thu, 17 Apr 2008 00:48:44 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 00:48:44 GMT Message-Id: <200804170048.m3H0miGF002623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 00:48:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=140142 Change 140142 by marcel@marcel_xcllnt on 2008/04/17 00:48:08 Make SMP go all the way into the scheduler. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#9 edit .. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#6 edit .. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#4 edit .. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#5 edit .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#8 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#21 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#10 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/machdep.c#9 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.111 2008/03/16 10:58:08 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.112 2008/04/16 23:28:12 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -130,12 +130,10 @@ int cold = 1; -static struct pcpu pcpu0; +struct pcpu __pcpu[MAXCPU]; + static struct trapframe frame0; -vm_offset_t kstack0; -vm_offset_t kstack0_phys; - char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); @@ -146,7 +144,7 @@ static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); -void powerpc_init(u_int, u_int, u_int, void *); +u_int powerpc_init(u_int, u_int, u_int, void *); int save_ofw_mapping(void); int restore_ofw_mapping(void); @@ -250,11 +248,11 @@ extern void *dblow, *dbsize; extern void *vectrap, *vectrapsize; -void +u_int powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) { struct pcpu *pc; - vm_offset_t end, off; + vm_offset_t end; void *kmdp; char *env; @@ -294,10 +292,9 @@ /* * Set up per-cpu data. */ - pc = &pcpu0; + pc = __pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; - pc->pc_curpcb = thread0.td_pcb; pc->pc_cpuid = 0; __asm __volatile("mtsprg 0, %0" :: "r"(pc)); @@ -380,15 +377,12 @@ /* * Finish setting up thread0. */ - thread0.td_kstack = kstack0; thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + ((thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE - + sizeof(struct pcb)) & ~15); + pc->pc_curpcb = thread0.td_pcb; - /* - * Map and initialise the message buffer. - */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, msgbuf_phys + off); + /* Initialise the message buffer. */ msgbufinit(msgbufp, MSGBUF_SIZE); #ifdef KDB @@ -396,6 +390,8 @@ kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); #endif + + return (((uintptr_t)thread0.td_pcb - 16) & ~15); } void ==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#6 (text+ko) ==== @@ -38,9 +38,12 @@ #include #include #include +#include #include #include +#include #include +#include #include #include @@ -138,7 +141,7 @@ uint32_t cpudep_ap_bootstrap(volatile uint32_t *trcp) { - uint32_t sp; + uint32_t hid, msr, sp; trcp[0] = 0x2000; trcp[1] = (uint32_t)&cpudep_ap_bootstrap; @@ -149,17 +152,48 @@ trcp[0] = 0x2001; trcp[1] = (uint32_t)pcpup; - mtmsr(PSL_IR | PSL_DR | PSL_ME); + hid = mfspr(SPR_HID0); + hid &= ~(HID0_ICE | HID0_DCE); + hid &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + mtspr(SPR_HID0, hid); isync(); trcp[0] = 0x2002; - trcp[1] = 0; + trcp[1] = hid; + + mtspr(SPR_HID0, hid | HID0_ICFI | HID0_DCFI); + mtspr(SPR_HID0, hid); + isync(); + + trcp[0] = 0x2003; + trcp[1] = hid; + + hid |= HID0_ICE | HID0_DCE; + mtspr(SPR_HID0, hid); + isync(); + + trcp[0] = 0x2004; + trcp[1] = hid; + + msr = PSL_IR | PSL_DR | PSL_ME; + mtmsr(msr); + isync(); + + trcp[0] = 0x2005; + trcp[1] = msr; + + hid |= HID0_NAP | HID0_DPM; + mtspr(SPR_HID0, hid); + isync(); + + trcp[0] = 0x2006; + trcp[1] = hid; pcpup->pc_curthread = pcpup->pc_idlethread; pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb; sp = pcpup->pc_curpcb->pcb_sp; - trcp[0] = 0x2003; + trcp[0] = 0x2007; trcp[1] = sp; return (sp); ==== //depot/projects/powerpc/sys/powerpc/aim/swtch.S#4 (text+ko) ==== @@ -67,6 +67,13 @@ #include /* + * void cpu_throw(struct thread *old, struct thread *new) + */ +ENTRY(cpu_throw) + mr %r15, %r4 + b cpu_switchin + +/* * void cpu_switch(struct thread *old, * struct thread *new, * struct mutex *mtx); @@ -111,6 +118,7 @@ .L1: bl pmap_deactivate /* Deactivate the current pmap */ +cpu_switchin: mr %r3,%r15 /* Get new thread ptr */ bl pmap_activate /* Activate the new address space */ ==== //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#5 (text+ko) ==== @@ -193,15 +193,6 @@ { } -/* Temporary helper */ -void -cpu_throw(struct thread *old, struct thread *new) -{ - - cpu_switch(old, new, old->td_lock); - panic("cpu_throw() didn't"); -} - /* * Reset back to firmware. */ ==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#8 (text+ko) ==== @@ -5,6 +5,7 @@ makeoptions NO_MODULES=yes options ALT_BREAK_TO_DEBUGGER +options BREAK_TO_DEBUGGER options CD9660 options DDB options FFS ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#21 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -44,7 +43,7 @@ #include "pic_if.h" -MALLOC_DEFINE(M_SMP, "smp", "SMP specific datastructures"); +extern struct pcpu __pcpu[MAXCPU]; volatile static int ap_awake; volatile static u_int ap_state; @@ -59,7 +58,7 @@ trcp[0] = 0x3000; trcp[1] = (uint32_t)&machdep_ap_bootstrap; - __asm __volatile("mtspr 1023,%0" :: "r"(PCPU_GET(cpuid))); + // __asm __volatile("mtspr 1023,%0" :: "r"(PCPU_GET(cpuid))); __asm __volatile("mfspr %0,1023" : "=r"(pcpup->pc_pir)); pcpup->pc_awake = 1; @@ -70,6 +69,9 @@ ap_awake++; + /* Initialize curthread. */ + PCPU_SET(curthread, PCPU_GET(idlethread)); + mtmsr(mfmsr() | PSL_EE | PSL_RI); sched_throw(NULL); } @@ -138,8 +140,7 @@ goto next; } if (cpu.cr_cpuid != bsp.cr_cpuid) { - pc = (struct pcpu *)malloc(sizeof(*pc), M_SMP, - M_WAITOK); + pc = &__pcpu[cpu.cr_cpuid]; pcpu_init(pc, cpu.cr_cpuid, sizeof(*pc)); } else { pc = pcpup; ==== //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#10 (text+ko) ==== @@ -132,10 +132,8 @@ "Version %s, supports %d CPUs and %d irqs\n", sc->sc_version, sc->sc_ncpu, sc->sc_nirq); - for (cpu = 0; cpu < sc->sc_ncpu; cpu++) { - openpic_write(sc, OPENPIC_PCPU_TPR(cpu), 0); - openpic_write(sc, OPENPIC_PCPU_WHOAMI(cpu), cpu); - } + for (cpu = 0; cpu < sc->sc_ncpu; cpu++) + openpic_write(sc, OPENPIC_PCPU_TPR(cpu), 15); /* Reset and disable all interrupts. */ for (irq = 0; irq < sc->sc_nirq; irq++) { @@ -164,10 +162,8 @@ for (irq = 0; irq < sc->sc_nirq; irq++) openpic_write(sc, OPENPIC_IDEST(irq), 1 << 0); - for (cpu = 0; cpu < sc->sc_ncpu; cpu++) { + for (cpu = 0; cpu < sc->sc_ncpu; cpu++) openpic_write(sc, OPENPIC_PCPU_TPR(cpu), 0); - openpic_write(sc, OPENPIC_PCPU_WHOAMI(cpu), cpu); - } /* clear all pending interrupts */ for (irq = 0; irq < sc->sc_nirq; irq++) { @@ -207,15 +203,25 @@ void openpic_dispatch(device_t dev, struct trapframe *tf) { + static int once = 0; struct openpic_softc *sc; u_int vector; + if (once == 0 && PCPU_GET(cpuid) != 0) { + printf("XXX: got interrupt!\n"); + once++; + } + sc = device_get_softc(dev); while (1) { vector = openpic_read(sc, OPENPIC_PCPU_IACK(PCPU_GET(cpuid))); vector &= OPENPIC_VECTOR_MASK; if (vector == 255) break; + if (once == 1 && PCPU_GET(cpuid) != 0) { + printf("XXX: got vector %u\n", vector); + once++; + } powerpc_dispatch_intr(vector, tf); } } From owner-p4-projects@FreeBSD.ORG Thu Apr 17 00:53:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19AC1065673; Thu, 17 Apr 2008 00:53:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A41051065671 for ; Thu, 17 Apr 2008 00:53:50 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 780788FC1E for ; Thu, 17 Apr 2008 00:53:50 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H0roJ3003015 for ; Thu, 17 Apr 2008 00:53:50 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H0ro6W003013 for perforce@freebsd.org; Thu, 17 Apr 2008 00:53:50 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 00:53:50 GMT Message-Id: <200804170053.m3H0ro6W003013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 00:53:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=140143 Change 140143 by marcel@marcel_xcllnt on 2008/04/17 00:53:05 Fix merge botch. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#4 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#4 (text+ko) ==== @@ -916,12 +916,6 @@ virtual_avail = VM_MIN_KERNEL_ADDRESS; virtual_end = VM_MAX_KERNEL_ADDRESS; - moea_rkva_start = virtual_avail; - moea_rkva_count = 4; - virtual_avail += moea_rkva_count * PAGE_SIZE; - - /* - /* * Set the start and end of kva. */ From owner-p4-projects@FreeBSD.ORG Thu Apr 17 01:49:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 163471065670; Thu, 17 Apr 2008 01:49:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC472106566C for ; Thu, 17 Apr 2008 01:49:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B95818FC0A for ; Thu, 17 Apr 2008 01:49:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H1nnPF007543 for ; Thu, 17 Apr 2008 01:49:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H1nnfv007541 for perforce@freebsd.org; Thu, 17 Apr 2008 01:49:49 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 01:49:49 GMT Message-Id: <200804170149.m3H1nnfv007541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 01:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=140147 Change 140147 by marcel@marcel_xcllnt on 2008/04/17 01:49:29 More merge botches... Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 (text+ko) ==== @@ -894,18 +894,6 @@ kernel_pmap->pm_active = ~0; pmap_cpu_bootstrap(trace, 0); - /* - * Initialize hardware. - */ - for (i = 0; i < 16; i++) { - mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); - } - __asm __volatile ("mtsr %0,%1" - :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); - __asm __volatile ("mtsr %0,%1" - :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT)); - __asm __volatile ("sync; mtsdr1 %0; isync" - :: "r"((u_int)moea_pteg_table | (moea_pteg_mask >> 10))); tlbia(); pmap_bootstrapped++; @@ -917,12 +905,6 @@ virtual_end = VM_MAX_KERNEL_ADDRESS; /* - * Set the start and end of kva. - */ - virtual_avail = VM_MIN_KERNEL_ADDRESS; - virtual_end = VM_MAX_KERNEL_ADDRESS; - - /* * Allocate a kernel stack with a guard page for thread0 and map it * into the kernel page map. */ From owner-p4-projects@FreeBSD.ORG Thu Apr 17 03:00:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B5FD1065670; Thu, 17 Apr 2008 03:00:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B5A9106566B for ; Thu, 17 Apr 2008 03:00:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05AF18FC0C for ; Thu, 17 Apr 2008 03:00:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H308bU013449 for ; Thu, 17 Apr 2008 03:00:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H3031j013418 for perforce@freebsd.org; Thu, 17 Apr 2008 03:00:03 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 03:00:03 GMT Message-Id: <200804170300.m3H3031j013418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 03:00:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=140150 Change 140150 by marcel@marcel_xcllnt on 2008/04/17 02:59:54 IFC @140149 Affected files ... .. //depot/projects/ia64/Makefile#59 integrate .. //depot/projects/ia64/Makefile.inc1#123 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#24 integrate .. //depot/projects/ia64/UPDATING#102 integrate .. //depot/projects/ia64/bin/Makefile#10 integrate .. //depot/projects/ia64/bin/ls/ls.1#32 integrate .. //depot/projects/ia64/bin/ls/ls.c#27 integrate .. //depot/projects/ia64/bin/ls/ls.h#10 integrate .. //depot/projects/ia64/bin/ls/print.c#22 integrate .. //depot/projects/ia64/bin/ls/util.c#15 integrate .. //depot/projects/ia64/bin/sh/options.c#11 integrate .. //depot/projects/ia64/bin/uuidgen/Makefile#2 integrate .. //depot/projects/ia64/cddl/Makefile.inc#3 integrate .. //depot/projects/ia64/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/ia64/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/ia64/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/ia64/cddl/lib/Makefile#4 integrate .. //depot/projects/ia64/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/ia64/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/ia64/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/ia64/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/ia64/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/ia64/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/ia64/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/ia64/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/ia64/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/ia64/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/ia64/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/ia64/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/ia64/compat/opensolaris/include/alloca.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/devid.h#3 delete .. //depot/projects/ia64/compat/opensolaris/include/fcntl.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/fsshare.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/libintl.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/mnttab.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/priv.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/solaris.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/stdio.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/stdlib.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/strings.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/unistd.h#2 delete .. //depot/projects/ia64/compat/opensolaris/include/zone.h#2 delete .. //depot/projects/ia64/compat/opensolaris/lib/libumem/umem.c#2 delete .. //depot/projects/ia64/compat/opensolaris/lib/libumem/umem.h#2 delete .. //depot/projects/ia64/compat/opensolaris/misc/deviceid.c#2 delete .. //depot/projects/ia64/compat/opensolaris/misc/fsshare.c#3 delete .. //depot/projects/ia64/compat/opensolaris/misc/mkdirp.c#2 delete .. //depot/projects/ia64/compat/opensolaris/misc/mnttab.c#2 delete .. //depot/projects/ia64/compat/opensolaris/misc/zmount.c#2 delete .. //depot/projects/ia64/compat/opensolaris/misc/zone.c#2 delete .. //depot/projects/ia64/contrib/bzip2/CHANGES#5 integrate .. //depot/projects/ia64/contrib/bzip2/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/bzip2/FREEBSD-vendor#1 branch .. //depot/projects/ia64/contrib/bzip2/LICENSE#5 integrate .. //depot/projects/ia64/contrib/bzip2/Makefile#5 integrate .. //depot/projects/ia64/contrib/bzip2/Makefile-libbz2_so#5 integrate .. //depot/projects/ia64/contrib/bzip2/README#5 integrate .. //depot/projects/ia64/contrib/bzip2/README.COMPILATION.PROBLEMS#5 integrate .. //depot/projects/ia64/contrib/bzip2/blocksort.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/bzip2.c#6 integrate .. //depot/projects/ia64/contrib/bzip2/bzip2recover.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib.c#6 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib.h#5 integrate .. //depot/projects/ia64/contrib/bzip2/bzlib_private.h#5 integrate .. //depot/projects/ia64/contrib/bzip2/compress.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/crctable.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/decompress.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/huffman.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/randtable.c#5 integrate .. //depot/projects/ia64/contrib/bzip2/spewG.c#3 integrate .. //depot/projects/ia64/contrib/bzip2/unzcrash.c#3 integrate .. //depot/projects/ia64/contrib/cvs/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/cvs/FAQ#5 integrate .. //depot/projects/ia64/contrib/cvs/HACKING#5 integrate .. //depot/projects/ia64/contrib/cvs/INSTALL#8 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/NEWS#8 integrate .. //depot/projects/ia64/contrib/cvs/README#5 integrate .. //depot/projects/ia64/contrib/cvs/TODO#6 integrate .. //depot/projects/ia64/contrib/cvs/aclocal.m4#7 integrate .. //depot/projects/ia64/contrib/cvs/compile#2 integrate .. //depot/projects/ia64/contrib/cvs/config.h.in#8 integrate .. //depot/projects/ia64/contrib/cvs/configure#8 integrate .. //depot/projects/ia64/contrib/cvs/configure.in#8 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/depcomp#4 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/cvs/doc/HACKING.DOCS#3 branch .. //depot/projects/ia64/contrib/cvs/doc/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.1#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.texinfo#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvsclient.texi#5 integrate .. //depot/projects/ia64/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/mkman.pl#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-1#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-vti#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/version-client.texi#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/version.texi#7 integrate .. //depot/projects/ia64/contrib/cvs/install-sh#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/lib/getdate#2 delete .. //depot/projects/ia64/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/missing#2 integrate .. //depot/projects/ia64/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/ia64/contrib/cvs/src/ChangeLog#8 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.in#7 integrate .. //depot/projects/ia64/contrib/cvs/src/add.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/classify.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/client.c#9 integrate .. //depot/projects/ia64/contrib/cvs/src/client.h#5 integrate .. //depot/projects/ia64/contrib/cvs/src/cvs.h#8 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/hash.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/import.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/lock.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#9 integrate .. //depot/projects/ia64/contrib/cvs/src/login.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/main.c#8 integrate .. //depot/projects/ia64/contrib/cvs/src/mkmodules.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/modules.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#9 integrate .. //depot/projects/ia64/contrib/cvs/src/recurse.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/root.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/root.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/sanity.sh#8 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#10 integrate .. //depot/projects/ia64/contrib/cvs/src/update.c#8 integrate .. //depot/projects/ia64/contrib/cvs/src/vers_ts.c#7 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/hostapd/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/hostapd/Makefile#5 integrate .. //depot/projects/ia64/contrib/hostapd/README#4 integrate .. //depot/projects/ia64/contrib/hostapd/aes_wrap.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/aes_wrap.h#4 integrate .. //depot/projects/ia64/contrib/hostapd/common.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/common.h#5 integrate .. //depot/projects/ia64/contrib/hostapd/defconfig#4 integrate .. //depot/projects/ia64/contrib/hostapd/driver.h#4 integrate .. //depot/projects/ia64/contrib/hostapd/driver_test.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/eap_aka.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_gpsk.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_gpsk_common.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_gpsk_common.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim_common.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/eap_sim_db.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/eap_tls_common.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/eapol_version.patch#2 delete .. //depot/projects/ia64/contrib/hostapd/hostapd.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/hostapd.conf#4 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_11.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_11_auth.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/ieee802_1x.c#5 integrate .. //depot/projects/ia64/contrib/hostapd/madwifi.conf#3 integrate .. //depot/projects/ia64/contrib/hostapd/os.h#2 integrate .. //depot/projects/ia64/contrib/hostapd/os_unix.c#2 integrate .. //depot/projects/ia64/contrib/hostapd/radius.c#4 integrate .. //depot/projects/ia64/contrib/hostapd/radius.h#4 integrate .. //depot/projects/ia64/contrib/hostapd/radius_client.c#5 integrate .. //depot/projects/ia64/contrib/hostapd/radius_server.c#5 integrate .. //depot/projects/ia64/contrib/hostapd/tls_openssl.c#5 integrate .. //depot/projects/ia64/contrib/hostapd/version.h#5 integrate .. //depot/projects/ia64/contrib/hostapd/wpa.c#5 integrate .. //depot/projects/ia64/contrib/netcat/nc.1#6 integrate .. //depot/projects/ia64/contrib/netcat/netcat.c#5 integrate .. //depot/projects/ia64/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb.8#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb.c#4 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs.8#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool.8#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/zpool/zpool_vdev.c#3 delete .. //depot/projects/ia64/contrib/opensolaris/cmd/ztest/ztest.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/atomic.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/libintl.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/stdio_ext.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/synch.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/head/thread.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#3 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete .. //depot/projects/ia64/contrib/opensolaris/lib/libzpool/common/util.c#2 delete .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_altq.c#7 integrate .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_qstats.c#5 integrate .. //depot/projects/ia64/contrib/top/machine.h#8 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-Xlist#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/Makefile#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/README#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/aes_wrap.h#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/asn1.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/common.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/common.h#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config_ssid.h#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/config_winreg.c#2 delete .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete .. //depot/projects/ia64/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/defconfig#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/driver_hostap.h#3 delete .. //depot/projects/ia64/contrib/wpa_supplicant/driver_ndis.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_gpsk.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_peap.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_sim_common.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eap_tlv.h#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_sm.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eapol_test.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/eloop_win.c#2 delete .. //depot/projects/ia64/contrib/wpa_supplicant/events.c#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/main.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/os.h#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/os_unix.c#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/pcsc_funcs.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius.h#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/radius_client.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/ia64/contrib/wpa_supplicant/tls_openssl.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/version.h#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_cli.c#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.c#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant.conf#4 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/wpa_supplicant_i.h#5 integrate .. //depot/projects/ia64/contrib/wpa_supplicant/x509v3.c#2 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#81 integrate .. //depot/projects/ia64/etc/freebsd-update.conf#3 integrate .. //depot/projects/ia64/etc/network.subr#22 integrate .. //depot/projects/ia64/etc/newsyslog.conf#13 integrate .. //depot/projects/ia64/etc/periodic/security/410.logincheck#2 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#48 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#21 integrate .. //depot/projects/ia64/etc/rc.d/ppp#9 integrate .. //depot/projects/ia64/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/ia64/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/ia64/etc/rc.d/zfs#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#71 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#32 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/config.h.proto#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/main.c#9 integrate .. //depot/projects/ia64/include/complex.h#6 integrate .. //depot/projects/ia64/include/dirent.h#10 integrate .. //depot/projects/ia64/include/pthread.h#16 integrate .. //depot/projects/ia64/include/stdio.h#23 integrate .. //depot/projects/ia64/include/string.h#18 integrate .. //depot/projects/ia64/include/time.h#17 integrate .. //depot/projects/ia64/include/unistd.h#32 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#30 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.3#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#19 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#15 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry_private.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#24 integrate .. //depot/projects/ia64/lib/libarchive/archive_string.h#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_string_sprintf.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_private.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio_newc.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#21 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#15 integrate .. //depot/projects/ia64/lib/libarchive/config_freebsd.h#6 integrate .. //depot/projects/ia64/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/ia64/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/ia64/lib/libarchive/test/test_archive_api_feature.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test_entry.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/ia64/lib/libc/gdtoa/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_hdtoa.c#5 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#41 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/ia64/lib/libc/gen/directory.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/err.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/lockf.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/modf.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/msgctl.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/opendir.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/scandir.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/sem_wait.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#19 integrate .. //depot/projects/ia64/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/ia64/lib/libc/gen/termios.c#5 integrate .. //depot/projects/ia64/lib/libc/include/libc_private.h#12 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#15 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#13 integrate .. //depot/projects/ia64/lib/libc/locale/wctype.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/svc_vc.c#14 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#9 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_sqrt.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#23 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#11 integrate .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#17 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#12 integrate .. //depot/projects/ia64/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/ia64/lib/libc/string/memchr.3#4 integrate .. //depot/projects/ia64/lib/libc/string/memrchr.c#1 branch .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#34 integrate .. //depot/projects/ia64/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/ia64/lib/libc/sys/access.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/aio_cancel.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/aio_suspend.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/chown.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/ia64/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/ia64/lib/libc/sys/execve.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/ia64/lib/libc/sys/kldunload.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/link.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/mincore.2#11 integrate .. //depot/projects/ia64/lib/libc/sys/mkdir.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/mkfifo.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/mknod.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/open.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/readlink.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/rename.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#17 integrate .. //depot/projects/ia64/lib/libc/sys/symlink.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/unlink.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#11 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_rec.c#9 integrate .. //depot/projects/ia64/lib/libc/yp/xdryp.c#5 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#13 integrate .. //depot/projects/ia64/lib/libelf/elf_update.3#4 integrate .. //depot/projects/ia64/lib/libelf/elf_update.c#5 integrate .. //depot/projects/ia64/lib/libelf/libelf_convert.m4#4 integrate .. //depot/projects/ia64/lib/libfetch/common.c#15 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/ia64/lib/libpmc/pmc.3#9 integrate .. //depot/projects/ia64/lib/libsdp/sdp.h#8 integrate .. //depot/projects/ia64/lib/libstand/nfs.c#7 integrate .. //depot/projects/ia64/lib/libthr/Makefile#22 integrate .. //depot/projects/ia64/lib/libthr/arch/amd64/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/ia64/lib/libthr/arch/amd64/include/pthread_md.h#4 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/ia64/lib/libthr/arch/i386/include/pthread_md.h#7 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#11 integrate .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#13 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_affinity.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_attr.c#10 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_cond.c#18 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#25 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#20 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_getcpuclockid.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#27 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#34 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutexattr.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#34 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_rwlock.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#17 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.c#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.h#8 integrate .. //depot/projects/ia64/lib/libthread_db/Makefile#8 integrate .. //depot/projects/ia64/lib/libthread_db/kse.h#1 branch .. //depot/projects/ia64/lib/libthread_db/libc_r_db.c#4 integrate .. //depot/projects/ia64/lib/libthread_db/libpthread_db.c#7 integrate .. //depot/projects/ia64/lib/libthread_db/libthr_db.c#8 integrate .. //depot/projects/ia64/lib/libthread_db/thread_db.c#4 integrate .. //depot/projects/ia64/lib/msun/Makefile#25 integrate .. //depot/projects/ia64/lib/msun/Symbol.map#5 integrate .. //depot/projects/ia64/lib/msun/amd64/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/msun/amd64/e_remainderl.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_remquol.S#1 branch .. //depot/projects/ia64/lib/msun/i387/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/msun/i387/e_remainderl.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_remquol.S#1 branch .. //depot/projects/ia64/lib/msun/man/csqrt.3#2 integrate .. //depot/projects/ia64/lib/msun/man/hypot.3#8 integrate .. //depot/projects/ia64/lib/msun/man/remainder.3#6 integrate .. //depot/projects/ia64/lib/msun/src/e_hypot.c#5 integrate .. //depot/projects/ia64/lib/msun/src/e_hypotf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/e_hypotl.c#1 branch .. //depot/projects/ia64/lib/msun/src/e_log.c#8 integrate .. //depot/projects/ia64/lib/msun/src/e_logf.c#6 integrate .. //depot/projects/ia64/lib/msun/src/e_remainder.c#6 integrate .. //depot/projects/ia64/lib/msun/src/e_remainderl.c#1 branch .. //depot/projects/ia64/lib/msun/src/math.h#28 integrate .. //depot/projects/ia64/lib/msun/src/s_csqrt.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_csqrtl.c#1 branch .. //depot/projects/ia64/lib/msun/src/s_expm1.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_expm1f.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_fma.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_fmaf.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_fmal.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_log1p.c#5 integrate .. //depot/projects/ia64/lib/msun/src/s_log1pf.c#5 integrate .. //depot/projects/ia64/lib/msun/src/s_remquo.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_remquol.c#1 branch .. //depot/projects/ia64/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/ia64/lib/msun/src/w_cabsl.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/ia64/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#39 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.h#14 integrate .. //depot/projects/ia64/libexec/talkd/announce.c#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/ia64/release/ia64/mkisoimages.sh#8 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#36 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#17 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#25 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#21 integrate .. //depot/projects/ia64/sbin/ddb/ddb.8#2 integrate .. //depot/projects/ia64/sbin/ddb/ddb.c#2 integrate .. //depot/projects/ia64/sbin/devd/token.l#7 integrate .. //depot/projects/ia64/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient-script#8 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck.h#16 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck_ffs.8#11 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#18 integrate .. //depot/projects/ia64/sbin/fsck_ffs/inode.c#13 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#22 integrate .. //depot/projects/ia64/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/ia64/sbin/geom/class/multipath/gmultipath.8#4 integrate .. //depot/projects/ia64/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/ia64/sbin/ggate/Makefile#8 integrate .. //depot/projects/ia64/sbin/gpt/gpt.c#24 integrate .. //depot/projects/ia64/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#37 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.h#13 integrate .. //depot/projects/ia64/sbin/ifconfig/ifvlan.c#8 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#26 integrate .. //depot/projects/ia64/sbin/restore/dirs.c#11 integrate .. //depot/projects/ia64/sbin/restore/interactive.c#10 integrate .. //depot/projects/ia64/sbin/restore/tape.c#18 integrate .. //depot/projects/ia64/sbin/route/route.c#18 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#13 integrate .. //depot/projects/ia64/share/man/man3/Makefile#19 integrate .. //depot/projects/ia64/share/man/man4/Makefile#107 integrate .. //depot/projects/ia64/share/man/man4/arcmsr.4#4 integrate .. //depot/projects/ia64/share/man/man4/asmc.4#2 integrate .. //depot/projects/ia64/share/man/man4/bpf.4#15 integrate .. //depot/projects/ia64/share/man/man4/ddb.4#17 integrate .. //depot/projects/ia64/share/man/man4/k8temp.4#1 branch .. //depot/projects/ia64/share/man/man4/malo.4#1 branch .. //depot/projects/ia64/share/man/man4/man4.i386/ar.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/linux.4#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/pnp.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/scd.4#8 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/streams.4#5 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/svr4.4#7 integrate .. //depot/projects/ia64/share/man/man4/nfe.4#6 integrate .. //depot/projects/ia64/share/man/man4/ng_pptpgre.4#8 integrate .. //depot/projects/ia64/share/man/man4/psm.4#11 integrate .. //depot/projects/ia64/share/man/man4/ubsa.4#8 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#84 integrate .. //depot/projects/ia64/share/man/man5/src.conf.5#12 integrate .. //depot/projects/ia64/share/man/man7/security.7#17 integrate .. //depot/projects/ia64/share/man/man8/rc.subr.8#13 integrate .. //depot/projects/ia64/share/man/man9/Makefile#72 integrate .. //depot/projects/ia64/share/man/man9/atomic.9#6 integrate .. //depot/projects/ia64/share/man/man9/ieee80211_radiotap.9#4 integrate .. //depot/projects/ia64/share/man/man9/lock.9#12 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#19 integrate .. //depot/projects/ia64/share/man/man9/mbchain.9#4 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#29 integrate .. //depot/projects/ia64/share/man/man9/rwlock.9#6 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#18 integrate .. //depot/projects/ia64/share/man/man9/stack.9#2 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#35 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#44 integrate .. //depot/projects/ia64/share/mk/bsd.own.mk#25 integrate .. //depot/projects/ia64/share/mk/sys.mk#26 integrate .. //depot/projects/ia64/share/zoneinfo/asia#15 integrate .. //depot/projects/ia64/share/zoneinfo/backward#12 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#16 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#17 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#18 integrate .. //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#20 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/legacy.c#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#23 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#53 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable.c#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#23 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#69 integrate .. //depot/projects/ia64/sys/amd64/amd64/prof_machdep.c#8 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#48 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#29 integrate .. //depot/projects/ia64/sys/amd64/ia32/ia32_signal.c#13 integrate .. //depot/projects/ia64/sys/amd64/include/atomic.h#8 integrate .. //depot/projects/ia64/sys/amd64/include/clock.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#14 integrate .. //depot/projects/ia64/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/ia64/sys/amd64/include/param.h#16 integrate .. //depot/projects/ia64/sys/amd64/include/pcb.h#11 integrate .. //depot/projects/ia64/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/ia64/sys/amd64/include/timerreg.h#3 integrate .. //depot/projects/ia64/sys/amd64/isa/atpic.c#15 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#22 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_syscall.h#16 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysent.c#16 integrate .. //depot/projects/ia64/sys/amd64/linux32/linux32_sysvec.c#19 integrate .. //depot/projects/ia64/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/ia64/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/ia64/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/ia64/sys/arm/arm/exception.S#6 integrate .. //depot/projects/ia64/sys/arm/arm/intr.c#15 integrate .. //depot/projects/ia64/sys/arm/arm/locore.S#16 integrate .. //depot/projects/ia64/sys/arm/arm/machdep.c#17 integrate .. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/arm/at91/kb920x_machdep.c#13 integrate .. //depot/projects/ia64/sys/arm/conf/AVILA#6 integrate .. //depot/projects/ia64/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/ia64/sys/arm/conf/BWCT#3 integrate .. //depot/projects/ia64/sys/arm/conf/CRB#3 integrate .. //depot/projects/ia64/sys/arm/conf/EP80219#5 integrate .. //depot/projects/ia64/sys/arm/conf/HL200#2 integrate .. //depot/projects/ia64/sys/arm/conf/IQ31244#12 integrate .. //depot/projects/ia64/sys/arm/conf/KB920X#8 integrate .. //depot/projects/ia64/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/ia64/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/ia64/sys/arm/include/machdep.h#3 integrate .. //depot/projects/ia64/sys/arm/include/param.h#8 integrate .. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#16 integrate .. //depot/projects/ia64/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#9 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/files.i80321#4 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#20 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/obio_space.c#5 integrate .. //depot/projects/ia64/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/ia64/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/ia64/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/ia64/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#39 integrate .. //depot/projects/ia64/sys/boot/i386/cdboot/cdboot.s#8 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/pxeldr.S#7 integrate .. //depot/projects/ia64/sys/boot/pc98/cdboot/cdboot.s#4 integrate .. //depot/projects/ia64/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/ia64/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#17 integrate .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/ia64/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/ia64/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_misc.c#30 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_proto.h#28 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate .. //depot/projects/ia64/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate .. //depot/projects/ia64/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#54 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#33 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/ia64/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#59 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#34 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#15 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#15 integrate .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/ia64/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 17 03:42:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92D781065671; Thu, 17 Apr 2008 03:42:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 502E9106566C for ; Thu, 17 Apr 2008 03:42:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9288FC0C for ; Thu, 17 Apr 2008 03:42:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H3grRr030108 for ; Thu, 17 Apr 2008 03:42:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H3gru5030106 for perforce@freebsd.org; Thu, 17 Apr 2008 03:42:53 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 03:42:53 GMT Message-Id: <200804170342.m3H3gru5030106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 03:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=140152 Change 140152 by marcel@marcel_xcllnt on 2008/04/17 03:42:33 IFC @140151 Affected files ... .. //depot/projects/efi/Makefile#1 branch .. //depot/projects/efi/amd64/Makefile#1 branch .. //depot/projects/efi/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/efi/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/efi/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/efi/amd64/acpica/madt.c#1 branch .. //depot/projects/efi/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/efi/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/efi/amd64/amd64/atomic.c#1 branch .. //depot/projects/efi/amd64/amd64/autoconf.c#1 branch .. //depot/projects/efi/amd64/amd64/bios.c#1 branch .. //depot/projects/efi/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/efi/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/efi/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/efi/amd64/amd64/db_interface.c#1 branch .. //depot/projects/efi/amd64/amd64/db_trace.c#1 branch .. //depot/projects/efi/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/exception.S#1 branch .. //depot/projects/efi/amd64/amd64/fpu.c#1 branch .. //depot/projects/efi/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/genassym.c#1 branch .. //depot/projects/efi/amd64/amd64/identcpu.c#1 branch .. //depot/projects/efi/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/efi/amd64/amd64/initcpu.c#1 branch .. //depot/projects/efi/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/io.c#1 branch .. //depot/projects/efi/amd64/amd64/io_apic.c#1 branch .. //depot/projects/efi/amd64/amd64/legacy.c#1 branch .. //depot/projects/efi/amd64/amd64/local_apic.c#1 branch .. //depot/projects/efi/amd64/amd64/locore.S#1 branch .. //depot/projects/efi/amd64/amd64/machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/mem.c#1 branch .. //depot/projects/efi/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/efi/amd64/amd64/mpboot.S#1 branch .. //depot/projects/efi/amd64/amd64/mptable.c#1 branch .. //depot/projects/efi/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/efi/amd64/amd64/msi.c#1 branch .. //depot/projects/efi/amd64/amd64/nexus.c#1 branch .. //depot/projects/efi/amd64/amd64/pmap.c#1 branch .. //depot/projects/efi/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/efi/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/support.S#1 branch .. //depot/projects/efi/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/trap.c#1 branch .. //depot/projects/efi/amd64/amd64/tsc.c#1 branch .. //depot/projects/efi/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/efi/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/efi/amd64/compile/.cvsignore#1 branch .. //depot/projects/efi/amd64/conf/.cvsignore#1 branch .. //depot/projects/efi/amd64/conf/DEFAULTS#1 branch .. //depot/projects/efi/amd64/conf/GENERIC#1 branch .. //depot/projects/efi/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/efi/amd64/conf/MAC#1 branch .. //depot/projects/efi/amd64/conf/Makefile#1 branch .. //depot/projects/efi/amd64/conf/NOTES#1 branch .. //depot/projects/efi/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/efi/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/efi/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/efi/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/efi/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/efi/amd64/include/_bus.h#1 branch .. //depot/projects/efi/amd64/include/_inttypes.h#1 branch .. //depot/projects/efi/amd64/include/_limits.h#1 branch .. //depot/projects/efi/amd64/include/_stdint.h#1 branch .. //depot/projects/efi/amd64/include/_types.h#1 branch .. //depot/projects/efi/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/efi/amd64/include/apicreg.h#1 branch .. //depot/projects/efi/amd64/include/apicvar.h#1 branch .. //depot/projects/efi/amd64/include/asm.h#1 branch .. //depot/projects/efi/amd64/include/asmacros.h#1 branch .. //depot/projects/efi/amd64/include/atomic.h#1 branch .. //depot/projects/efi/amd64/include/bus.h#1 branch .. //depot/projects/efi/amd64/include/bus_dma.h#1 branch .. //depot/projects/efi/amd64/include/clock.h#1 branch .. //depot/projects/efi/amd64/include/cpu.h#1 branch .. //depot/projects/efi/amd64/include/cpufunc.h#1 branch .. //depot/projects/efi/amd64/include/cputypes.h#1 branch .. //depot/projects/efi/amd64/include/db_machdep.h#1 branch .. //depot/projects/efi/amd64/include/elf.h#1 branch .. //depot/projects/efi/amd64/include/endian.h#1 branch .. //depot/projects/efi/amd64/include/exec.h#1 branch .. //depot/projects/efi/amd64/include/float.h#1 branch .. //depot/projects/efi/amd64/include/floatingpoint.h#1 branch .. //depot/projects/efi/amd64/include/fpu.h#1 branch .. //depot/projects/efi/amd64/include/frame.h#1 branch .. //depot/projects/efi/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/efi/amd64/include/ieeefp.h#1 branch .. //depot/projects/efi/amd64/include/in_cksum.h#1 branch .. //depot/projects/efi/amd64/include/intr_machdep.h#1 branch .. //depot/projects/efi/amd64/include/iodev.h#1 branch .. //depot/projects/efi/amd64/include/kdb.h#1 branch .. //depot/projects/efi/amd64/include/legacyvar.h#1 branch .. //depot/projects/efi/amd64/include/limits.h#1 branch .. //depot/projects/efi/amd64/include/md_var.h#1 branch .. //depot/projects/efi/amd64/include/memdev.h#1 branch .. //depot/projects/efi/amd64/include/metadata.h#1 branch .. //depot/projects/efi/amd64/include/minidump.h#1 branch .. //depot/projects/efi/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/efi/amd64/include/mptable.h#1 branch .. //depot/projects/efi/amd64/include/mutex.h#1 branch .. //depot/projects/efi/amd64/include/nexusvar.h#1 branch .. //depot/projects/efi/amd64/include/param.h#1 branch .. //depot/projects/efi/amd64/include/pc/bios.h#1 branch .. //depot/projects/efi/amd64/include/pc/display.h#1 branch .. //depot/projects/efi/amd64/include/pcb.h#1 branch .. //depot/projects/efi/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/efi/amd64/include/pcpu.h#1 branch .. //depot/projects/efi/amd64/include/pmap.h#1 branch .. //depot/projects/efi/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/efi/amd64/include/ppireg.h#1 branch .. //depot/projects/efi/amd64/include/proc.h#1 branch .. //depot/projects/efi/amd64/include/profile.h#1 branch .. //depot/projects/efi/amd64/include/psl.h#1 branch .. //depot/projects/efi/amd64/include/ptrace.h#1 branch .. //depot/projects/efi/amd64/include/reg.h#1 branch .. //depot/projects/efi/amd64/include/reloc.h#1 branch .. //depot/projects/efi/amd64/include/resource.h#1 branch .. //depot/projects/efi/amd64/include/runq.h#1 branch .. //depot/projects/efi/amd64/include/segments.h#1 branch .. //depot/projects/efi/amd64/include/setjmp.h#1 branch .. //depot/projects/efi/amd64/include/sf_buf.h#1 branch .. //depot/projects/efi/amd64/include/sigframe.h#1 branch .. //depot/projects/efi/amd64/include/signal.h#1 branch .. //depot/projects/efi/amd64/include/smp.h#1 branch .. //depot/projects/efi/amd64/include/specialreg.h#1 branch .. //depot/projects/efi/amd64/include/stack.h#1 branch .. //depot/projects/efi/amd64/include/stdarg.h#1 branch .. //depot/projects/efi/amd64/include/sysarch.h#1 branch .. //depot/projects/efi/amd64/include/timerreg.h#1 branch .. //depot/projects/efi/amd64/include/trap.h#1 branch .. //depot/projects/efi/amd64/include/tss.h#1 branch .. //depot/projects/efi/amd64/include/ucontext.h#1 branch .. //depot/projects/efi/amd64/include/varargs.h#1 branch .. //depot/projects/efi/amd64/include/vmparam.h#1 branch .. //depot/projects/efi/amd64/isa/atpic.c#1 branch .. //depot/projects/efi/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/efi/amd64/isa/clock.c#1 branch .. //depot/projects/efi/amd64/isa/elcr.c#1 branch .. //depot/projects/efi/amd64/isa/icu.h#1 branch .. //depot/projects/efi/amd64/isa/isa.c#1 branch .. //depot/projects/efi/amd64/isa/isa.h#1 branch .. //depot/projects/efi/amd64/isa/isa_dma.c#1 branch .. //depot/projects/efi/amd64/isa/nmi.c#1 branch .. //depot/projects/efi/amd64/linux32/Makefile#1 branch .. //depot/projects/efi/amd64/linux32/linux.h#1 branch .. //depot/projects/efi/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/efi/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/efi/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/efi/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/efi/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/efi/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/efi/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/efi/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/efi/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/efi/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/efi/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/efi/amd64/linux32/syscalls.master#1 branch .. //depot/projects/efi/amd64/pci/pci_bus.c#1 branch .. //depot/projects/efi/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/efi/arm/arm/autoconf.c#1 branch .. //depot/projects/efi/arm/arm/bcopy_page.S#1 branch .. //depot/projects/efi/arm/arm/bcopyinout.S#1 branch .. //depot/projects/efi/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/efi/arm/arm/blockio.S#1 branch .. //depot/projects/efi/arm/arm/bootconfig.c#1 branch .. //depot/projects/efi/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/efi/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/efi/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/efi/arm/arm/copystr.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc.c#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/efi/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/efi/arm/arm/db_disasm.c#1 branch .. //depot/projects/efi/arm/arm/db_interface.c#1 branch .. //depot/projects/efi/arm/arm/db_trace.c#1 branch .. //depot/projects/efi/arm/arm/disassem.c#1 branch .. //depot/projects/efi/arm/arm/dump_machdep.c#1 branch .. //depot/projects/efi/arm/arm/elf_machdep.c#1 branch .. //depot/projects/efi/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/efi/arm/arm/exception.S#1 branch .. //depot/projects/efi/arm/arm/fiq.c#1 branch .. //depot/projects/efi/arm/arm/fiq_subr.S#1 branch .. //depot/projects/efi/arm/arm/fusu.S#1 branch .. //depot/projects/efi/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/efi/arm/arm/genassym.c#1 branch .. //depot/projects/efi/arm/arm/identcpu.c#1 branch .. //depot/projects/efi/arm/arm/in_cksum.c#1 branch .. //depot/projects/efi/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/efi/arm/arm/inckern.S#1 branch .. //depot/projects/efi/arm/arm/intr.c#1 branch .. //depot/projects/efi/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/efi/arm/arm/locore.S#1 branch .. //depot/projects/efi/arm/arm/machdep.c#1 branch .. //depot/projects/efi/arm/arm/mem.c#1 branch .. //depot/projects/efi/arm/arm/nexus.c#1 branch .. //depot/projects/efi/arm/arm/pmap.c#1 branch .. //depot/projects/efi/arm/arm/setcpsr.S#1 branch .. //depot/projects/efi/arm/arm/setstack.s#1 branch .. //depot/projects/efi/arm/arm/stack_machdep.c#1 branch .. //depot/projects/efi/arm/arm/support.S#1 branch .. //depot/projects/efi/arm/arm/swtch.S#1 branch .. //depot/projects/efi/arm/arm/sys_machdep.c#1 branch .. //depot/projects/efi/arm/arm/trap.c#1 branch .. //depot/projects/efi/arm/arm/uio_machdep.c#1 branch .. //depot/projects/efi/arm/arm/undefined.c#1 branch .. //depot/projects/efi/arm/arm/vectors.S#1 branch .. //depot/projects/efi/arm/arm/vm_machdep.c#1 branch .. //depot/projects/efi/arm/at91/at91.c#1 branch .. //depot/projects/efi/arm/at91/at91_mci.c#1 branch .. //depot/projects/efi/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/efi/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/efi/arm/at91/at91_pio.c#1 branch .. //depot/projects/efi/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/efi/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/efi/arm/at91/at91_piovar.h#1 branch .. //depot/projects/efi/arm/at91/at91_pmc.c#1 branch .. //depot/projects/efi/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/efi/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/efi/arm/at91/at91_rtc.c#1 branch .. //depot/projects/efi/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/efi/arm/at91/at91_spi.c#1 branch .. //depot/projects/efi/arm/at91/at91_spireg.h#1 branch .. //depot/projects/efi/arm/at91/at91_ssc.c#1 branch .. //depot/projects/efi/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/efi/arm/at91/at91_st.c#1 branch .. //depot/projects/efi/arm/at91/at91_streg.h#1 branch .. //depot/projects/efi/arm/at91/at91_twi.c#1 branch .. //depot/projects/efi/arm/at91/at91_twiio.h#1 branch .. //depot/projects/efi/arm/at91/at91_twireg.h#1 branch .. //depot/projects/efi/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/efi/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/efi/arm/at91/at91var.h#1 branch .. //depot/projects/efi/arm/at91/files.at91#1 branch .. //depot/projects/efi/arm/at91/files.kb920x#1 branch .. //depot/projects/efi/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/efi/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/efi/arm/at91/if_ate.c#1 branch .. //depot/projects/efi/arm/at91/if_atereg.h#1 branch .. //depot/projects/efi/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/efi/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/efi/arm/at91/std.at91#1 branch .. //depot/projects/efi/arm/at91/std.kb920x#1 branch .. //depot/projects/efi/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/efi/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/efi/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/efi/arm/compile/.cvsignore#1 branch .. //depot/projects/efi/arm/conf/.cvsignore#1 branch .. //depot/projects/efi/arm/conf/AVILA#1 branch .. //depot/projects/efi/arm/conf/AVILA.hints#1 branch .. //depot/projects/efi/arm/conf/BWCT#1 branch .. //depot/projects/efi/arm/conf/BWCT.hints#1 branch .. //depot/projects/efi/arm/conf/CRB#1 branch .. //depot/projects/efi/arm/conf/EP80219#1 branch .. //depot/projects/efi/arm/conf/HL200#1 branch .. //depot/projects/efi/arm/conf/IQ31244#1 branch .. //depot/projects/efi/arm/conf/KB920X#1 branch .. //depot/projects/efi/arm/conf/KB920X.hints#1 branch .. //depot/projects/efi/arm/conf/SIMICS#1 branch .. //depot/projects/efi/arm/conf/SKYEYE#1 branch .. //depot/projects/efi/arm/include/_bus.h#1 branch .. //depot/projects/efi/arm/include/_inttypes.h#1 branch .. //depot/projects/efi/arm/include/_limits.h#1 branch .. //depot/projects/efi/arm/include/_stdint.h#1 branch .. //depot/projects/efi/arm/include/_types.h#1 branch .. //depot/projects/efi/arm/include/armreg.h#1 branch .. //depot/projects/efi/arm/include/asm.h#1 branch .. //depot/projects/efi/arm/include/asmacros.h#1 branch .. //depot/projects/efi/arm/include/atomic.h#1 branch .. //depot/projects/efi/arm/include/blockio.h#1 branch .. //depot/projects/efi/arm/include/bootconfig.h#1 branch .. //depot/projects/efi/arm/include/bus.h#1 branch .. //depot/projects/efi/arm/include/bus_dma.h#1 branch .. //depot/projects/efi/arm/include/clock.h#1 branch .. //depot/projects/efi/arm/include/cpu.h#1 branch .. //depot/projects/efi/arm/include/cpuconf.h#1 branch .. //depot/projects/efi/arm/include/cpufunc.h#1 branch .. //depot/projects/efi/arm/include/db_machdep.h#1 branch .. //depot/projects/efi/arm/include/disassem.h#1 branch .. //depot/projects/efi/arm/include/elf.h#1 branch .. //depot/projects/efi/arm/include/endian.h#1 branch .. //depot/projects/efi/arm/include/exec.h#1 branch .. //depot/projects/efi/arm/include/fiq.h#1 branch .. //depot/projects/efi/arm/include/float.h#1 branch .. //depot/projects/efi/arm/include/floatingpoint.h#1 branch .. //depot/projects/efi/arm/include/fp.h#1 branch .. //depot/projects/efi/arm/include/frame.h#1 branch .. //depot/projects/efi/arm/include/gdb_machdep.h#1 branch .. //depot/projects/efi/arm/include/ieee.h#1 branch .. //depot/projects/efi/arm/include/ieeefp.h#1 branch .. //depot/projects/efi/arm/include/in_cksum.h#1 branch .. //depot/projects/efi/arm/include/intr.h#1 branch .. //depot/projects/efi/arm/include/katelib.h#1 branch .. //depot/projects/efi/arm/include/kdb.h#1 branch .. //depot/projects/efi/arm/include/limits.h#1 branch .. //depot/projects/efi/arm/include/machdep.h#1 branch .. //depot/projects/efi/arm/include/md_var.h#1 branch .. //depot/projects/efi/arm/include/memdev.h#1 branch .. //depot/projects/efi/arm/include/metadata.h#1 branch .. //depot/projects/efi/arm/include/mutex.h#1 branch .. //depot/projects/efi/arm/include/param.h#1 branch .. //depot/projects/efi/arm/include/pcb.h#1 branch .. //depot/projects/efi/arm/include/pcpu.h#1 branch .. //depot/projects/efi/arm/include/pmap.h#1 branch .. //depot/projects/efi/arm/include/pmc_mdep.h#1 branch .. //depot/projects/efi/arm/include/proc.h#1 branch .. //depot/projects/efi/arm/include/profile.h#1 branch .. //depot/projects/efi/arm/include/psl.h#1 branch .. //depot/projects/efi/arm/include/pte.h#1 branch .. //depot/projects/efi/arm/include/ptrace.h#1 branch .. //depot/projects/efi/arm/include/reg.h#1 branch .. //depot/projects/efi/arm/include/reloc.h#1 branch .. //depot/projects/efi/arm/include/resource.h#1 branch .. //depot/projects/efi/arm/include/runq.h#1 branch .. //depot/projects/efi/arm/include/setjmp.h#1 branch .. //depot/projects/efi/arm/include/sf_buf.h#1 branch .. //depot/projects/efi/arm/include/sigframe.h#1 branch .. //depot/projects/efi/arm/include/signal.h#1 branch .. //depot/projects/efi/arm/include/smp.h#1 branch .. //depot/projects/efi/arm/include/stack.h#1 branch .. //depot/projects/efi/arm/include/stdarg.h#1 branch .. //depot/projects/efi/arm/include/swi.h#1 branch .. //depot/projects/efi/arm/include/sysarch.h#1 branch .. //depot/projects/efi/arm/include/trap.h#1 branch .. //depot/projects/efi/arm/include/ucontext.h#1 branch .. //depot/projects/efi/arm/include/undefined.h#1 branch .. //depot/projects/efi/arm/include/utrap.h#1 branch .. //depot/projects/efi/arm/include/vmparam.h#1 branch .. //depot/projects/efi/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/efi/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/efi/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/efi/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/efi/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/efi/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/efi/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/efi/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/efi/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/efi/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/efi/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/efi/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/efi/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/efi/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/efi/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/efi/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/efi/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/efi/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/efi/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/efi/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/efi/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/efi/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/efi/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/efi/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/efi/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/efi/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/efi/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/efi/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/efi/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/efi/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/efi/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/efi/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/efi/arm/xscale/std.xscale#1 branch .. //depot/projects/efi/arm/xscale/xscalereg.h#1 branch .. //depot/projects/efi/arm/xscale/xscalevar.h#1 branch .. //depot/projects/efi/boot/Makefile#1 branch .. //depot/projects/efi/boot/README#1 branch .. //depot/projects/efi/boot/arm/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/efi/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/boot0/README#1 branch .. //depot/projects/efi/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/efi/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/efi/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/efi/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/efi/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/efi/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/efi/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/efi/boot/common/Makefile.inc#1 branch .. //depot/projects/efi/boot/common/bcache.c#1 branch .. //depot/projects/efi/boot/common/boot.c#1 branch .. //depot/projects/efi/boot/common/bootstrap.h#1 branch .. //depot/projects/efi/boot/common/commands.c#1 branch .. //depot/projects/efi/boot/common/console.c#1 branch .. //depot/projects/efi/boot/common/dev_net.c#1 branch .. //depot/projects/efi/boot/common/dev_net.h#1 branch .. //depot/projects/efi/boot/common/devopen.c#1 branch .. //depot/projects/efi/boot/common/help.common#1 branch .. //depot/projects/efi/boot/common/interp.c#1 branch .. //depot/projects/efi/boot/common/interp_backslash.c#1 branch .. //depot/projects/efi/boot/common/interp_forth.c#1 branch .. //depot/projects/efi/boot/common/interp_parse.c#1 branch .. //depot/projects/efi/boot/common/isapnp.c#1 branch .. //depot/projects/efi/boot/common/isapnp.h#1 branch .. //depot/projects/efi/boot/common/load.c#1 branch .. //depot/projects/efi/boot/common/load_elf.c#1 branch .. //depot/projects/efi/boot/common/load_elf32.c#1 branch .. //depot/projects/efi/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/efi/boot/common/load_elf64.c#1 branch .. //depot/projects/efi/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/efi/boot/common/load_elf_obj.c#1 branch .. //depot/projects/efi/boot/common/loader.8#1 branch .. //depot/projects/efi/boot/common/ls.c#1 branch .. //depot/projects/efi/boot/common/merge_help.awk#1 branch .. //depot/projects/efi/boot/common/misc.c#1 branch .. //depot/projects/efi/boot/common/module.c#1 branch .. //depot/projects/efi/boot/common/newvers.sh#1 branch .. //depot/projects/efi/boot/common/panic.c#1 branch .. //depot/projects/efi/boot/common/pnp.c#1 branch .. //depot/projects/efi/boot/common/reloc_elf.c#1 branch .. //depot/projects/efi/boot/common/reloc_elf32.c#1 branch .. //depot/projects/efi/boot/common/reloc_elf64.c#1 branch .. //depot/projects/efi/boot/common/ufsread.c#1 branch .. //depot/projects/efi/boot/efi/Makefile#1 branch .. //depot/projects/efi/boot/efi/Makefile.inc#1 branch .. //depot/projects/efi/boot/efi/include/README#1 branch .. //depot/projects/efi/boot/efi/include/efi.h#1 branch .. //depot/projects/efi/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/efi/boot/efi/include/efiapi.h#1 branch .. //depot/projects/efi/boot/efi/include/eficon.h#1 branch .. //depot/projects/efi/boot/efi/include/efidebug.h#1 branch .. //depot/projects/efi/boot/efi/include/efidef.h#1 branch .. //depot/projects/efi/boot/efi/include/efidevp.h#1 branch .. //depot/projects/efi/boot/efi/include/efierr.h#1 branch .. //depot/projects/efi/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/efi/boot/efi/include/efifs.h#1 branch .. //depot/projects/efi/boot/efi/include/efilib.h#1 branch .. //depot/projects/efi/boot/efi/include/efinet.h#1 branch .. //depot/projects/efi/boot/efi/include/efipart.h#1 branch .. //depot/projects/efi/boot/efi/include/efiprot.h#1 branch .. //depot/projects/efi/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/efi/boot/efi/include/efiser.h#1 branch .. //depot/projects/efi/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/efi/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/efi/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/efi/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/efi/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/efi/boot/efi/libefi/Makefile#1 branch .. //depot/projects/efi/boot/efi/libefi/delay.c#1 branch .. //depot/projects/efi/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/efi/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/efi/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/efi/boot/efi/libefi/errno.c#1 branch .. //depot/projects/efi/boot/efi/libefi/handles.c#1 branch .. //depot/projects/efi/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/efi/boot/efi/libefi/time.c#1 branch .. //depot/projects/efi/boot/ficl/Makefile#1 branch .. //depot/projects/efi/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/efi/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/efi/boot/ficl/dict.c#1 branch .. //depot/projects/efi/boot/ficl/ficl.c#1 branch .. //depot/projects/efi/boot/ficl/ficl.h#1 branch .. //depot/projects/efi/boot/ficl/fileaccess.c#1 branch .. //depot/projects/efi/boot/ficl/float.c#1 branch .. //depot/projects/efi/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/efi/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/efi/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/efi/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/efi/boot/ficl/loader.c#1 branch .. //depot/projects/efi/boot/ficl/math64.c#1 branch .. //depot/projects/efi/boot/ficl/math64.h#1 branch .. //depot/projects/efi/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/efi/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/efi/boot/ficl/prefix.c#1 branch .. //depot/projects/efi/boot/ficl/search.c#1 branch .. //depot/projects/efi/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/efi/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/efi/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/efi/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/efi/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/efi/boot/ficl/stack.c#1 branch .. //depot/projects/efi/boot/ficl/testmain.c#1 branch .. //depot/projects/efi/boot/ficl/tools.c#1 branch .. //depot/projects/efi/boot/ficl/unix.c#1 branch .. //depot/projects/efi/boot/ficl/vm.c#1 branch .. //depot/projects/efi/boot/ficl/words.c#1 branch .. //depot/projects/efi/boot/forth/beastie.4th#1 branch .. //depot/projects/efi/boot/forth/frames.4th#1 branch .. //depot/projects/efi/boot/forth/loader.4th#1 branch .. //depot/projects/efi/boot/forth/loader.4th.8#1 branch .. //depot/projects/efi/boot/forth/loader.conf#1 branch .. //depot/projects/efi/boot/forth/loader.conf.5#1 branch .. //depot/projects/efi/boot/forth/loader.rc#1 branch .. //depot/projects/efi/boot/forth/pnp.4th#1 branch .. //depot/projects/efi/boot/forth/screen.4th#1 branch .. //depot/projects/efi/boot/forth/support.4th#1 branch .. //depot/projects/efi/boot/i386/Makefile#1 branch .. //depot/projects/efi/boot/i386/Makefile.inc#1 branch .. //depot/projects/efi/boot/i386/boot0/Makefile#1 branch .. //depot/projects/efi/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/efi/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/efi/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/efi/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/efi/boot/i386/boot2/Makefile#1 branch .. //depot/projects/efi/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/efi/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/efi/boot/i386/boot2/lib.h#1 branch .. //depot/projects/efi/boot/i386/boot2/sio.S#1 branch .. //depot/projects/efi/boot/i386/btx/Makefile#1 branch .. //depot/projects/efi/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/efi/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/efi/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/efi/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/efi/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/efi/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/efi/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/efi/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/efi/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/efi/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/efi/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/efi/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/efi/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/efi/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/efi/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/efi/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/efi/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/efi/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/efi/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/efi/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/efi/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/efi/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/efi/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/efi/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/efi/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/efi/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/efi/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/efi/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/efi/boot/i386/libi386/Makefile#1 branch .. //depot/projects/efi/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/efi/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/efi/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/efi/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/efi/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/efi/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/efi/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/efi/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/efi/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/efi/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/efi/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/efi/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/efi/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/efi/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/efi/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/efi/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/efi/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/efi/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/efi/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/efi/boot/i386/libi386/pread.c#1 branch .. //depot/projects/efi/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/efi/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/efi/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/efi/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/efi/boot/i386/libi386/time.c#1 branch .. //depot/projects/efi/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/efi/boot/i386/loader/Makefile#1 branch .. //depot/projects/efi/boot/i386/loader/conf.c#1 branch .. //depot/projects/efi/boot/i386/loader/help.i386#1 branch .. //depot/projects/efi/boot/i386/loader/loader.rc#1 branch .. //depot/projects/efi/boot/i386/loader/main.c#1 branch .. //depot/projects/efi/boot/i386/loader/version#1 branch .. //depot/projects/efi/boot/i386/mbr/Makefile#1 branch .. //depot/projects/efi/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/efi/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/efi/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/efi/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/efi/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/efi/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/efi/boot/ia64/Makefile#1 branch .. //depot/projects/efi/boot/ia64/Makefile.inc#1 branch .. //depot/projects/efi/boot/ia64/common/Makefile#1 branch .. //depot/projects/efi/boot/ia64/common/autoload.c#1 branch .. //depot/projects/efi/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/efi/boot/ia64/common/copy.c#1 branch .. //depot/projects/efi/boot/ia64/common/devicename.c#1 branch .. //depot/projects/efi/boot/ia64/common/exec.c#1 branch .. //depot/projects/efi/boot/ia64/common/libia64.h#1 branch .. //depot/projects/efi/boot/ia64/efi/Makefile#1 branch .. //depot/projects/efi/boot/ia64/efi/conf.c#1 branch .. //depot/projects/efi/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/efi/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/efi/boot/ia64/efi/main.c#1 branch .. //depot/projects/efi/boot/ia64/efi/start.S#1 branch .. //depot/projects/efi/boot/ia64/efi/version#1 branch .. //depot/projects/efi/boot/ia64/ski/Makefile#1 branch .. //depot/projects/efi/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/efi/boot/ia64/ski/conf.c#1 branch .. //depot/projects/efi/boot/ia64/ski/delay.c#1 branch .. //depot/projects/efi/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/efi/boot/ia64/ski/exit.c#1 branch .. //depot/projects/efi/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/efi/boot/ia64/ski/libski.h#1 branch .. //depot/projects/efi/boot/ia64/ski/main.c#1 branch .. //depot/projects/efi/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/efi/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/efi/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/efi/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/efi/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/efi/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/efi/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/efi/boot/ia64/ski/start.S#1 branch .. //depot/projects/efi/boot/ia64/ski/time.c#1 branch .. //depot/projects/efi/boot/ia64/ski/version#1 branch .. //depot/projects/efi/boot/ofw/Makefile#1 branch .. //depot/projects/efi/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/efi/boot/ofw/common/main.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/efi/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/efi/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/efi/boot/pc98/Makefile#1 branch .. //depot/projects/efi/boot/pc98/Makefile.inc#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/efi/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/efi/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/efi/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/efi/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/efi/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/efi/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/efi/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/efi/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/io.c#1 branch .. //depot/projects/efi/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/efi/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/efi/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/start.S#1 branch .. //depot/projects/efi/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/efi/boot/pc98/boot2/table.c#1 branch .. //depot/projects/efi/boot/pc98/btx/Makefile#1 branch .. //depot/projects/efi/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/efi/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/efi/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/efi/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/efi/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/efi/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/efi/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/efi/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/efi/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/efi/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/efi/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/efi/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/efi/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/efi/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/efi/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/efi/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/efi/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/efi/boot/pc98/loader/Makefile#1 branch .. //depot/projects/efi/boot/pc98/loader/conf.c#1 branch .. //depot/projects/efi/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/efi/boot/pc98/loader/main.c#1 branch .. //depot/projects/efi/boot/powerpc/Makefile#1 branch .. //depot/projects/efi/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/efi/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/efi/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/efi/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/efi/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/efi/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/efi/boot/powerpc/ofw/version#1 branch .. //depot/projects/efi/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/efi/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/efi/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/efi/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/efi/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/efi/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/efi/boot/powerpc/uboot/version#1 branch .. //depot/projects/efi/boot/sparc64/Makefile#1 branch .. //depot/projects/efi/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/efi/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/efi/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/efi/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/efi/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/efi/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/efi/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/efi/boot/sparc64/loader/main.c#1 branch .. //depot/projects/efi/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/efi/boot/sparc64/loader/version#1 branch .. //depot/projects/efi/boot/uboot/Makefile#1 branch .. //depot/projects/efi/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/efi/boot/uboot/common/main.c#1 branch .. //depot/projects/efi/boot/uboot/lib/Makefile#1 branch .. //depot/projects/efi/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/efi/boot/uboot/lib/console.c#1 branch .. //depot/projects/efi/boot/uboot/lib/copy.c#1 branch .. //depot/projects/efi/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/efi/boot/uboot/lib/disk.c#1 branch .. //depot/projects/efi/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/efi/boot/uboot/lib/glue.c#1 branch .. //depot/projects/efi/boot/uboot/lib/glue.h#1 branch .. //depot/projects/efi/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/efi/boot/uboot/lib/module.c#1 branch .. //depot/projects/efi/boot/uboot/lib/net.c#1 branch .. //depot/projects/efi/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/efi/boot/uboot/lib/time.c#1 branch .. //depot/projects/efi/bsm/audit.h#1 branch .. //depot/projects/efi/bsm/audit_internal.h#1 branch .. //depot/projects/efi/bsm/audit_kevents.h#1 branch .. //depot/projects/efi/bsm/audit_record.h#1 branch .. //depot/projects/efi/cam/README.quirks#1 branch .. //depot/projects/efi/cam/cam.c#1 branch .. //depot/projects/efi/cam/cam.h#1 branch .. //depot/projects/efi/cam/cam_ccb.h#1 branch .. //depot/projects/efi/cam/cam_debug.h#1 branch .. //depot/projects/efi/cam/cam_periph.c#1 branch .. //depot/projects/efi/cam/cam_periph.h#1 branch .. //depot/projects/efi/cam/cam_queue.c#1 branch .. //depot/projects/efi/cam/cam_queue.h#1 branch .. //depot/projects/efi/cam/cam_sim.c#1 branch .. //depot/projects/efi/cam/cam_sim.h#1 branch .. //depot/projects/efi/cam/cam_xpt.c#1 branch .. //depot/projects/efi/cam/cam_xpt.h#1 branch .. //depot/projects/efi/cam/cam_xpt_periph.h#1 branch .. //depot/projects/efi/cam/cam_xpt_sim.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_all.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_all.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_da.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_da.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_low.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_low.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_message.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/efi/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_target.c#1 branch .. //depot/projects/efi/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/efi/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/efi/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 17 03:50:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19749106567A; Thu, 17 Apr 2008 03:50:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE7C31065674 for ; Thu, 17 Apr 2008 03:50:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB12C8FC2C for ; Thu, 17 Apr 2008 03:50:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H3o3r6030343 for ; Thu, 17 Apr 2008 03:50:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H3o3im030314 for perforce@freebsd.org; Thu, 17 Apr 2008 03:50:03 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 03:50:03 GMT Message-Id: <200804170350.m3H3o3im030314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 03:50:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=140153 Change 140153 by marcel@marcel_xcllnt on 2008/04/17 03:49:30 Move the beginnings of i386 EFI support from the ia64 branch. Affected files ... .. //depot/projects/efi/boot/i386/Makefile#2 edit .. //depot/projects/efi/boot/i386/efi/Makefile#1 add .. //depot/projects/efi/boot/i386/efi/conf.c#1 add .. //depot/projects/efi/boot/i386/efi/exec.c#1 add .. //depot/projects/efi/boot/i386/efi/ldscript.ia32#1 add .. //depot/projects/efi/boot/i386/efi/main.c#1 add .. //depot/projects/efi/boot/i386/efi/version#1 add Differences ... ==== //depot/projects/efi/boot/i386/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/boot/i386/Makefile,v 1.22 2007/10/24 21:32:58 jhb Exp $ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ - libi386 libfirewire loader + libi386 libfirewire loader efi # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr From owner-p4-projects@FreeBSD.ORG Thu Apr 17 03:52:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03BBB1065670; Thu, 17 Apr 2008 03:52:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA5D3106566B for ; Thu, 17 Apr 2008 03:52:05 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A747C8FC0C for ; Thu, 17 Apr 2008 03:52:05 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H3q51K030418 for ; Thu, 17 Apr 2008 03:52:05 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H3q5PM030416 for perforce@freebsd.org; Thu, 17 Apr 2008 03:52:05 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 03:52:05 GMT Message-Id: <200804170352.m3H3q5PM030416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 03:52:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=140154 Change 140154 by marcel@marcel_xcllnt on 2008/04/17 03:51:50 i386 EFI support moved to efi branch. Affected files ... .. //depot/projects/ia64/sys/boot/i386/Makefile#11 edit .. //depot/projects/ia64/sys/boot/i386/efi/Makefile#4 delete .. //depot/projects/ia64/sys/boot/i386/efi/conf.c#2 delete .. //depot/projects/ia64/sys/boot/i386/efi/exec.c#2 delete .. //depot/projects/ia64/sys/boot/i386/efi/ldscript.ia32#3 delete .. //depot/projects/ia64/sys/boot/i386/efi/main.c#2 delete .. //depot/projects/ia64/sys/boot/i386/efi/version#3 delete Differences ... ==== //depot/projects/ia64/sys/boot/i386/Makefile#11 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/sys/boot/i386/Makefile,v 1.22 2007/10/24 21:32:58 jhb Exp $ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ - libi386 libfirewire loader efi + libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr From owner-p4-projects@FreeBSD.ORG Thu Apr 17 04:30:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FDF91065671; Thu, 17 Apr 2008 04:30:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08928106566B for ; Thu, 17 Apr 2008 04:30:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E76E78FC14 for ; Thu, 17 Apr 2008 04:30:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H4UlPF033268 for ; Thu, 17 Apr 2008 04:30:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H4Ultt033266 for perforce@freebsd.org; Thu, 17 Apr 2008 04:30:47 GMT (envelope-from jb@freebsd.org) Date: Thu, 17 Apr 2008 04:30:47 GMT Message-Id: <200804170430.m3H4Ultt033266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 04:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=140157 Change 140157 by jb@jb_freebsd1 on 2008/04/17 04:30:46 IF7 The big CDDL file move. Affected files ... .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/assert.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/atomic.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/libintl.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/synch.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/head/thread.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch .. //depot/projects/dtrace7/src/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/FREEBSD-Xlist#2 delete .. //depot/projects/dtrace7/src/contrib/bzip2/FREEBSD-upgrade#2 delete .. //depot/projects/dtrace7/src/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/Makefile#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/README#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/compress.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/spewG.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bzip2/unzcrash.c#2 integrate .. //depot/projects/dtrace7/src/crypto/openssh/channels.c#2 integrate .. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/dtrace7/src/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/dtrace7/src/sys/rpc/clnt_rc.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/dtrace7/src/contrib/bzip2/CHANGES#2 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -312,3 +312,8 @@ * Fix minor doc/comment bugs. + +1.0.5 (10 Dec 07) +~~~~~~~~~~~~~~~~~ +Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + ==== //depot/projects/dtrace7/src/contrib/bzip2/LICENSE#2 (text+ko) ==== @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2006 Julian R Seward. All +documentation, are copyright (C) 1996-2007 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -36,8 +36,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Julian Seward, Cambridge, UK. -jseward@bzip.org -bzip2/libbzip2 version 1.0.4 of 20 December 2006 +Julian Seward, jseward@bzip.org +bzip2/libbzip2 version 1.0.5 of 10 December 2007 -------------------------------------------------------------------------- ==== //depot/projects/dtrace7/src/contrib/bzip2/Makefile#2 (text+ko) ==== @@ -2,8 +2,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -137,7 +137,7 @@ distclean: clean rm -f manual.ps manual.html manual.pdf -DISTNAME=bzip2-1.0.4 +DISTNAME=bzip2-1.0.5 dist: check manual rm -f $(DISTNAME) ln -s -f . $(DISTNAME) ==== //depot/projects/dtrace7/src/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ==== @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.4 of 20 December 2006 -# Copyright (C) 1996-2006 Julian Seward +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/README#2 (text+ko) ==== @@ -6,8 +6,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -177,7 +177,11 @@ See the CHANGES file. +WHAT'S NEW IN 1.0.5 ? + See the CHANGES file. + + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org if you have any suggestions or queries. Many people mailed me with @@ -203,3 +207,4 @@ 30 December 2001 (bzip2, version 1.0.2pre1) 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ==== //depot/projects/dtrace7/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 (text+ko) ==== @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.4 of 20 December 2006 -Copyright (C) 1996-2006 Julian Seward +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.4 should compile without problems on the vast majority of +bzip2-1.0.5 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file ==== //depot/projects/dtrace7/src/contrib/bzip2/blocksort.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/bzip2.c#2 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ==== //depot/projects/dtrace7/src/contrib/bzip2/bzip2recover.c#2 (text+ko) ==== @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", ==== //depot/projects/dtrace7/src/contrib/bzip2/bzlib.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3 2007/03/28 07:46:20 delphij Exp $"); +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.3.2.1 2008/04/17 00:48:28 delphij Exp $"); #include "bzlib_private.h" @@ -52,7 +52,7 @@ "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", errcode, BZ2_bzlibVersion() ); @@ -605,6 +605,7 @@ UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; ==== //depot/projects/dtrace7/src/contrib/bzip2/bzlib.h#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/bzlib_private.h#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.4, 20-Dec-2006" +#define BZ_VERSION "1.0.5, 10-Dec-2007" typedef char Char; typedef unsigned char Bool; @@ -442,11 +442,15 @@ /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ s->tPos = s->tt[s->tPos]; \ cccc = (UChar)(s->tPos & 0xff); \ s->tPos >>= 8; #define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ c_tPos = c_tt[c_tPos]; \ cccc = (UChar)(c_tPos & 0xff); \ c_tPos >>= 8; @@ -469,8 +473,10 @@ (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) #define BZ_GET_SMALL(cccc) \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); /*-- externs for decompression. --*/ ==== //depot/projects/dtrace7/src/contrib/bzip2/compress.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/crctable.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/decompress.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/huffman.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/randtable.c#2 (text+ko) ==== @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/spewG.c#2 (text+ko) ==== @@ -13,8 +13,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/contrib/bzip2/unzcrash.c#2 (text+ko) ==== @@ -17,8 +17,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. ==== //depot/projects/dtrace7/src/crypto/openssh/channels.c#2 (text+ko) ==== @@ -2895,9 +2895,6 @@ debug2("bind port %d: %.100s", port, strerror(errno)); close(sock); - if (ai->ai_next) - continue; - for (n = 0; n < num_socks; n++) { close(socks[n]); } ==== //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.24 2008/04/06 05:19:21 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.25 2008/04/17 00:58:50 delphij Exp $ 2000 @@ -264,6 +264,9 @@ awk has been updated from 1 May 2007 release to the 23 October 2007 release. + bzip2 has been updated from 1.0.4 + to 1.0.5. + OpenPAM has been updated from the Figwort release to the Hydrangea release. ==== //depot/projects/dtrace7/src/sbin/geom/class/journal/gjournal.8#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.1.2.1 2007/11/20 07:32:54 ru Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.1.2.2 2008/04/16 18:54:08 remko Exp $ .\" -.Dd November 14, 2007 +.Dd April 13, 2008 .Dt GJOURNAL 8 .Os .Sh NAME @@ -219,7 +219,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable && \e + tunefs -J enable -n disable da01sd.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.4.2.1 2008/04/10 09:39:25 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/nlm/nlm_prot_impl.c,v 1.4.2.2 2008/04/16 09:08:54 dfr Exp $"); #include #include @@ -161,6 +161,11 @@ /* * NLM host. */ +enum nlm_host_state { + NLM_UNMONITORED, + NLM_MONITORED, + NLM_MONITOR_FAILED +}; struct nlm_host { struct mtx nh_lock; TAILQ_ENTRY(nlm_host) nh_link; /* (s) global list of hosts */ @@ -171,7 +176,7 @@ CLIENT *nh_rpc; /* (s) RPC handle to send to host */ rpcvers_t nh_vers; /* (s) NLM version of host */ int nh_state; /* (s) last seen NSM state of host */ - bool_t nh_monitored; /* (s) TRUE if local NSM is monitoring */ + enum nlm_host_state nh_monstate; /* (s) local NSM monitoring state */ time_t nh_idle_timeout; /* (s) Time at which host is idle */ struct sysctl_ctx_list nh_sysctl; /* (c) vfs.nlm.sysid nodes */ struct nlm_async_lock_list nh_pending; /* (l) pending async locks */ @@ -607,7 +612,7 @@ host->nh_rpc = NULL; host->nh_vers = 0; host->nh_state = 0; - host->nh_monitored = FALSE; + host->nh_monstate = NLM_UNMONITORED; TAILQ_INIT(&host->nh_pending); TAILQ_INIT(&host->nh_finished); TAILQ_INSERT_TAIL(&nlm_hosts, host, nh_link); @@ -621,7 +626,7 @@ SYSCTL_ADD_INT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO, "version", CTLFLAG_RD, &host->nh_vers, 0, ""); SYSCTL_ADD_INT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO, - "monitored", CTLFLAG_RD, &host->nh_monitored, 0, ""); + "monitored", CTLFLAG_RD, &host->nh_monstate, 0, ""); SYSCTL_ADD_PROC(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO, "lock_count", CTLTYPE_INT | CTLFLAG_RD, host, 0, nlm_host_lock_count_sysctl, "I", ""); @@ -679,7 +684,7 @@ nlm_next_idle_check = time_uptime + NLM_IDLE_PERIOD; TAILQ_FOREACH(host, &nlm_hosts, nh_link) { - if (host->nh_monitored + if (host->nh_monstate == NLM_MONITORED && time_uptime > host->nh_idle_timeout) { if (lf_countlocks(host->nh_sysid) > 0) { host->nh_idle_timeout = @@ -861,7 +866,7 @@ return; } - host->nh_monitored = FALSE; + host->nh_monstate = NLM_UNMONITORED; } /* @@ -896,7 +901,7 @@ host->nh_caller_name, host->nh_sysid, state); } - if (host->nh_monitored) + if (host->nh_monstate != NLM_UNMONITORED) return; if (nlm_debug_level >= 1) @@ -928,10 +933,11 @@ if (smstat.res_stat == stat_fail) { printf("Local NSM refuses to monitor %s\n", host->nh_caller_name); + host->nh_monstate = NLM_MONITOR_FAILED; return; } - host->nh_monitored = TRUE; + host->nh_monstate = NLM_MONITORED; } /* @@ -1265,6 +1271,7 @@ struct mount *vs_mp; struct vnode *vs_vp; int vs_vfslocked; + int vs_vnlocked; }; static int @@ -1296,6 +1303,7 @@ error = VFS_FHTOVP(vs->vs_mp, &fhp->fh_fid, &vs->vs_vp); if (error) goto out; + vs->vs_vnlocked = TRUE; cred = crget(); freecred = TRUE; @@ -1308,11 +1316,6 @@ cred = credanon; freecred = FALSE; } -#if __FreeBSD_version < 800011 - VOP_UNLOCK(vs->vs_vp, 0, curthread); -#else - VOP_UNLOCK(vs->vs_vp, 0); -#endif /* * Check cred. @@ -1321,6 +1324,13 @@ if (error) goto out; +#if __FreeBSD_version < 800011 + VOP_UNLOCK(vs->vs_vp, 0, curthread); +#else + VOP_UNLOCK(vs->vs_vp, 0); +#endif + vs->vs_vnlocked = FALSE; + out: if (freecred) crfree(cred); @@ -1332,8 +1342,12 @@ nlm_release_vfs_state(struct vfs_state *vs) { - if (vs->vs_vp) - vrele(vs->vs_vp); + if (vs->vs_vp) { + if (vs->vs_vnlocked) + vput(vs->vs_vp); + else + vrele(vs->vs_vp); + } if (vs->vs_mp) vfs_rel(vs->vs_mp); VFS_UNLOCK_GIANT(vs->vs_vfslocked); ==== //depot/projects/dtrace7/src/sys/pci/if_rl.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.170.2.2 2008/03/13 07:50:48 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.170.2.3 2008/04/17 04:16:50 yongari Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -1140,17 +1140,19 @@ * datasheet makes absolutely no mention of this and * RealTek should be shot for this. */ - if ((uint16_t)(rxstat >> 16) == RL_RXSTAT_UNFINISHED) + total_len = rxstat >> 16; + if (total_len == RL_RXSTAT_UNFINISHED) break; - if (!(rxstat & RL_RXSTAT_RXOK)) { + if (!(rxstat & RL_RXSTAT_RXOK) || + total_len < ETHER_MIN_LEN || + total_len > ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) { ifp->if_ierrors++; rl_init_locked(sc); return; } /* No errors; receive the packet. */ - total_len = rxstat >> 16; rx_bytes += total_len + 4; /* ==== //depot/projects/dtrace7/src/sys/rpc/clnt_rc.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/rpc/clnt_rc.c,v 1.2.2.1 2008/04/10 09:39:26 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/rpc/clnt_rc.c,v 1.2.2.2 2008/04/16 09:08:54 dfr Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 17 05:02:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E32E1065671; Thu, 17 Apr 2008 05:02:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4B7F106566B for ; Thu, 17 Apr 2008 05:02:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C16418FC18 for ; Thu, 17 Apr 2008 05:02:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H52QTw043521 for ; Thu, 17 Apr 2008 05:02:26 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H52QjD043519 for perforce@freebsd.org; Thu, 17 Apr 2008 05:02:26 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 05:02:26 GMT Message-Id: <200804170502.m3H52QjD043519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 05:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=140159 Change 140159 by marcel@marcel_xcllnt on 2008/04/17 05:02:03 Revert to vendor. Affected files ... .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#6 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#6 (text+ko) ==== @@ -2,18 +2,11 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cofflink.c \ - cpu-i386.c \ - efi-app-ia32.c \ +SRCS+= cpu-i386.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c \ - peigen.c + elflink.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec \ - bfd_efi_app_ia32_vec - -peigen.c: peXXigen.c - sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} + bfd_elf32_i386_vec From owner-p4-projects@FreeBSD.ORG Thu Apr 17 05:22:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCCC91065674; Thu, 17 Apr 2008 05:22:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EE9B106566B for ; Thu, 17 Apr 2008 05:22:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 524178FC0C for ; Thu, 17 Apr 2008 05:22:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H5Mm33045292 for ; Thu, 17 Apr 2008 05:22:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H5Mmxh045290 for perforce@freebsd.org; Thu, 17 Apr 2008 05:22:48 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 05:22:48 GMT Message-Id: <200804170522.m3H5Mmxh045290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 05:22:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=140161 Change 140161 by marcel@marcel_cluster on 2008/04/17 05:21:58 Declare ia64_pgtbl and ia64_pgtblsz as extern. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/common/libia64.h#5 (text+ko) ==== @@ -45,6 +45,9 @@ * and shared by all loader implementations. */ +extern uint64_t *ia64_pgtbl; +extern uint32_t ia64_pgtblsz; + extern int ia64_autoload(void); extern ssize_t ia64_copyin(const void *, vm_offset_t, size_t); From owner-p4-projects@FreeBSD.ORG Thu Apr 17 05:57:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04E431065670; Thu, 17 Apr 2008 05:57:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8939106566B for ; Thu, 17 Apr 2008 05:57:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A34968FC13 for ; Thu, 17 Apr 2008 05:57:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3H5vOIB046273 for ; Thu, 17 Apr 2008 05:57:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3H5vOhb046271 for perforce@freebsd.org; Thu, 17 Apr 2008 05:57:24 GMT (envelope-from jb@freebsd.org) Date: Thu, 17 Apr 2008 05:57:24 GMT Message-Id: <200804170557.m3H5vOhb046271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 05:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=140162 Change 140162 by jb@jb_freebsd1 on 2008/04/17 05:57:18 IF7 Affected files ... .. //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#4 integrate .. //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#4 integrate Differences ... ==== //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2.2.1 2008/04/17 04:59:16 jb Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl LIB= avl SRCS= avl.c -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common .include ==== //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2.2.1 2008/04/17 04:59:16 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair LIB= nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common .include ==== //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2.2.1 2008/04/17 04:59:17 jb Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem LIB= umem SRCS= umem.c -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include ==== //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2.2.1 2008/04/17 04:59:17 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl LIB= uutil SRCS= avl.c \ @@ -16,10 +16,10 @@ uu_strtoint.c CFLAGS+= -DNATIVE_BUILD -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head .include ==== //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs DPADD= ${LIBUTIL} @@ -31,17 +31,17 @@ CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,21 +1,21 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5.2.1 2008/04/17 04:59:17 jb Exp $ -.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" +.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os # ATOMIC_SRCS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= atomic.S .else -.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern +.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c .endif @@ -29,17 +29,17 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair DPADD= ${LIBPTHREAD} ${LIBZ} LDADD= -lpthread -lz ==== //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#3 (text+ko) ==== @@ -1,23 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} ==== //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#3 (text+ko) ==== @@ -1,23 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} ==== //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ==== @@ -1,18 +1,18 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4.2.1 2008/04/17 04:59:18 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest PROG= ztest NO_MAN= -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ ==== //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ==== @@ -1,19 +1,19 @@ -# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $ +# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4.2.1 2008/04/17 04:59:18 jb Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c -CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ ==== //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.100.2.2 2008/02/03 16:26:17 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.100.2.3 2008/04/17 04:27:44 brueffer Exp $ # # @@ -108,7 +108,6 @@ rum i386,amd64 safe i386,pc98,amd64 sbp i386,sparc64,ia64,amd64 -sf i386,pc98,ia64,amd64 sis i386,pc98,ia64,amd64 sk i386,sparc64,pc98,amd64 sn i386,amd64 ==== //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#5 (text+ko) ==== @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include -__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.21.2.4 2008/03/18 00:42:26 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.21.2.5 2008/04/17 04:22:32 yongari Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -242,6 +242,14 @@ "NVIDIA nForce MCP67 Networking Adapter"}, {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_LAN4, "NVIDIA nForce MCP67 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN1, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN2, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN3, + "NVIDIA nForce MCP73 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN4, + "NVIDIA nForce MCP73 Networking Adapter"}, {0, 0, NULL} }; @@ -460,6 +468,10 @@ case PCI_PRODUCT_NVIDIA_MCP67_LAN2: case PCI_PRODUCT_NVIDIA_MCP67_LAN3: case PCI_PRODUCT_NVIDIA_MCP67_LAN4: + case PCI_PRODUCT_NVIDIA_MCP73_LAN1: + case PCI_PRODUCT_NVIDIA_MCP73_LAN2: + case PCI_PRODUCT_NVIDIA_MCP73_LAN3: + case PCI_PRODUCT_NVIDIA_MCP73_LAN4: sc->nfe_flags |= NFE_40BIT_ADDR | NFE_PWR_MGMT | NFE_CORRECT_MACADDR | NFE_TX_FLOW_CTRL; break; ==== //depot/projects/dtrace7/src/sys/dev/nfe/if_nfereg.h#2 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10 2007/06/12 10:51:47 yongari Exp $ + * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10.2.1 2008/04/17 04:22:32 yongari Exp $ */ #define NFE_RX_RING_COUNT 256 @@ -300,6 +300,10 @@ #define PCI_PRODUCT_NVIDIA_MCP67_LAN2 0x054d #define PCI_PRODUCT_NVIDIA_MCP67_LAN3 0x054e #define PCI_PRODUCT_NVIDIA_MCP67_LAN4 0x054f +#define PCI_PRODUCT_NVIDIA_MCP73_LAN1 0x07dc +#define PCI_PRODUCT_NVIDIA_MCP73_LAN2 0x07dd +#define PCI_PRODUCT_NVIDIA_MCP73_LAN3 0x07de +#define PCI_PRODUCT_NVIDIA_MCP73_LAN4 0x07df #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 #define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 ==== //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#4 (text+ko) ==== @@ -1,17 +1,18 @@ -# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.7 2007/11/28 22:58:09 jb Exp $ +# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6.2.1 2008/04/17 04:59:18 jb Exp $ KMOD= zfs SRCS= vnode_if.h -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/acl +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/acl SRCS+= acl_common.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/avl SRCS+= avl.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/nvpair SRCS+= nvpair.c -.PATH: ${.CURDIR}/../../compat/opensolaris/kern +.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern +SRCS+= opensolaris_kmem.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c SRCS+= opensolaris_misc.c @@ -20,21 +21,29 @@ SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +SRCS+= atomic.S +.else +.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern +SRCS+= opensolaris_atomic.c +.endif + +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs SRCS+= gfs.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/os SRCS+= callb.c SRCS+= list.c SRCS+= nvpair_alloc_system.c SRCS+= taskq.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/rpc +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/rpc SRCS+= xdr.c SRCS+= xdr_array.c SRCS+= xdr_mem.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/zmod +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod SRCS+= adler32.c SRCS+= crc32.c SRCS+= deflate.c @@ -46,9 +55,9 @@ SRCS+= zmod_subr.c SRCS+= zutil.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/zfs -.include "${.CURDIR}/../../contrib/opensolaris/uts/common/Makefile.files" -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs +.include "${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/Makefile.files" +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/} SRCS+= ${ZFS_SRCS} SRCS+= vdev_geom.c @@ -67,13 +76,15 @@ CWARNFLAGS+=-Wno-unused CWARNFLAGS+=-Wno-switch -CFLAGS+=-I${.CURDIR}/../../compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod -CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common +CFLAGS+=-D_SOLARIS_C_SOURCE + +CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris +CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod +CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common CFLAGS+=-I${.CURDIR}/../.. -CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common +CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs +CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common CFLAGS+=-I${.CURDIR}/../../../include WARNS?=1 From owner-p4-projects@FreeBSD.ORG Thu Apr 17 08:30:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 585211065677; Thu, 17 Apr 2008 08:30:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AA1E1065674; Thu, 17 Apr 2008 08:30:12 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from semihalf.com (semihalf.com [206.130.101.55]) by mx1.freebsd.org (Postfix) with ESMTP id CF38C8FC27; Thu, 17 Apr 2008 08:30:11 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from mail.semihalf.com (mail.semihalf.com [83.15.139.206]) by semihalf.com (8.13.1/8.13.1) with ESMTP id m3H7wcEn018730; Thu, 17 Apr 2008 01:58:39 -0600 Message-ID: <4807032D.1040204@semihalf.com> Date: Thu, 17 Apr 2008 09:58:37 +0200 From: Rafal Jaworowski MIME-Version: 1.0 To: Marcel Moolenaar References: <200804170048.m3H0miGF002623@repoman.freebsd.org> In-Reply-To: <200804170048.m3H0miGF002623@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 140142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 08:30:12 -0000 Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=140142 > > Change 140142 by marcel@marcel_xcllnt on 2008/04/17 00:48:08 > > Make SMP go all the way into the scheduler. Wow, great to see this, Marcel! :) I'm getting up to speed with the dual e500 too, so will follow up on the SMP PPC for sure. Rafal From owner-p4-projects@FreeBSD.ORG Thu Apr 17 16:18:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A3FA1065673; Thu, 17 Apr 2008 16:18:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B5EB106566B for ; Thu, 17 Apr 2008 16:18:37 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.67]) by mx1.freebsd.org (Postfix) with ESMTP id EF5EE8FC14 for ; Thu, 17 Apr 2008 16:18:36 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from mac.com (asmtp003-s [10.150.69.66]) by smtpoutm.mac.com (Xserve/smtpout004/MantshX 4.0) with ESMTP id m3HG5xZo027119; Thu, 17 Apr 2008 09:05:59 -0700 (PDT) Received: from macbook-pro.jnpr.net (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mac.com (Xserve/asmtp003/MantshX 4.0) with ESMTP id m3HG5hGQ003043 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 17 Apr 2008 09:05:52 -0700 (PDT) Message-Id: <7BFB3A59-2546-4201-94A3-3FB95B797F9C@mac.com> From: Marcel Moolenaar To: Rafal Jaworowski In-Reply-To: <4807032D.1040204@semihalf.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v919.2) Date: Thu, 17 Apr 2008 09:05:43 -0700 References: <200804170048.m3H0miGF002623@repoman.freebsd.org> <4807032D.1040204@semihalf.com> X-Mailer: Apple Mail (2.919.2) Cc: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 140142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 16:18:37 -0000 On Apr 17, 2008, at 12:58 AM, Rafal Jaworowski wrote: > Marcel Moolenaar wrote: >> http://perforce.freebsd.org/chv.cgi?CH=140142 >> >> Change 140142 by marcel@marcel_xcllnt on 2008/04/17 00:48:08 >> >> Make SMP go all the way into the scheduler. > > Wow, great to see this, Marcel! :) I'm getting up to speed with the > dual e500 > too, so will follow up on the SMP PPC for sure. Great! It's probably easiest to use the powerpc branch (or create a branch off of it) if I haven't committed anything to CVS. Everything's in place for e500, except the actual details of enumerating the CPUs or starting them. See mp_cpudep.c in sys/powerpc/aim for the OFW version. For e500 you only have to add mp_cpudep.c and implement the following functions: int powerpc_smp_first_cpu(struct cpuref *cpuref); int powerpc_smp_next_cpu(struct cpuref *cpuref); int powerpc_smp_get_bsp(struct cpuref *cpuref); int powerpc_smp_start_cpu(struct pcpu *pc); The first two are used by the powerpc common code to enumerate CPUs. The 3rd is to obtain the reference of the bootstrap processor. The 4th is to actually start APs. The AP eventually has to call void machdep_ap_bootstrap(volatile uint32_t *trcp); At that time all the MMU and CPU specific initialization should have been done. That's it, Come to think of it: most of the MD code for SMP support is actually MI code if you have the right primitives. Such as the primitives above... -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Thu Apr 17 17:37:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 613CF1065672; Thu, 17 Apr 2008 17:37:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EBC8106564A for ; Thu, 17 Apr 2008 17:37:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 03D948FC14 for ; Thu, 17 Apr 2008 17:37:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HHbrFk082426 for ; Thu, 17 Apr 2008 17:37:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HHbrRC082424 for perforce@freebsd.org; Thu, 17 Apr 2008 17:37:53 GMT (envelope-from marcel@freebsd.org) Date: Thu, 17 Apr 2008 17:37:53 GMT Message-Id: <200804171737.m3HHbrRC082424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 17:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=140173 Change 140173 by marcel@marcel_cluster on 2008/04/17 17:37:45 Cleanup. While here, bump LVM page size to 2MB so that we have 1GB of LVM with a single EFI page for the page table (i.e. enough to pre-load a CD image). Affected files ... .. //depot/projects/ia64/sys/ia64/include/vmparam.h#23 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/vmparam.h#23 (text+ko) ==== @@ -1,7 +1,3 @@ -/* $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.18 2007/12/27 16:45:39 alc Exp $ */ -/* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ -#ifndef _MACHINE_VMPARAM_H -#define _MACHINE_VMPARAM_H /*- * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -38,11 +34,13 @@ * from: Utah $Hdr: vmparam.h 1.16 91/01/18$ * * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 + * + * $FreeBSD: src/sys/ia64/include/vmparam.h,v 1.18 2007/12/27 16:45:39 alc Exp $ */ -/* - * Machine dependent constants for ia64. - */ +#ifndef _MACHINE_VMPARAM_H_ +#define _MACHINE_VMPARAM_H_ + /* * USRSTACK is the top (end) of the user stack. Immediately above the user * stack resides the syscall gateway page. @@ -72,18 +70,6 @@ #endif /* - * Boundary at which to place first MAPMEM segment if not explicitly - * specified. Should be a power of two. This allows some slop for - * the data segment to grow underneath the first mapped segment. - */ -#define MMSEG 0x200000 - -/* - * The size of the clock loop. - */ -#define LOOPPAGES (maxfree - firstfree) - -/* * The time for a process to be blocked before being very swappable. * This is a number of seconds which the system takes as being a non-trivial * amount of real time. You probably shouldn't change this; @@ -95,17 +81,6 @@ #define MAXSLP 20 /* - * A swapped in process is given a small amount of core without being bothered - * by the page replacement algorithm. Basically this says that if you are - * swapped in you deserve some resources. We protect the last SAFERSS - * pages against paging and will just swap you out rather than paging you. - * Note that each process has at least UPAGES pages which are not - * paged anyways, in addition to SAFERSS. - */ -#define SAFERSS 10 /* nominal ``small'' resident set size - protected against replacement */ - -/* * We need region 7 virtual addresses for pagetables. */ #define UMA_MD_SMALL_ALLOC @@ -177,9 +152,13 @@ * Parameters for loader virtual memory (LVM). The kernel, its modules and * metadata are loaded in the LVM by the loader. The kernel is given the PA * and size of the page table that provides the mapping of the LVM. + * With EFI pages 4KB in size and pointers 8 bytes wide, we have at least + * 512 entries in the page table. With a 2MB page size this gives us 1GB of + * LVM. Enough to pre-load a 700MB CD image. More LVM can be created by + * using multiple EFI pages for the page table. */ #define IA64_LVM_BASE 0xbffc000000000000 -#define IA64_LVM_PAGE_SHIFT 20 /* 1MB */ +#define IA64_LVM_PAGE_SHIFT 21 /* 2MB */ #define IA64_LVM_PAGE_SIZE (1U< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58ECF1065672; Thu, 17 Apr 2008 19:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 195301065670 for ; Thu, 17 Apr 2008 19:00:23 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 091E18FC14 for ; Thu, 17 Apr 2008 19:00:23 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HJ0Mcg086639 for ; Thu, 17 Apr 2008 19:00:23 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HJ0KLP086637 for perforce@freebsd.org; Thu, 17 Apr 2008 19:00:20 GMT (envelope-from marius@freebsd.org) Date: Thu, 17 Apr 2008 19:00:20 GMT Message-Id: <200804171900.m3HJ0KLP086637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 140175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 19:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=140175 Change 140175 by marius@flak on 2008/04/17 19:00:18 IFC @140167 and adjust schizo(4) to recent changes. Affected files ... .. //depot/projects/usiii/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/usiii/amd64/acpica/madt.c#3 integrate .. //depot/projects/usiii/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/usiii/amd64/amd64/genassym.c#4 integrate .. //depot/projects/usiii/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/usiii/amd64/amd64/legacy.c#4 integrate .. //depot/projects/usiii/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/usiii/amd64/amd64/machdep.c#5 integrate .. //depot/projects/usiii/amd64/amd64/mptable.c#2 integrate .. //depot/projects/usiii/amd64/amd64/nexus.c#3 integrate .. //depot/projects/usiii/amd64/amd64/pmap.c#5 integrate .. //depot/projects/usiii/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#7 integrate .. //depot/projects/usiii/amd64/conf/NOTES#5 integrate .. //depot/projects/usiii/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/usiii/amd64/include/atomic.h#2 integrate .. //depot/projects/usiii/amd64/include/clock.h#3 integrate .. //depot/projects/usiii/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/usiii/amd64/include/nexusvar.h#1 branch .. //depot/projects/usiii/amd64/include/param.h#2 integrate .. //depot/projects/usiii/amd64/include/pcb.h#2 integrate .. //depot/projects/usiii/amd64/include/pcb_ext.h#2 delete .. //depot/projects/usiii/amd64/include/timerreg.h#2 integrate .. //depot/projects/usiii/amd64/isa/atpic.c#2 integrate .. //depot/projects/usiii/amd64/isa/clock.c#5 integrate .. //depot/projects/usiii/amd64/linux32/linux.h#3 integrate .. //depot/projects/usiii/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/usiii/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/usiii/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/usiii/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/usiii/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/usiii/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/usiii/arm/arm/exception.S#2 integrate .. //depot/projects/usiii/arm/arm/intr.c#2 integrate .. //depot/projects/usiii/arm/arm/locore.S#4 integrate .. //depot/projects/usiii/arm/arm/machdep.c#2 integrate .. //depot/projects/usiii/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/usiii/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/usiii/arm/conf/AVILA#6 integrate .. //depot/projects/usiii/arm/conf/AVILA.hints#2 integrate .. //depot/projects/usiii/arm/conf/BWCT#3 integrate .. //depot/projects/usiii/arm/conf/CRB#4 integrate .. //depot/projects/usiii/arm/conf/EP80219#3 integrate .. //depot/projects/usiii/arm/conf/HL200#2 integrate .. //depot/projects/usiii/arm/conf/IQ31244#3 integrate .. //depot/projects/usiii/arm/conf/KB920X#3 integrate .. //depot/projects/usiii/arm/conf/SIMICS#3 integrate .. //depot/projects/usiii/arm/conf/SKYEYE#3 integrate .. //depot/projects/usiii/arm/include/machdep.h#2 integrate .. //depot/projects/usiii/arm/include/param.h#2 integrate .. //depot/projects/usiii/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/usiii/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/usiii/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/usiii/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/usiii/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/usiii/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/usiii/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/usiii/boot/forth/loader.conf#3 integrate .. //depot/projects/usiii/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/usiii/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/usiii/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/usiii/boot/uboot/Makefile#2 integrate .. //depot/projects/usiii/boot/uboot/common/main.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/usiii/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/usiii/boot/uboot/lib/copy.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/usiii/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/usiii/boot/uboot/lib/module.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/net.c#3 integrate .. //depot/projects/usiii/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/usiii/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/usiii/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/usiii/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/usiii/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_file.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_file.h#1 branch .. //depot/projects/usiii/compat/linux/linux_futex.c#3 integrate .. //depot/projects/usiii/compat/linux/linux_futex.h#2 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#5 integrate .. //depot/projects/usiii/compat/linux/linux_stats.c#4 integrate .. //depot/projects/usiii/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_util.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_util.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_kmem.c#3 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_kobj.c#3 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_vfs.c#4 delete .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/usiii/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/usiii/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/kmem.h#4 delete .. //depot/projects/usiii/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/mutex.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/proc.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/rwlock.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/types.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/usiii/compat/opensolaris/sys/vnode.h#3 delete .. //depot/projects/usiii/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/usiii/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/usiii/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/usiii/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/usiii/conf/Makefile.arm#3 integrate .. //depot/projects/usiii/conf/Makefile.mips#1 branch .. //depot/projects/usiii/conf/NOTES#8 integrate .. //depot/projects/usiii/conf/files#8 integrate .. //depot/projects/usiii/conf/files.amd64#5 integrate .. //depot/projects/usiii/conf/files.i386#5 integrate .. //depot/projects/usiii/conf/files.mips#1 branch .. //depot/projects/usiii/conf/files.pc98#3 integrate .. //depot/projects/usiii/conf/ldscript.mips#1 branch .. //depot/projects/usiii/conf/ldscript.mips.cfe#1 branch .. //depot/projects/usiii/conf/options#8 integrate .. //depot/projects/usiii/conf/options.amd64#3 integrate .. //depot/projects/usiii/conf/options.i386#3 integrate .. //depot/projects/usiii/conf/options.mips#1 branch .. //depot/projects/usiii/conf/options.pc98#2 integrate .. //depot/projects/usiii/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/gfs.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/os/callb.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/usiii/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/usiii/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/usiii/ddb/db_command.c#4 integrate .. //depot/projects/usiii/ddb/db_ps.c#4 integrate .. //depot/projects/usiii/ddb/ddb.h#3 integrate .. //depot/projects/usiii/dev/aac/aac.c#4 integrate .. //depot/projects/usiii/dev/aac/aac_cam.c#3 integrate .. //depot/projects/usiii/dev/aac/aac_debug.c#3 integrate .. //depot/projects/usiii/dev/aac/aac_disk.c#2 integrate .. //depot/projects/usiii/dev/aac/aac_pci.c#3 integrate .. //depot/projects/usiii/dev/aac/aacreg.h#3 integrate .. //depot/projects/usiii/dev/aac/aacvar.h#3 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/usiii/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi.c#6 integrate .. //depot/projects/usiii/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/usiii/dev/acpica/acpivar.h#3 integrate .. //depot/projects/usiii/dev/asmc/asmc.c#2 integrate .. //depot/projects/usiii/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/usiii/dev/ata/ata-all.c#3 integrate .. //depot/projects/usiii/dev/ata/ata-all.h#4 integrate .. //depot/projects/usiii/dev/ata/ata-card.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/usiii/dev/ata/ata-disk.c#4 integrate .. //depot/projects/usiii/dev/ata/ata-disk.h#2 integrate .. //depot/projects/usiii/dev/ata/ata-dma.c#4 integrate .. //depot/projects/usiii/dev/ata/ata-isa.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/usiii/dev/ata/ata-pci.c#3 integrate .. //depot/projects/usiii/dev/ata/ata-pci.h#5 integrate .. //depot/projects/usiii/dev/ata/ata-queue.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-raid.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-raid.h#2 integrate .. //depot/projects/usiii/dev/ata/ata-usb.c#2 integrate .. //depot/projects/usiii/dev/ata/ata_if.m#2 integrate .. //depot/projects/usiii/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/usiii/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/usiii/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/usiii/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/usiii/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/usiii/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/usiii/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/usiii/dev/ath/if_ath.c#5 integrate .. //depot/projects/usiii/dev/atkbdc/psm.c#3 integrate .. //depot/projects/usiii/dev/bce/if_bce.c#4 integrate .. //depot/projects/usiii/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/usiii/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#8 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/usiii/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/usiii/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/usiii/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/usiii/dev/dc/if_dc.c#3 integrate .. //depot/projects/usiii/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/usiii/dev/de/if_de.c#2 integrate .. //depot/projects/usiii/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/usiii/dev/drm/i915_dma.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82540.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82541.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82542.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82543.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82571.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_82571.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_api.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_api.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_defines.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_hw.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_mac.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_mac.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_manage.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_osdep.c#1 branch .. //depot/projects/usiii/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/usiii/dev/em/e1000_phy.c#4 integrate .. //depot/projects/usiii/dev/em/e1000_phy.h#4 integrate .. //depot/projects/usiii/dev/em/if_em.c#5 integrate .. //depot/projects/usiii/dev/em/if_em.h#5 integrate .. //depot/projects/usiii/dev/en/midway.c#2 integrate .. //depot/projects/usiii/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/usiii/dev/fb/vga.c#3 integrate .. //depot/projects/usiii/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/usiii/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/usiii/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/usiii/dev/gem/if_gem.c#7 integrate .. //depot/projects/usiii/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/usiii/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/usiii/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/usiii/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/usiii/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/usiii/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/usiii/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/usiii/dev/igb/if_igb.c#3 integrate .. //depot/projects/usiii/dev/iscsi/initiator/isc_soc.c#4 integrate .. //depot/projects/usiii/dev/k8temp/k8temp.c#1 branch .. //depot/projects/usiii/dev/malo/if_malo.c#1 branch .. //depot/projects/usiii/dev/malo/if_malo.h#1 branch .. //depot/projects/usiii/dev/malo/if_malo_pci.c#1 branch .. //depot/projects/usiii/dev/malo/if_malohal.c#1 branch .. //depot/projects/usiii/dev/malo/if_malohal.h#1 branch .. //depot/projects/usiii/dev/malo/if_maloioctl.h#1 branch .. //depot/projects/usiii/dev/mfi/mfi.c#3 integrate .. //depot/projects/usiii/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/usiii/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/usiii/dev/mii/miidevs#5 integrate .. //depot/projects/usiii/dev/mpt/mpt.c#3 integrate .. //depot/projects/usiii/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/usiii/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/usiii/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/usiii/dev/nvram/nvram.c#2 integrate .. //depot/projects/usiii/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/usiii/dev/pci/pcivar.h#4 integrate .. //depot/projects/usiii/dev/ral/rt2661.c#5 integrate .. //depot/projects/usiii/dev/re/if_re.c#5 integrate .. //depot/projects/usiii/dev/sound/midi/mpu401.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/usiii/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/usiii/dev/speaker/spkr.c#2 integrate .. //depot/projects/usiii/dev/syscons/syscons.c#4 integrate .. //depot/projects/usiii/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/usiii/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/usiii/dev/ti/if_ti.c#5 integrate .. //depot/projects/usiii/dev/usb/ehci.c#5 integrate .. //depot/projects/usiii/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/usiii/dev/usb/if_aue.c#2 integrate .. //depot/projects/usiii/dev/usb/if_rum.c#6 integrate .. //depot/projects/usiii/dev/usb/if_zyd.c#6 integrate .. //depot/projects/usiii/dev/usb/ohci.c#2 integrate .. //depot/projects/usiii/dev/usb/ubsa.c#3 integrate .. //depot/projects/usiii/dev/usb/ucom.c#3 integrate .. //depot/projects/usiii/dev/usb/ucomvar.h#2 integrate .. //depot/projects/usiii/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/usiii/dev/usb/uipaq.c#3 integrate .. //depot/projects/usiii/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/usiii/dev/usb/usbdevs#7 integrate .. //depot/projects/usiii/dev/usb/usbdi.c#3 integrate .. //depot/projects/usiii/dev/usb/usbdi.h#2 integrate .. //depot/projects/usiii/dev/usb/usbdivar.h#2 integrate .. //depot/projects/usiii/fs/coda/coda_vfsops.c#5 integrate .. //depot/projects/usiii/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/usiii/fs/msdosfs/denode.h#3 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/usiii/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/usiii/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/usiii/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/usiii/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/usiii/gdb/gdb_cons.c#2 integrate .. //depot/projects/usiii/geom/geom.h#2 integrate .. //depot/projects/usiii/geom/geom_subr.c#2 integrate .. //depot/projects/usiii/geom/part/g_part.c#3 integrate .. //depot/projects/usiii/geom/part/g_part.h#3 integrate .. //depot/projects/usiii/geom/part/g_part_apm.c#3 integrate .. //depot/projects/usiii/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/usiii/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/usiii/geom/part/g_part_if.m#2 integrate .. //depot/projects/usiii/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/usiii/geom/part/g_part_pc98.c#1 branch .. //depot/projects/usiii/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/usiii/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/usiii/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/usiii/i386/acpica/madt.c#4 integrate .. //depot/projects/usiii/i386/conf/GENERIC#7 integrate .. //depot/projects/usiii/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/usiii/i386/conf/NOTES#5 integrate .. //depot/projects/usiii/i386/conf/XBOX#3 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#5 integrate .. //depot/projects/usiii/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/usiii/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/usiii/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/usiii/i386/i386/k6_mem.c#3 integrate .. //depot/projects/usiii/i386/i386/legacy.c#4 integrate .. //depot/projects/usiii/i386/i386/local_apic.c#3 integrate .. //depot/projects/usiii/i386/i386/machdep.c#4 integrate .. //depot/projects/usiii/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/usiii/i386/i386/mptable.c#2 integrate .. //depot/projects/usiii/i386/i386/nexus.c#2 integrate .. //depot/projects/usiii/i386/i386/pmap.c#4 integrate .. //depot/projects/usiii/i386/i386/trap.c#4 integrate .. //depot/projects/usiii/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/usiii/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/usiii/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/usiii/i386/include/atomic.h#2 integrate .. //depot/projects/usiii/i386/include/clock.h#3 integrate .. //depot/projects/usiii/i386/include/intr_machdep.h#2 integrate .. //depot/projects/usiii/i386/include/nexusvar.h#1 branch .. //depot/projects/usiii/i386/include/param.h#2 integrate .. //depot/projects/usiii/i386/include/pmap.h#4 integrate .. //depot/projects/usiii/i386/include/timerreg.h#2 integrate .. //depot/projects/usiii/i386/include/vmparam.h#4 integrate .. //depot/projects/usiii/i386/isa/atpic.c#2 integrate .. //depot/projects/usiii/i386/isa/clock.c#4 integrate .. //depot/projects/usiii/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/usiii/i386/isa/vesa.c#2 integrate .. //depot/projects/usiii/i386/linux/linux.h#3 integrate .. //depot/projects/usiii/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/usiii/i386/linux/linux_proto.h#3 integrate .. //depot/projects/usiii/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/usiii/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/usiii/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/usiii/i386/linux/syscalls.master#3 integrate .. //depot/projects/usiii/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/usiii/i386/xbox/xbox.c#2 integrate .. //depot/projects/usiii/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/usiii/ia64/conf/GENERIC#6 integrate .. //depot/projects/usiii/ia64/conf/SKI#2 integrate .. //depot/projects/usiii/ia64/ia64/clock.c#2 integrate .. //depot/projects/usiii/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/usiii/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/usiii/ia64/ia64/machdep.c#6 integrate .. //depot/projects/usiii/ia64/ia64/nexus.c#2 integrate .. //depot/projects/usiii/ia64/ia64/pmap.c#5 integrate .. //depot/projects/usiii/ia64/ia64/sapic.c#2 integrate .. //depot/projects/usiii/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/usiii/ia64/include/atomic.h#3 integrate .. //depot/projects/usiii/ia64/include/clock.h#2 integrate .. //depot/projects/usiii/ia64/include/md_var.h#3 integrate .. //depot/projects/usiii/ia64/include/param.h#2 integrate .. //depot/projects/usiii/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/usiii/isa/atrtc.c#1 branch .. //depot/projects/usiii/isa/rtc.h#2 integrate .. //depot/projects/usiii/isa/syscons_isa.c#2 integrate .. //depot/projects/usiii/kern/bus_if.m#2 integrate .. //depot/projects/usiii/kern/init_main.c#6 integrate .. //depot/projects/usiii/kern/init_sysent.c#6 integrate .. //depot/projects/usiii/kern/kern_alq.c#4 integrate .. //depot/projects/usiii/kern/kern_clock.c#6 integrate .. //depot/projects/usiii/kern/kern_conf.c#3 integrate .. //depot/projects/usiii/kern/kern_cpuset.c#2 integrate .. //depot/projects/usiii/kern/kern_descrip.c#6 integrate .. //depot/projects/usiii/kern/kern_event.c#3 integrate .. //depot/projects/usiii/kern/kern_exec.c#6 integrate .. //depot/projects/usiii/kern/kern_exit.c#5 integrate .. //depot/projects/usiii/kern/kern_fork.c#5 integrate .. //depot/projects/usiii/kern/kern_idle.c#3 integrate .. //depot/projects/usiii/kern/kern_intr.c#4 integrate .. //depot/projects/usiii/kern/kern_jail.c#4 integrate .. //depot/projects/usiii/kern/kern_kthread.c#3 integrate .. //depot/projects/usiii/kern/kern_linker.c#4 integrate .. //depot/projects/usiii/kern/kern_lock.c#6 integrate .. //depot/projects/usiii/kern/kern_lockf.c#2 integrate .. //depot/projects/usiii/kern/kern_malloc.c#2 integrate .. //depot/projects/usiii/kern/kern_mbuf.c#4 integrate .. //depot/projects/usiii/kern/kern_module.c#4 integrate .. //depot/projects/usiii/kern/kern_ntptime.c#2 integrate .. //depot/projects/usiii/kern/kern_poll.c#2 integrate .. //depot/projects/usiii/kern/kern_proc.c#6 integrate .. //depot/projects/usiii/kern/kern_resource.c#4 integrate .. //depot/projects/usiii/kern/kern_rwlock.c#5 integrate .. //depot/projects/usiii/kern/kern_shutdown.c#5 integrate .. //depot/projects/usiii/kern/kern_sig.c#6 integrate .. //depot/projects/usiii/kern/kern_subr.c#2 integrate .. //depot/projects/usiii/kern/kern_switch.c#5 integrate .. //depot/projects/usiii/kern/kern_synch.c#6 integrate .. //depot/projects/usiii/kern/kern_tc.c#4 integrate .. //depot/projects/usiii/kern/kern_thr.c#3 integrate .. //depot/projects/usiii/kern/kern_thread.c#7 integrate .. //depot/projects/usiii/kern/kern_timeout.c#7 integrate .. //depot/projects/usiii/kern/kern_umtx.c#4 integrate .. //depot/projects/usiii/kern/link_elf.c#4 integrate .. //depot/projects/usiii/kern/link_elf_obj.c#4 integrate .. //depot/projects/usiii/kern/makesyscalls.sh#2 integrate .. //depot/projects/usiii/kern/sched_4bsd.c#7 integrate .. //depot/projects/usiii/kern/sched_ule.c#8 integrate .. //depot/projects/usiii/kern/subr_autoconf.c#3 integrate .. //depot/projects/usiii/kern/subr_bus.c#6 integrate .. //depot/projects/usiii/kern/subr_clock.c#2 integrate .. //depot/projects/usiii/kern/subr_eventhandler.c#2 integrate .. //depot/projects/usiii/kern/subr_firmware.c#2 integrate .. //depot/projects/usiii/kern/subr_log.c#2 integrate .. //depot/projects/usiii/kern/subr_mchain.c#2 integrate .. //depot/projects/usiii/kern/subr_prof.c#2 integrate .. //depot/projects/usiii/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/usiii/kern/subr_smp.c#7 integrate .. //depot/projects/usiii/kern/subr_taskqueue.c#3 integrate .. //depot/projects/usiii/kern/subr_trap.c#5 integrate .. //depot/projects/usiii/kern/subr_turnstile.c#4 integrate .. //depot/projects/usiii/kern/subr_witness.c#7 integrate .. //depot/projects/usiii/kern/sys_generic.c#4 integrate .. //depot/projects/usiii/kern/sys_process.c#5 integrate .. //depot/projects/usiii/kern/syscalls.c#6 integrate .. //depot/projects/usiii/kern/syscalls.master#7 integrate .. //depot/projects/usiii/kern/systrace_args.c#6 integrate .. //depot/projects/usiii/kern/tty.c#3 integrate .. //depot/projects/usiii/kern/tty_cons.c#3 integrate .. //depot/projects/usiii/kern/tty_pts.c#2 integrate .. //depot/projects/usiii/kern/tty_pty.c#4 integrate .. //depot/projects/usiii/kern/tty_subr.c#2 integrate .. //depot/projects/usiii/kern/tty_tty.c#2 integrate .. //depot/projects/usiii/kern/uipc_domain.c#2 integrate .. //depot/projects/usiii/kern/uipc_mbuf.c#4 integrate .. //depot/projects/usiii/kern/uipc_mqueue.c#3 integrate .. //depot/projects/usiii/kern/uipc_shm.c#3 integrate .. //depot/projects/usiii/kern/uipc_socket.c#5 integrate .. //depot/projects/usiii/kern/uipc_syscalls.c#5 integrate .. //depot/projects/usiii/kern/vfs_acl.c#4 integrate .. //depot/projects/usiii/kern/vfs_bio.c#7 integrate .. //depot/projects/usiii/kern/vfs_cache.c#6 integrate .. //depot/projects/usiii/kern/vfs_cluster.c#2 integrate .. //depot/projects/usiii/kern/vfs_default.c#4 integrate .. //depot/projects/usiii/kern/vfs_extattr.c#4 integrate .. //depot/projects/usiii/kern/vfs_hash.c#2 integrate .. //depot/projects/usiii/kern/vfs_lookup.c#6 integrate .. //depot/projects/usiii/kern/vfs_mount.c#6 integrate .. //depot/projects/usiii/kern/vfs_subr.c#7 integrate .. //depot/projects/usiii/kern/vfs_syscalls.c#6 integrate .. //depot/projects/usiii/kern/vfs_vnops.c#4 integrate .. //depot/projects/usiii/kern/vnode_if.src#4 integrate .. //depot/projects/usiii/mips/compile/.cvsignore#1 branch .. //depot/projects/usiii/mips/conf/ADM5120#1 branch .. //depot/projects/usiii/mips/conf/ADM5120.hints#1 branch .. //depot/projects/usiii/mips/conf/IDT#1 branch .. //depot/projects/usiii/mips/conf/IDT.hints#1 branch .. //depot/projects/usiii/mips/conf/MALTA#1 branch .. //depot/projects/usiii/mips/conf/MALTA.hints#1 branch .. //depot/projects/usiii/mips/conf/QEMU#1 branch .. //depot/projects/usiii/mips/conf/SENTRY5#1 branch .. //depot/projects/usiii/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/usiii/mips/include/_bus.h#1 branch .. //depot/projects/usiii/mips/include/_bus_octeon.h#1 branch .. //depot/projects/usiii/mips/include/_inttypes.h#1 branch .. //depot/projects/usiii/mips/include/_limits.h#1 branch .. //depot/projects/usiii/mips/include/_stdint.h#1 branch .. //depot/projects/usiii/mips/include/_types.h#1 branch .. //depot/projects/usiii/mips/include/am29lv081b.h#1 branch .. //depot/projects/usiii/mips/include/archtype.h#1 branch .. //depot/projects/usiii/mips/include/asm.h#1 branch .. //depot/projects/usiii/mips/include/asmacros.h#1 branch .. //depot/projects/usiii/mips/include/atomic.h#1 branch .. //depot/projects/usiii/mips/include/bootinfo.h#1 branch .. //depot/projects/usiii/mips/include/bswap.h#1 branch .. //depot/projects/usiii/mips/include/bus.h#1 branch .. //depot/projects/usiii/mips/include/bus_dma.h#1 branch .. //depot/projects/usiii/mips/include/bus_octeon.h#1 branch .. //depot/projects/usiii/mips/include/cache.h#1 branch .. //depot/projects/usiii/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/usiii/mips/include/cache_r4k.h#1 branch .. //depot/projects/usiii/mips/include/clock.h#1 branch .. //depot/projects/usiii/mips/include/clockvar.h#1 branch .. //depot/projects/usiii/mips/include/cp0.h#1 branch .. //depot/projects/usiii/mips/include/cpu.h#1 branch .. //depot/projects/usiii/mips/include/cpufunc.h#1 branch .. //depot/projects/usiii/mips/include/cpuinfo.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 17 23:10:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20AC91065671; Thu, 17 Apr 2008 23:10:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D698C106566C for ; Thu, 17 Apr 2008 23:10:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C07FD8FC19 for ; Thu, 17 Apr 2008 23:10:49 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HNAnqI012929 for ; Thu, 17 Apr 2008 23:10:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HNAnrT012927 for perforce@freebsd.org; Thu, 17 Apr 2008 23:10:49 GMT (envelope-from sam@freebsd.org) Date: Thu, 17 Apr 2008 23:10:49 GMT Message-Id: <200804172310.m3HNAnrT012927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 23:10:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=140186 Change 140186 by sam@sam_ebb on 2008/04/17 23:09:58 cleanup Affected files ... .. //depot/projects/vap/sys/dev/mwl/if_mwl_pci.c#2 edit Differences ... ==== //depot/projects/vap/sys/dev/mwl/if_mwl_pci.c#2 (text+ko) ==== @@ -78,17 +78,43 @@ #define BS_BAR0 0x10 #define BS_BAR1 0x14 +struct mwl_pci_ident { + uint16_t vendor; + uint16_t device; + const char *name; +}; + +static const struct mwl_pci_ident mwl_pci_ids[] = { + { 0x11ab, 0x2a02, "Marvell 88W8363" }, + { 0x11ab, 0x2a03, "Marvell 88W8363" }, + { 0x11ab, 0x2a0a, "Marvell 88W8363" }, + { 0x11ab, 0x2a0b, "Marvell 88W8363" }, + { 0x11ab, 0x2a0c, "Marvell 88W8363" }, + { 0x11ab, 0x2a21, "Marvell 88W8363" }, + { 0x11ab, 0x2a24, "Marvell 88W8363" }, + + { 0, 0, NULL } +}; + +const static struct mwl_pci_ident * +mwl_pci_lookup(int vendor, int device) +{ + const struct mwl_pci_ident *ident; + + for (ident = mwl_pci_ids; ident->name != NULL; ident++) + if (vendor == ident->vendor && device == ident->device) + return ident; + return NULL; +} + static int mwl_pci_probe(device_t dev) { - if (pci_get_vendor(dev) == 0x11ab && - (pci_get_device(dev) == 0x2a02 - || pci_get_device(dev) == 0x2a03 - || pci_get_device(dev) == 0x2a0b - || pci_get_device(dev) == 0x2a0c - || pci_get_device(dev) == 0x2a21 - || pci_get_device(dev) == 0x2a24)) { - device_set_desc(dev, "Marvell 88W8363"); + const struct mwl_pci_ident *ident; + + ident = mwl_pci_lookup(pci_get_vendor(dev), pci_get_device(dev)); + if (ident != NULL) { + device_set_desc(dev, ident->name); return BUS_PROBE_DEFAULT; } return ENXIO; From owner-p4-projects@FreeBSD.ORG Thu Apr 17 23:31:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 433281065670; Thu, 17 Apr 2008 23:31:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05F05106564A for ; Thu, 17 Apr 2008 23:31:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E398F8FC0C for ; Thu, 17 Apr 2008 23:31:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HNVA78013651 for ; Thu, 17 Apr 2008 23:31:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HNVAj0013649 for perforce@freebsd.org; Thu, 17 Apr 2008 23:31:10 GMT (envelope-from sam@freebsd.org) Date: Thu, 17 Apr 2008 23:31:10 GMT Message-Id: <200804172331.m3HNVAj0013649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 23:31:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=140188 Change 140188 by sam@sam_ebb on 2008/04/17 23:30:46 revamp so driver can auto-load the image Affected files ... .. //depot/projects/vap/sys/modules/mwlfw/Makefile#2 edit Differences ... ==== //depot/projects/vap/sys/modules/mwlfw/Makefile#2 (text+ko) ==== @@ -1,18 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/dev/mwl +KMOD= mw88W8363fw +FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot -KMOD= mwlfw -FIRMWS= mwlfw:mw88W8363fw mwlboot:mwlboot +CLEANFILES+= mw88W8363.fw mwlboot.fw -CLEANFILES= mwlfw mwlboot +mw88W8363.fw: ${.CURDIR}/../../contrib/dev/mwl/mw88W8363.fw.uu + uudecode -p $? > ${.TARGET} -MWL= ${.CURDIR}/../../contrib/dev/mwl - -mwlfw: ${MWL}/mw88W8363.fw.uu - uudecode -p ${MWL}/mw88W8363.fw.uu > ${.TARGET} - -mwlboot: ${MWL}/mwlboot.fw.uu - uudecode -p ${MWL}/mwlboot.fw.uu > ${.TARGET} +mwlboot.fw: ${.CURDIR}/../../contrib/dev/mwl/mwlboot.fw.uu + uudecode -p $? > ${.TARGET} .include From owner-p4-projects@FreeBSD.ORG Thu Apr 17 23:33:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76FF1065671; Thu, 17 Apr 2008 23:33:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6927D106566B for ; Thu, 17 Apr 2008 23:33:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FEE88FC19 for ; Thu, 17 Apr 2008 23:33:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HNXE0J013714 for ; Thu, 17 Apr 2008 23:33:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HNXDmf013712 for perforce@freebsd.org; Thu, 17 Apr 2008 23:33:13 GMT (envelope-from sam@freebsd.org) Date: Thu, 17 Apr 2008 23:33:13 GMT Message-Id: <200804172333.m3HNXDmf013712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 23:33:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=140189 Change 140189 by sam@sam_ebb on 2008/04/17 23:33:09 sync w/ latest ralink license and bring in 2860 firmware Affected files ... .. //depot/projects/vap/sys/contrib/dev/ral/LICENSE#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/Makefile#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/rt2561.fw.uu#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/rt2561s.fw.uu#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/rt2661.fw.uu#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/rt2661_ucode.h#2 edit .. //depot/projects/vap/sys/contrib/dev/ral/rt2860.fw.uu#1 add Differences ... ==== //depot/projects/vap/sys/contrib/dev/ral/LICENSE#2 (text+ko) ==== @@ -1,16 +1,14 @@ - - Copyright (c) 2005-2006, Ralink Technology, Corp. +Copyright (c) 2005-2008, Ralink Technology Corp. Paul Lin - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ==== //depot/projects/vap/sys/contrib/dev/ral/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= rt2561s.fw.uu rt2561.fw.uu rt2661.fw.uu +FILES= rt2561s.fw.uu rt2561.fw.uu rt2661.fw.uu rt2860.fw.uu rt2561s.fw.uu: rt2661_ucode.h LICENSE (cat rt2661_ucode.h; \ @@ -23,6 +23,13 @@ }') | ${CC} -o build -x c - (sed 's/^/# /' LICENSE; ./build | uuencode rt2661.fw) > ${.TARGET} +rt2860.fw.uu: rt2661_ucode.h LICENSE + (cat rt2661_ucode.h; \ + echo 'int main(void) { \ + write(1, rt2860_ucode, sizeof(rt2860_ucode)); return 0; \ + }') | ${CC} -o build -x c - + (sed 's/^/# /' LICENSE; ./build | uuencode rt2860.fw) > ${.TARGET} + clean: rm -f build build.c ${FILES} ==== //depot/projects/vap/sys/contrib/dev/ral/rt2561.fw.uu#2 (text+ko) ==== @@ -1,19 +1,17 @@ -# -# Copyright (c) 2005-2006, Ralink Technology, Corp. +# Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin # -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. begin 644 rt2561.fw M`AP2`A/+PHPB(@`"%@_"K\*-=8R4=8J3TJ\B`AC:$AOH0`,"`AZ0(0+@]2V0 M``/@$@@E`+```,X!`%X0`&\1`/(@`4TA`7`B`80P`8\Q`=50`9]1`?)2`@9@ ==== //depot/projects/vap/sys/contrib/dev/ral/rt2561s.fw.uu#2 (text+ko) ==== @@ -1,19 +1,17 @@ -# -# Copyright (c) 2005-2006, Ralink Technology, Corp. +# Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin # -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. begin 644 rt2561s.fw M`APM`@??PHPB(@`"&4/"K\*-=8R4=8J3TJ\B`AJ<$@C?0`,"`AZ0(0+@]2V0 M``/@$@0_`+```,X!`%X0`&\1`/(@`4TA`7`B`80P`8\Q`=50`9]1`?)2`@9@ ==== //depot/projects/vap/sys/contrib/dev/ral/rt2661.fw.uu#2 (text+ko) ==== @@ -1,19 +1,17 @@ -# -# Copyright (c) 2005-2006, Ralink Technology, Corp. +# Copyright (c) 2005-2008, Ralink Technology Corp. # Paul Lin # -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. begin 644 rt2661.fw M`A+>`A3PPHPB(@`"%N7"K\*-=8R4=8J3TJ\B`AF)Y3`2#^4`/P``K0$!%0(! MJ0,!_00"1`4"MP8#)@<```->P@$2``:0,#K@]1+E)B#E")`TF.!4_O`BD#28 ==== //depot/projects/vap/sys/contrib/dev/ral/rt2661_ucode.h#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* $FreeBSD: src/sys/dev/ral/rt2661_ucode.h,v 1.1 2006/03/05 20:41:51 damien Exp $ */ -/* OpenBSD: microcode.h,v 1.1 2006/01/09 20:03:40 damien Exp */ +/* $OpenBSD: microcode.h,v 1.5 2008/03/06 09:18:04 deraadt Exp $ */ /*- - * Copyright (c) 2005-2006, Ralink Technology, Corp. + * Copyright (c) 2005-2008, Ralink Technology, Corp. * Paul Lin * * Permission to use, copy, modify, and distribute this software for any @@ -2266,3 +2266,751 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x43, 0xcf }; + +static const unsigned char rt2860_ucode[] = { + 0x02, 0x00, 0xe2, 0x02, 0x02, 0xec, 0x22, 0x22, 0xff, 0xff, 0xff, + 0x02, 0x01, 0xbd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x1e, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x01, 0x6e, 0xc0, 0xe0, 0xc0, + 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x18, 0xc2, + 0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x09, 0x90, 0x04, 0x16, 0xe0, + 0x30, 0xe3, 0x0d, 0x74, 0x08, 0xf0, 0xe5, 0x55, 0x60, 0x06, 0x64, + 0x03, 0x60, 0x02, 0xd2, 0x03, 0x90, 0x04, 0x14, 0xe0, 0x20, 0xe7, + 0x03, 0x02, 0x00, 0xd5, 0x74, 0x80, 0xf0, 0x90, 0x70, 0x12, 0xe0, + 0xf5, 0x36, 0x90, 0x04, 0x04, 0xe0, 0x24, 0xcf, 0x60, 0x30, 0x14, + 0x60, 0x42, 0x24, 0xe2, 0x60, 0x47, 0x14, 0x60, 0x55, 0x24, 0x21, + 0x70, 0x60, 0xe5, 0x55, 0x24, 0xfe, 0x60, 0x07, 0x14, 0x60, 0x08, + 0x24, 0x02, 0x70, 0x08, 0x7d, 0x01, 0x80, 0x28, 0x7d, 0x02, 0x80, + 0x24, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x50, 0x85, 0x36, 0x40, 0xd2, + 0x01, 0x80, 0x3e, 0xe5, 0x55, 0x64, 0x03, 0x60, 0x04, 0xe5, 0x55, + 0x70, 0x04, 0x7d, 0x02, 0x80, 0x09, 0x85, 0x36, 0x41, 0xd2, 0x02, + 0x80, 0x29, 0xad, 0x55, 0xaf, 0x36, 0x12, 0x02, 0xc8, 0x80, 0x20, + 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x47, 0x90, 0x70, 0x11, 0xe0, 0xf5, + 0x44, 0x12, 0x10, 0x25, 0x80, 0x06, 0x90, 0x70, 0x10, 0xe0, 0xf5, + 0x45, 0xe4, 0xfd, 0xaf, 0x36, 0x12, 0x02, 0xc8, 0xd2, 0x04, 0x90, + 0x70, 0x13, 0xe4, 0xf0, 0xd2, 0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, + 0x83, 0xd0, 0xf0, 0xd0, 0xe0, 0x32, 0x78, 0x7f, 0xe4, 0xf6, 0xd8, + 0xfd, 0x75, 0x81, 0x7d, 0x02, 0x01, 0x29, 0x02, 0x02, 0x0b, 0xe4, + 0x93, 0xa3, 0xf8, 0xe4, 0x93, 0xa3, 0x40, 0x03, 0xf6, 0x80, 0x01, + 0xf2, 0x08, 0xdf, 0xf4, 0x80, 0x29, 0xe4, 0x93, 0xa3, 0xf8, 0x54, + 0x07, 0x24, 0x0c, 0xc8, 0xc3, 0x33, 0xc4, 0x54, 0x0f, 0x44, 0x20, + 0xc8, 0x83, 0x40, 0x04, 0xf4, 0x56, 0x80, 0x01, 0x46, 0xf6, 0xdf, + 0xe4, 0x80, 0x0b, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, + 0x90, 0x03, 0x9a, 0xe4, 0x7e, 0x01, 0x93, 0x60, 0xbc, 0xa3, 0xff, + 0x54, 0x3f, 0x30, 0xe5, 0x09, 0x54, 0x1f, 0xfe, 0xe4, 0x93, 0xa3, + 0x60, 0x01, 0x0e, 0xcf, 0x54, 0xc0, 0x25, 0xe0, 0x60, 0xa8, 0x40, + 0xb8, 0xe4, 0x93, 0xa3, 0xfa, 0xe4, 0x93, 0xa3, 0xf8, 0xe4, 0x93, + 0xa3, 0xc8, 0xc5, 0x82, 0xc8, 0xca, 0xc5, 0x83, 0xca, 0xf0, 0xa3, + 0xc8, 0xc5, 0x82, 0xc8, 0xca, 0xc5, 0x83, 0xca, 0xdf, 0xe9, 0xde, + 0xe7, 0x80, 0xbe, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82, + 0xc0, 0xd0, 0xe8, 0xc0, 0xe0, 0xe9, 0xc0, 0xe0, 0xea, 0xc0, 0xe0, + 0xeb, 0xc0, 0xe0, 0xec, 0xc0, 0xe0, 0xed, 0xc0, 0xe0, 0xee, 0xc0, + 0xe0, 0xef, 0xc0, 0xe0, 0xc2, 0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, + 0x12, 0xd2, 0xaf, 0xd0, 0xe0, 0xff, 0xd0, 0xe0, 0xfe, 0xd0, 0xe0, + 0xfd, 0xd0, 0xe0, 0xfc, 0xd0, 0xe0, 0xfb, 0xd0, 0xe0, 0xfa, 0xd0, + 0xe0, 0xf9, 0xd0, 0xe0, 0xf8, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, + 0xd0, 0xf0, 0xd0, 0xe0, 0x32, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, + 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x10, 0xc2, 0xaf, 0x30, 0x45, + 0x03, 0x12, 0x10, 0x0c, 0x30, 0x58, 0x0a, 0xe5, 0x54, 0x60, 0x04, + 0x15, 0x54, 0x80, 0x02, 0xc2, 0x58, 0x30, 0x59, 0x0a, 0xe5, 0x50, + 0x60, 0x04, 0x15, 0x50, 0x80, 0x02, 0xc2, 0x59, 0xd5, 0x53, 0x07, + 0x30, 0x60, 0x04, 0x15, 0x46, 0xd2, 0x04, 0x30, 0x45, 0x03, 0x12, + 0x10, 0x0f, 0xc2, 0x8d, 0xd2, 0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, + 0x83, 0xd0, 0xf0, 0xd0, 0xe0, 0x32, 0x12, 0x03, 0x0e, 0x30, 0x45, + 0x03, 0x12, 0x10, 0x03, 0x30, 0x01, 0x06, 0x20, 0x09, 0x03, 0x12, + 0x10, 0x1c, 0x30, 0x02, 0x06, 0x20, 0x0a, 0x03, 0x12, 0x10, 0x1f, + 0x30, 0x03, 0x06, 0x20, 0x0b, 0x03, 0x12, 0x10, 0x1f, 0x30, 0x04, + 0x06, 0x20, 0x0c, 0x03, 0x12, 0x10, 0x22, 0x20, 0x13, 0x09, 0x20, + 0x11, 0x06, 0xe5, 0x2b, 0x45, 0x2c, 0x60, 0x03, 0xd3, 0x80, 0x01, + 0xc3, 0x92, 0xa9, 0x12, 0x03, 0x3e, 0x80, 0xbf, 0xd0, 0x83, 0xd0, + 0x82, 0xf8, 0xe4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93, 0x70, 0x0d, + 0xa3, 0xa3, 0x93, 0xf8, 0x74, 0x01, 0x93, 0xf5, 0x82, 0x88, 0x83, + 0xe4, 0x73, 0x74, 0x02, 0x93, 0x68, 0x60, 0xef, 0xa3, 0xa3, 0xa3, + 0x80, 0xdf, 0x8a, 0x83, 0x89, 0x82, 0xe4, 0x73, 0xc8, 0xef, 0xc8, + 0xe6, 0xfa, 0x08, 0xe6, 0x4a, 0x60, 0x0c, 0xc8, 0xef, 0xc8, 0x08, + 0xe6, 0x16, 0x18, 0x70, 0x01, 0x16, 0xc3, 0x22, 0xed, 0x24, 0xff, + 0xfd, 0xec, 0x34, 0xff, 0xc8, 0xef, 0xc8, 0xf6, 0x08, 0xc6, 0xed, + 0xc6, 0xd3, 0x22, 0xc2, 0x43, 0xd2, 0x45, 0xe4, 0xf5, 0x20, 0xf5, + 0x21, 0xf5, 0x53, 0xf5, 0x46, 0xf5, 0x2b, 0xf5, 0x2c, 0xc2, 0x42, + 0xf5, 0x51, 0xf5, 0x52, 0xf5, 0x55, 0x90, 0x04, 0x18, 0x74, 0x80, + 0xf0, 0x90, 0x04, 0x1a, 0x74, 0x08, 0xf0, 0x22, 0xef, 0xf4, 0x60, + 0x1f, 0xe4, 0xfe, 0x12, 0x03, 0x7d, 0xe0, 0xb4, 0xff, 0x12, 0x12, + 0x03, 0x7d, 0xef, 0xf0, 0x74, 0x1c, 0x2e, 0xf5, 0x82, 0xe4, 0x34, + 0x70, 0xf5, 0x83, 0xed, 0xf0, 0x22, 0x0e, 0xbe, 0x04, 0xe3, 0x22, + 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, + 0xd0, 0x08, 0xc2, 0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x06, 0xd2, + 0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xf0, 0xd0, 0xe0, + 0x32, 0xc2, 0xaf, 0x12, 0x00, 0x06, 0x12, 0x02, 0xa2, 0x12, 0x03, + 0x27, 0xe4, 0xf5, 0x22, 0xf5, 0x47, 0x90, 0x04, 0x00, 0x74, 0x80, + 0xf0, 0xd2, 0xaf, 0x22, 0x75, 0x89, 0x02, 0xe4, 0xf5, 0x8c, 0xf5, + 0x8a, 0xf5, 0x88, 0xf5, 0xb8, 0xf5, 0xe8, 0x75, 0x90, 0x18, 0xd2, + 0x8c, 0x75, 0xa8, 0x05, 0x22, 0x30, 0x45, 0x03, 0x12, 0x10, 0x15, + 0xe5, 0x20, 0x70, 0x03, 0x20, 0x10, 0x03, 0x30, 0x11, 0x03, 0x43, + 0x87, 0x01, 0x22, 0xce, 0xef, 0xce, 0xee, 0x60, 0x08, 0x7f, 0xff, + 0x12, 0x03, 0x93, 0x1e, 0x80, 0xf5, 0x22, 0xc8, 0xef, 0xc8, 0xe6, + 0x60, 0x03, 0x16, 0xc3, 0x22, 0xed, 0x14, 0xf6, 0xd3, 0x22, 0xc8, + 0xef, 0xc8, 0xe6, 0x60, 0x06, 0x16, 0xe6, 0x24, 0xff, 0xb3, 0x22, + 0xc3, 0x22, 0x74, 0x14, 0x2e, 0xf5, 0x82, 0xe4, 0x34, 0x70, 0xf5, + 0x83, 0x22, 0xef, 0x90, 0x03, 0x91, 0x93, 0x90, 0x04, 0x00, 0x73, + 0x0a, 0x18, 0xef, 0x60, 0x03, 0x1f, 0x80, 0xfa, 0x22, 0x01, 0x3b, + 0x00, 0xc1, 0xae, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xc0, 0x26, 0x74, 0x04, 0xc0, 0xe0, 0xc0, 0x82, 0xc0, 0x83, + 0x75, 0x26, 0x0a, 0x22, 0xc0, 0x26, 0x74, 0x04, 0xc0, 0xe0, 0xc0, + 0x82, 0xc0, 0x83, 0x75, 0x26, 0x18, 0x22, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x10, 0x28, 0x02, + 0x10, 0x44, 0x02, 0x10, 0x45, 0x02, 0x12, 0xa9, 0x02, 0x12, 0xaa, + 0x02, 0x13, 0x45, 0x02, 0x13, 0x46, 0xc3, 0x22, 0xff, 0xff, 0x02, + 0x15, 0x48, 0x02, 0x16, 0x1e, 0x02, 0x13, 0xfd, 0x02, 0x13, 0x47, + 0x30, 0x05, 0x06, 0x20, 0x0d, 0x03, 0x12, 0x16, 0x9b, 0x30, 0x06, + 0x06, 0x20, 0x0e, 0x03, 0x12, 0x18, 0xbd, 0x30, 0x07, 0x06, 0x20, + 0x0f, 0x03, 0x12, 0x18, 0xfe, 0x22, 0x22, 0x90, 0x04, 0x14, 0xe0, + 0x20, 0xe7, 0x03, 0x02, 0x12, 0x9c, 0x90, 0x70, 0x12, 0xe0, 0xf5, + 0x56, 0x90, 0x04, 0x04, 0xe0, 0x12, 0x02, 0x4f, 0x10, 0x87, 0x31, + 0x10, 0xb2, 0x51, 0x10, 0xbd, 0x52, 0x10, 0xbd, 0x53, 0x10, 0xbd, + 0x54, 0x11, 0x71, 0x60, 0x10, 0xfe, 0x61, 0x11, 0xbf, 0x62, 0x10, + 0xfe, 0x63, 0x11, 0xe8, 0x70, 0x12, 0x12, 0x71, 0x12, 0x3c, 0x72, + 0x12, 0x6e, 0x80, 0x00, 0x00, 0x12, 0x9c, 0x20, 0x02, 0x03, 0x30, + 0x03, 0x1d, 0x7d, 0x02, 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, + 0x14, 0x74, 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, + 0xf4, 0x70, 0x03, 0x02, 0x12, 0x9c, 0x02, 0x12, 0x8f, 0x85, 0x56, + 0x41, 0xd2, 0x02, 0x02, 0x12, 0x9c, 0x90, 0x70, 0x11, 0xe0, 0x24, + 0xff, 0x92, 0x47, 0x02, 0x12, 0x9c, 0x90, 0x04, 0x04, 0xe0, 0x25, + 0xe0, 0x24, 0x5d, 0xf5, 0x57, 0x90, 0x70, 0x10, 0xe0, 0xff, 0x74, + 0x47, 0x25, 0x57, 0xf8, 0xc6, 0xef, 0xc6, 0x90, 0x70, 0x11, 0xe0, + 0xff, 0x74, 0x48, 0x25, 0x57, 0xf8, 0xc6, 0xef, 0xc6, 0xe4, 0xfd, + 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, 0x74, 0x80, 0xf0, + 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, 0x70, 0x03, 0x02, + 0x12, 0x9c, 0x02, 0x12, 0x8f, 0x90, 0x70, 0x11, 0xe0, 0x54, 0x1f, + 0xf5, 0x62, 0xe0, 0x54, 0x80, 0xf5, 0x64, 0x90, 0x70, 0x10, 0xe0, + 0xff, 0x7e, 0x00, 0x90, 0x04, 0x04, 0xe0, 0xb4, 0x61, 0x04, 0x7d, + 0x00, 0x80, 0x02, 0x7d, 0x07, 0xef, 0xc8, 0xed, 0xc8, 0x08, 0x80, + 0x05, 0xc3, 0x33, 0xce, 0x33, 0xce, 0xd8, 0xf9, 0xf5, 0x61, 0x8e, + 0x60, 0x90, 0x70, 0x11, 0xe0, 0x54, 0x60, 0x24, 0xff, 0x92, 0x2d, + 0xe0, 0x54, 0x60, 0xc4, 0x13, 0x54, 0x07, 0x14, 0xf5, 0x63, 0x75, + 0x65, 0x80, 0x75, 0x66, 0x23, 0x75, 0x67, 0x06, 0x75, 0x68, 0x18, + 0x75, 0x69, 0x15, 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, + 0x04, 0x14, 0x74, 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, + 0x56, 0xf4, 0x70, 0x03, 0x02, 0x12, 0x9c, 0x02, 0x12, 0x8f, 0x90, + 0x70, 0x11, 0xe0, 0x54, 0x1f, 0xf5, 0x6e, 0x90, 0x70, 0x10, 0xe0, + 0xf5, 0x6b, 0x90, 0x70, 0x11, 0xe0, 0x54, 0x60, 0x24, 0xff, 0x92, + 0x2c, 0xe0, 0x54, 0x60, 0xc4, 0x13, 0x54, 0x07, 0x14, 0xf5, 0x6f, + 0x75, 0x71, 0x40, 0x75, 0x72, 0x24, 0x75, 0x73, 0x05, 0x75, 0x74, + 0x17, 0x75, 0x75, 0xe7, 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0xc8, + 0x90, 0x04, 0x14, 0x74, 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, + 0xe5, 0x56, 0xf4, 0x70, 0x03, 0x02, 0x12, 0x9c, 0x02, 0x12, 0x8f, + 0x90, 0x70, 0x10, 0xe0, 0x60, 0x04, 0xd2, 0x1a, 0x80, 0x02, 0xd2, + 0x22, 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, + 0x74, 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, + 0x70, 0x03, 0x02, 0x12, 0x9c, 0x02, 0x12, 0x8f, 0x90, 0x70, 0x10, + 0xe0, 0xfe, 0x90, 0x70, 0x11, 0xe0, 0xfd, 0xed, 0xf8, 0xe6, 0xf5, + 0x57, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, 0x74, + 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, 0x70, + 0x03, 0x02, 0x12, 0x9c, 0x80, 0x7d, 0x90, 0x70, 0x10, 0xe0, 0xfe, + 0x90, 0x70, 0x11, 0xe0, 0xfd, 0xed, 0xf5, 0x82, 0x8e, 0x83, 0xe0, + 0xf5, 0x57, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, + 0x74, 0x80, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, + 0x60, 0x62, 0x80, 0x53, 0xe4, 0xf5, 0x7a, 0x75, 0x7b, 0x01, 0xf5, + 0x6a, 0xc2, 0x2d, 0xf5, 0x23, 0xf5, 0x3b, 0xd2, 0x2e, 0xf5, 0x77, + 0xc2, 0x2c, 0xf5, 0x24, 0x75, 0x76, 0x18, 0xad, 0x57, 0xaf, 0x56, + 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, 0x74, 0x80, 0xf0, 0xe4, 0x90, + 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, 0x60, 0x30, 0x80, 0x21, 0x90, + 0x70, 0x10, 0xe0, 0x24, 0xff, 0x92, 0x4a, 0xd2, 0x05, 0xad, 0x57, + 0xaf, 0x56, 0x12, 0x02, 0xc8, 0x90, 0x04, 0x14, 0x74, 0x80, 0xf0, + 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4, 0x60, 0x0d, 0x90, + 0x70, 0x24, 0xe0, 0x44, 0x10, 0xf0, 0x90, 0x02, 0x2c, 0x74, 0xff, + 0xf0, 0xe5, 0x23, 0x24, 0xff, 0x92, 0x06, 0xe5, 0x24, 0x24, 0xff, + 0x92, 0x07, 0x22, 0x22, 0xe5, 0x76, 0x60, 0x04, 0x15, 0x76, 0x80, + 0x03, 0x75, 0x76, 0x18, 0xe5, 0x76, 0x70, 0x43, 0x30, 0x2d, 0x0d, + 0x7f, 0x6c, 0xad, 0x61, 0xac, 0x60, 0x12, 0x02, 0x7b, 0x50, 0x02, + 0xd2, 0x18, 0x30, 0x2c, 0x0b, 0x7f, 0x7c, 0xad, 0x6b, 0x12, 0x03, + 0x61, 0x50, 0x02, 0xd2, 0x20, 0xe5, 0x77, 0x60, 0x09, 0x7f, 0x7a, + 0x12, 0x03, 0x6f, 0x50, 0x02, 0xd2, 0x21, 0xe5, 0x6a, 0x60, 0x09, + 0x7f, 0x7a, 0x12, 0x03, 0x6f, 0x50, 0x02, 0xd2, 0x19, 0xe5, 0x77, + 0x60, 0x07, 0xe5, 0x7b, 0xb4, 0x03, 0x02, 0xd2, 0x23, 0xe5, 0x23, + 0x24, 0xff, 0x92, 0x06, 0xe5, 0x24, 0x24, 0xff, 0x92, 0x07, 0x90, + 0x70, 0x60, 0xe5, 0x7b, 0xf0, 0xa3, 0xe5, 0x6a, 0xf0, 0xa3, 0xe5, + 0x20, 0xf0, 0xa3, 0xe5, 0x23, 0xf0, 0xe5, 0x6c, 0xa3, 0xf0, 0xa3, + 0xe5, 0x6d, 0xf0, 0xa2, 0x2d, 0xe4, 0x33, 0xa3, 0xf0, 0xa3, 0xe5, + 0x62, 0xf0, 0x90, 0x70, 0x6b, 0xe5, 0x76, 0xf0, 0xe5, 0x53, 0x70, + 0x0e, 0xe5, 0x4f, 0x45, 0x4e, 0x60, 0x08, 0xe5, 0x4f, 0x15, 0x4f, + 0x70, 0x02, 0x15, 0x4e, 0x22, 0x22, 0x22, 0xc2, 0x4b, 0xc2, 0x4c, + 0xe5, 0x44, 0x12, 0x02, 0x4f, 0x13, 0x69, 0x00, 0x13, 0xc4, 0x04, + 0x13, 0xc0, 0x08, 0x13, 0xa8, 0x10, 0x13, 0x74, 0x20, 0x13, 0x86, + 0x60, 0x13, 0x91, 0xa0, 0x00, 0x00, 0x13, 0xc6, 0x85, 0x48, 0x43, + 0x85, 0x4a, 0x42, 0x85, 0x4c, 0x5e, 0x80, 0x52, 0xe5, 0x48, 0xc4, + 0x54, 0x0f, 0xf5, 0x43, 0xe5, 0x4a, 0xc4, 0x54, 0x0f, 0xf5, 0x42, + 0xe5, 0x4c, 0x80, 0x1b, 0x85, 0x49, 0x43, 0x85, 0x4b, 0x42, 0x85, + 0x4d, 0x5e, 0x80, 0x35, 0xe5, 0x49, 0xc4, 0x54, 0x0f, 0xf5, 0x43, + 0xe5, 0x4b, 0xc4, 0x54, 0x0f, 0xf5, 0x42, 0xe5, 0x4d, 0xc4, 0x54, + 0x0f, 0xf5, 0x5e, 0x80, 0x1e, 0xe5, 0x47, 0xb4, 0x04, 0x06, 0x53, + 0x5e, 0xfb, 0x75, 0x42, 0x09, 0xe5, 0x47, 0xb4, 0x05, 0x0e, 0x43, + 0x5e, 0x04, 0x75, 0x42, 0x09, 0x80, 0x06, 0xd2, 0x4b, 0x80, 0x02, + 0xd2, 0x4c, 0xe4, 0xf5, 0x4e, 0xf5, 0x4f, 0xf5, 0x27, 0xe5, 0x42, + 0xc4, 0x54, 0xf0, 0xff, 0xe5, 0x43, 0x54, 0x0f, 0x4f, 0xf5, 0x5f, + 0x90, 0x70, 0x44, 0xf0, 0xa3, 0xe5, 0x5e, 0xf0, 0xa3, 0xe5, 0x4a, + 0xf0, 0xa3, 0xe5, 0x48, 0xf0, 0xa3, 0xe5, 0x4c, 0xf0, 0xa3, 0xe5, + 0x44, 0xf0, 0xa3, 0xe5, 0x42, 0xf0, 0xa3, 0xe5, 0x43, 0xf0, 0xd2, + 0x60, 0x22, 0x90, 0x70, 0x40, 0xe0, 0x04, 0xf0, 0x90, 0x70, 0x42, + 0xe5, 0x47, 0xf0, 0xe5, 0x47, 0x60, 0x10, 0x24, 0xc0, 0x70, 0x03, + 0x12, 0x15, 0x28, 0x12, 0x14, 0x1e, 0xc2, 0xaf, 0xc2, 0x04, 0xd2, + 0xaf, 0x22, 0xc2, 0xaf, 0x90, 0x04, 0x14, 0xe0, 0x54, 0x0e, 0x60, + 0x14, 0xe5, 0x47, 0xb4, 0x02, 0x0b, 0xe5, 0x44, 0xb4, 0x20, 0x06, + 0x75, 0x4e, 0x08, 0x75, 0x4f, 0x00, 0xd2, 0x28, 0x80, 0x08, 0xe5, + 0x4e, 0x45, 0x4f, 0x24, 0xff, 0x92, 0x28, 0xd2, 0xaf, 0x90, 0x04, + 0x14, 0xe0, 0xa2, 0xe4, 0x92, 0x29, 0x74, 0x1e, 0xf0, 0xe5, 0x5f, + 0x54, 0x0f, 0xf5, 0x2d, 0xe5, 0x27, 0x70, 0x13, 0x30, 0x28, 0x05, + 0xe5, 0x5f, 0x20, 0xe5, 0x0b, 0x30, 0x29, 0x19, 0xe5, 0x5f, 0x54, + 0x30, 0xff, 0xbf, 0x30, 0x11, 0xe5, 0x27, 0x70, 0x05, 0x75, 0x27, + 0x0c, 0x80, 0x02, 0x15, 0x27, 0xd2, 0x6c, 0xd2, 0x6d, 0x80, 0x0f, + 0xe5, 0x5f, 0x30, 0xe6, 0x06, 0xc2, 0x6c, 0xd2, 0x6d, 0x80, 0x04, + 0xd2, 0x6c, 0xc2, 0x6d, 0xe5, 0x47, 0x64, 0x03, 0x70, 0x21, 0x30, + 0x4b, 0x06, 0xc2, 0x6c, 0xd2, 0x6d, 0x80, 0x18, 0xe5, 0x27, 0x70, + 0x03, 0x30, 0x4c, 0x11, 0xc2, 0x4c, 0xe5, 0x27, 0x70, 0x05, 0x75, + 0x27, 0x07, 0x80, 0x02, 0x15, 0x27, 0xd2, 0x6c, 0xd2, 0x6d, 0x90, + 0x70, 0x46, 0xe5, 0x2d, 0xf0, 0x20, 0x69, 0x07, 0xe5, 0x5e, 0x20, + 0xe0, 0x02, 0xb2, 0x68, 0x20, 0x6b, 0x07, 0xe5, 0x5e, 0x20, 0xe1, + 0x02, 0xb2, 0x6a, 0x20, 0x6d, 0x07, 0xe5, 0x5e, 0x20, 0xe2, 0x02, + 0xb2, 0x6c, 0x90, 0x70, 0x47, 0xe5, 0x2d, 0xf0, 0x75, 0x2e, 0x40, + 0x20, 0x69, 0x04, 0xa2, 0x68, 0x80, 0x0a, 0xe5, 0x46, 0x30, 0x68, + 0x04, 0xa2, 0xe3, 0x80, 0x01, 0x33, 0x92, 0x73, 0x92, 0x72, 0x20, + 0x6b, 0x04, 0xa2, 0x6a, 0x80, 0x0a, 0xe5, 0x46, 0x30, 0x6a, 0x04, + 0xa2, 0xe3, 0x80, 0x01, 0x33, 0x92, 0x75, 0x92, 0x74, 0x20, 0x6d, + 0x04, 0xa2, 0x6c, 0x80, 0x0a, 0xe5, 0x46, 0x30, 0x6c, 0x04, 0xa2, + 0xe3, 0x80, 0x01, 0x33, 0x92, 0x71, 0x92, 0x70, 0x90, 0x10, 0x2f, + 0xe5, 0x2e, 0xf0, 0x22, 0xe4, 0x90, 0x02, 0x29, 0xf0, 0x30, 0x47, + 0x04, 0xaf, 0x45, 0x80, 0x04, 0xe5, 0x45, 0xf4, 0xff, 0x90, 0x02, + 0x28, 0xef, 0xf0, 0x22, 0x8f, 0x50, 0xd2, 0x59, 0x22, 0x8f, 0x54, + 0xd2, 0x58, 0x22, 0xe4, 0xf5, 0x38, 0xc2, 0xaf, 0xe5, 0x51, 0x14, + 0x60, 0x45, 0x14, 0x60, 0x61, 0x24, 0x02, 0x60, 0x03, 0x02, 0x16, + 0x02, 0xd2, 0x59, 0x75, 0x55, 0x01, 0x90, 0x02, 0x08, 0xe0, 0x54, + 0xfe, 0xf0, 0xe0, 0x20, 0xe1, 0x22, 0x90, 0x04, 0x34, 0xe0, 0xb4, + 0x02, 0x1b, 0xa3, 0xe0, 0xb4, 0x02, 0x16, 0xa3, 0xe0, 0xb4, 0x02, + 0x11, 0x7f, 0x20, 0x12, 0x15, 0x3e, 0x90, 0x10, 0x04, 0xe0, 0x54, + 0xf3, 0xf0, 0x75, 0x51, 0x01, 0x80, 0x74, 0xe5, 0x50, 0x70, 0x05, + 0x75, 0x38, 0x03, 0x80, 0x6b, 0x90, 0x12, 0x00, 0xe0, 0x54, 0x03, + 0x70, 0x11, 0x7f, 0x20, 0x12, 0x15, 0x3e, 0x90, 0x02, 0x08, 0xe0, + 0x54, 0xfb, 0xf0, 0x75, 0x51, 0x02, 0x80, 0x52, 0xe5, 0x50, 0x70, + 0x02, 0x80, 0x47, 0x90, 0x02, 0x08, 0xe0, 0x20, 0xe3, 0x3c, 0x90, + 0x04, 0x37, 0xe0, 0x64, 0x22, 0x70, 0x34, 0x90, 0x12, 0x04, 0x74, + 0x0a, 0xf0, 0x90, 0x13, 0x28, 0xe0, 0x54, 0xf0, 0xf0, 0xa3, 0xe0, + 0x54, 0xf0, 0xf0, 0xa3, 0xe0, 0x54, 0xfa, 0xf0, 0x90, 0x04, 0x01, + 0xe0, 0x44, 0x10, 0xf0, 0xe0, 0x54, 0xf9, 0xf0, 0x90, 0x12, 0x04, + 0xe0, 0x44, 0x04, 0xf0, 0x75, 0x38, 0x01, 0x75, 0x55, 0x02, 0xe4, + 0xf5, 0x51, 0x80, 0x09, 0xe5, 0x50, 0x70, 0x05, 0x75, 0x38, 0x03, + 0xf5, 0x51, 0xe5, 0x38, 0x60, 0x15, 0xc2, 0x01, 0xe4, 0xf5, 0x51, + 0xc2, 0x59, 0xad, 0x38, 0xaf, 0x40, 0x12, 0x02, 0xc8, 0xe5, 0x38, + 0xb4, 0x03, 0x02, 0xd2, 0x03, 0xd2, 0xaf, 0x22, 0xc2, 0xaf, 0x30, + 0x01, 0x0e, 0xe4, 0xf5, 0x51, 0xc2, 0x59, 0xc2, 0x01, 0x7d, 0x02, + 0xaf, 0x40, 0x12, 0x02, 0xc8, 0xe5, 0x52, 0x14, 0x60, 0x17, 0x04, + 0x70, 0x5d, 0x90, 0x12, 0x04, 0xe0, 0x54, 0xfb, 0xf0, 0x7f, 0x20, + 0x12, 0x15, 0x43, 0x75, 0x52, 0x01, 0x75, 0x55, 0x03, 0x80, 0x49, + 0xe5, 0x54, 0x70, 0x45, 0x90, 0x04, 0x01, 0xe0, 0x44, 0x0e, 0xf0, + 0xe0, 0x54, 0xef, 0xf0, 0x90, 0x13, 0x28, 0xe0, 0x44, 0x0f, 0xf0, + 0xa3, 0xe0, 0x44, 0x0f, 0xf0, 0xa3, 0xe0, 0x44, 0x05, 0xf0, 0x90, + 0x12, 0x04, 0x74, 0x03, 0xf0, 0x90, 0x02, 0x08, 0xe0, 0x44, 0x05, + 0xf0, 0x90, 0x10, 0x04, 0xe0, 0x44, 0x0c, 0xf0, 0xe4, 0xf5, 0x52, + 0xf5, 0x55, 0x30, 0x02, 0x0b, 0xc2, 0x02, 0x7d, 0x01, 0xaf, 0x41, + 0x12, 0x02, 0xc8, 0x80, 0x02, 0xc2, 0x03, 0xd2, 0xaf, 0x22, 0x22, + 0x22, 0xc2, 0xaf, 0xe5, 0x6a, 0x70, 0x04, 0xe5, 0x77, 0x60, 0x03, + 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x28, 0x90, 0x70, 0x2a, 0xe0, 0x30, + 0xe1, 0x2c, 0xe0, 0x13, 0x92, 0x29, 0x90, 0x70, 0x29, 0xe0, 0xff, + 0x90, 0x70, 0x28, 0xe0, 0xfd, 0xa2, 0x28, 0x92, 0x2a, 0xa2, 0x29, + 0x92, 0x2b, 0x12, 0x16, 0xe1, 0x50, 0x03, 0x20, 0x28, 0x05, 0x12, + 0x17, 0x61, 0x80, 0x07, 0x90, 0x70, 0x2a, 0xe0, 0x54, 0xfd, 0xf0, + 0xc2, 0x05, 0xd2, 0xaf, 0x22, 0x30, 0x2b, 0x49, 0x30, 0x2a, 0x46, + 0xbf, 0x41, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x32, 0xf0, 0x80, 0x39, + 0xbf, 0x42, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x33, 0xf0, 0x80, 0x2e, + 0xbf, 0x45, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x35, 0xf0, 0x80, 0x23, + 0xbf, 0x46, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x30, 0xf0, 0x80, 0x18, + 0xbf, 0x49, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x31, 0xf0, 0x80, 0x0d, + 0xbf, 0x71, 0x08, 0x90, 0x70, 0x28, 0xe5, 0x2f, 0xf0, 0x80, 0x02, + 0xc3, 0x22, 0xd3, 0x22, 0x20, 0x2b, 0x2f, 0xbf, 0x41, 0x04, 0x8d, + 0x32, 0x80, 0x25, 0xbf, 0x42, 0x04, 0x8d, 0x33, 0x80, 0x1e, 0xbf, + 0x45, 0x04, 0x8d, 0x35, 0x80, 0x17, 0xbf, 0x46, 0x04, 0x8d, 0x30, + 0x80, 0x10, 0xbf, 0x49, 0x04, 0x8d, 0x31, 0x80, 0x09, 0xbf, 0x71, + 0x04, 0x8d, 0x2f, 0x80, 0x02, 0xc3, 0x22, 0xa2, 0x2a, 0x22, 0xc3, + 0x22, 0x90, 0x70, 0x28, 0xe0, 0x90, 0x10, 0x1c, 0xf0, 0x90, 0x70, + 0x29, 0xe0, 0x90, 0x10, 0x1d, 0xf0, 0x90, 0x70, 0x2a, 0xe0, 0x90, + 0x10, 0x1e, 0xf0, 0x90, 0x10, 0x1c, 0xe0, 0xf5, 0x38, 0x90, 0x10, + 0x1e, 0xe0, 0x20, 0xe1, 0xf3, 0x90, 0x10, 0x1c, 0xe0, 0x90, 0x70, + 0x28, 0xf0, 0x90, 0x10, 0x1d, 0xe0, 0x90, 0x70, 0x29, 0xf0, 0x90, + 0x10, 0x1e, 0xe0, 0x90, 0x70, 0x2a, 0xf0, 0x30, 0x4a, 0x0d, 0x90, + 0x70, 0x24, 0xe0, 0x44, 0x01, 0xf0, 0x90, 0x02, 0x2c, 0x74, 0xff, + 0xf0, 0x22, 0xc2, 0xaf, 0x90, 0x10, 0x1c, 0xed, 0xf0, 0xa3, 0xef, + 0xf0, 0xa3, 0x74, 0x0a, 0xf0, 0x90, 0x10, 0x1c, 0xe0, 0xf5, 0x3a, + 0x90, 0x10, 0x1e, 0xe0, 0x20, 0xe1, 0xf3, 0xd2, 0xaf, 0x22, 0xc2, + 0xaf, 0x90, 0x10, 0x1d, 0xef, 0xf0, 0xa3, 0x74, 0x0b, 0xf0, 0x90, + 0x10, 0x1c, 0xe0, 0xff, 0x90, 0x10, 0x1e, 0xe0, 0x20, 0xe1, 0xf4, + 0xd2, 0xaf, 0x22, 0x90, 0x13, 0x44, 0xe0, 0xf5, 0x34, 0xe4, 0xf0, + 0x90, 0x02, 0x29, 0xf0, 0x90, 0x02, 0x28, 0xe0, 0x44, 0x02, 0xf0, + 0x7d, 0x1d, 0x7f, 0x41, 0x12, 0x17, 0xaf, 0x7d, 0x60, 0x0f, 0x12, + 0x17, 0xaf, 0x7f, 0x71, 0x12, 0x17, 0xcd, 0xef, 0x44, 0x20, 0xfd, + 0x7f, 0x71, 0x02, 0x17, 0xaf, 0xe4, 0x90, 0x02, 0x29, 0xf0, 0x90, + 0x02, 0x28, 0xe0, 0x44, 0x02, 0xf0, 0x90, 0x13, 0x44, 0xe0, 0xf5, + 0x34, 0xe4, 0xf0, 0x7f, 0x04, 0x12, 0x17, 0xcd, 0xef, 0x54, 0x18, + 0x60, 0x1d, 0xe5, 0x78, 0x24, 0x02, 0xf8, 0xe6, 0x60, 0x07, 0x90, + 0x70, 0x2c, 0xe0, 0xfd, 0x80, 0x05, 0x90, 0x70, 0x2d, 0xe0, 0xfd, + 0x7f, 0x42, 0x12, 0x17, 0xaf, 0x7d, 0x30, 0x80, 0x1b, 0xe5, 0x78, + 0x24, 0x02, 0xf8, 0xe6, 0x60, 0x07, 0x90, 0x70, 0x2e, 0xe0, 0xfd, + 0x80, 0x05, 0x90, 0x70, 0x2f, 0xe0, 0xfd, 0x7f, 0x42, 0x12, 0x17, + 0xaf, 0x7d, 0x28, 0x7f, 0x45, 0x12, 0x17, 0xaf, 0x0f, 0x12, 0x17, + 0xaf, 0x7d, 0x08, 0x7f, 0x49, 0x12, 0x17, 0xaf, 0x22, 0xe4, 0x90, + 0x02, 0x29, 0xf0, 0x90, 0x02, 0x28, 0xe0, 0x54, 0xfd, 0xf0, 0x90, + 0x13, 0x44, 0xe5, 0x34, 0xf0, 0x7f, 0x71, 0x12, 0x17, 0xcd, 0xef, + 0x54, 0xdf, 0xfd, 0x7f, 0x71, 0x12, 0x17, 0xaf, 0xad, 0x32, 0x7f, + 0x41, 0x12, 0x17, 0xaf, 0xad, 0x33, 0x0f, 0x12, 0x17, 0xaf, 0xad, + 0x35, 0x7f, 0x45, 0x12, 0x17, 0xaf, 0xad, 0x30, 0x0f, 0x12, 0x17, + 0xaf, 0xad, 0x31, 0x7f, 0x49, 0x02, 0x17, 0xaf, 0xe5, 0x6a, 0x14, + 0x60, 0x16, 0x04, 0x70, 0x31, 0x90, 0x70, 0x6c, 0xe0, 0x04, 0xf0, + 0x7f, 0x06, 0x12, 0x1b, 0x95, 0x50, 0x24, 0x75, 0x6a, 0x01, 0x75, + 0x78, 0x62, 0x90, 0x70, 0x6d, 0xe0, 0x04, 0xf0, 0x12, 0x19, 0x60, + 0x40, 0x13, 0x90, 0x70, 0x24, 0xe0, 0x44, 0x04, 0xf0, 0x90, 0x02, + 0x2c, 0x74, 0xff, 0xf0, 0xe4, 0xf5, 0x6a, 0x12, 0x1b, 0xae, 0xc2, + 0xaf, 0x53, 0x20, 0xbf, 0xd2, 0xaf, 0x22, 0xe5, 0x77, 0x14, 0x60, + 0x10, 0x04, 0x70, 0x52, 0x7f, 0x07, 0x12, 0x1b, 0x95, 0x50, 0x4b, + 0x75, 0x77, 0x01, 0x75, 0x78, 0x6e, 0x12, 0x19, 0x60, 0x40, 0x40, + 0xe5, 0x79, 0x24, 0x05, 0xff, 0x13, 0x13, 0x13, 0x54, 0x1f, 0xfe, + 0x24, 0x24, 0xf5, 0x82, 0xe4, 0x34, 0x70, 0xf5, 0x83, 0xe0, 0xfd, + 0xef, 0x54, 0x07, 0xff, 0x74, 0x01, 0xc8, 0xef, 0xc8, 0x08, 0x80, + 0x02, 0xc3, 0x33, 0xd8, 0xfc, 0x4d, 0xff, 0x74, 0x24, 0x2e, 0xf5, + 0x82, 0xe4, 0x34, 0x70, 0xf5, 0x83, 0xef, 0xf0, 0x90, 0x02, 0x2c, + 0x74, 0xff, 0xf0, 0xe4, 0xf5, 0x77, 0x12, 0x1b, 0xae, 0xc2, 0xaf, + 0x53, 0x20, 0x7f, 0xd2, 0xaf, 0x22, 0xe5, 0x78, 0x24, 0x04, 0xf8, + 0xe6, 0xf5, 0x38, 0x90, 0x70, 0x68, 0xf0, 0xf8, 0xe6, 0xff, 0xa3, + 0xf0, 0x90, 0x70, 0x6f, 0xe0, 0x04, 0xf0, 0xe5, 0x7b, 0x24, 0xfe, + 0x70, 0x03, 0x02, 0x1a, 0x26, 0x14, 0x70, 0x03, 0x02, 0x1a, 0x78, + 0x24, 0x02, 0x60, 0x03, 0x02, 0x1b, 0x94, 0xe4, 0xf5, 0x79, 0xef, + 0x20, 0xe0, 0x03, 0x02, 0x1a, 0x24, 0xa8, 0x38, 0xe6, 0x54, 0xfe, + 0xf6, 0xe5, 0x78, 0x04, 0xf8, 0xe6, 0x60, 0x4d, 0xc2, 0xaf, 0x75, + 0x7a, 0x05, 0xa8, 0x38, 0xe6, 0x54, 0xfb, 0xf6, 0xd2, 0xaf, 0xe5, + 0x78, 0x04, 0xf8, 0xe6, 0x64, 0x02, 0x70, 0x1c, 0x90, 0x77, 0x85, + 0xf0, 0xe5, 0x78, 0x24, 0x03, 0xf8, 0xe6, 0x90, 0x04, 0x10, 0xf0, + 0xe5, 0x78, 0x24, 0x03, 0xf8, 0xe6, 0xff, 0x90, 0x04, 0x10, 0xe0, + 0x5f, 0x70, 0xf2, 0x90, 0x77, 0x85, 0x74, 0xfe, 0xf0, 0xa8, 0x38, + 0xe6, 0x54, 0xfb, 0xf6, 0xe5, 0x78, 0x24, 0x03, 0xf8, 0xe6, 0x90, + 0x04, 0x10, 0xf0, 0x75, 0x7b, 0x02, 0x80, 0x33, 0xc2, 0xaf, 0xa8, + 0x78, 0xe6, 0xf5, 0x7a, 0xa8, 0x38, 0xe6, 0x54, 0xfb, 0xf6, 0xd2, + 0xaf, 0x90, 0x10, 0x04, 0xe0, 0x54, 0xfb, 0xf0, 0xe5, 0x6a, 0x60, + 0x06, 0x90, 0x17, 0x04, 0xe0, 0xf5, 0x39, 0xe5, 0x78, 0x24, 0x06, + 0xf8, 0xe6, 0xfe, 0x08, 0xe6, 0xca, 0xee, 0xca, 0xf9, 0x12, 0x02, + 0x75, 0x75, 0x7b, 0x03, 0xd3, 0x22, 0xa8, 0x38, 0xe6, 0x30, 0xe2, + 0x3b, 0x54, 0xfb, 0xf6, 0xc2, 0xaf, 0xa8, 0x78, 0xe6, 0xf5, 0x7a, + 0xa8, 0x38, 0xe6, 0x54, 0xfb, 0xf6, 0xd2, 0xaf, 0x90, 0x10, 0x04, + 0xe0, 0x54, 0xfb, 0xf0, 0xe5, 0x6a, 0x60, 0x06, 0x90, 0x17, 0x04, + 0xe0, 0xf5, 0x39, 0xe5, 0x78, 0x24, 0x06, 0xf8, 0xe6, 0xfe, 0x08, + 0xe6, 0xca, 0xee, 0xca, 0xf9, 0x12, 0x02, 0x75, 0xe4, 0xf5, 0x7d, + 0x75, 0x7b, 0x03, 0xd3, 0x22, 0xa8, 0x38, 0xe6, 0x30, 0xe1, 0x09, + 0x54, 0xfd, 0xf6, 0xe4, 0xf5, 0x79, 0x02, 0x1b, 0x8e, 0xd3, 0x22, + 0xe5, 0x77, 0x70, 0x03, 0x02, 0x1b, 0x6e, 0xa8, 0x38, 0xe6, 0x20, + 0xe3, 0x03, 0x02, 0x1b, 0x6e, 0x54, 0xf7, 0xf6, 0x7f, 0x73, 0x12, + 0x17, 0xcd, 0xef, 0x64, 0x02, 0x60, 0x03, 0x02, 0x1b, 0x28, 0x90, + 0x02, 0x29, 0xf0, 0x90, 0x02, 0x28, 0xe0, 0x44, 0x08, 0xf0, 0x7f, + 0x76, 0x12, 0x17, 0xcd, 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, + 0x00, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xef, 0xf0, 0x7f, + 0x75, 0x12, 0x17, 0xcd, 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, + 0x01, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xef, 0xf0, 0x7f, + 0x74, 0x12, 0x17, 0xcd, 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, + 0x02, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xef, 0xf0, 0x7f, + 0x73, 0x12, 0x17, 0xcd, 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, + 0x03, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xef, 0xf0, 0x7f, + 0x71, 0x12, 0x17, 0xcd, 0xef, 0x54, 0xdf, 0xfd, 0x7f, 0x71, 0x12, + 0x17, 0xaf, 0x7f, 0x71, 0x12, 0x17, 0xcd, 0xef, 0x44, 0x20, 0xfd, + 0x7f, 0x71, 0x12, 0x17, 0xaf, 0x75, 0x79, 0xff, 0xe4, 0x90, 0x02, + 0x29, 0xf0, 0x90, 0x02, 0x28, 0xe0, 0x54, 0xf7, 0xf0, 0x80, 0x44, + 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, 0x00, 0xf5, 0x82, 0xe4, + 0x34, 0x71, 0xf5, 0x83, 0xe4, 0xf0, 0xe5, 0x7d, 0x25, 0xe0, 0x25, + 0xe0, 0x24, 0x01, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xe4, + 0xf0, 0xe5, 0x7d, 0x25, 0xe0, 0x25, 0xe0, 0x24, 0x02, 0xf5, 0x82, + 0xe4, 0x34, 0x71, 0xf5, 0x83, 0xe4, 0xf0, 0xe5, 0x7d, 0x25, 0xe0, + 0x25, 0xe0, 0x24, 0x03, 0xf5, 0x82, 0xe4, 0x34, 0x71, 0xf5, 0x83, + 0xe4, 0xf0, 0x05, 0x7d, 0xa8, 0x38, 0xe6, 0xff, 0x30, 0xe1, 0x1e, + 0x54, 0xfd, 0xf6, 0xe5, 0x79, 0xf4, 0x60, 0x07, 0x7f, 0x73, 0x12, + 0x17, 0xcd, 0x8f, 0x79, 0x12, 0x18, 0x7c, 0x90, 0x10, 0x04, 0xe0, + 0x44, 0x04, 0xf0, 0x75, 0x7b, 0x01, 0xc3, 0x22, 0xd3, 0x22, 0xa2, + 0x2e, 0xe4, 0x33, 0x90, 0x70, 0x6a, 0xf0, 0xc2, 0xaf, 0x30, 0x2e, + 0x06, 0xc2, 0x2e, 0xd2, 0xaf, 0xd3, 0x22, 0x8f, 0x3b, 0xd2, 0xaf, + 0xc3, 0x22, 0xc2, 0xaf, 0xe5, 0x3b, 0x60, 0x12, 0xff, 0x74, 0x01, + 0xc8, 0xef, 0xc8, 0x08, 0x80, 0x02, 0xc3, 0x33, 0xd8, 0xfc, 0x42, + 0x20, 0xe4, 0xf5, 0x3b, 0xd2, 0x2e, 0xd2, 0xaf, 0x22, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x65, 0x30 +}; From owner-p4-projects@FreeBSD.ORG Thu Apr 17 23:34:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00EE21065671; Thu, 17 Apr 2008 23:34:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B788B106564A for ; Thu, 17 Apr 2008 23:34:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87F8C8FC19 for ; Thu, 17 Apr 2008 23:34:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3HNYFJt013748 for ; Thu, 17 Apr 2008 23:34:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3HNYFkI013746 for perforce@freebsd.org; Thu, 17 Apr 2008 23:34:15 GMT (envelope-from sam@freebsd.org) Date: Thu, 17 Apr 2008 23:34:15 GMT Message-Id: <200804172334.m3HNYFkI013746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2008 23:34:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=140190 Change 140190 by sam@sam_ebb on 2008/04/17 23:33:46 add 2860 firmware image Affected files ... .. //depot/projects/vap/sys/modules/ralfw/Makefile#2 edit .. //depot/projects/vap/sys/modules/ralfw/rt2860/Makefile#1 add Differences ... ==== //depot/projects/vap/sys/modules/ralfw/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= rt2561 rt2561s rt2661 +SUBDIR= rt2561 rt2561s rt2661 rt2860 .include From owner-p4-projects@FreeBSD.ORG Fri Apr 18 01:13:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB4811065674; Fri, 18 Apr 2008 01:13:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 738E11065672 for ; Fri, 18 Apr 2008 01:13:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AD928FC0A for ; Fri, 18 Apr 2008 01:13:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3I1D7v6029035 for ; Fri, 18 Apr 2008 01:13:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3I1D7x9029033 for perforce@freebsd.org; Fri, 18 Apr 2008 01:13:07 GMT (envelope-from marcel@freebsd.org) Date: Fri, 18 Apr 2008 01:13:07 GMT Message-Id: <200804180113.m3I1D7x9029033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 01:13:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=140193 Change 140193 by marcel@marcel_cluster on 2008/04/18 01:12:33 Add a size argument to ldr_alloc(), so that the API is more common and less implicit. Affected files ... .. //depot/projects/ia64/sys/boot/ia64/common/copy.c#6 edit .. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#6 edit .. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#8 edit .. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/common/copy.c#6 (text+ko) ==== @@ -73,7 +73,7 @@ ofs = va & IA64_LVM_PAGE_MASK; pa = ia64_pgtbl[idx]; if (pa == 0) { - pa = ldr_alloc(va - ofs); + pa = ldr_alloc(va - ofs, IA64_LVM_PAGE_SIZE); if (pa == 0) { *len = 0; return (NULL); ==== //depot/projects/ia64/sys/boot/ia64/common/libia64.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * Portability functions provided by the loader * implementation specific to the platform. */ -extern uint64_t ldr_alloc(vm_offset_t); +extern uint64_t ldr_alloc(vm_offset_t, vm_size_t); extern int ldr_bootinfo(struct bootinfo *, uint64_t *); extern int ldr_enter(const char *); ==== //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#8 (text+ko) ==== @@ -48,7 +48,7 @@ static UINTN mapkey; uint64_t -ldr_alloc(vm_offset_t va) +ldr_alloc(vm_offset_t va, vm_size_t sz) { return (0); ==== //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ extern void sal_stub_init(void); uint64_t -ldr_alloc(vm_offset_t va) +ldr_alloc(vm_offset_t va, vm_size_t sz __unused) { if (va >= PHYS_SIZE) From owner-p4-projects@FreeBSD.ORG Fri Apr 18 02:30:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C35AB106567A; Fri, 18 Apr 2008 02:30:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83CDB1065672 for ; Fri, 18 Apr 2008 02:30:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67C388FC1A for ; Fri, 18 Apr 2008 02:30:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3I2UT7I033204 for ; Fri, 18 Apr 2008 02:30:29 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3I2UTKC033176 for perforce@freebsd.org; Fri, 18 Apr 2008 02:30:29 GMT (envelope-from marcel@freebsd.org) Date: Fri, 18 Apr 2008 02:30:29 GMT Message-Id: <200804180230.m3I2UTKC033176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 02:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=140198 Change 140198 by marcel@marcel_xcllnt on 2008/04/18 02:29:39 IFC @140197 Affected files ... .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#7 integrate .. //depot/projects/ia64/include/stdio.h#24 integrate .. //depot/projects/ia64/lib/libc/stdio/_flock_stub.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/asprintf.c#7 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetwc.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetws.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/findfp.c#12 integrate .. //depot/projects/ia64/lib/libc/stdio/fputwc.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#10 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#14 integrate .. //depot/projects/ia64/lib/libc/stdio/refill.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/sscanf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetc.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/vasprintf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#31 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#20 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vsscanf.c#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vswprintf.c#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vswscanf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/xprintf.c#5 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#25 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#77 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#43 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#63 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#55 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#48 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#41 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#56 integrate .. //depot/projects/ia64/sys/dev/ata/ata-queue.c#31 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#45 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#57 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#32 integrate .. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#31 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#16 integrate .. //depot/projects/ia64/sys/ia64/include/vmparam.h#24 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#52 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#49 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#54 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#77 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#107 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#47 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#59 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#23 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#63 integrate .. //depot/projects/ia64/sys/kern/subr_turnstile.c#22 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#69 integrate .. //depot/projects/ia64/sys/netinet/in.h#35 integrate .. //depot/projects/ia64/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#58 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#38 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#42 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#72 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#36 integrate .. //depot/projects/ia64/sys/netinet/ip_options.c#6 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#66 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#56 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#82 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#45 integrate .. //depot/projects/ia64/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/ia64/sys/netinet/tcp_sack.c#17 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#68 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#54 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#34 integrate .. //depot/projects/ia64/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#43 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#55 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#37 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#38 integrate .. //depot/projects/ia64/sys/netinet6/in6_src.c#27 integrate .. //depot/projects/ia64/sys/netinet6/raw_ip6.c#32 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#36 integrate .. //depot/projects/ia64/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/ia64/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/ia64/sys/sparc64/pci/apb.c#12 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci_if.m#8 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib.c#8 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.c#8 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcib_subr.h#4 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pcibus.c#13 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#45 integrate .. //depot/projects/ia64/sys/sparc64/pci/psychovar.h#16 integrate .. //depot/projects/ia64/sys/sys/proc.h#117 integrate .. //depot/projects/ia64/sys/sys/sched.h#21 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#39 integrate .. //depot/projects/ia64/sys/sys/termios.h#5 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#28 integrate .. //depot/projects/ia64/usr.bin/env/env.1#7 integrate .. //depot/projects/ia64/usr.bin/env/env.c#10 integrate Differences ... ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.i386#7 (text+ko) ==== @@ -1,12 +1,19 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ +SRCS+= cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c + elflink.c \ + peigen.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec + +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/ia64/include/stdio.h#24 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $ */ #ifndef _STDIO_H_ @@ -72,9 +72,6 @@ int _size; }; -/* hold a buncha junk that would grow the ABI */ -struct __sFILEX; - /* * stdio state variables. * @@ -98,15 +95,19 @@ * that does not match the previous one in _bf. When this happens, * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. + * + * Certain members of __sFILE are accessed directly via macros or + * inline functions. To preserve ABI compat, these members must not + * be disturbed. These members are marked below with (*). */ typedef struct __sFILE { - unsigned char *_p; /* current position in (some) buffer */ - int _r; /* read space left for getc() */ - int _w; /* write space left for putc() */ - short _flags; /* flags, below; this FILE is free if 0 */ - short _file; /* fileno, if Unix descriptor, else -1 */ + unsigned char *_p; /* (*) current position in (some) buffer */ + int _r; /* (*) read space left for getc() */ + int _w; /* (*) write space left for putc() */ + short _flags; /* (*) flags, below; this FILE is free if 0 */ + short _file; /* (*) fileno, if Unix descriptor, else -1 */ struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ - int _lbfsize; /* 0 or -_bf._size, for inline putc */ + int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */ /* operations */ void *_cookie; /* cookie passed to io functions */ @@ -117,7 +118,7 @@ /* separate buffer for long sequences of ungetc() */ struct __sbuf _ub; /* ungetc buffer */ - struct __sFILEX *_extra; /* additions to FILE to not break ABI */ + unsigned char *_up; /* saved _p when _p is doing ungetc data */ int _ur; /* saved _r when _r is counting ungetc data */ /* tricks to meet minimum requirements even when malloc() fails */ @@ -130,6 +131,12 @@ /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ fpos_t _offset; /* current lseek offset */ + + struct pthread_mutex *_fl_mutex; /* used for MT-safety */ + struct pthread *_fl_owner; /* current owner */ + int _fl_count; /* recursive lock count */ + int _orientation; /* orientation for fwide() */ + __mbstate_t _mbstate; /* multibyte conversion state */ } FILE; #ifndef _STDSTREAM_DECLARED ==== //depot/projects/ia64/lib/libc/stdio/_flock_stub.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.15 2007/01/12 07:31:30 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.16 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -55,31 +55,21 @@ __weak_reference(_ftrylockfile, ftrylockfile); __weak_reference(_funlockfile, funlockfile); -/* - * We need to retain binary compatibility for a while. So pretend - * that _lock is part of FILE * even though it is dereferenced off - * _extra now. When we stop encoding the size of FILE into binaries - * this can be changed in stdio.h. This will reduce the amount of - * code that has to change in the future (just remove this comment - * and #define). - */ -#define _lock _extra - void _flockfile(FILE *fp) { pthread_t curthread = _pthread_self(); - if (fp->_lock->fl_owner == curthread) - fp->_lock->fl_count++; + if (fp->_fl_owner == curthread) + fp->_fl_count++; else { /* * Make sure this mutex is treated as a private * internal mutex: */ - _pthread_mutex_lock(&fp->_lock->fl_mutex); - fp->_lock->fl_owner = curthread; - fp->_lock->fl_count = 1; + _pthread_mutex_lock(&fp->_fl_mutex); + fp->_fl_owner = curthread; + fp->_fl_count = 1; } } @@ -98,15 +88,15 @@ pthread_t curthread = _pthread_self(); int ret = 0; - if (fp->_lock->fl_owner == curthread) - fp->_lock->fl_count++; + if (fp->_fl_owner == curthread) + fp->_fl_count++; /* * Make sure this mutex is treated as a private * internal mutex: */ - else if (_pthread_mutex_trylock(&fp->_lock->fl_mutex) == 0) { - fp->_lock->fl_owner = curthread; - fp->_lock->fl_count = 1; + else if (_pthread_mutex_trylock(&fp->_fl_mutex) == 0) { + fp->_fl_owner = curthread; + fp->_fl_count = 1; } else ret = -1; @@ -121,26 +111,26 @@ /* * Check if this file is owned by the current thread: */ - if (fp->_lock->fl_owner == curthread) { + if (fp->_fl_owner == curthread) { /* * Check if this thread has locked the FILE * more than once: */ - if (fp->_lock->fl_count > 1) + if (fp->_fl_count > 1) /* * Decrement the count of the number of * times the running thread has locked this * file: */ - fp->_lock->fl_count--; + fp->_fl_count--; else { /* * The running thread will release the * lock now: */ - fp->_lock->fl_count = 0; - fp->_lock->fl_owner = NULL; - _pthread_mutex_unlock(&fp->_lock->fl_mutex); + fp->_fl_count = 0; + fp->_fl_owner = NULL; + _pthread_mutex_unlock(&fp->_fl_mutex); } } } ==== //depot/projects/ia64/lib/libc/stdio/asprintf.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.14 2008/04/17 22:17:53 jhb Exp $"); #include #include @@ -43,7 +43,6 @@ int ret; va_list ap; FILE f; - struct __sFILEX ext; f._file = -1; f._flags = __SWR | __SSTR | __SALC; @@ -54,8 +53,8 @@ return (-1); } f._bf._size = f._w = 127; /* Leave room for the NUL */ - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */ va_end(ap); ==== //depot/projects/ia64/lib/libc/stdio/fgetwc.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.13 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -71,7 +71,7 @@ return (wc); } do { - nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); + nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_mbstate); if (nconv == (size_t)-1) break; else if (nconv == (size_t)-2) ==== //depot/projects/ia64/lib/libc/stdio/fgetws.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.7 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -62,7 +62,7 @@ nl = memchr(fp->_p, '\n', fp->_r); nconv = __mbsnrtowcs(wsp, &src, nl != NULL ? (nl - fp->_p + 1) : fp->_r, - n - 1, &fp->_extra->mbstate); + n - 1, &fp->_mbstate); if (nconv == (size_t)-1) /* Conversion error */ goto error; @@ -86,7 +86,7 @@ if (wsp == ws) /* EOF */ goto error; - if (!__mbsinit(&fp->_extra->mbstate)) + if (!__mbsinit(&fp->_mbstate)) /* Incomplete character */ goto error; *wsp++ = L'\0'; ==== //depot/projects/ia64/lib/libc/stdio/findfp.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.31 2007/01/09 00:28:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.32 2008/04/17 22:17:53 jhb Exp $"); #include #include @@ -54,36 +54,19 @@ #define NDYNAMIC 10 /* add ten more whenever necessary */ #define std(flags, file) \ - {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \ - {0}, __sFX + file} + {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite} /* p r w flags file _bf z cookie close read seek write */ - /* _ub _extra */ + /* the usual - (stdin + stdout + stderr) */ static FILE usual[FOPEN_MAX - 3]; -static struct __sFILEX usual_extra[FOPEN_MAX - 3]; static struct glue uglue = { NULL, FOPEN_MAX - 3, usual }; -static struct __sFILEX __sFX[3]; - -/* - * We can't make this 'static' until 6.0-current due to binary - * compatibility concerns. This also means we cannot change the - * sizeof(FILE) until that time either and must continue to use the - * __sFILEX stuff to add to FILE. - */ -FILE __sF[3] = { +static FILE __sF[3] = { std(__SRD, STDIN_FILENO), std(__SWR, STDOUT_FILENO), std(__SWR|__SNBF, STDERR_FILENO) }; -/* - * The following kludge is done to ensure enough binary compatibility - * with future versions of libc. Or rather it allows us to work with - * libraries that have been built with a newer libc that defines these - * symbols and expects libc to provide them. We only have need to support - * i386 because it is the only "old" system we have deployed. - */ FILE *__stdinp = &__sF[0]; FILE *__stdoutp = &__sF[1]; FILE *__stderrp = &__sF[2]; @@ -109,25 +92,17 @@ { struct glue *g; static FILE empty; - static struct __sFILEX emptyx; FILE *p; - struct __sFILEX *fx; - g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) + - n * sizeof(struct __sFILEX)); + g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE)); if (g == NULL) return (NULL); p = (FILE *)ALIGN(g + 1); - fx = (struct __sFILEX *)&p[n]; g->next = NULL; g->niobs = n; g->iobs = p; - while (--n >= 0) { - *p = empty; - p->_extra = fx; - *p->_extra = emptyx; - p++, fx++; - } + while (--n >= 0) + *p++ = empty; return (g); } @@ -175,8 +150,8 @@ fp->_lb._base = NULL; /* no line buffer */ fp->_lb._size = 0; /* fp->_lock = NULL; */ /* once set always set (reused) */ - fp->_extra->orientation = 0; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + fp->_orientation = 0; + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (fp); } @@ -229,17 +204,8 @@ void __sinit() { - int i; - THREAD_LOCK(); - if (__sdidinit == 0) { - /* Set _extra for the usual suspects. */ - for (i = 0; i < FOPEN_MAX - 3; i++) - usual[i]._extra = &usual_extra[i]; - - /* Make sure we clean up on exit. */ - __cleanup = _cleanup; /* conservative */ - __sdidinit = 1; - } - THREAD_UNLOCK(); + /* Make sure we clean up on exit. */ + __cleanup = _cleanup; /* conservative */ + __sdidinit = 1; } ==== //depot/projects/ia64/lib/libc/stdio/fputwc.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.11 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -56,8 +56,7 @@ *buf = (unsigned char)wc; len = 1; } else { - if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == - (size_t)-1) { + if ((len = __wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } ==== //depot/projects/ia64/lib/libc/stdio/fputws.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.6 2004/07/21 10:54:57 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.7 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -55,7 +55,7 @@ iov.iov_base = buf; do { nbytes = __wcsnrtombs(buf, &ws, SIZE_T_MAX, sizeof(buf), - &fp->_extra->mbstate); + &fp->_mbstate); if (nbytes == (size_t)-1) goto error; iov.iov_len = uio.uio_resid = nbytes; ==== //depot/projects/ia64/lib/libc/stdio/freopen.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.20 2008/02/27 21:25:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.21 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -182,8 +182,8 @@ if (HASLB(fp)) FREELB(fp); fp->_lb._size = 0; - fp->_extra->orientation = 0; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + fp->_orientation = 0; + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ ==== //depot/projects/ia64/lib/libc/stdio/fseek.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fseek.c 8.3 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.43 2007/06/18 02:09:08 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.44 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -233,7 +233,7 @@ */ if (HASUB(fp)) { curoff += fp->_r; /* kill off ungetc */ - n = fp->_extra->_up - fp->_bf._base; + n = fp->_up - fp->_bf._base; curoff -= n; n += fp->_ur; } else { @@ -255,7 +255,7 @@ if (HASUB(fp)) FREEUB(fp); fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); } @@ -283,7 +283,7 @@ fp->_r -= n; } fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); /* @@ -306,6 +306,6 @@ fp->_r = 0; /* fp->_w = 0; */ /* unnecessary (I think...) */ fp->_flags &= ~__SEOF; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (0); } ==== //depot/projects/ia64/lib/libc/stdio/fwide.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fwide.c,v 1.1 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fwide.c,v 1.2 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -42,9 +42,9 @@ FLOCKFILE(fp); /* Only change the orientation if the stream is not oriented yet. */ - if (mode != 0 && fp->_extra->orientation == 0) - fp->_extra->orientation = mode > 0 ? 1 : -1; - m = fp->_extra->orientation; + if (mode != 0 && fp->_orientation == 0) + fp->_orientation = mode > 0 ? 1 : -1; + m = fp->_orientation; FUNLOCKFILE(fp); return (m); ==== //depot/projects/ia64/lib/libc/stdio/local.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.30 2007/01/09 00:28:06 imp Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.31 2008/04/17 22:17:54 jhb Exp $ */ #include /* for off_t */ @@ -80,16 +80,6 @@ extern int __sdidinit; -/* hold a buncha junk that would grow the ABI */ -struct __sFILEX { - unsigned char *_up; /* saved _p when _p is doing ungetc data */ - pthread_mutex_t fl_mutex; /* used for MT-safety */ - pthread_t fl_owner; /* current owner */ - int fl_count; /* recursive lock count */ - int orientation; /* orientation for fwide() */ - mbstate_t mbstate; /* multibyte conversion state */ -}; - /* * Prepare the given FILE for writing, and return 0 iff it * can be written now. Otherwise, return EOF and set errno. @@ -119,20 +109,11 @@ (fp)->_lb._base = NULL; \ } -#define INITEXTRA(fp) { \ - (fp)->_extra->_up = NULL; \ - (fp)->_extra->fl_mutex = PTHREAD_MUTEX_INITIALIZER; \ - (fp)->_extra->fl_owner = NULL; \ - (fp)->_extra->fl_count = 0; \ - (fp)->_extra->orientation = 0; \ - memset(&(fp)->_extra->mbstate, 0, sizeof(mbstate_t)); \ -} - /* * Set the orientation for a stream. If o > 0, the stream has wide- * orientation. If o < 0, the stream has byte-orientation. */ #define ORIENT(fp, o) do { \ - if ((fp)->_extra->orientation == 0) \ - (fp)->_extra->orientation = (o); \ + if ((fp)->_orientation == 0) \ + (fp)->_orientation = (o); \ } while (0) ==== //depot/projects/ia64/lib/libc/stdio/refill.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/refill.c,v 1.19 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/refill.c,v 1.20 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -106,7 +106,7 @@ if (HASUB(fp)) { FREEUB(fp); if ((fp->_r = fp->_ur) != 0) { - fp->_p = fp->_extra->_up; + fp->_p = fp->_up; return (0); } } ==== //depot/projects/ia64/lib/libc/stdio/snprintf.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.21 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.22 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -49,7 +49,6 @@ int ret; va_list ap; FILE f; - struct __sFILEX ext; on = n; if (n != 0) @@ -61,8 +60,8 @@ f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); ret = __vfprintf(&f, fmt, ap); if (on > 0) *f._p = '\0'; ==== //depot/projects/ia64/lib/libc/stdio/sprintf.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.15 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -47,14 +47,13 @@ int ret; va_list ap; FILE f; - struct __sFILEX ext; f._file = -1; f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); ret = __vfprintf(&f, fmt, ap); va_end(ap); ==== //depot/projects/ia64/lib/libc/stdio/sscanf.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.12 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.13 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -59,7 +59,6 @@ { int ret; va_list ap; - struct __sFILEX extra; FILE f; f._file = -1; @@ -69,8 +68,8 @@ f._read = eofread; f._ub._base = NULL; f._lb._base = NULL; - f._extra = &extra; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); ret = __svfscanf(&f, fmt, ap); va_end(ap); ==== //depot/projects/ia64/lib/libc/stdio/ungetc.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.17 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.18 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -158,7 +158,7 @@ * Initially, we will use the `reserve' buffer. */ fp->_ur = fp->_r; - fp->_extra->_up = fp->_p; + fp->_up = fp->_p; fp->_ub._base = fp->_ubuf; fp->_ub._size = sizeof(fp->_ubuf); fp->_ubuf[sizeof(fp->_ubuf) - 1] = c; ==== //depot/projects/ia64/lib/libc/stdio/ungetwc.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.10 2005/08/20 07:59:13 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.11 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -49,7 +49,7 @@ if (wc == WEOF) return (WEOF); - if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == (size_t)-1) { + if ((len = __wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } ==== //depot/projects/ia64/lib/libc/stdio/vasprintf.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.18 2002/09/26 13:11:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.19 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -43,7 +43,6 @@ { int ret; FILE f; - struct __sFILEX ext; f._file = -1; f._flags = __SWR | __SSTR | __SALC; @@ -54,8 +53,8 @@ return (-1); } f._bf._size = f._w = 127; /* Leave room for the NUL */ - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); ret = __vfprintf(&f, fmt, ap); if (ret < 0) { free(f._bf._base); ==== //depot/projects/ia64/lib/libc/stdio/vfprintf.c#31 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.77 2007/05/08 03:08:28 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.78 2008/04/17 22:17:54 jhb Exp $"); /* * Actual printf innards. @@ -149,7 +149,8 @@ fake._file = fp->_file; fake._cookie = fp->_cookie; fake._write = fp->_write; - fake._extra = fp->_extra; + fake._orientation = fp->_orientation; + fake._mbstate = fp->_mbstate; /* set up the buffer */ fake._bf._base = fake._p = buf; ==== //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#20 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.28 2007/12/18 01:20:33 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.29 2008/04/17 22:17:54 jhb Exp $"); /* * Actual wprintf innards. @@ -132,7 +132,8 @@ fake._file = fp->_file; fake._cookie = fp->_cookie; fake._write = fp->_write; - fake._extra = fp->_extra; + fake._orientation = fp->_orientation; + fake._mbstate = fp->_mbstate; /* set up the buffer */ fake._bf._base = fake._p = buf; ==== //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#9 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.23 2007/01/09 00:28:08 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.24 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -48,7 +48,6 @@ int ret; char dummy[2]; FILE f; - struct __sFILEX ext; on = n; if (n != 0) @@ -66,8 +65,8 @@ f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = n; - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); ret = __vfprintf(&f, fmt, ap); if (on > 0) *f._p = '\0'; ==== //depot/projects/ia64/lib/libc/stdio/vsprintf.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.15 2007/01/09 00:28:08 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -45,14 +45,13 @@ { int ret; FILE f; - struct __sFILEX ext; f._file = -1; f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *)str; f._bf._size = f._w = INT_MAX; - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); ret = __vfprintf(&f, fmt, ap); *f._p = 0; return (ret); ==== //depot/projects/ia64/lib/libc/stdio/vsscanf.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.13 2007/01/09 00:28:08 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.14 2008/04/17 22:17:54 jhb Exp $"); #include #include @@ -61,7 +61,6 @@ __va_list ap; { FILE f; - struct __sFILEX ext; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 02:32:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3321065671; Fri, 18 Apr 2008 02:32:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE7E9106564A for ; Fri, 18 Apr 2008 02:32:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 949698FC0A for ; Fri, 18 Apr 2008 02:32:31 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3I2WV1m033527 for ; Fri, 18 Apr 2008 02:32:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3I2WVDF033525 for perforce@freebsd.org; Fri, 18 Apr 2008 02:32:31 GMT (envelope-from marcel@freebsd.org) Date: Fri, 18 Apr 2008 02:32:31 GMT Message-Id: <200804180232.m3I2WVDF033525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 140199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 02:32:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=140199 Change 140199 by marcel@marcel_xcllnt on 2008/04/18 02:31:55 Revert to 1MB pages. The larger the page size the more memory we may end up wasting. 1MB is just about right. Affected files ... .. //depot/projects/ia64/sys/ia64/include/vmparam.h#25 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/vmparam.h#25 (text+ko) ==== @@ -158,7 +158,7 @@ * using multiple EFI pages for the page table. */ #define IA64_LVM_BASE 0xbffc000000000000 -#define IA64_LVM_PAGE_SHIFT 21 /* 2MB */ +#define IA64_LVM_PAGE_SHIFT 20 /* 1MB */ #define IA64_LVM_PAGE_SIZE (1U< Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180901065676; Fri, 18 Apr 2008 12:28:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD7961065674 for ; Fri, 18 Apr 2008 12:28:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8A0F8FC14 for ; Fri, 18 Apr 2008 12:28:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ICSgbW087397 for ; Fri, 18 Apr 2008 12:28:42 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ICSfNa087391 for perforce@freebsd.org; Fri, 18 Apr 2008 12:28:41 GMT (envelope-from piso@freebsd.org) Date: Fri, 18 Apr 2008 12:28:41 GMT Message-Id: <200804181228.m3ICSfNa087391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 140203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 12:28:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=140203 Change 140203 by piso@piso_ferret on 2008/04/18 12:27:51 IFC@140201 Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#18 integrate .. //depot/projects/soc2005/libalias/contrib/top/machine.h#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#8 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 integrate .. //depot/projects/soc2005/libalias/include/dirent.h#3 integrate .. //depot/projects/soc2005/libalias/include/stdio.h#5 integrate .. //depot/projects/soc2005/libalias/include/unistd.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/gdtoa/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/soc2005/libalias/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/directory.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/gen/termios.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/_flock_stub.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/asprintf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fgetwc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/findfp.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fputwc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/freopen.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fseek.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/fwide.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/local.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/snprintf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/sscanf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/ungetwc.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vasprintf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vswprintf.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vswscanf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/access.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/chmod.2#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/chown.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/execve.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/link.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/mkdir.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/mkfifo.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/mknod.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/open.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/rename.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/stat.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/symlink.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/unlink.2#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/utimes.2#5 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/common.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_rwlock.c#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/soc2005/libalias/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/fsutil.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/inode.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/fsck_ffs/main.c#6 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/restore/dirs.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/restore/tape.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/route/route.c#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#19 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#11 integrate .. //depot/projects/soc2005/libalias/share/man/man4/k8temp.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/nfe.4#6 integrate .. //depot/projects/soc2005/libalias/share/man/man9/lock.9#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#13 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/clock.h#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/soc2005/libalias/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_dummy.c#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#15 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#15 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#15 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/intr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/Makefile.mips#1 branch .. //depot/projects/soc2005/libalias/sys/conf/files#38 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#16 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.i386#15 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.mips#1 branch .. //depot/projects/soc2005/libalias/sys/conf/files.pc98#13 integrate .. //depot/projects/soc2005/libalias/sys/conf/ldscript.mips#1 branch .. //depot/projects/soc2005/libalias/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/soc2005/libalias/sys/conf/options#30 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.mips#1 branch .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#18 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/fb/vga.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#19 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/midi/mpu401.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uhci_pci.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/soc2005/libalias/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/soc2005/libalias/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part.c#7 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part.h#7 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/intr_machdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/clock.h#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/clock.c#12 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_dummy.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#16 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/SKI#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/sapic.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/vmparam.h#8 integrate .. //depot/projects/soc2005/libalias/sys/isa/atrtc.c#1 branch .. //depot/projects/soc2005/libalias/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_linker.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_subr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_switch.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_synch.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thread.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_4bsd.c#17 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_ule.c#18 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_clock.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_trap.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_default.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/soc2005/libalias/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/ADM5120#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/IDT#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/MALTA#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/QEMU#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/soc2005/libalias/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_limits.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_stdint.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/_types.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/archtype.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/asm.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/asmacros.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/atomic.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/bswap.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/bus.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cache.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/clock.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/clockvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cp0.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/cputypes.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/defs.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/elf.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/endian.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/exec.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/float.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/fpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/frame.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/ieee.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/intr.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/iodev.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/kdb.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/limits.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/locore.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/md_var.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/memdev.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/metadata.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/minidump.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/mutex.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/param.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pcb.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pcpu.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pltfm.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pmap.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/ppireg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/proc.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/profile.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/psl.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/pte.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/ptrace.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/queue.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/regdef.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/regnum.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/reloc.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/resource.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/rm7000.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/runq.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/segments.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/setjmp.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/sigframe.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/signal.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/smp.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/stdarg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/sysarch.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/timerreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/trap.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/ucontext.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/varargs.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/include/vmparam.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/cache.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/copystr.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/cpu.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/exception.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/fp.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/genassym.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/locore.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/mem.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/nexus.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/pmap.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/support.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/swtch.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/tick.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/tlb.S#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/trap.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/soc2005/libalias/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/soc2005/libalias/sys/modules/Makefile#24 integrate .. //depot/projects/soc2005/libalias/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.c#13 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/net/radix.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net/radix.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/radix_mpath.c#1 branch .. //depot/projects/soc2005/libalias/sys/net/radix_mpath.h#1 branch .. //depot/projects/soc2005/libalias/sys/net/route.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net/route.h#3 integrate .. //depot/projects/soc2005/libalias/sys/net/rtsock.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in.h#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_proto.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#56 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_options.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_var.h#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctputil.h#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_proto.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/soc2005/libalias/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/soc2005/libalias/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#15 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm_token.c#10 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#16 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_worker.c#10 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_framework.h#10 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pci_if.m#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/intr_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/ata.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/interrupt.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/jail.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/lock.h#6 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockf.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#25 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#20 integrate .. //depot/projects/soc2005/libalias/sys/sys/protosw.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/sched.h#12 integrate .. //depot/projects/soc2005/libalias/sys/sys/socket.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/termios.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/ttycom.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#14 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_glue.c#10 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/soc2005/libalias/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/env/env.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/env/env.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/soc2005/libalias/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/top/machine.c#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/vmstat/vmstat.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/config/main.c#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ndiscvt/ndiscvt.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ndiscvt/ndisgen.sh#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/perform.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/match.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd.c#9 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,10 +963,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif ==== //depot/projects/soc2005/libalias/contrib/top/machine.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $ + * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $ */ /* @@ -44,7 +44,6 @@ int *memory; int *swap; struct timeval boottime; - unsigned long cpumask; /* bitfield of cpu states represented */ int ncpus; }; ==== //depot/projects/soc2005/libalias/etc/rc.d/dhclient#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dhclient,v 1.31 2008/02/01 23:43:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.32 2008/04/15 23:03:35 brooks Exp $ # # PROVIDE: dhclient @@ -26,6 +26,10 @@ if [ -n "$pids" ]; then exit 0 fi + elif [ -e /var/run/dhclient.pid ]; then + if [ -n "`pgrep -F /var/run/dhclient.pid`" ]; then + exit 0 + fi fi fi ==== //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ==== @@ -1,12 +1,19 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ +SRCS+= cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c + elflink.c \ + peigen.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec + +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/soc2005/libalias/include/dirent.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.15 2007/11/20 01:49:00 jb Exp $ + * $FreeBSD: src/include/dirent.h,v 1.16 2008/04/16 18:59:35 delphij Exp $ */ #ifndef _DIRENT_H_ @@ -100,6 +100,7 @@ int getdirentries(int, char *, int, long *); #endif DIR *opendir(const char *); +DIR *fdopendir(int); struct dirent * readdir(DIR *); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 ==== //depot/projects/soc2005/libalias/include/stdio.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $ */ #ifndef _STDIO_H_ @@ -72,9 +72,6 @@ int _size; }; -/* hold a buncha junk that would grow the ABI */ -struct __sFILEX; - /* * stdio state variables. * @@ -98,15 +95,19 @@ * that does not match the previous one in _bf. When this happens, * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. + * + * Certain members of __sFILE are accessed directly via macros or + * inline functions. To preserve ABI compat, these members must not + * be disturbed. These members are marked below with (*). */ typedef struct __sFILE { - unsigned char *_p; /* current position in (some) buffer */ - int _r; /* read space left for getc() */ - int _w; /* write space left for putc() */ - short _flags; /* flags, below; this FILE is free if 0 */ - short _file; /* fileno, if Unix descriptor, else -1 */ + unsigned char *_p; /* (*) current position in (some) buffer */ + int _r; /* (*) read space left for getc() */ + int _w; /* (*) write space left for putc() */ + short _flags; /* (*) flags, below; this FILE is free if 0 */ + short _file; /* (*) fileno, if Unix descriptor, else -1 */ struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ - int _lbfsize; /* 0 or -_bf._size, for inline putc */ + int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */ /* operations */ void *_cookie; /* cookie passed to io functions */ @@ -117,7 +118,7 @@ /* separate buffer for long sequences of ungetc() */ struct __sbuf _ub; /* ungetc buffer */ - struct __sFILEX *_extra; /* additions to FILE to not break ABI */ + unsigned char *_up; /* saved _p when _p is doing ungetc data */ int _ur; /* saved _r when _r is counting ungetc data */ /* tricks to meet minimum requirements even when malloc() fails */ @@ -130,6 +131,12 @@ /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ fpos_t _offset; /* current lseek offset */ + + struct pthread_mutex *_fl_mutex; /* used for MT-safety */ + struct pthread *_fl_owner; /* current owner */ + int _fl_count; /* recursive lock count */ + int _orientation; /* orientation for fwide() */ + __mbstate_t _mbstate; /* multibyte conversion state */ } FILE; #ifndef _STDSTREAM_DECLARED ==== //depot/projects/soc2005/libalias/include/unistd.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $ + * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $ */ #ifndef _UNISTD_H_ @@ -566,7 +566,7 @@ int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); -ssize_t readlinkat(int, const char *, char *, size_t); +ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t); int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/soc2005/libalias/lib/libc/gdtoa/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.9 2006/03/13 01:14:56 deischen Exp $ +# $FreeBSD: src/lib/libc/gdtoa/Makefile.inc,v 1.10 2008/04/12 03:11:36 das Exp $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa -MISRCS+=_hdtoa.c _ldtoa.c glue.c +MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \ hd_init.c hexnan.c misc.c smisc.c \ strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c ==== //depot/projects/soc2005/libalias/lib/libc/gdtoa/_hdtoa.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2005 David Schultz + * Copyright (c) 2004-2008 David Schultz * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.7 2008/04/12 14:53:52 das Exp $"); #include #include #include + +#include "../stdio/floatio.h" #include "fpmath.h" #include "gdtoaimp.h" @@ -37,63 +39,10 @@ #define INFSTR "Infinity" #define NANSTR "NaN" -#define DBL_ADJ (DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4)) -#define LDBL_ADJ (LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4)) +#define DBL_ADJ (DBL_MAX_EXP - 2) +#define SIGFIGS ((DBL_MANT_DIG + 3) / 4 + 1) -/* - * Round up the given digit string. If the digit string is fff...f, - * this procedure sets it to 100...0 and returns 1 to indicate that - * the exponent needs to be bumped. Otherwise, 0 is returned. - */ -static int -roundup(char *s0, int ndigits) -{ - char *s; - - for (s = s0 + ndigits - 1; *s == 0xf; s--) { - if (s == s0) { - *s = 1; - return (1); - } - *s = 0; - } - ++*s; - return (0); -} - -/* - * Round the given digit string to ndigits digits according to the - * current rounding mode. Note that this could produce a string whose - * value is not representable in the corresponding floating-point - * type. The exponent pointed to by decpt is adjusted if necessary. - */ -static void -dorounding(char *s0, int ndigits, int sign, int *decpt) -{ - int adjust = 0; /* do we need to adjust the exponent? */ - - switch (FLT_ROUNDS) { - case 0: /* toward zero */ - default: /* implementation-defined */ - break; - case 1: /* to nearest, halfway rounds to even */ - if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) - adjust = roundup(s0, ndigits); - break; - case 2: /* toward +inf */ - if (sign == 0) - adjust = roundup(s0, ndigits); - break; - case 3: /* toward -inf */ - if (sign != 0) - adjust = roundup(s0, ndigits); - break; - } - - if (adjust) - *decpt += 4; -} +static const float one[] = { 1.0f, -1.0f }; /* * This procedure converts a double-precision number in IEEE format @@ -112,9 +61,9 @@ * * Note that the C99 standard does not specify what the leading digit * should be for non-zero numbers. For instance, 0x1.3p3 is the same - * as 0x2.6p2 is the same as 0x4.cp3. This implementation chooses the - * first digit so that subsequent digits are aligned on nibble - * boundaries (before rounding). + * as 0x2.6p2 is the same as 0x4.cp3. This implementation always makes + * the leading digit a 1. This ensures that the exponent printed is the + * actual base-2 exponent, i.e., ilogb(d). * * Inputs: d, xdigs, ndigits * Outputs: decpt, sign, rve @@ -123,10 +72,10 @@ __hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign, char **rve) { - static const int sigfigs = (DBL_MANT_DIG + 3) / 4; union IEEEd2bits u; char *s, *s0; int bufsize; + uint32_t manh, manl; u.d = d; *sign = u.bits.sign; @@ -145,11 +94,9 @@ case FP_INFINITE: *decpt = INT_MAX; return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1)); - case FP_NAN: + default: /* FP_NAN or unrecognized */ *decpt = INT_MAX; return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1)); - default: - abort(); } /* FP_NORMAL or FP_SUBNORMAL */ @@ -158,162 +105,40 @@ ndigits = 1; /* - * For simplicity, we generate all the digits even if the - * caller has requested fewer. + * If ndigits < 0, we are expected to auto-size, so we allocate + * enough space for all the digits. */ - bufsize = (sigfigs > ndigits) ? sigfigs : ndigits; + bufsize = (ndigits > 0) ? ndigits : SIGFIGS; s0 = rv_alloc(bufsize); - /* - * We work from right to left, first adding any requested zero - * padding, then the least significant portion of the - * mantissa, followed by the most significant. The buffer is - * filled with the byte values 0x0 through 0xf, which are - * converted to xdigs[0x0] through xdigs[0xf] after the - * rounding phase. - */ - for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--) - *s = 0; - for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) { - *s = u.bits.manl & 0xf; - u.bits.manl >>= 4; - } - for (; s > s0; s--) { - *s = u.bits.manh & 0xf; - u.bits.manh >>= 4; + /* Round to the desired number of digits. */ + if (SIGFIGS > ndigits && ndigits > 0) { + float redux = one[u.bits.sign]; + int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG; + u.bits.exp = offset; + u.d += redux; + u.d -= redux; + *decpt += u.bits.exp - offset; } - /* - * At this point, we have snarfed all the bits in the - * mantissa, with the possible exception of the highest-order - * (partial) nibble, which is dealt with by the next - * statement. We also tack on the implicit normalization bit. - */ - *s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4)); - - /* If ndigits < 0, we are expected to auto-size the precision. */ - if (ndigits < 0) { - for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--) - ; - } - - if (sigfigs > ndigits && s0[ndigits] != 0) - dorounding(s0, ndigits, u.bits.sign, decpt); - - s = s0 + ndigits; - if (rve != NULL) - *rve = s; - *s-- = '\0'; - for (; s >= s0; s--) - *s = xdigs[(unsigned int)*s]; - - return (s0); -} - -#if (LDBL_MANT_DIG > DBL_MANT_DIG) - -/* - * This is the long double version of __hdtoa(). - */ -char * -__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign, - char **rve) -{ - static const int sigfigs = (LDBL_MANT_DIG + 3) / 4; - union IEEEl2bits u; - char *s, *s0; - int bufsize; - - u.e = e; - *sign = u.bits.sign; - - switch (fpclassify(e)) { - case FP_NORMAL: - *decpt = u.bits.exp - LDBL_ADJ; - break; - case FP_ZERO: - *decpt = 1; - return (nrv_alloc("0", rve, 1)); - case FP_SUBNORMAL: - u.e *= 0x1p514L; - *decpt = u.bits.exp - (514 + LDBL_ADJ); - break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 17:58:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7CD1065675; Fri, 18 Apr 2008 17:58:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 475161065670 for ; Fri, 18 Apr 2008 17:58:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 311588FC16 for ; Fri, 18 Apr 2008 17:58:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IHwC5C055269 for ; Fri, 18 Apr 2008 17:58:12 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IHwArD055267 for perforce@freebsd.org; Fri, 18 Apr 2008 17:58:10 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 18 Apr 2008 17:58:10 GMT Message-Id: <200804181758.m3IHwArD055267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 140211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 17:58:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=140211 Change 140211 by peter@peter_overcee on 2008/04/18 17:58:03 IFC @140209 Affected files ... .. //depot/projects/hammer/Makefile.inc1#134 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#50 integrate .. //depot/projects/hammer/UPDATING#115 integrate .. //depot/projects/hammer/bin/ls/ls.1#27 integrate .. //depot/projects/hammer/bin/ls/ls.c#18 integrate .. //depot/projects/hammer/bin/ls/ls.h#7 integrate .. //depot/projects/hammer/bin/ls/print.c#18 integrate .. //depot/projects/hammer/bin/ls/util.c#12 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#6 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#5 integrate .. //depot/projects/hammer/contrib/top/machine.h#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#84 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#60 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#22 integrate .. //depot/projects/hammer/etc/rc.d/ppp#10 integrate .. //depot/projects/hammer/etc/rc.d/rfcomm_pppd_server#1 branch .. //depot/projects/hammer/etc/rc.d/wpa_supplicant#3 integrate .. //depot/projects/hammer/etc/rc.d/zfs#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#79 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#7 integrate .. //depot/projects/hammer/include/dirent.h#6 integrate .. //depot/projects/hammer/include/stdio.h#14 integrate .. //depot/projects/hammer/include/string.h#10 integrate .. //depot/projects/hammer/include/unistd.h#23 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_hdtoa.c#5 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_hldtoa.c#1 branch .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#35 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/hammer/lib/libc/gen/directory.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/err.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/msgctl.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/hammer/lib/libc/gen/termios.c#3 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#16 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#13 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#12 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#8 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_sqrt.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/_flock_stub.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#9 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetws.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/findfp.c#10 integrate .. //depot/projects/hammer/lib/libc/stdio/fputwc.c#9 integrate .. //depot/projects/hammer/lib/libc/stdio/fputws.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/freopen.c#8 integrate .. //depot/projects/hammer/lib/libc/stdio/fseek.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/fwide.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#17 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#12 integrate .. //depot/projects/hammer/lib/libc/stdio/refill.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/sscanf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetc.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#10 integrate .. //depot/projects/hammer/lib/libc/stdio/vasprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#25 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#21 integrate .. //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#6 integrate .. //depot/projects/hammer/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/vsscanf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/vswscanf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#7 integrate .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#10 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#12 integrate .. //depot/projects/hammer/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/hammer/lib/libc/string/memchr.3#4 integrate .. //depot/projects/hammer/lib/libc/string/memrchr.c#1 branch .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#34 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/hammer/lib/libc/sys/access.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/aio_cancel.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/aio_suspend.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/chmod.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/chown.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/execve.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.c#1 branch .. //depot/projects/hammer/lib/libc/sys/link.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/mkdir.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mkfifo.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mknod.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/open.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/readlink.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/rename.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/stat.2#15 integrate .. //depot/projects/hammer/lib/libc/sys/symlink.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/unlink.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/utimes.2#6 integrate .. //depot/projects/hammer/lib/libfetch/common.c#13 integrate .. //depot/projects/hammer/lib/libstand/nfs.c#4 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch .. //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#29 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#41 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#6 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#6 integrate .. //depot/projects/hammer/lib/msun/src/s_fma.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_fmal.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/mips/reloc.c#1 branch .. //depot/projects/hammer/libexec/rtld-elf/mips/rtld_machdep.h#1 branch .. //depot/projects/hammer/libexec/rtld-elf/mips/rtld_start.S#1 branch .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#40 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#32 integrate .. //depot/projects/hammer/release/ia64/mkisoimages.sh#9 integrate .. //depot/projects/hammer/sbin/ddb/ddb.8#3 integrate .. //depot/projects/hammer/sbin/ddb/ddb.c#3 integrate .. //depot/projects/hammer/sbin/dhclient/bpf.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#13 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck_ffs.8#9 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#11 integrate .. //depot/projects/hammer/sbin/fsck_ffs/inode.c#7 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#15 integrate .. //depot/projects/hammer/sbin/geom/class/journal/gjournal.8#3 integrate .. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#15 integrate .. //depot/projects/hammer/sbin/restore/dirs.c#9 integrate .. //depot/projects/hammer/sbin/restore/interactive.c#9 integrate .. //depot/projects/hammer/sbin/restore/tape.c#9 integrate .. //depot/projects/hammer/sbin/route/route.c#15 integrate .. //depot/projects/hammer/share/man/man4/Makefile#104 integrate .. //depot/projects/hammer/share/man/man4/asmc.4#2 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#14 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#14 integrate .. //depot/projects/hammer/share/man/man4/k8temp.4#1 branch .. //depot/projects/hammer/share/man/man4/nfe.4#7 integrate .. //depot/projects/hammer/share/man/man4/psm.4#11 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#88 integrate .. //depot/projects/hammer/share/man/man9/Makefile#82 integrate .. //depot/projects/hammer/share/man/man9/lock.9#15 integrate .. //depot/projects/hammer/share/man/man9/rwlock.9#8 integrate .. //depot/projects/hammer/share/man/man9/sleep.9#15 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#33 integrate .. //depot/projects/hammer/share/mk/sys.mk#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#53 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#177 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#111 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#36 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#70 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#15 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#21 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/hammer/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/exception.S#6 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#18 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#18 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#22 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#12 integrate .. //depot/projects/hammer/sys/arm/include/machdep.h#3 integrate .. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#13 integrate .. //depot/projects/hammer/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_io.c#9 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80321#4 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/files.iq31244#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#23 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/obio_space.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#37 integrate .. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#7 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#29 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#48 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#32 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.c#14 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#11 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#19 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#25 integrate .. //depot/projects/hammer/sys/conf/Makefile.mips#1 branch .. //depot/projects/hammer/sys/conf/NOTES#142 integrate .. //depot/projects/hammer/sys/conf/files#179 integrate .. //depot/projects/hammer/sys/conf/files.amd64#103 integrate .. //depot/projects/hammer/sys/conf/files.i386#90 integrate .. //depot/projects/hammer/sys/conf/files.mips#1 branch .. //depot/projects/hammer/sys/conf/files.pc98#65 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips#1 branch .. //depot/projects/hammer/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/hammer/sys/conf/options#128 integrate .. //depot/projects/hammer/sys/conf/options.mips#1 branch .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#36 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#48 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#14 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#11 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#83 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#42 integrate .. //depot/projects/hammer/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/hammer/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#67 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#49 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#86 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.h#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#31 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#16 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#45 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#52 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#37 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#42 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-usb.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#5 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#12 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.h#9 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#10 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcefw.h#6 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#10 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#80 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/hammer/sys/dev/de/if_de.c#6 integrate .. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82540.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82541.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82542.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82543.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82571.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82571.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_api.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_api.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_defines.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_hw.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_mac.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_mac.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_manage.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_nvm.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_nvm.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/hammer/sys/dev/em/e1000_osdep.h#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_phy.c#5 integrate .. //depot/projects/hammer/sys/dev/em/e1000_phy.h#5 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#73 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#37 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#24 integrate .. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#60 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#22 integrate .. //depot/projects/hammer/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/hammer/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/hammer/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/hammer/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#13 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#22 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#23 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#11 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/hammer/sys/dev/nvram/nvram.c#3 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#17 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#11 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#60 integrate .. //depot/projects/hammer/sys/dev/sound/midi/mpu401.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#34 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#36 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#100 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#23 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.h#7 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#31 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#7 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#29 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#12 integrate .. //depot/projects/hammer/sys/geom/part/g_part.h#9 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#11 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#11 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#74 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#111 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_util.c#8 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#18 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#14 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#44 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#11 integrate .. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#26 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#26 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#27 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#33 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#26 integrate .. //depot/projects/hammer/sys/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#35 integrate .. //depot/projects/hammer/sys/ia64/conf/SKI#17 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock.c#14 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#30 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#70 integrate .. //depot/projects/hammer/sys/ia64/ia64/nexus.c#15 integrate .. //depot/projects/hammer/sys/ia64/ia64/sapic.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/sscdisk.c#13 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#15 integrate .. //depot/projects/hammer/sys/isa/atrtc.c#1 branch .. //depot/projects/hammer/sys/isa/rtc.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#49 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#62 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#107 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#30 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#60 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#95 integrate .. //depot/projects/hammer/sys/kern/subr_clock.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_firmware.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#44 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#28 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#70 integrate .. //depot/projects/hammer/sys/kern/tty.c#58 integrate .. //depot/projects/hammer/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#81 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#55 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#92 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#130 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#81 integrate .. //depot/projects/hammer/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/hammer/sys/mips/conf/ADM5120#1 branch .. //depot/projects/hammer/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/IDT#1 branch .. //depot/projects/hammer/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/MALTA#1 branch .. //depot/projects/hammer/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/hammer/sys/mips/conf/QEMU#1 branch .. //depot/projects/hammer/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/hammer/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/hammer/sys/mips/include/_bus.h#1 branch .. //depot/projects/hammer/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/hammer/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/hammer/sys/mips/include/_limits.h#1 branch .. //depot/projects/hammer/sys/mips/include/_stdint.h#1 branch .. //depot/projects/hammer/sys/mips/include/_types.h#1 branch .. //depot/projects/hammer/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/hammer/sys/mips/include/archtype.h#1 branch .. //depot/projects/hammer/sys/mips/include/asm.h#1 branch .. //depot/projects/hammer/sys/mips/include/asmacros.h#1 branch .. //depot/projects/hammer/sys/mips/include/atomic.h#1 branch .. //depot/projects/hammer/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/hammer/sys/mips/include/bswap.h#1 branch .. //depot/projects/hammer/sys/mips/include/bus.h#1 branch .. //depot/projects/hammer/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/hammer/sys/mips/include/cache.h#1 branch .. //depot/projects/hammer/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/hammer/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/hammer/sys/mips/include/clock.h#1 branch .. //depot/projects/hammer/sys/mips/include/clockvar.h#1 branch .. //depot/projects/hammer/sys/mips/include/cp0.h#1 branch .. //depot/projects/hammer/sys/mips/include/cpu.h#1 branch .. //depot/projects/hammer/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/hammer/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/hammer/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/hammer/sys/mips/include/cputypes.h#1 branch .. //depot/projects/hammer/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/hammer/sys/mips/include/defs.h#1 branch .. //depot/projects/hammer/sys/mips/include/elf.h#1 branch .. //depot/projects/hammer/sys/mips/include/endian.h#1 branch .. //depot/projects/hammer/sys/mips/include/exec.h#1 branch .. //depot/projects/hammer/sys/mips/include/float.h#1 branch .. //depot/projects/hammer/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/hammer/sys/mips/include/fpu.h#1 branch .. //depot/projects/hammer/sys/mips/include/frame.h#1 branch .. //depot/projects/hammer/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/hammer/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/hammer/sys/mips/include/ieee.h#1 branch .. //depot/projects/hammer/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/hammer/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/hammer/sys/mips/include/intr.h#1 branch .. //depot/projects/hammer/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/hammer/sys/mips/include/iodev.h#1 branch .. //depot/projects/hammer/sys/mips/include/kdb.h#1 branch .. //depot/projects/hammer/sys/mips/include/limits.h#1 branch .. //depot/projects/hammer/sys/mips/include/locore.h#1 branch .. //depot/projects/hammer/sys/mips/include/md_var.h#1 branch .. //depot/projects/hammer/sys/mips/include/memdev.h#1 branch .. //depot/projects/hammer/sys/mips/include/metadata.h#1 branch .. //depot/projects/hammer/sys/mips/include/minidump.h#1 branch .. //depot/projects/hammer/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/hammer/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/hammer/sys/mips/include/mutex.h#1 branch .. //depot/projects/hammer/sys/mips/include/param.h#1 branch .. //depot/projects/hammer/sys/mips/include/pcb.h#1 branch .. //depot/projects/hammer/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/hammer/sys/mips/include/pcpu.h#1 branch .. //depot/projects/hammer/sys/mips/include/pltfm.h#1 branch .. //depot/projects/hammer/sys/mips/include/pmap.h#1 branch .. //depot/projects/hammer/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/mips/include/ppireg.h#1 branch .. //depot/projects/hammer/sys/mips/include/proc.h#1 branch .. //depot/projects/hammer/sys/mips/include/profile.h#1 branch .. //depot/projects/hammer/sys/mips/include/psl.h#1 branch .. //depot/projects/hammer/sys/mips/include/pte.h#1 branch .. //depot/projects/hammer/sys/mips/include/ptrace.h#1 branch .. //depot/projects/hammer/sys/mips/include/queue.h#1 branch .. //depot/projects/hammer/sys/mips/include/reg.h#1 branch .. //depot/projects/hammer/sys/mips/include/regdef.h#1 branch .. //depot/projects/hammer/sys/mips/include/regnum.h#1 branch .. //depot/projects/hammer/sys/mips/include/reloc.h#1 branch .. //depot/projects/hammer/sys/mips/include/resource.h#1 branch .. //depot/projects/hammer/sys/mips/include/rm7000.h#1 branch .. //depot/projects/hammer/sys/mips/include/runq.h#1 branch .. //depot/projects/hammer/sys/mips/include/segments.h#1 branch .. //depot/projects/hammer/sys/mips/include/setjmp.h#1 branch .. //depot/projects/hammer/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/hammer/sys/mips/include/sigframe.h#1 branch .. //depot/projects/hammer/sys/mips/include/signal.h#1 branch .. //depot/projects/hammer/sys/mips/include/smp.h#1 branch .. //depot/projects/hammer/sys/mips/include/stdarg.h#1 branch .. //depot/projects/hammer/sys/mips/include/sysarch.h#1 branch .. //depot/projects/hammer/sys/mips/include/timerreg.h#1 branch .. //depot/projects/hammer/sys/mips/include/trap.h#1 branch .. //depot/projects/hammer/sys/mips/include/ucontext.h#1 branch .. //depot/projects/hammer/sys/mips/include/varargs.h#1 branch .. //depot/projects/hammer/sys/mips/include/vmparam.h#1 branch .. //depot/projects/hammer/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/hammer/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/cache.c#1 branch .. //depot/projects/hammer/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/hammer/sys/mips/mips/copystr.S#1 branch .. //depot/projects/hammer/sys/mips/mips/cpu.c#1 branch .. //depot/projects/hammer/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/hammer/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/hammer/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/hammer/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/exception.S#1 branch .. //depot/projects/hammer/sys/mips/mips/fp.S#1 branch .. //depot/projects/hammer/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/genassym.c#1 branch .. //depot/projects/hammer/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/hammer/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/locore.S#1 branch .. //depot/projects/hammer/sys/mips/mips/machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/hammer/sys/mips/mips/mem.c#1 branch .. //depot/projects/hammer/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/hammer/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/nexus.c#1 branch .. //depot/projects/hammer/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/pmap.c#1 branch .. //depot/projects/hammer/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/hammer/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/support.S#1 branch .. //depot/projects/hammer/sys/mips/mips/swtch.S#1 branch .. //depot/projects/hammer/sys/mips/mips/tick.c#1 branch .. //depot/projects/hammer/sys/mips/mips/tlb.S#1 branch .. //depot/projects/hammer/sys/mips/mips/trap.c#1 branch .. //depot/projects/hammer/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/hammer/sys/modules/Makefile#123 integrate .. //depot/projects/hammer/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/em/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/igb/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/zfs/Makefile#9 integrate .. //depot/projects/hammer/sys/net/bpf.c#59 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/hammer/sys/net/if_loop.c#33 integrate .. //depot/projects/hammer/sys/net/if_tap.c#33 integrate .. //depot/projects/hammer/sys/net/radix.c#12 integrate .. //depot/projects/hammer/sys/net/radix.h#7 integrate .. //depot/projects/hammer/sys/net/radix_mpath.c#1 branch .. //depot/projects/hammer/sys/net/radix_mpath.h#1 branch .. //depot/projects/hammer/sys/net/route.c#33 integrate .. //depot/projects/hammer/sys/net/route.h#19 integrate .. //depot/projects/hammer/sys/net/rtsock.c#36 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#5 integrate .. //depot/projects/hammer/sys/netgraph/netflow/ng_netflow.c#12 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#34 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#58 integrate .. //depot/projects/hammer/sys/netinet/in.h#28 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#56 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#38 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#25 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#41 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#94 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#39 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#71 integrate .. //depot/projects/hammer/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#69 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#51 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#19 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#12 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#25 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#13 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#20 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#83 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#50 integrate .. //depot/projects/hammer/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#29 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#81 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#58 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#55 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#53 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#33 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#35 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#22 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#27 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#26 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#35 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#36 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#32 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#18 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#60 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#21 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#14 integrate .. //depot/projects/hammer/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#6 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#14 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#60 integrate .. //depot/projects/hammer/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/hammer/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/hammer/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/hammer/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/hammer/sys/powerpc/include/asm.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/atomic.h#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#18 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#10 integrate .. //depot/projects/hammer/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#17 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#13 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#11 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/hammer/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/hammer/sys/security/audit/audit_trigger.c#7 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#14 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#11 integrate .. //depot/projects/hammer/sys/sparc64/include/intr_machdep.h#8 integrate .. //depot/projects/hammer/sys/sparc64/include/smp.h#10 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#12 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci_if.m#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.h#4 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#18 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#39 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#18 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#23 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/intr_machdep.c#7 integrate .. //depot/projects/hammer/sys/sys/_lockmgr.h#1 branch .. //depot/projects/hammer/sys/sys/_stack.h#1 branch .. //depot/projects/hammer/sys/sys/ata.h#22 integrate .. //depot/projects/hammer/sys/sys/callout.h#10 integrate .. //depot/projects/hammer/sys/sys/cpuset.h#5 integrate .. //depot/projects/hammer/sys/sys/eventhandler.h#14 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#18 integrate .. //depot/projects/hammer/sys/sys/jail.h#13 integrate .. //depot/projects/hammer/sys/sys/kernel.h#25 integrate .. //depot/projects/hammer/sys/sys/lock.h#23 integrate .. //depot/projects/hammer/sys/sys/lockf.h#8 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#20 integrate .. //depot/projects/hammer/sys/sys/param.h#110 integrate .. //depot/projects/hammer/sys/sys/proc.h#118 integrate .. //depot/projects/hammer/sys/sys/protosw.h#15 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#12 integrate .. //depot/projects/hammer/sys/sys/sched.h#27 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#12 integrate .. //depot/projects/hammer/sys/sys/socket.h#27 integrate .. //depot/projects/hammer/sys/sys/stack.h#4 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#32 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#41 integrate .. //depot/projects/hammer/sys/sys/termios.h#4 integrate .. //depot/projects/hammer/sys/sys/ttycom.h#10 integrate .. //depot/projects/hammer/sys/sys/umtx.h#17 integrate .. //depot/projects/hammer/sys/sys/vnode.h#79 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#54 integrate .. //depot/projects/hammer/sys/ufs/ufs/dirhash.h#4 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#13 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_dirhash.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_gjournal.c#3 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#21 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#54 integrate .. //depot/projects/hammer/sys/vm/uma.h#18 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#55 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#52 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#69 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#71 integrate .. //depot/projects/hammer/sys/vm/vm_phys.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#31 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#10 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#10 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-fma.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-fma.t#1 branch .. //depot/projects/hammer/tools/tools/README#27 integrate .. //depot/projects/hammer/tools/tools/mctest/Makefile#1 branch .. //depot/projects/hammer/tools/tools/mctest/mctest.1#1 branch .. //depot/projects/hammer/tools/tools/mctest/mctest.cc#2 integrate .. //depot/projects/hammer/tools/tools/mctest/mctest.h#2 integrate .. //depot/projects/hammer/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/hammer/usr.bin/env/env.1#8 integrate .. //depot/projects/hammer/usr.bin/env/env.c#7 integrate .. //depot/projects/hammer/usr.bin/fstat/zfs.c#1 branch .. //depot/projects/hammer/usr.bin/gprof/gprof.h#10 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#12 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#25 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.1#5 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/hammer/usr.bin/netstat/sctp.c#7 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#24 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#30 integrate .. //depot/projects/hammer/usr.bin/xlint/lint1/param.h#6 integrate .. //depot/projects/hammer/usr.sbin/btxld/btxld.c#7 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#18 integrate .. //depot/projects/hammer/usr.sbin/fifolog/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/lib/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#8 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.c#9 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndisgen.sh#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/perform.c#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/perform.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#16 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#8 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#11 integrate .. //depot/projects/hammer/usr.sbin/rpc.statd/statd.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#22 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#48 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#134 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -975,10 +975,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif ==== //depot/projects/hammer/ObsoleteFiles.inc#50 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080331: pkg_sign has been removed +OLD_FILES+=usr/sbin/pkg_check +OLD_FILES+=usr/sbin/pkg_sign +OLD_FILES+=usr/share/man/man1/pkg_check.1.gz +OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal ==== //depot/projects/hammer/UPDATING#115 (text+ko) ==== @@ -22,6 +22,13 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080408: + psm(4) has gained write(2) support in native operation level. + Arbitrary commands can be written to /dev/psm%d and status can + be read back from it. Therefore, an application is responsible + for status validation and error recovery. It is a no-op in + other operation levels. + 20080312: Support for KSE threading has been removed from the kernel. To run legacy applications linked against KSE libmap.conf may @@ -1007,4 +1014,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ +$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $ ==== //depot/projects/hammer/bin/ls/ls.1#27 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.102 2008/04/04 05:55:42 ru Exp $ .\" -.Dd October 12, 2006 +.Dd April 4, 2008 .Dt LS 1 .Os .Sh NAME @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 +.Op Fl D Ar format .Op Ar .Sh DESCRIPTION For each operand that names a @@ -88,6 +89,21 @@ is the numeric value of the character in octal. .It Fl C Force multi-column output; this is the default when output is to a terminal. +.It Fl D Ar format +When printing in the long +.Pq Fl l +format, use +.Ar format +to format the date and time output. +The argument +.Ar format +is a string used by +.Xr strftime 3 . +Depending on the choice of format string, this may result in a +different number of columns in the output. +This option overrides the +.Fl T +option. .It Fl F Display a slash .Pq Ql / @@ -146,12 +162,13 @@ Sort by size (largest file first) before sorting the operands in lexicographical order. .It Fl T -When used with the -.Fl l -(lowercase letter -.Dq ell ) -option, display complete time information for the file, including +When printing in the long +.Pq Fl l +format, display complete time information for the file, including month, day, hour, minute, second, and year. +The +.Fl D +option gives even more control over the output format. .It Fl U Use time when file was created for sorting or printing. .It Fl W @@ -325,7 +342,12 @@ modified, and the pathname. .Pp If the modification time of the file is more than 6 months -in the past or future, then the year of the last modification +in the past or future, and the +.Fl D +or +.Fl T +are not specified, +then the year of the last modification is displayed in place of the hour and minute fields. .Pp If the owner or group names are not a known user or group name, @@ -657,6 +679,7 @@ .Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , +.Xr strftime 3 , .Xr termcap 5 , .Xr maclabel 7 , .Xr symlink 7 , ==== //depot/projects/hammer/bin/ls/ls.c#18 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); #include #include @@ -125,10 +125,11 @@ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ int f_slash; /* similar to f_type, but only for dirs */ - int f_sortacross; /* sort across rows, not down columns */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ + char *f_timeformat; /* user-specified time format */ static int f_sizesort; int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -179,7 +180,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCD:FGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -198,6 +199,9 @@ case 'C': f_sortacross = f_longform = f_singlecol = 0; break; + case 'D': + f_timeformat = optarg; + break; case 'l': f_longform = 1; f_singlecol = 0; ==== //depot/projects/hammer/bin/ls/ls.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:05:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 953781065682; Fri, 18 Apr 2008 18:05:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 558311065676 for ; Fri, 18 Apr 2008 18:05:21 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F2C58FC12 for ; Fri, 18 Apr 2008 18:05:21 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3II5L3B056725 for ; Fri, 18 Apr 2008 18:05:21 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3II5JHr056723 for perforce@freebsd.org; Fri, 18 Apr 2008 18:05:19 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 18 Apr 2008 18:05:19 GMT Message-Id: <200804181805.m3II5JHr056723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 140214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:05:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=140214 Change 140214 by peter@peter_overcee on 2008/04/18 18:05:17 IFC @140209 Affected files ... .. //depot/projects/bike_sched/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/bike_sched/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/bike_sched/sys/amd64/include/clock.h#5 integrate .. //depot/projects/bike_sched/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/bike_sched/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/bike_sched/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/bike_sched/sys/arm/arm/exception.S#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/intr.c#4 integrate .. //depot/projects/bike_sched/sys/arm/arm/locore.S#5 integrate .. //depot/projects/bike_sched/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#9 integrate .. //depot/projects/bike_sched/sys/arm/include/machdep.h#2 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/bike_sched/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/bike_sched/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/bike_sched/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/bike_sched/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/bike_sched/sys/conf/Makefile.arm#5 integrate .. //depot/projects/bike_sched/sys/conf/Makefile.mips#1 branch .. //depot/projects/bike_sched/sys/conf/NOTES#8 integrate .. //depot/projects/bike_sched/sys/conf/files#11 integrate .. //depot/projects/bike_sched/sys/conf/files.amd64#5 integrate .. //depot/projects/bike_sched/sys/conf/files.i386#5 integrate .. //depot/projects/bike_sched/sys/conf/files.mips#1 branch .. //depot/projects/bike_sched/sys/conf/files.pc98#4 integrate .. //depot/projects/bike_sched/sys/conf/ldscript.mips#1 branch .. //depot/projects/bike_sched/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/bike_sched/sys/conf/options#8 integrate .. //depot/projects/bike_sched/sys/conf/options.mips#1 branch .. //depot/projects/bike_sched/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac.c#7 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/bike_sched/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/bike_sched/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/bike_sched/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/bike_sched/sys/dev/de/if_de.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/bike_sched/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/bike_sched/sys/dev/em/if_em.c#5 integrate .. //depot/projects/bike_sched/sys/dev/em/if_em.h#4 integrate .. //depot/projects/bike_sched/sys/dev/fb/vga.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/bike_sched/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/bike_sched/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/bike_sched/sys/dev/igb/e1000_mac.c#2 integrate .. //depot/projects/bike_sched/sys/dev/igb/e1000_osdep.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/if_igb.c#2 integrate .. //depot/projects/bike_sched/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/bike_sched/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/bike_sched/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mii/miidevs#4 integrate .. //depot/projects/bike_sched/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/bike_sched/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/bike_sched/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/bike_sched/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/bike_sched/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/bike_sched/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/bike_sched/sys/dev/re/if_re.c#7 integrate .. //depot/projects/bike_sched/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/bike_sched/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/bike_sched/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/bike_sched/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part.c#4 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part.h#5 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_if.m#2 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/bike_sched/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/bike_sched/sys/i386/include/clock.h#5 integrate .. //depot/projects/bike_sched/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/bike_sched/sys/i386/isa/clock.c#6 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux.h#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_proto.h#6 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_syscall.h#6 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysent.c#6 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/bike_sched/sys/i386/linux/syscalls.master#6 integrate .. //depot/projects/bike_sched/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/bike_sched/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/bike_sched/sys/ia64/conf/SKI#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/sapic.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/bike_sched/sys/isa/atrtc.c#1 branch .. //depot/projects/bike_sched/sys/isa/rtc.h#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_clock.c#7 integrate .. //depot/projects/bike_sched/sys/kern/kern_conf.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_event.c#6 integrate .. //depot/projects/bike_sched/sys/kern/kern_intr.c#9 integrate .. //depot/projects/bike_sched/sys/kern/kern_jail.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_linker.c#7 integrate .. //depot/projects/bike_sched/sys/kern/kern_lock.c#6 integrate .. //depot/projects/bike_sched/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/bike_sched/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_subr.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_switch.c#15 integrate .. //depot/projects/bike_sched/sys/kern/kern_synch.c#11 integrate .. //depot/projects/bike_sched/sys/kern/kern_thread.c#15 integrate .. //depot/projects/bike_sched/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#24 integrate .. //depot/projects/bike_sched/sys/kern/sched_ule.c#24 integrate .. //depot/projects/bike_sched/sys/kern/subr_clock.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/bike_sched/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/bike_sched/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/bike_sched/sys/kern/subr_trap.c#10 integrate .. //depot/projects/bike_sched/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/bike_sched/sys/kern/subr_witness.c#6 integrate .. //depot/projects/bike_sched/sys/kern/tty.c#6 integrate .. //depot/projects/bike_sched/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/bike_sched/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/bike_sched/sys/kern/vfs_default.c#5 integrate .. //depot/projects/bike_sched/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/bike_sched/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/bike_sched/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/bike_sched/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/bike_sched/sys/mips/compile/.cvsignore#1 branch .. //depot/projects/bike_sched/sys/mips/conf/ADM5120#1 branch .. //depot/projects/bike_sched/sys/mips/conf/ADM5120.hints#1 branch .. //depot/projects/bike_sched/sys/mips/conf/IDT#1 branch .. //depot/projects/bike_sched/sys/mips/conf/IDT.hints#1 branch .. //depot/projects/bike_sched/sys/mips/conf/MALTA#1 branch .. //depot/projects/bike_sched/sys/mips/conf/MALTA.hints#1 branch .. //depot/projects/bike_sched/sys/mips/conf/QEMU#1 branch .. //depot/projects/bike_sched/sys/mips/conf/SENTRY5#1 branch .. //depot/projects/bike_sched/sys/mips/conf/SENTRY5.hints#1 branch .. //depot/projects/bike_sched/sys/mips/include/_bus.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/_bus_octeon.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/_inttypes.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/_limits.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/_stdint.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/_types.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/archtype.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/asm.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/asmacros.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/atomic.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/bswap.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/bus.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/bus_dma.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/bus_octeon.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cache.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cache_mipsNN.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cache_r4k.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/clock.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/clockvar.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cp0.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cpu.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cpufunc.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cpuinfo.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cpuregs.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/cputypes.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/db_machdep.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/defs.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/elf.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/endian.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/exec.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/float.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/floatingpoint.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/fpu.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/frame.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/gdb_machdep.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/hwfunc.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/ieee.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/ieeefp.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/in_cksum.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/intr.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/intr_machdep.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/iodev.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/kdb.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/limits.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/locore.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/md_var.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/memdev.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/metadata.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/minidump.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/mips_opcode.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/mp_watchdog.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/mutex.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/param.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pcb.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pci_cfgreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pcpu.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pltfm.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pmap.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pmc_mdep.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/ppireg.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/proc.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/profile.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/psl.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/pte.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/ptrace.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/queue.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/reg.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/regdef.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/regnum.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/reloc.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/resource.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/rm7000.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/runq.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/segments.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/setjmp.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/sf_buf.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/sigframe.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/signal.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/smp.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/stdarg.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/sysarch.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/timerreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/trap.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/ucontext.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/varargs.h#1 branch .. //depot/projects/bike_sched/sys/mips/include/vmparam.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips/autoconf.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/busdma_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/cache.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/cache_mipsNN.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/copystr.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/cpu.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/db_disasm.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/db_interface.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/db_trace.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/dump_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/elf_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/exception.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/fp.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/genassym.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/in_cksum.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/intr_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/locore.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/mem.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/nexus.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/pmap.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/stack_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/support.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/swtch.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/tick.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/tlb.S#1 branch .. //depot/projects/bike_sched/sys/mips/mips/trap.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/uio_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips/vm_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/adm5120reg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/admpci.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/console.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/files.adm5120#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/if_admsw.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/if_admswreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/if_admswvar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/obio.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/obiovar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/std.adm5120#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/files.idt#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/idt_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/idtpci.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/idtreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/if_kr.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/if_krreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/obio.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/obiovar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/std.idt#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/files.malta#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/gt.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/gt_pci.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/gtreg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/gtvar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/malta_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/maltareg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/obio.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/obiovar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/std.malta#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/yamon.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/malta/yamon.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/files.sentry5#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/obio.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/obiovar.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/s5_machdep.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/s5reg.h#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/siba_cc.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/siba_mips.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/siba_sdram.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/bike_sched/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/bike_sched/sys/modules/Makefile#6 integrate .. //depot/projects/bike_sched/sys/modules/asmc/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/em/Makefile#5 integrate .. //depot/projects/bike_sched/sys/modules/igb/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/bike_sched/sys/net/bpf.c#8 integrate .. //depot/projects/bike_sched/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/bike_sched/sys/net/bpf_zerocopy.h#2 integrate .. //depot/projects/bike_sched/sys/net/if_loop.c#5 integrate .. //depot/projects/bike_sched/sys/net/if_tap.c#3 integrate .. //depot/projects/bike_sched/sys/net/radix.c#2 integrate .. //depot/projects/bike_sched/sys/net/radix.h#2 integrate .. //depot/projects/bike_sched/sys/net/radix_mpath.c#1 branch .. //depot/projects/bike_sched/sys/net/radix_mpath.h#1 branch .. //depot/projects/bike_sched/sys/net/route.c#5 integrate .. //depot/projects/bike_sched/sys/net/route.h#3 integrate .. //depot/projects/bike_sched/sys/net/rtsock.c#5 integrate .. //depot/projects/bike_sched/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/bike_sched/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/bike_sched/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/bike_sched/sys/netinet/in.h#4 integrate .. //depot/projects/bike_sched/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/bike_sched/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/bike_sched/sys/netinet/in_proto.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/bike_sched/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_input.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/bike_sched/sys/netinet/ip_ipsec.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_options.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_output.c#6 integrate .. //depot/projects/bike_sched/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctputil.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctputil.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp.h#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/bike_sched/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/bike_sched/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/bike_sched/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/bike_sched/sys/nfsclient/nfsnode.h#4 integrate .. //depot/projects/bike_sched/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/bike_sched/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/bike_sched/sys/pc98/cbus/sc_machdep.h#2 integrate .. //depot/projects/bike_sched/sys/pc98/cbus/syscons_cbus.c#5 integrate .. //depot/projects/bike_sched/sys/pc98/conf/GENERIC.hints#2 integrate .. //depot/projects/bike_sched/sys/pci/if_rl.c#4 integrate .. //depot/projects/bike_sched/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/bike_sched/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/bike_sched/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/bike_sched/sys/powerpc/conf/MPC85XX#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_add.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_compare.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_div.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_explode.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_implode.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_mul.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/fpu/fpu_subr.c#2 integrate .. //depot/projects/bike_sched/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/bike_sched/sys/powerpc/include/atomic.h#4 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/bike_sched/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/bike_sched/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/bike_sched/sys/security/audit/audit.c#6 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/bike_sched/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/bike_sched/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/bike_sched/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/bike_sched/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/bike_sched/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/ofw_pci_if.m#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/bike_sched/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/bike_sched/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/sun4v/sun4v/intr_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/sys/_lockmgr.h#1 branch .. //depot/projects/bike_sched/sys/sys/_stack.h#1 branch .. //depot/projects/bike_sched/sys/sys/ata.h#5 integrate .. //depot/projects/bike_sched/sys/sys/callout.h#3 integrate .. //depot/projects/bike_sched/sys/sys/cpuset.h#4 integrate .. //depot/projects/bike_sched/sys/sys/eventhandler.h#5 integrate .. //depot/projects/bike_sched/sys/sys/interrupt.h#4 integrate .. //depot/projects/bike_sched/sys/sys/jail.h#3 integrate .. //depot/projects/bike_sched/sys/sys/kernel.h#5 integrate .. //depot/projects/bike_sched/sys/sys/lock.h#4 integrate .. //depot/projects/bike_sched/sys/sys/lockf.h#4 integrate .. //depot/projects/bike_sched/sys/sys/lockmgr.h#5 integrate .. //depot/projects/bike_sched/sys/sys/param.h#6 integrate .. //depot/projects/bike_sched/sys/sys/proc.h#14 integrate .. //depot/projects/bike_sched/sys/sys/protosw.h#5 integrate .. //depot/projects/bike_sched/sys/sys/rwlock.h#6 integrate .. //depot/projects/bike_sched/sys/sys/sched.h#11 integrate .. //depot/projects/bike_sched/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/bike_sched/sys/sys/socket.h#4 integrate .. //depot/projects/bike_sched/sys/sys/stack.h#4 integrate .. //depot/projects/bike_sched/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/bike_sched/sys/sys/sysctl.h#6 integrate .. //depot/projects/bike_sched/sys/sys/termios.h#2 integrate .. //depot/projects/bike_sched/sys/sys/ttycom.h#3 integrate .. //depot/projects/bike_sched/sys/sys/umtx.h#3 integrate .. //depot/projects/bike_sched/sys/sys/vnode.h#6 integrate .. //depot/projects/bike_sched/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/bike_sched/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/bike_sched/sys/vm/uma.h#3 integrate .. //depot/projects/bike_sched/sys/vm/uma_core.c#3 integrate .. //depot/projects/bike_sched/sys/vm/vm_glue.c#8 integrate .. //depot/projects/bike_sched/sys/vm/vm_map.c#5 integrate .. //depot/projects/bike_sched/sys/vm/vm_page.c#7 integrate .. //depot/projects/bike_sched/sys/vm/vm_phys.c#3 integrate .. //depot/projects/bike_sched/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_reserv.h#2 integrate .. //depot/projects/bike_sched/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/bike_sched/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.41 2008/04/11 03:26:39 jeff Exp $ */ /* @@ -85,9 +85,6 @@ static int intr_assign_cpu(void *arg, u_char cpu); static void intr_disable_src(void *arg); -#ifdef INTR_FILTER -static void intr_event_stray(void *cookie); -#endif static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -142,7 +139,7 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); - error = intr_event_create(&isrc->is_event, isrc, 0, + error = intr_event_create(&isrc->is_event, isrc, 0, vector, intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source, (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:", vector); @@ -238,12 +235,11 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); } -#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { + struct intr_event *ie; struct thread *td; - struct intr_event *ie; int vector; td = curthread; @@ -267,64 +263,11 @@ if (vector == 0) clkintr_pending = 1; - if (intr_event_handle(ie, frame) != 0) - intr_event_stray(isrc); -} - -static void -intr_event_stray(void *cookie) -{ - struct intsrc *isrc; - - isrc = cookie; /* * For stray interrupts, mask and EOI the source, bump the * stray count, and log the condition. */ - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) - log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); - else if (*isrc->is_straycount == MAX_STRAY_LOG) - log(LOG_CRIT, - "too many stray irq %d's: not logging anymore\n", - isrc->is_pic->pic_vector(isrc)); -} -#else -void -intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) -{ - struct thread *td; - struct intr_event *ie; - struct intr_handler *ih; - int error, vector, thread, ret; - - td = curthread; - - /* - * We count software interrupts when we process them. The - * code here follows previous practice, but there's an - * argument for counting hardware interrupts when they're - * processed too. - */ - (*isrc->is_count)++; - PCPU_INC(cnt.v_intr); - - ie = isrc->is_event; - - /* - * XXX: We assume that IRQ 0 is only used for the ISA timer - * device (clk). - */ - vector = isrc->is_pic->pic_vector(isrc); - if (vector == 0) - clkintr_pending = 1; - - /* - * For stray interrupts, mask and EOI the source, bump the - * stray count, and log the condition. - */ - if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) { + if (intr_event_handle(ie, frame) != 0) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) @@ -333,60 +276,8 @@ log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); - return; - } - - /* - * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. - */ - td->td_intr_nesting_level++; - ret = 0; - thread = 0; - critical_enter(); - TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_filter == NULL) { - thread = 1; - continue; - } - CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_filter, ih->ih_argument == NULL ? frame : - ih->ih_argument, ih->ih_name); - if (ih->ih_argument == NULL) - ret = ih->ih_filter(frame); - else - ret = ih->ih_filter(ih->ih_argument); - /* - * Wrapper handler special case: see - * i386/intr_machdep.c::intr_execute_handlers() - */ - if (!thread) { - if (ret == FILTER_SCHEDULE_THREAD) - thread = 1; - } } - - /* - * If there are any threaded handlers that need to run, - * mask the source as well as sending it an EOI. Otherwise, - * just send it an EOI but leave it unmasked. - */ - if (thread) - isrc->is_pic->pic_disable_source(isrc, PIC_EOI); - else - isrc->is_pic->pic_eoi_source(isrc); - - /* Schedule the ithread if needed. */ - if (thread) { - error = intr_event_schedule_thread(ie); - KASSERT(error == 0, ("bad stray interrupt")); - } - critical_exit(); - td->td_intr_nesting_level--; } -#endif void intr_resume(void) ==== //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.610 2008/03/28 04:29:27 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $"); /* * Manages physical address maps. @@ -215,11 +215,12 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); -static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m); +static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va); +static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, @@ -318,8 +319,6 @@ pmap_pml4e(pmap_t pmap, vm_offset_t va) { - if (!pmap) - return NULL; return (&pmap->pm_pml4[pmap_pml4e_index(va)]); } @@ -340,7 +339,7 @@ pml4_entry_t *pml4e; pml4e = pmap_pml4e(pmap, va); - if (pml4e == NULL || (*pml4e & PG_V) == 0) + if ((*pml4e & PG_V) == 0) return NULL; return (pmap_pml4e_to_pdpe(pml4e, va)); } @@ -2173,7 +2172,7 @@ * Create the pv entry for a 2MB page mapping. */ static boolean_t -pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m) +pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) { struct md_page *pvh; pv_entry_t pv; @@ -2182,7 +2181,7 @@ if (pv_entry_count < pv_entry_high_water && (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); + pvh = pa_to_pvh(pa); TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list); return (TRUE); } else @@ -2906,12 +2905,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); @@ -3082,7 +3075,7 @@ /* * Abort this mapping if its PV entry could not be created. */ - if (!pmap_pv_insert_pde(pmap, va, m)) { + if (!pmap_pv_insert_pde(pmap, va, VM_PAGE_TO_PHYS(m))) { free = NULL; if (pmap_unwire_pte_hold(pmap, va, mpde, &free)) { pmap_invalidate_page(pmap, va); @@ -3511,8 +3504,8 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0 && ((srcptepaddr & PG_MANAGED) == 0 || - pmap_pv_insert_pde(dst_pmap, addr, - PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME)))) { + pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr & + PG_PS_FRAME))) { *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; @@ -3681,16 +3674,29 @@ int pmap_page_wired_mappings(vm_page_t m) { - pv_entry_t pv; - pt_entry_t *pte; - pmap_t pmap; int count; count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + count = pmap_pvh_wired_mappings(&m->md, count); + return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); +} + +/* + * pmap_pvh_wired_mappings: + * + * Return the updated number "count" of managed mappings that are wired. + */ +static int +pmap_pvh_wired_mappings(struct md_page *pvh, int count) +{ + pmap_t pmap; + pt_entry_t *pte; + pv_entry_t pv; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pte = pmap_pte(pmap, pv->pv_va); ==== //depot/projects/bike_sched/sys/amd64/conf/NOTES#7 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.78 2008/04/12 14:20:22 rpaulo Exp $ # # @@ -444,8 +444,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/bike_sched/sys/amd64/include/clock.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -27,8 +27,6 @@ * Driver to clock driver interface. */ -int rtcin(int reg); -void writertc(int reg, unsigned char val); void init_TSC(void); void init_TSC_tc(void); ==== //depot/projects/bike_sched/sys/amd64/include/cpufunc.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.148 2005/05/13 00:05:55 nectar Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.149 2008/04/18 05:47:56 jeff Exp $ */ /* @@ -514,6 +514,19 @@ __asm __volatile("movl %0,%%es" : : "rm" (sel)); } +static inline void +cpu_monitor(const void *addr, int extensions, int hints) +{ + __asm __volatile("monitor;" + : :"a" (addr), "c" (extensions), "d"(hints)); +} + +static inline void +cpu_mwait(int extensions, int hints) +{ + __asm __volatile("mwait;" : :"a" (hints), "c" (extensions)); +} + #ifdef _KERNEL /* This is defined in but is too painful to get to */ #ifndef MSR_FSBASE ==== //depot/projects/bike_sched/sys/amd64/isa/clock.c#6 (text+ko) ==== @@ -33,19 +33,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $"); /* * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" #include "opt_isa.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:14:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8801065672; Fri, 18 Apr 2008 18:14:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D181106564A for ; Fri, 18 Apr 2008 18:14:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 597A78FC17 for ; Fri, 18 Apr 2008 18:14:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIEWZK056970 for ; Fri, 18 Apr 2008 18:14:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIEWMC056968 for perforce@freebsd.org; Fri, 18 Apr 2008 18:14:32 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:14:32 GMT Message-Id: <200804181814.m3IIEWMC056968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=140215 Change 140215 by sam@sam_ebb on 2008/04/18 18:14:27 don't hold softc lock over ieee80211_start_all Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#61 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#61 (text+ko) ==== @@ -1348,7 +1348,8 @@ if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); - goto done; + ATH_UNLOCK(sc); + return; } ath_chan_change(sc, ic->ic_curchan); @@ -1369,7 +1370,8 @@ */ if (ath_startrecv(sc) != 0) { if_printf(ifp, "unable to start recv logic\n"); - goto done; + ATH_UNLOCK(sc); + return; } /* @@ -1393,9 +1395,9 @@ sc->sc_tx99->start(sc->sc_tx99); else #endif + ATH_UNLOCK(sc); + ieee80211_start_all(ic); /* start all vap's */ -done: - ATH_UNLOCK(sc); } static void From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:16:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E2E51065678; Fri, 18 Apr 2008 18:16:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D42651065670 for ; Fri, 18 Apr 2008 18:16:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C1E28FC1C for ; Fri, 18 Apr 2008 18:16:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIGYXR057114 for ; Fri, 18 Apr 2008 18:16:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIGYlT057112 for perforce@freebsd.org; Fri, 18 Apr 2008 18:16:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:16:34 GMT Message-Id: <200804181816.m3IIGYlT057112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:16:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=140216 Change 140216 by sam@sam_ebb on 2008/04/18 18:16:06 o don't hold softc lock over ieee80211_start_all o change watchdog timer to run when IFF_DRV_RUNNING is set instead of being reprimed on every packet Affected files ... .. //depot/projects/vap/sys/dev/wi/if_wi.c#25 edit Differences ... ==== //depot/projects/vap/sys/dev/wi/if_wi.c#25 (text+ko) ==== @@ -629,7 +629,7 @@ } static int -wi_init_locked(struct wi_softc *sc, int porttype, int mode, +wi_setup_locked(struct wi_softc *sc, int porttype, int mode, uint8_t mac[IEEE80211_ADDR_LEN]) { int i; @@ -664,40 +664,46 @@ return 0; } -void -wi_init(void *arg) +static void +wi_init_locked(struct wi_softc *sc) { - struct wi_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; int wasenabled; - WI_LOCK(sc); - if (sc->wi_gone) { - WI_UNLOCK(sc); - return; - } + WI_LOCK_ASSERT(sc); + wasenabled = sc->sc_enabled; if (wasenabled) wi_stop_locked(sc, 1); IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - if (wi_init_locked(sc, sc->sc_porttype, 3, ic->ic_myaddr) != 0) { + if (wi_setup_locked(sc, sc->sc_porttype, 3, ic->ic_myaddr) != 0) { if_printf(ifp, "interface not running\n"); wi_stop_locked(sc, 1); - WI_UNLOCK(sc); return; } ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + callout_reset(&sc->sc_watchdog, hz, wi_watchdog, sc); + wi_enable(sc); /* Enable desired port */ +} + +void +wi_init(void *arg) +{ + struct wi_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + + WI_LOCK(sc); + wi_init_locked(sc); WI_UNLOCK(sc); ieee80211_start_all(ic); - - callout_reset(&sc->sc_watchdog, hz, wi_watchdog, sc); } static void @@ -715,7 +721,7 @@ } else if (sc->wi_gone && disable) /* gone --> not enabled */ sc->sc_enabled = 0; - callout_stop(&sc->sc_watchdog); /* XXX drain */ + callout_stop(&sc->sc_watchdog); sc->sc_tx_timer = 0; sc->sc_false_syns = 0; @@ -822,7 +828,7 @@ if (nstate == IEEE80211_S_AUTH) { WI_LOCK(sc); - wi_init_locked(sc, WI_PORTTYPE_BSS, 3, vap->iv_myaddr); + wi_setup_locked(sc, WI_PORTTYPE_BSS, 3, vap->iv_myaddr); if (vap->iv_flags & IEEE80211_F_PMGTON) { wi_write_val(sc, WI_RID_MAX_SLEEP, ic->ic_lintval); @@ -894,7 +900,7 @@ error = WI_VAP(vap)->wv_newstate(vap, nstate, arg); if (error == 0 && nstate == IEEE80211_S_RUN) { WI_LOCK(sc); - wi_init_locked(sc, WI_PORTTYPE_HOSTAP, 0, vap->iv_myaddr); + wi_setup_locked(sc, WI_PORTTYPE_HOSTAP, 0, vap->iv_myaddr); bss = vap->iv_bss; wi_write_ssid(sc, WI_RID_OWN_SSID, @@ -1153,16 +1159,16 @@ struct wi_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; + WI_LOCK_ASSERT(sc); + if (!sc->sc_enabled) return; - if (sc->sc_tx_timer) { - if (--sc->sc_tx_timer == 0) { - if_printf(ifp, "device timeout\n"); - ifp->if_oerrors++; - wi_init(ifp->if_softc); - return; - } + if (sc->sc_tx_timer && --sc->sc_tx_timer == 0) { + if_printf(ifp, "device timeout\n"); + ifp->if_oerrors++; + wi_init_locked(ifp->if_softc); + return; } callout_reset(&sc->sc_watchdog, hz, wi_watchdog, sc); } @@ -1173,7 +1179,7 @@ struct wi_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall; switch (cmd) { case SIOCSIFFLAGS: @@ -1189,10 +1195,14 @@ if ((ifp->if_flags ^ sc->sc_if_flags) & IFF_PROMISC) { wi_write_val(sc, WI_RID_PROMISC, (ifp->if_flags & IFF_PROMISC) != 0); - } else - wi_init(sc); - } else - wi_init(sc); + } else { + wi_init_locked(sc); + startall = 1; + } + } else { + wi_init_locked(sc); + startall = 1; + } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) wi_stop_locked(sc, 1); @@ -1200,7 +1210,9 @@ } sc->sc_if_flags = ifp->if_flags; WI_UNLOCK(sc); - error = 0; + + if (startall) + ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:17:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 225EB1065674; Fri, 18 Apr 2008 18:17:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6CEB1065670 for ; Fri, 18 Apr 2008 18:17:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2B3C8FC25 for ; Fri, 18 Apr 2008 18:17:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIHZZx057135 for ; Fri, 18 Apr 2008 18:17:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIHZbW057133 for perforce@freebsd.org; Fri, 18 Apr 2008 18:17:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:17:35 GMT Message-Id: <200804181817.m3IIHZbW057133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:17:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=140217 Change 140217 by sam@sam_ebb on 2008/04/18 18:16:56 don't hold the softc lock over ieee80211_start_all and untangle some other locking; also make watchdog timer handling consistent Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2560.c#27 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#25 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2560.c#27 (text) ==== @@ -158,7 +158,9 @@ static int rt2560_bbp_init(struct rt2560_softc *); static void rt2560_set_txantenna(struct rt2560_softc *, int); static void rt2560_set_rxantenna(struct rt2560_softc *, int); +static void rt2560_init_locked(struct rt2560_softc *); static void rt2560_init(void *); +static void rt2560_stop_locked(struct rt2560_softc *); static int rt2560_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); @@ -1978,20 +1980,22 @@ struct rt2560_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + RAL_LOCK_ASSERT(sc); + + KASSERT(ifp->if_drv_flags & IFF_DRV_RUNNING, ("not running")); + + if (sc->sc_invalid) /* card ejected */ return; rt2560_encryption_intr(sc); rt2560_tx_intr(sc); - if (sc->sc_tx_timer > 0) { - if (--sc->sc_tx_timer == 0) { - device_printf(sc->sc_dev, "device timeout\n"); - rt2560_init(sc); - ifp->if_oerrors++; - /* watchdog timeout is set in rt2560_init() */ - return; - } + if (sc->sc_tx_timer > 0 && --sc->sc_tx_timer == 0) { + if_printf(ifp, "device timeout\n"); + rt2560_init_locked(sc); + ifp->if_oerrors++; + /* NB: callout is reset in rt2560_init() */ + return; } callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); } @@ -2002,21 +2006,25 @@ struct rt2560_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall; switch (cmd) { case SIOCSIFFLAGS: + RAL_LOCK(sc); + startall = 0; if (ifp->if_flags & IFF_UP) { - RAL_LOCK(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + rt2560_init_locked(sc); + startall = 1; + } else rt2560_update_promisc(ifp); - else - rt2560_init(sc); - RAL_UNLOCK(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2560_stop(sc); + rt2560_stop_locked(sc); } + RAL_UNLOCK(sc); + if (startall) /* NB: need to drop lock */ + ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -2621,18 +2629,18 @@ } static void -rt2560_init(void *priv) +rt2560_init_locked(struct rt2560_softc *sc) { #define N(a) (sizeof (a) / sizeof ((a)[0])) - struct rt2560_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; uint32_t tmp; int i; - rt2560_stop(sc); + RAL_LOCK_ASSERT(sc); + + rt2560_stop_locked(sc); - RAL_LOCK(sc); /* setup tx rings */ tmp = RT2560_PRIO_RING_COUNT << 24 | RT2560_ATIM_RING_COUNT << 16 | @@ -2706,27 +2714,36 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; callout_reset(&sc->watchdog_ch, hz, rt2560_watchdog, sc); +#undef N +} +static void +rt2560_init(void *priv) +{ + struct rt2560_softc *sc = priv; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + + RAL_LOCK(sc); + rt2560_init_locked(sc); RAL_UNLOCK(sc); - ieee80211_start_all(ic); /* start all vap's */ -#undef N + ieee80211_start_all(ic); } -void -rt2560_stop(void *arg) +static void +rt2560_stop_locked(struct rt2560_softc *sc) { - struct rt2560_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; volatile int *flags = &sc->sc_flags; - while (*flags & RT2560_F_INPUT_RUNNING) { - tsleep(sc, 0, "ralrunning", hz/10); - } + RAL_LOCK_ASSERT(sc); - RAL_LOCK(sc); + while (*flags & RT2560_F_INPUT_RUNNING) + msleep(sc, &sc->sc_mtx, 0, "ralrunning", hz/10); callout_stop(&sc->watchdog_ch); + sc->sc_tx_timer = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); @@ -2751,9 +2768,16 @@ rt2560_reset_tx_ring(sc, &sc->bcnq); rt2560_reset_rx_ring(sc, &sc->rxq); } - sc->sc_tx_timer = 0; sc->sc_flags &= ~(RT2560_F_PRIO_OACTIVE | RT2560_F_DATA_OACTIVE); +} + +void +rt2560_stop(void *arg) +{ + struct rt2560_softc *sc = arg; + RAL_LOCK(sc); + rt2560_stop_locked(sc); RAL_UNLOCK(sc); } ==== //depot/projects/vap/sys/dev/ral/rt2661.c#25 (text) ==== @@ -157,9 +157,10 @@ static void rt2661_read_eeprom(struct rt2661_softc *, struct ieee80211com *); static int rt2661_bbp_init(struct rt2661_softc *); +static void rt2661_init_locked(struct rt2661_softc *); static void rt2661_init(void *); +static void rt2661_stop_locked(struct rt2661_softc *); static void rt2661_stop(void *); -static void rt2661_stop_locked(struct rt2661_softc *); static int rt2661_load_microcode(struct rt2661_softc *); #ifdef notyet static void rt2661_rx_tune(struct rt2661_softc *); @@ -357,7 +358,6 @@ RAL_LOCK(sc); rt2661_stop_locked(sc); - callout_stop(&sc->watchdog_ch); RAL_UNLOCK(sc); bpfdetach(ifp); @@ -1660,7 +1660,6 @@ } sc->sc_tx_timer = 5; - callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); } } @@ -1709,7 +1708,6 @@ if (rt2661_tx_mgt(sc, m, ni) != 0) goto bad; sc->sc_tx_timer = 5; - callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); RAL_UNLOCK(sc); @@ -1725,16 +1723,23 @@ rt2661_watchdog(void *arg) { struct rt2661_softc *sc = (struct rt2661_softc *)arg; + struct ifnet *ifp = sc->sc_ifp; + + RAL_LOCK_ASSERT(sc); + + KASSERT(ifp->if_drv_flags & IFF_DRV_RUNNING, ("not running")); - if (sc->sc_tx_timer > 0 && !sc->sc_invalid) { - if (--sc->sc_tx_timer == 0) { - device_printf(sc->sc_dev, "device timeout\n"); - rt2661_init(sc); - sc->sc_ifp->if_oerrors++; - return; - } - callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); + if (sc->sc_invalid) /* card ejected */ + return; + + if (sc->sc_tx_timer > 0 && --sc->sc_tx_timer == 0) { + if_printf(ifp, "device timeout\n"); + rt2661_init_locked(sc); + ifp->if_oerrors++; + /* NB: callout is reset in rt2661_init() */ + return; } + callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); } static int @@ -1743,19 +1748,25 @@ struct rt2661_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall; switch (cmd) { case SIOCSIFFLAGS: + RAL_LOCK(sc); + startall = 0; if (ifp->if_flags & IFF_UP) { - if (ifp->if_drv_flags & IFF_DRV_RUNNING) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + rt2661_init_locked(sc); + startall = 1; + } else rt2661_update_promisc(ifp); - else - rt2661_init(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - rt2661_stop(sc); + rt2661_stop_locked(sc); } + RAL_UNLOCK(sc); + if (startall) /* NB: need to drop lock */ + ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -2317,16 +2328,15 @@ } static void -rt2661_init(void *priv) +rt2661_init_locked(struct rt2661_softc *sc) { #define N(a) (sizeof (a) / sizeof ((a)[0])) - struct rt2661_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; uint32_t tmp, sta[3]; int i, error, ntries; - RAL_LOCK(sc); + RAL_LOCK_ASSERT(sc); if ((sc->sc_flags & RAL_FW_LOADED) == 0) { error = rt2661_load_microcode(sc); @@ -2334,7 +2344,6 @@ if_printf(ifp, "%s: could not load 8051 microcode, error %d\n", __func__, error); - RAL_UNLOCK(sc); return; } sc->sc_flags |= RAL_FW_LOADED; @@ -2401,13 +2410,11 @@ if (ntries == 1000) { printf("timeout waiting for BBP/RF to wakeup\n"); rt2661_stop_locked(sc); - RAL_UNLOCK(sc); return; } if (rt2661_bbp_init(sc) != 0) { rt2661_stop_locked(sc); - RAL_UNLOCK(sc); return; } @@ -2451,20 +2458,22 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - RAL_UNLOCK(sc); - - ieee80211_start_all(ic); /* start all vap's */ + callout_reset(&sc->watchdog_ch, hz, rt2661_watchdog, sc); #undef N } -void -rt2661_stop(void *priv) +static void +rt2661_init(void *priv) { struct rt2661_softc *sc = priv; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; RAL_LOCK(sc); - rt2661_stop_locked(sc); + rt2661_init_locked(sc); RAL_UNLOCK(sc); + + ieee80211_start_all(ic); } void @@ -2474,12 +2483,13 @@ uint32_t tmp; volatile int *flags = &sc->sc_flags; - while (*flags & RAL_INPUT_RUNNING) { + while (*flags & RAL_INPUT_RUNNING) msleep(sc, &sc->sc_mtx, 0, "ralrunning", hz/10); - } + + callout_stop(&sc->watchdog_ch); + sc->sc_tx_timer = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - sc->sc_tx_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); /* abort Tx (for all 5 Tx rings) */ @@ -2511,6 +2521,16 @@ } } +void +rt2661_stop(void *priv) +{ + struct rt2661_softc *sc = priv; + + RAL_LOCK(sc); + rt2661_stop_locked(sc); + RAL_UNLOCK(sc); +} + static int rt2661_load_microcode(struct rt2661_softc *sc) { From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:22:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 935961065670; Fri, 18 Apr 2008 18:22:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55F00106564A for ; Fri, 18 Apr 2008 18:22:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 41FAA8FC17 for ; Fri, 18 Apr 2008 18:22:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIMfXS060017 for ; Fri, 18 Apr 2008 18:22:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIMfeD060015 for perforce@freebsd.org; Fri, 18 Apr 2008 18:22:41 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:22:41 GMT Message-Id: <200804181822.m3IIMfeD060015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:22:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=140218 Change 140218 by sam@sam_ebb on 2008/04/18 18:21:48 Eliminate holding the com lock over the ioctl callback to auto-up the parent device by deferring to a task. We mark the vap running so when the driver calls back to us through ieee80211_start_all we don't double count them in ic_nrunning. This eliminates the lock being held over the driver's init method which was problematic for drivers that must defer work (e.g. usb) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#28 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#39 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#28 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -95,6 +96,7 @@ "WME_UPSD", }; +static void parent_up(void *, int); static int ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state, int); @@ -128,6 +130,8 @@ } ic->ic_protmode = IEEE80211_PROT_CTSONLY; + TASK_INIT(&ic->ic_parent_task, 0, parent_up, ifp); + ic->ic_wme.wme_hipri_switch_hysteresis = AGGRESSIVE_MODE_SWITCH_HYSTERESIS; @@ -1059,6 +1063,14 @@ } } +static void +parent_up(void *arg, int npending) +{ + struct ifnet *parent = arg; + + parent->if_ioctl(parent, SIOCSIFFLAGS, NULL); +} + /* * Start a vap running. If this is the first vap to be * set running on the underlying device then we @@ -1079,6 +1091,15 @@ if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { /* + * Mark us running. Note that it's ok to do this first; + * if we need to bring the parent device up we defer that + * to avoid dropping the com lock. We expect the device + * to respond to being marked up by calling back into us + * through ieee80211_start_all at which point we'll come + * back in here and complete the work. + */ + ifp->if_drv_flags |= IFF_DRV_RUNNING; + /* * We are not running; if this we are the first vap * to be brought up auto-up the parent if necessary. */ @@ -1088,13 +1109,9 @@ IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "%s: up parent %s\n", __func__, parent->if_xname); parent->if_flags |= IFF_UP; - parent->if_ioctl(parent, SIOCSIFFLAGS, NULL); + taskqueue_enqueue(taskqueue_swi, &ic->ic_parent_task); + return; } - /* - * Mark us running. Note that we do this after - * bringing up the parent device to avoid recursion. - */ - ifp->if_drv_flags |= IFF_DRV_RUNNING; /* mark us running */ } /* * If the parent is up and running, then kick the @@ -1231,7 +1248,6 @@ /* * Stop all vap's running on a device. - * XXX not currently used */ void ieee80211_stop_all(struct ieee80211com *ic) @@ -1240,12 +1256,18 @@ struct ieee80211vap *vap; IEEE80211_LOCK(ic); + /* XXX why do we do this? */ /* XXX shouldn't touch driver state */ parent->if_drv_flags &= ~IFF_DRV_RUNNING; TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { struct ifnet *ifp = vap->iv_ifp; - if (IFNET_IS_UP_RUNNING(ifp)) /* NB: avoid recursion */ + if (IFNET_IS_UP_RUNNING(ifp)) { /* NB: avoid recursion */ + /* + * NB: since parent is marked !RUNNING + * this won't drop com lock + */ ieee80211_stop_locked(vap); + } } IEEE80211_UNLOCK(ic); } ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#39 (text+ko) ==== @@ -116,6 +116,7 @@ struct ifmedia ic_media; /* interface media config */ uint8_t ic_myaddr[IEEE80211_ADDR_LEN]; struct callout ic_inact; /* inactivity processing */ + struct task ic_parent_task; /* deferred parent processing */ uint32_t ic_flags; /* state flags */ uint32_t ic_flags_ext; /* extended state flags */ From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:34:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51BCF1065673; Fri, 18 Apr 2008 18:34:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 142F9106564A for ; Fri, 18 Apr 2008 18:34:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB37D8FC14 for ; Fri, 18 Apr 2008 18:34:53 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIYrvS060456 for ; Fri, 18 Apr 2008 18:34:53 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIYrCx060454 for perforce@freebsd.org; Fri, 18 Apr 2008 18:34:53 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:34:53 GMT Message-Id: <200804181834.m3IIYrCx060454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=140219 Change 140219 by sam@sam_ebb on 2008/04/18 18:34:06 fix tx99 handling broken by previous change Submitted by: thompsa Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#62 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#62 (text+ko) ==== @@ -1390,13 +1390,13 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; ath_hal_intrset(ah, sc->sc_imask); + ATH_UNLOCK(sc); + #ifdef ATH_TX99_DIAG if (sc->sc_tx99 != NULL) sc->sc_tx99->start(sc->sc_tx99); else #endif - ATH_UNLOCK(sc); - ieee80211_start_all(ic); /* start all vap's */ } From owner-p4-projects@FreeBSD.ORG Fri Apr 18 18:44:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F97E1065674; Fri, 18 Apr 2008 18:44:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30EBD106566B for ; Fri, 18 Apr 2008 18:44:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D2898FC17 for ; Fri, 18 Apr 2008 18:44:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IIi4wI061963 for ; Fri, 18 Apr 2008 18:44:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIi3XV061961 for perforce@freebsd.org; Fri, 18 Apr 2008 18:44:03 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 18:44:03 GMT Message-Id: <200804181844.m3IIi3XV061961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 18:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=140220 Change 140220 by sam@sam_ebb on 2008/04/18 18:43:38 Cleanup stop handling the same way as init: defer the parent ioctl op to the taskq so we can avoid dropping the com lock. This also eliminates the bogus futzing of the parent's running flag to avoid problems. Also move taskq ops to run in a thread instead of a swi so the driver has a blocking context. We're likely to add our own thread to help with other issues at which point we can do these operations there. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#29 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#29 (text+ko) ==== @@ -96,7 +96,7 @@ "WME_UPSD", }; -static void parent_up(void *, int); +static void parent_updown(void *, int); static int ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state, int); @@ -130,7 +130,7 @@ } ic->ic_protmode = IEEE80211_PROT_CTSONLY; - TASK_INIT(&ic->ic_parent_task, 0, parent_up, ifp); + TASK_INIT(&ic->ic_parent_task, 0, parent_updown, ifp); ic->ic_wme.wme_hipri_switch_hysteresis = AGGRESSIVE_MODE_SWITCH_HYSTERESIS; @@ -1064,7 +1064,7 @@ } static void -parent_up(void *arg, int npending) +parent_updown(void *arg, int npending) { struct ifnet *parent = arg; @@ -1109,7 +1109,7 @@ IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "%s: up parent %s\n", __func__, parent->if_xname); parent->if_flags |= IFF_UP; - taskqueue_enqueue(taskqueue_swi, &ic->ic_parent_task); + taskqueue_enqueue(taskqueue_thread, &ic->ic_parent_task); return; } } @@ -1228,10 +1228,7 @@ IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG, "down parent %s\n", parent->if_xname); parent->if_flags &= ~IFF_UP; - /* XXX must drop lock */ - IEEE80211_UNLOCK(ic); - parent->if_ioctl(parent, SIOCSIFFLAGS, NULL); - IEEE80211_LOCK(ic); + taskqueue_enqueue(taskqueue_thread, &ic->ic_parent_task); } } } @@ -1252,22 +1249,13 @@ void ieee80211_stop_all(struct ieee80211com *ic) { - struct ifnet *parent = ic->ic_ifp; struct ieee80211vap *vap; IEEE80211_LOCK(ic); - /* XXX why do we do this? */ - /* XXX shouldn't touch driver state */ - parent->if_drv_flags &= ~IFF_DRV_RUNNING; TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { struct ifnet *ifp = vap->iv_ifp; - if (IFNET_IS_UP_RUNNING(ifp)) { /* NB: avoid recursion */ - /* - * NB: since parent is marked !RUNNING - * this won't drop com lock - */ + if (IFNET_IS_UP_RUNNING(ifp)) /* NB: avoid recursion */ ieee80211_stop_locked(vap); - } } IEEE80211_UNLOCK(ic); } From owner-p4-projects@FreeBSD.ORG Fri Apr 18 20:07:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE70F1065678; Fri, 18 Apr 2008 20:07:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58912106566C for ; Fri, 18 Apr 2008 20:07:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4595E8FC17 for ; Fri, 18 Apr 2008 20:07:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IK7jNB093268 for ; Fri, 18 Apr 2008 20:07:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IK7jtr093266 for perforce@freebsd.org; Fri, 18 Apr 2008 20:07:45 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 20:07:45 GMT Message-Id: <200804182007.m3IK7jtr093266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 20:07:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=140224 Change 140224 by sam@sam_ebb on 2008/04/18 20:07:02 o back out use of rwlock for node table and iterator; it was wrong for several reasons. Restore the 2 mtx's; one for the node table contents and one for the scan generation #; we must have two since we need to drop the node table lock over the callback and must guard against scangen being changed by colliding iterators. o cleanup the lock name stuff by encapsulating the char buffer that holds the constructed lock name in the lock types. o eliminate some unnecessary recursive locking in mlme ops o correct the LOR in the mlme op to deauth/diassoc station(s) by holding the node table lock only for the single-address case and using ieee80211_iterate_nodes otherwise Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#25 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#55 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#29 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#19 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#25 (text+ko) ==== @@ -49,22 +49,46 @@ /* * Node locking definitions. */ -typedef struct rwlock ieee80211_node_lock_t; -#define IEEE80211_NODE_LOCK_INIT(_nt, _name) \ - rw_init_flags(&(_nt)->nt_nodelock, _name, RW_RECURSE) -#define IEEE80211_NODE_LOCK_DESTROY(_nt) rw_destroy(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_LOCK(_nt) rw_wlock(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_IS_LOCKED(_nt) rw_wowned(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_UNLOCK(_nt) rw_wunlock(&(_nt)->nt_nodelock) +typedef struct { + char name[16]; /* e.g. "ath0_node_lock" */ + struct mtx mtx; +} ieee80211_node_lock_t; +#define IEEE80211_NODE_LOCK_INIT(_nt, _name) do { \ + ieee80211_node_lock_t *nl = &(_nt)->nt_nodelock; \ + snprintf(nl->name, sizeof(nl->name), "%s_node_lock", _name); \ + mtx_init(&nl->mtx, NULL, nl->name, MTX_DEF | MTX_RECURSE); \ +} while (0) +#define IEEE80211_NODE_LOCK_DESTROY(_nt) \ + mtx_destroy(&(_nt)->nt_nodelock.mtx) +#define IEEE80211_NODE_LOCK(_nt) \ + mtx_lock(&(_nt)->nt_nodelock.mtx) +#define IEEE80211_NODE_IS_LOCKED(_nt) \ + mtx_owned(&(_nt)->nt_nodelock.mtx) +#define IEEE80211_NODE_UNLOCK(_nt) \ + mtx_unlock(&(_nt)->nt_nodelock.mtx) #define IEEE80211_NODE_LOCK_ASSERT(_nt) \ - rw_assert(&(_nt)->nt_nodelock, RA_WLOCKED) + mtx_assert(&(_nt)->nt_nodelock.mtx, MA_OWNED) /* - * Node table iteration locking definitions; we piggyback on the node - * table lock by using a read/shared acquisition. + * Node table iteration locking definitions; this protects the + * scan generation # used to iterate over the station table + * while grabbing+releasing the node lock. */ -#define IEEE80211_NODE_ITERATE_LOCK(_nt) rw_rlock(&(_nt)->nt_nodelock) -#define IEEE80211_NODE_ITERATE_UNLOCK(_nt) rw_runlock(&(_nt)->nt_nodelock) +typedef struct { + char name[16]; /* e.g. "ath0_scan_lock" */ + struct mtx mtx; +} ieee80211_scan_lock_t; +#define IEEE80211_NODE_ITERATE_LOCK_INIT(_nt, _name) do { \ + ieee80211_scan_lock_t *sl = &(_nt)->nt_scanlock; \ + snprintf(sl->name, sizeof(sl->name), "%s_scan_lock", _name); \ + mtx_init(&sl->mtx, NULL, sl->name, MTX_DEF); \ +} while (0) +#define IEEE80211_NODE_ITERATE_LOCK_DESTROY(_nt) \ + mtx_destroy(&(_nt)->nt_scanlock.mtx) +#define IEEE80211_NODE_ITERATE_LOCK(_nt) \ + mtx_lock(&(_nt)->nt_scanlock.mtx) +#define IEEE80211_NODE_ITERATE_UNLOCK(_nt) \ + mtx_unlock(&(_nt)->nt_scanlock.mtx) #define _AGEQ_ENQUEUE(_ifq, _m, _qlen, _age) do { \ (_m)->m_nextpkt = NULL; \ ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#55 (text+ko) ==== @@ -1261,6 +1261,31 @@ ieee80211_node_leave(ni); } +static int +setmlme_dropsta(struct ieee80211vap *vap, + const uint8_t mac[IEEE80211_ADDR_LEN], struct mlmeop *mlmeop) +{ + struct ieee80211com *ic = vap->iv_ic; + struct ieee80211_node_table *nt = &ic->ic_sta; + struct ieee80211_node *ni; + int error = 0; + + /* NB: the broadcast address means do 'em all */ + if (!IEEE80211_ADDR_EQ(mac, ic->ic_ifp->if_broadcastaddr)) { + IEEE80211_NODE_LOCK(nt); + ni = ieee80211_find_node_locked(nt, mac); + if (ni != NULL) { + domlme(mlmeop, ni); + ieee80211_free_node(ni); + } else + error = ENOENT; + IEEE80211_NODE_UNLOCK(nt); + } else { + ieee80211_iterate_nodes(nt, domlme, mlmeop); + } + return error; +} + static __noinline int setmlme_common(struct ieee80211vap *vap, int op, const uint8_t mac[IEEE80211_ADDR_LEN], int reason) @@ -1285,20 +1310,7 @@ mlmeop.vap = vap; mlmeop.op = op; mlmeop.reason = reason; - IEEE80211_NODE_LOCK(nt); - /* NB: the broadcast address means do 'em all */ - if (!IEEE80211_ADDR_EQ(mac, ic->ic_ifp->if_broadcastaddr)) { - ni = ieee80211_find_node_locked(nt, mac); - if (ni != NULL) { - domlme(&mlmeop, ni); - ieee80211_free_node(ni); - } else - error = ENOENT; - } else { - ieee80211_iterate_nodes(&ic->ic_sta, - domlme, &mlmeop); - } - IEEE80211_NODE_UNLOCK(nt); + error = setmlme_dropsta(vap, mac, &mlmeop); break; case IEEE80211_M_WDS: /* XXX user app should send raw frame? */ @@ -1332,7 +1344,7 @@ break; } IEEE80211_NODE_LOCK(nt); - ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); + ni = ieee80211_find_vap_node_locked(nt, vap, mac); if (ni != NULL) { mlmedebug(vap, mac, op, reason); if (op == IEEE80211_MLME_AUTHORIZE) @@ -1350,7 +1362,7 @@ break; } IEEE80211_NODE_LOCK(nt); - ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); + ni = ieee80211_find_vap_node_locked(nt, vap, mac); if (ni != NULL) { mlmedebug(vap, mac, op, reason); if (reason == IEEE80211_STATUS_SUCCESS) { ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#29 (text+ko) ==== @@ -1698,10 +1698,11 @@ struct ieee80211_node_table *nt, const char *name, int inact, int keyixmax) { + struct ifnet *ifp = ic->ic_ifp; + nt->nt_ic = ic; - snprintf(nt->nt_lockname, sizeof(nt->nt_lockname), "%s_node_lock", - ic->ic_ifp->if_xname); - IEEE80211_NODE_LOCK_INIT(nt, nt->nt_lockname); + IEEE80211_NODE_LOCK_INIT(nt, ifp->if_xname); + IEEE80211_NODE_ITERATE_LOCK_INIT(nt, ifp->if_xname); TAILQ_INIT(&nt->nt_node); nt->nt_name = name; nt->nt_scangen = 1; @@ -1772,6 +1773,7 @@ FREE(nt->nt_keyixmap, M_80211_NODE); nt->nt_keyixmap = NULL; } + IEEE80211_NODE_ITERATE_LOCK_DESTROY(nt); IEEE80211_NODE_LOCK_DESTROY(nt); } @@ -1793,13 +1795,10 @@ struct ieee80211_node *ni; int gen = 0; + IEEE80211_NODE_ITERATE_LOCK(nt); + gen = ++nt->nt_scangen; restart: IEEE80211_NODE_LOCK(nt); - if (gen == 0) { - gen = ++nt->nt_scangen; - if (nt->nt_scangen == 0) /* NB: 0 is never used */ - nt->nt_scangen++; - } TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_scangen == gen) /* previously handled */ continue; @@ -1920,6 +1919,8 @@ } } IEEE80211_NODE_UNLOCK(nt); + + IEEE80211_NODE_ITERATE_UNLOCK(nt); } /* @@ -2003,28 +2004,28 @@ } void -ieee80211_iterate_nodes(struct ieee80211_node_table *nt, ieee80211_iter_func *f, void *arg) +ieee80211_iterate_nodes(struct ieee80211_node_table *nt, + ieee80211_iter_func *f, void *arg) { struct ieee80211_node *ni; - u_int gen = 0; + u_int gen; + IEEE80211_NODE_ITERATE_LOCK(nt); + gen = ++nt->nt_scangen; restart: - IEEE80211_NODE_ITERATE_LOCK(nt); - if (gen == 0) { - gen = ++nt->nt_scangen; - if (nt->nt_scangen == 0) /* NB: 0 is never used */ - nt->nt_scangen++; - } + IEEE80211_NODE_LOCK(nt); TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { if (ni->ni_scangen != gen) { ni->ni_scangen = gen; (void) ieee80211_ref_node(ni); - IEEE80211_NODE_ITERATE_UNLOCK(nt); + IEEE80211_NODE_UNLOCK(nt); (*f)(arg, ni); ieee80211_free_node(ni); goto restart; } } + IEEE80211_NODE_UNLOCK(nt); + IEEE80211_NODE_ITERATE_UNLOCK(nt); } @@ -2070,6 +2071,8 @@ { struct ieee80211vap *vap; + IEEE80211_LOCK_ASSERT(ic); + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) if (vap->iv_opmode == IEEE80211_M_HOSTAP) ieee80211_beacon_notify(vap, IEEE80211_BEACON_ERP); ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#19 (text+ko) ==== @@ -295,14 +295,14 @@ */ struct ieee80211_node_table { struct ieee80211com *nt_ic; /* back reference */ - char nt_lockname[16];/* e.g. "ath0_node_lock" */ ieee80211_node_lock_t nt_nodelock; /* on node table */ TAILQ_HEAD(, ieee80211_node) nt_node; /* information of all nodes */ LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE]; struct ieee80211_node **nt_keyixmap; /* key ix -> node map */ int nt_keyixmax; /* keyixmap size */ - const char *nt_name; /* for debugging */ - u_int nt_scangen; /* gen# for timeout scan */ + const char *nt_name; /* table name for debug msgs */ + ieee80211_scan_lock_t nt_scanlock; /* on nt_scangen */ + u_int nt_scangen; /* gen# for iterators */ int nt_inact_init; /* initial node inact setting */ }; From owner-p4-projects@FreeBSD.ORG Fri Apr 18 20:18:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B82A1065672; Fri, 18 Apr 2008 20:18:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F23E4106566B for ; Fri, 18 Apr 2008 20:18:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C73FA8FC16 for ; Fri, 18 Apr 2008 20:18:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IKIuhO093621 for ; Fri, 18 Apr 2008 20:18:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IKIua9093619 for perforce@freebsd.org; Fri, 18 Apr 2008 20:18:56 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 20:18:56 GMT Message-Id: <200804182018.m3IKIua9093619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 20:18:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=140225 Change 140225 by sam@sam_ebb on 2008/04/18 20:18:47 assert the com lock while walking the vap list Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#20 (text+ko) ==== @@ -965,6 +965,8 @@ struct ieee80211vap *vap; int first = 1; + IEEE80211_LOCK_ASSERT(ic); + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { if (vap->iv_opmode != IEEE80211_M_HOSTAP) continue; From owner-p4-projects@FreeBSD.ORG Fri Apr 18 20:56:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D3371065672; Fri, 18 Apr 2008 20:56:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C388A1065670 for ; Fri, 18 Apr 2008 20:56:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1E3A8FC1A for ; Fri, 18 Apr 2008 20:56:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IKucxi004021 for ; Fri, 18 Apr 2008 20:56:38 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IKucI0004019 for perforce@freebsd.org; Fri, 18 Apr 2008 20:56:38 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 20:56:38 GMT Message-Id: <200804182056.m3IKucI0004019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 20:56:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=140226 Change 140226 by sam@sam_ebb on 2008/04/18 20:56:37 auto load crypto modules on hostapd startup Affected files ... .. //depot/projects/vap/tools/tools/net80211/scripts/config#5 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#2 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#3 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#4 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#4 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#4 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#4 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#4 edit .. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#4 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/scripts/config#5 (text+ko) ==== @@ -44,3 +44,11 @@ test -z "$HOSTAPD" && HOSTAPD=/usr/sbin/hostapd test -z "$WLANWATCH" && WLANWATCH=/usr/local/bin/wlanwatch test -z "$WLANWDS" && WLANWDS=/usr/local/bin/wlanwds + +start_hostapd() +{ + for m in wlan_xauth wlan_ccmp wlan_tkip wlan_wep; do + kldstat -q -m $m || kldload $m + done + $HOSTAPD $* +} ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#2 (text+ko) ==== @@ -59,4 +59,4 @@ makeconf $CONF $WPA_WLAN #athdebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#3 (text+ko) ==== @@ -52,4 +52,4 @@ makeconf $CONF #mwldebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#4 (text+ko) ==== @@ -46,7 +46,7 @@ # ifconfig $WIRED up makeconf $CONF - $HOSTAPD $CONF& + start_hostapd $CONF& pid=$! ifconfig ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#4 (text+ko) ==== @@ -50,4 +50,4 @@ makeconf $CONF #athdebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#4 (text+ko) ==== @@ -50,4 +50,4 @@ makeconf $CONF #mwldebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#4 (text+ko) ==== @@ -50,4 +50,4 @@ makeconf $CONF #mwldebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#4 (text+ko) ==== @@ -51,4 +51,4 @@ makeconf $CONF #mwldebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF ==== //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#4 (text+ko) ==== @@ -51,4 +51,4 @@ makeconf $CONF #mwldebug -i $WIRELESS keycache -$HOSTAPD -K $CONF +start_hostapd -K $CONF From owner-p4-projects@FreeBSD.ORG Fri Apr 18 21:20:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D29521065676; Fri, 18 Apr 2008 21:20:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 915311065671 for ; Fri, 18 Apr 2008 21:20:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D13D8FC24 for ; Fri, 18 Apr 2008 21:20:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ILKInI005822 for ; Fri, 18 Apr 2008 21:20:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ILK5RW005808 for perforce@freebsd.org; Fri, 18 Apr 2008 21:20:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Apr 2008 21:20:05 GMT Message-Id: <200804182120.m3ILK5RW005808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 21:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=140227 Change 140227 by hselasky@hselasky_laptop001 on 2008/04/18 21:19:40 IFC @ 140168 The "uslcom" module is currently broken, but will be fixed during the weekend. Affected files ... .. //depot/projects/usb/src/sys/Makefile#6 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/usb/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/clock.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/usb/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/smp.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/usb/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/usb/src/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_dummy.c#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/usb/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/usb/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/intr.c#6 integrate .. //depot/projects/usb/src/sys/arm/arm/locore.S#5 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/arm/support.S#4 integrate .. //depot/projects/usb/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/usb/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#6 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#7 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/usb/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/param.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/stack.h#1 branch .. //depot/projects/usb/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#6 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/files.sa11x0#3 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/usb/src/sys/boot/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/usb/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/usb/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/usb/src/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/usb/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/usb/src/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/usb/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/cdboot/cdboot.s#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/usb/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/usb/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/usb/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/usb/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/usb/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/usb/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/usb/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 delete .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/rpc/xdr.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/atomic.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/bitmap.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cpupart.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cpuvar.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/cyclic.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/elf.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kmem.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mman.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/modctl.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/mutex.h#4 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/objfs.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/param.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/pcpu.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/proc.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/rwlock.h#4 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/stat.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/time.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/types.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/vfs.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/vnode.h#3 delete .. //depot/projects/usb/src/sys/compat/opensolaris/sys/zone.h#2 delete .. //depot/projects/usb/src/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/usb/src/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/usb/src/sys/conf/Makefile.mips#1 branch .. //depot/projects/usb/src/sys/conf/NOTES#11 integrate .. //depot/projects/usb/src/sys/conf/files#26 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#7 integrate .. //depot/projects/usb/src/sys/conf/files.arm#6 integrate .. //depot/projects/usb/src/sys/conf/files.i386#7 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#7 integrate .. //depot/projects/usb/src/sys/conf/files.mips#1 branch .. //depot/projects/usb/src/sys/conf/files.pc98#7 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.cfe#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/usb/src/sys/conf/options#8 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#5 integrate .. //depot/projects/usb/src/sys/conf/options.i386#5 integrate .. //depot/projects/usb/src/sys/conf/options.mips#1 branch .. //depot/projects/usb/src/sys/conf/options.pc98#4 integrate .. //depot/projects/usb/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/os/list.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/avl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/note.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#3 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 delete .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 delete .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/usb/src/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/usb/src/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_capture.c#1 branch .. //depot/projects/usb/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/usb/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/usb/src/sys/ddb/db_examine.c#4 integrate .. //depot/projects/usb/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_lex.c#2 integrate .. //depot/projects/usb/src/sys/ddb/db_lex.h#2 integrate .. //depot/projects/usb/src/sys/ddb/db_main.c#3 integrate .. //depot/projects/usb/src/sys/ddb/db_output.c#4 integrate .. //depot/projects/usb/src/sys/ddb/db_ps.c#5 integrate .. //depot/projects/usb/src/sys/ddb/db_script.c#1 branch .. //depot/projects/usb/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/usb/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/usb/src/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/usb/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmcvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#35 integrate .. //depot/projects/usb/src/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/usb/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/usb/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/usb/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/usb/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/usb/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/usb/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/usb/src/sys/dev/em/LICENSE#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/usb/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/usb/src/sys/dev/en/midway.c#5 integrate .. //depot/projects/usb/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/usb/src/sys/dev/fb/creator.c#6 integrate .. //depot/projects/usb/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/usb/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/usb/src/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/usb/src/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/usb/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/usb/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/usb/src/sys/dev/ic/quicc.h#1 branch .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/usb/src/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/usb/src/sys/dev/igb/e1000_mac.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 21:29:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6B381065673; Fri, 18 Apr 2008 21:29:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78EEA106566B for ; Fri, 18 Apr 2008 21:29:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 660788FC0A for ; Fri, 18 Apr 2008 21:29:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ILTVAJ006071 for ; Fri, 18 Apr 2008 21:29:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ILTSjm006069 for perforce@freebsd.org; Fri, 18 Apr 2008 21:29:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Apr 2008 21:29:28 GMT Message-Id: <200804182129.m3ILTSjm006069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 21:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=140228 Change 140228 by hselasky@hselasky_laptop001 on 2008/04/18 21:29:16 Style changes by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uark.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/ucom.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#46 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/usb_template.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_template_msc.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/uslcom.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uark.c#23 (text+ko) ==== @@ -396,9 +396,9 @@ uint32_t speed = t->c_ospeed; uint16_t data; - /* - * NOTE: When reverse computing the baud rate from the "data" - * all allowed baud rates are within 3% of the initial baud rate. + /* + * NOTE: When reverse computing the baud rate from the "data" all + * allowed baud rates are within 3% of the initial baud rate. */ data = (UARK_BAUD_REF + (speed / 2)) / speed; ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#40 (text+ko) ==== @@ -266,9 +266,9 @@ static const struct ubsa_product ubsa_products[] = { /* AnyData ADU-E100A/H */ - { USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X }, + {USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X}, /* Axesstel MV100H */ - { USB_VENDOR_AXESSTEL, USB_PRODUCT_AXESSTEL_DATAMODEM }, + {USB_VENDOR_AXESSTEL, USB_PRODUCT_AXESSTEL_DATAMODEM}, /* BELKIN F5U103 */ {USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103}, /* BELKIN F5U120 */ @@ -280,9 +280,9 @@ /* Peracom */ {USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1}, /* Novatel Wireless Merlin cards */ - { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, + {USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740}, /* Novatel Wireless Merlin v740 */ - { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740 }, + {USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740}, /* Option Vodafone MC3G */ {USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G}, /* Option GlobeTrotter 3G */ @@ -292,10 +292,10 @@ /* Option GlobeTrotter 3G QUAD */ {USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD}, /* Huawei Mobile */ - { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, + {USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE}, /* Qualcomm, Inc. ZTE CDMA */ - { USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM }, - { 0, 0 } + {USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM}, + {0, 0} }; static device_method_t ubsa_methods[] = { ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#29 (text+ko) ==== @@ -154,6 +154,7 @@ static int ucom_modevent(module_t mod, int type, void *data) { + ; /* style fix */ switch (type) { case MOD_LOAD: break; ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#37 (text+ko) ==== @@ -148,7 +148,7 @@ static void uftdi_stop_read(struct ucom_softc *ucom); static void uftdi_start_write(struct ucom_softc *ucom); static void uftdi_stop_write(struct ucom_softc *ucom); -static uint8_t uftdi_8u232am_getrate(uint32_t speed, uint16_t *rate); +static uint8_t uftdi_8u232am_getrate(uint32_t speed, uint16_t *rate); static const struct usbd_config uftdi_config[UFTDI_ENDPT_MAX] = { @@ -928,7 +928,7 @@ { /* Table of the nearest even powers-of-2 for values 0..15. */ static const uint8_t roundoff[16] = { - 0, 2, 2, 4, 4, 4, 8, 8, + 0, 2, 2, 4, 4, 4, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, }; uint32_t d; @@ -936,7 +936,7 @@ uint16_t result; if ((speed < 178) || (speed > ((3000000 * 100) / 97))) - return (1); /* prevent numerical overflow */ + return (1); /* prevent numerical overflow */ /* Special cases for 2M and 3M. */ if ((speed >= ((3000000 * 100) / 103)) && @@ -949,7 +949,6 @@ result = 1; goto done; } - d = (FTDI_8U232AM_FREQ << 4) / speed; d = (d & ~15) + roundoff[d & 15]; @@ -958,21 +957,20 @@ else if (d > FTDI_8U232AM_MAX_DIV) d = FTDI_8U232AM_MAX_DIV; - /* - * Calculate the frequency needed for "d" to exactly divide down - * to our target "speed", and check that the actual frequency is - * within 3% of this. + /* + * Calculate the frequency needed for "d" to exactly divide down to + * our target "speed", and check that the actual frequency is within + * 3% of this. */ freq = (speed * d); if ((freq < ((FTDI_8U232AM_FREQ * 1600ULL) / 103)) || (freq > ((FTDI_8U232AM_FREQ * 1600ULL) / 97))) return (1); - /* - * Pack the divisor into the resultant value. The lower - * 14-bits hold the integral part, while the upper 2 bits - * encode the fractional component: either 0, 0.5, 0.25, or - * 0.125. + /* + * Pack the divisor into the resultant value. The lower 14-bits + * hold the integral part, while the upper 2 bits encode the + * fractional component: either 0, 0.5, 0.25, or 0.125. */ result = (d >> 4); if (d & 8) ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#31 (text+ko) ==== @@ -183,29 +183,28 @@ if (device_id == 0x265b8086) { return ("Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D"); } - if (device_id == 0x28308086) - return ("Intel 82801H (ICH8) USB controller USB-A"); + return ("Intel 82801H (ICH8) USB controller USB-A"); if (device_id == 0x28318086) - return ("Intel 82801H (ICH8) USB controller USB-B"); + return ("Intel 82801H (ICH8) USB controller USB-B"); if (device_id == 0x28328086) - return ("Intel 82801H (ICH8) USB controller USB-C"); + return ("Intel 82801H (ICH8) USB controller USB-C"); if (device_id == 0x28348086) - return ("Intel 82801H (ICH8) USB controller USB-D"); + return ("Intel 82801H (ICH8) USB controller USB-D"); if (device_id == 0x28358086) - return ("Intel 82801H (ICH8) USB controller USB-E"); + return ("Intel 82801H (ICH8) USB controller USB-E"); if (device_id == 0x29348086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x29358086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x29368086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x29378086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x29388086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x29398086) - return ("Intel 82801I (ICH9) USB controller"); + return ("Intel 82801I (ICH9) USB controller"); if (device_id == 0x719a8086) { return ("Intel 82443MX USB controller"); ==== //depot/projects/usb/src/sys/dev/usb/umass.c#46 (text+ko) ==== @@ -354,13 +354,15 @@ * Device reports number of sectors from READ_CAPACITY, not max * sector number. */ -#define READ_CAPACITY_OFFBY1 0x2000 - /* Device cannot handle a SCSI synchronize cache command. Normally +#define READ_CAPACITY_OFFBY1 0x2000 + /* + * Device cannot handle a SCSI synchronize cache command. Normally * this quirk would be handled in the cam layer, but for IDE bridges * we need to associate the quirk with the bridge and not the - * underlying disk device. This is handled by faking a success result. + * underlying disk device. This is handled by faking a success + * result. */ -#define NO_SYNCHRONIZE_CACHE 0x4000 +#define NO_SYNCHRONIZE_CACHE 0x4000 }; static const struct umass_devdescr umass_devdescr[] = { @@ -604,9 +606,9 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY }, - { USB_VENDOR_NETAC, USB_PRODUCT_NETAC_ONLYDISK, RID_WILDCARD, - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - IGNORE_RESIDUE + {USB_VENDOR_NETAC, USB_PRODUCT_NETAC_ONLYDISK, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE }, {USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK_40, RID_WILDCARD, UMASS_PROTO_ATAPI, @@ -848,9 +850,9 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, - { USB_VENDOR_VIA, USB_PRODUCT_VIA_USB2IDEBRIDGE, RID_WILDCARD, - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - NO_SYNCHRONIZE_CACHE + {USB_VENDOR_VIA, USB_PRODUCT_VIA_USB2IDEBRIDGE, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_SYNCHRONIZE_CACHE }, {USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_35XX, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, @@ -2944,7 +2946,7 @@ ccb->csio.dxfer_len = SHORT_INQUIRY_LENGTH; } } else if (sc->sc_transfer.cmd_data[0] == SYNCHRONIZE_CACHE) { - if (sc->sc_quirks & NO_SYNCHRONIZE_CACHE) { + if (sc->sc_quirks & NO_SYNCHRONIZE_CACHE) { ccb->csio.scsi_status = SCSI_STATUS_OK; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); ==== //depot/projects/usb/src/sys/dev/usb/ums.c#42 (text+ko) ==== @@ -261,7 +261,6 @@ if (sc->sc_flags & UMS_FLAG_REVZ) { dz = -dz; } - dt = (sc->sc_flags & UMS_FLAG_T_AXIS) ? -hid_get_data(buf, len, &sc->sc_loc_t): 0; @@ -272,7 +271,7 @@ } if (dx || dy || dz || dt || dw || - (buttons != sc->sc_status.button)) { + (buttons != sc->sc_status.button)) { DPRINTF(5, "x:%d y:%d z:%d t:%d w:%d buttons:0x%08x\n", dx, dy, dz, dt, dw, buttons); @@ -376,7 +375,6 @@ (id->bInterfaceClass != UICLASS_HID)) { return (UMATCH_NONE); } - error = hid_read_report_desc_from_usb (uaa->device, &usb_global_lock, &d_ptr, &d_len, M_TEMP, uaa->iface_index); @@ -384,9 +382,8 @@ if (error) { return (UMATCH_NONE); } - if (hid_is_collection(d_ptr, d_len, - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) { + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) { error = UMATCH_IFACECLASS; } else if ((id->bInterfaceSubClass == UISUBCLASS_BOOT) && (id->bInterfaceProtocol == UIPROTO_MOUSE)) { @@ -462,34 +459,31 @@ sc->sc_flags |= UMS_FLAG_Y_AXIS; } } - /* Try the wheel first as the Z activator since it's tradition. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags)) { + HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; } - /* * We might have both a wheel and Z direction, if so put * put the Z on the W coordinate. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_w, &flags)) { + HUG_Z), hid_input, &sc->sc_loc_w, &flags)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_W_AXIS; } } - } else if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_z, &flags)) { + } else if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_Z), hid_input, &sc->sc_loc_z, &flags)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; } } - /* * The Microsoft Wireless Intellimouse 2.0 reports it's wheel * using 0x0048, which is HUG_TWHEEL, and seems to expect you ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#42 (text+ko) ==== @@ -288,9 +288,9 @@ /* I/O DATA USB-RSAQ3 */ {USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, 0xFFFF, TYPE_PL2303X}, /* PLANEX USB-RS232 URS-03 */ - { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0xFFFF, TYPE_PL2303 }, + {USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0xFFFF, TYPE_PL2303}, /* TrendNet TU-S9 */ - { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0400, TYPE_PL2303X }, + {USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0400, TYPE_PL2303X}, /* ST Lab USB-SERIAL-4 */ {USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0300, TYPE_PL2303X}, /* IOGEAR/ATEN UC-232A (also ST Lab USB-SERIAL-1) */ ==== //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#17 (text+ko) ==== @@ -59,7 +59,7 @@ }; static const struct usbd_quirk_entry usb_quirks[] = { - { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_LCM, ANY, { UQ_HID_IGNORE }}, + {USB_VENDOR_ASUS, USB_PRODUCT_ASUS_LCM, ANY, {UQ_HID_IGNORE}}, {USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4, 0x094, {UQ_SWAP_UNICODE}}, {USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, {UQ_BAD_ADC}}, ==== //depot/projects/usb/src/sys/dev/usb/usb_template.h#9 (text+ko) ==== @@ -89,6 +89,6 @@ /* prototypes */ extern const struct usb_temp_device_desc usb_template_cdce; -extern const struct usb_temp_device_desc usb_template_msc; /* Mass Storage Class */ +extern const struct usb_temp_device_desc usb_template_msc; /* Mass Storage Class */ #endif /* _USB_TEMPLATE_H_ */ ==== //depot/projects/usb/src/sys/dev/usb/usb_template_msc.c#2 (text+ko) ==== @@ -79,7 +79,7 @@ #define STRING_MSC_SERIAL \ 'M', 0, 'a', 0, 'r', 0, 'c', 0, \ 'h', 0, ' ', 0, '2', 0, '0', 0, \ - '0', 0, '8', 0, + '0', 0, '8', 0, /* make the real string descriptors */ ==== //depot/projects/usb/src/sys/dev/usb/uscanner.c#27 (text+ko) ==== @@ -250,7 +250,7 @@ {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX425}, 0}, {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200}, USCANNER_FLAG_KEEP_OPEN}, {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F}, USCANNER_FLAG_KEEP_OPEN}, - {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400 }, 0 }, + {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400}, 0}, {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF}, 0}, {{USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480}, 0}, ==== //depot/projects/usb/src/sys/dev/usb/uslcom.c#2 (text+ko) ==== @@ -37,62 +37,63 @@ #include #ifdef USLCOM_DEBUG -#define DPRINTFN(n, x) do { if (uslcomdebug > (n)) printf x; } while (0) +#define DPRINTFN(n, x) do { if (uslcomdebug > (n)) printf x; } while (0) int uslcomdebug = 1; + #else -#define DPRINTFN(n, x) +#define DPRINTFN(n, x) #endif -#define DPRINTF(x) DPRINTFN(0, x) +#define DPRINTF(x) DPRINTFN(0, x) -#define USLCOMBUFSZ 256 -#define USLCOM_CONFIG_NO 0 -#define USLCOM_IFACE_NO 0 +#define USLCOMBUFSZ 256 +#define USLCOM_CONFIG_NO 0 +#define USLCOM_IFACE_NO 0 -#define USLCOM_SET_DATA_BITS(x) (x << 8) +#define USLCOM_SET_DATA_BITS(x) (x << 8) -#define USLCOM_WRITE 0x41 -#define USLCOM_READ 0xc1 +#define USLCOM_WRITE 0x41 +#define USLCOM_READ 0xc1 -#define USLCOM_UART 0x00 -#define USLCOM_BAUD_RATE 0x01 -#define USLCOM_DATA 0x03 -#define USLCOM_BREAK 0x05 -#define USLCOM_CTRL 0x07 +#define USLCOM_UART 0x00 +#define USLCOM_BAUD_RATE 0x01 +#define USLCOM_DATA 0x03 +#define USLCOM_BREAK 0x05 +#define USLCOM_CTRL 0x07 -#define USLCOM_UART_DISABLE 0x00 -#define USLCOM_UART_ENABLE 0x01 +#define USLCOM_UART_DISABLE 0x00 +#define USLCOM_UART_ENABLE 0x01 -#define USLCOM_CTRL_DTR_ON 0x0001 -#define USLCOM_CTRL_DTR_SET 0x0100 -#define USLCOM_CTRL_RTS_ON 0x0002 -#define USLCOM_CTRL_RTS_SET 0x0200 -#define USLCOM_CTRL_CTS 0x0010 -#define USLCOM_CTRL_DSR 0x0020 -#define USLCOM_CTRL_DCD 0x0080 +#define USLCOM_CTRL_DTR_ON 0x0001 +#define USLCOM_CTRL_DTR_SET 0x0100 +#define USLCOM_CTRL_RTS_ON 0x0002 +#define USLCOM_CTRL_RTS_SET 0x0200 +#define USLCOM_CTRL_CTS 0x0010 +#define USLCOM_CTRL_DSR 0x0020 +#define USLCOM_CTRL_DCD 0x0080 -#define USLCOM_BAUD_REF 0x384000 +#define USLCOM_BAUD_REF 0x384000 -#define USLCOM_STOP_BITS_1 0x00 -#define USLCOM_STOP_BITS_2 0x02 +#define USLCOM_STOP_BITS_1 0x00 +#define USLCOM_STOP_BITS_2 0x02 -#define USLCOM_PARITY_NONE 0x00 -#define USLCOM_PARITY_ODD 0x10 -#define USLCOM_PARITY_EVEN 0x20 +#define USLCOM_PARITY_NONE 0x00 +#define USLCOM_PARITY_ODD 0x10 +#define USLCOM_PARITY_EVEN 0x20 -#define USLCOM_BREAK_OFF 0x00 -#define USLCOM_BREAK_ON 0x01 +#define USLCOM_BREAK_OFF 0x00 +#define USLCOM_BREAK_ON 0x01 struct uslcom_softc { - struct ucom_softc sc_ucom; - device_t sc_dev; - usbd_device_handle sc_udev; + struct ucom_softc sc_ucom; + device_t sc_dev; + usbd_device_handle sc_udev; - u_char sc_msr; - u_char sc_lsr; + u_char sc_msr; + u_char sc_lsr; - u_char sc_dying; + u_char sc_dying; }; void uslcom_get_status(void *, int portno, u_char *lsr, u_char *msr); @@ -114,24 +115,24 @@ }; static const struct usb_devno uslcom_devs[] = { - { USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER }, - { USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD }, - { USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128 }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREE }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BURNSIDE }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HELICOM }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP2102 }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2 }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUUNTO }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRAQMATE }, - { USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE }, - { USB_VENDOR_USI, USB_PRODUCT_USI_MC60 } + {USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER}, + {USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD}, + {USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREE}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BURNSIDE}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HELICOM}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP2102}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUUNTO}, + {USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRAQMATE}, + {USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE}, + {USB_VENDOR_USI, USB_PRODUCT_USI_MC60} }; static device_probe_t uslcom_match; @@ -143,13 +144,13 @@ DEVMETHOD(device_probe, uslcom_match), DEVMETHOD(device_attach, uslcom_attach), DEVMETHOD(device_detach, uslcom_detach), - { 0, 0 } + {0, 0} }; static driver_t uslcom_driver = { "ucom", uslcom_methods, - sizeof (struct uslcom_softc) + sizeof(struct uslcom_softc) }; DRIVER_MODULE(uslcom, uhub, uslcom_driver, ucom_devclass, usbd_driver_load, 0); @@ -175,7 +176,7 @@ struct uslcom_softc *sc = device_get_softc(self); struct usb_attach_arg *uaa = device_get_ivars(self); usbd_device_handle dev = uaa->device; - struct ucom_softc* ucom; + struct ucom_softc *ucom; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; @@ -185,7 +186,7 @@ ucom->sc_dev = self; ucom->sc_udev = dev; ucom->sc_iface = uaa->iface; - + sc->sc_dev = self; sc->sc_udev = uaa->device; @@ -194,7 +195,6 @@ sc->sc_dying = 1; return ENXIO; } - /* get the first interface handle */ error = usbd_device2interface_handle(sc->sc_udev, USLCOM_IFACE_NO, &ucom->sc_iface); @@ -203,7 +203,6 @@ sc->sc_dying = 1; return ENXIO; } - id = usbd_get_interface_descriptor(ucom->sc_iface); ucom->sc_bulkin_no = ucom->sc_bulkout_no = -1; @@ -215,7 +214,6 @@ sc->sc_dying = 1; return ENXIO; } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) ucom->sc_bulkin_no = ed->bEndpointAddress; @@ -229,7 +227,6 @@ sc->sc_dying = 1; return ENXIO; } - ucom->sc_parent = sc; ucom->sc_portno = UCOM_UNK_PORTNO; /* bulkin, bulkout set above */ @@ -239,11 +236,11 @@ ucom->sc_opkthdrlen = 0; ucom->sc_callback = &uslcom_callback; - DPRINTF(("uslcom: in = 0x%x, out = 0x%x\n", - ucom->sc_bulkin_no, ucom->sc_bulkout_no)); + DPRINTF(("uslcom: in = 0x%x, out = 0x%x\n", + ucom->sc_bulkin_no, ucom->sc_bulkout_no)); - ucom_attach(&sc->sc_ucom); - return 0; + ucom_attach(&sc->sc_ucom); + return 0; } static int @@ -381,10 +378,10 @@ #if 0 /* XXX flow control */ - if (ISSET(t->c_cflag, CRTSCTS)) - /* rts/cts flow ctl */ - } else if (ISSET(t->c_iflag, IXON|IXOFF)) { - /* xon/xoff flow ctl */ + if (ISSET(t->c_cflag, CRTSCTS)) { + /* rts/cts flow ctl */ + } else if (ISSET(t->c_iflag, IXON | IXOFF)) { + /* xon/xoff flow ctl */ } else { /* disable flow ctl */ } @@ -397,7 +394,7 @@ uslcom_get_status(void *vsc, int portno, u_char *lsr, u_char *msr) { struct uslcom_softc *sc = vsc; - + if (msr != NULL) *msr = sc->sc_msr; if (lsr != NULL) @@ -409,7 +406,7 @@ { struct uslcom_softc *sc = vsc; usb_device_request_t req; - int brk = onoff ? USLCOM_BREAK_ON : USLCOM_BREAK_OFF; + int brk = onoff ? USLCOM_BREAK_ON : USLCOM_BREAK_OFF; req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_BREAK; @@ -418,5 +415,5 @@ USETW(req.wLength, 0); usbd_do_request(sc->sc_udev, &req, NULL); } + #endif - From owner-p4-projects@FreeBSD.ORG Fri Apr 18 22:06:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2E541065673; Fri, 18 Apr 2008 22:06:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94FC61065672 for ; Fri, 18 Apr 2008 22:06:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 833738FC12 for ; Fri, 18 Apr 2008 22:06:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IM6A7d008287 for ; Fri, 18 Apr 2008 22:06:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IM69RW008285 for perforce@freebsd.org; Fri, 18 Apr 2008 22:06:09 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 22:06:09 GMT Message-Id: <200804182206.m3IM69RW008285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 22:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=140229 Change 140229 by sam@sam_ebb on 2008/04/18 22:05:30 Make drivers consistent in handling ieee80211_start_all, ioctls, resume, other stuff related to calling the if_init method. Affected files ... .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#7 edit .. //depot/projects/vap/sys/dev/ipw/if_ipw.c#13 edit .. //depot/projects/vap/sys/dev/iwi/if_iwi.c#26 edit .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#10 edit .. //depot/projects/vap/sys/dev/malo/if_malo.c#5 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#6 edit .. //depot/projects/vap/sys/dev/ral/rt2560.c#28 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#26 edit .. //depot/projects/vap/sys/dev/usb/if_rum.c#16 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#18 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#16 edit .. //depot/projects/vap/sys/dev/wi/if_wi.c#26 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#18 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#7 (text+ko) ==== @@ -655,11 +655,8 @@ { struct ifnet *ifp = sc->sc_ifp; - if (ifp->if_flags & IFF_UP) { + if (ifp->if_flags & IFF_UP) bwi_init(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - bwi_start(ifp); - } } int @@ -1303,8 +1300,9 @@ /* Enable intrs */ bwi_enable_intrs(sc, BWI_INIT_INTRS); + BWI_UNLOCK(sc); + ieee80211_start_all(ic); /* start all vap's */ - BWI_UNLOCK(sc); return; bad: bwi_stop(sc, 1); ==== //depot/projects/vap/sys/dev/ipw/if_ipw.c#13 (text+ko) ==== @@ -847,19 +847,11 @@ { struct ipw_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; - IPW_LOCK_DECL; - - IPW_LOCK(sc); pci_write_config(dev, 0x41, 0, 1); - if (ifp->if_flags & IFF_UP) { - ipw_init_locked(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - ipw_start_locked(ifp); - } - - IPW_UNLOCK(sc); + if (ifp->if_flags & IFF_UP) + ipw_init(sc); return 0; } @@ -1852,20 +1844,21 @@ struct ipw_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 0; IPW_LOCK_DECL; + IPW_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: - IPW_LOCK(sc); if (ifp->if_flags & IFF_UP) { - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { ipw_init_locked(sc); + startall = 1; + } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) ipw_stop_locked(sc); } - IPW_UNLOCK(sc); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -1874,6 +1867,10 @@ default: error = ether_ioctl(ifp, cmd, data); } + IPW_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; } @@ -2397,11 +2394,15 @@ ipw_init(void *priv) { struct ipw_softc *sc = priv; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; IPW_LOCK_DECL; IPW_LOCK(sc); ipw_init_locked(sc); IPW_UNLOCK(sc); + + ieee80211_start_all(ic); } static void @@ -2495,8 +2496,6 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - ieee80211_start_all(ic); /* start all vap's */ - sc->flags &=~ IPW_FLAG_INIT_LOCKED; return; ==== //depot/projects/vap/sys/dev/iwi/if_iwi.c#26 (text+ko) ==== @@ -196,6 +196,7 @@ static int iwi_queue_cmd(struct iwi_softc *, int, unsigned long); static int iwi_auth_and_assoc(struct iwi_softc *, struct ieee80211vap *); static int iwi_disassociate(struct iwi_softc *, int quiet); +static void iwi_init_locked(struct iwi_softc *); static void iwi_init(void *); static int iwi_init_fw_dma(struct iwi_softc *, int); static void iwi_stop_locked(void *); @@ -891,20 +892,12 @@ { struct iwi_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; - IWI_LOCK_DECL; - - IWI_LOCK(sc); pci_write_config(dev, 0x41, 0, 1); - if (ifp->if_flags & IFF_UP) { - ifp->if_init(ifp->if_softc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - ifp->if_start(ifp); - } + if (ifp->if_flags & IFF_UP) + iwi_init(sc); - IWI_UNLOCK(sc); - return 0; } @@ -2056,16 +2049,20 @@ struct iwi_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 0; + IWI_LOCK_DECL; + IWI_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - iwi_init(sc); + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + iwi_init_locked(sc); + startall = 1; + } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - iwi_stop(sc); + iwi_stop_locked(sc); } break; case SIOCGIFMEDIA: @@ -2076,6 +2073,10 @@ error = ether_ioctl(ifp, cmd, data); break; } + IWI_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; } @@ -3072,19 +3073,15 @@ } static void -iwi_init(void *priv) +iwi_init_locked(struct iwi_softc *sc) { - struct iwi_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; struct iwi_rx_data *data; int i; - IWI_LOCK_DECL; - IWI_LOCK(sc); + IWI_LOCK_ASSERT(sc); if (sc->fw_state == IWI_FW_LOADING) { - IWI_UNLOCK(sc); device_printf(sc->sc_dev, "%s: already loading\n", __func__); return; /* XXX: condvar? */ } @@ -3157,16 +3154,27 @@ callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - - IWI_UNLOCK(sc); - - ieee80211_start_all(ic); /* start all vap's */ return; fail: IWI_STATE_END(sc, IWI_FW_LOADING); fail2: iwi_stop_locked(sc); +} + +static void +iwi_init(void *priv) +{ + struct iwi_softc *sc = priv; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + iwi_init_locked(sc); IWI_UNLOCK(sc); + + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ieee80211_start_all(ic); } static void @@ -3224,9 +3232,7 @@ { struct iwi_softc *sc = arg; - /* XXX not right */ - if (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) - iwi_init(sc); + iwi_init(sc); } /* ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#10 (text+kox) ==== @@ -562,11 +562,8 @@ pci_write_config(dev, 0x41, 0, 1); - if (ifp->if_flags & IFF_UP) { - iwn_init(ifp->if_softc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - iwn_start(ifp); - } + if (ifp->if_flags & IFF_UP) + iwn_init(sc); return 0; } @@ -2362,31 +2359,21 @@ struct iwn_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 0; + IWN_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - iwn_init(sc); + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + iwn_init_locked(sc); + startall = 1; + } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) - iwn_stop(sc); + iwn_stop_locked(sc); } break; -#if 0 -XXX Do we support mulitcast - case SIOCADDMULTI: - case SIOCDELMULTI: - ifr = (struct ifreq *)data; - error = (cmd == SIOCADDMULTI) ? - ether_addmulti(ifr, &ic->ic_ac) : - ether_delmulti(ifr, &ic->ic_ac); - - if (error == ENETRESET) - error = 0; - break; -#endif case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); @@ -2395,6 +2382,10 @@ error = ether_ioctl(ifp, cmd, data); break; } + IWN_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; } @@ -4119,28 +4110,27 @@ } void -iwn_init(void *arg) +iwn_init_locked(struct iwn_softc *sc) { - struct iwn_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; uint32_t tmp; int error, qid; - IWN_LOCK(sc); + IWN_LOCK_ASSERT(sc); /* load the firmware */ if (sc->fw_fp == NULL && (error = iwn_load_firmware(sc)) != 0) { device_printf(sc->sc_dev, "%s: could not load firmware, error %d\n", __func__, error); - goto fail; + return; } error = iwn_reset(sc); if (error != 0) { device_printf(sc->sc_dev, "%s: could not reset adapter, error %d\n", __func__, error); - goto fail; + return; } iwn_mem_lock(sc); @@ -4208,14 +4198,14 @@ if (!(IWN_READ(sc, IWN_GPIO_CTL) & IWN_GPIO_RF_ENABLED)) { device_printf(sc->sc_dev, "radio is disabled by hardware switch\n"); - goto fail; + return; } error = iwn_transfer_firmware(sc); if (error != 0) { device_printf(sc->sc_dev, "%s: could not load firmware, error %d\n", __func__, error); - goto fail; + return; } /* firmware has notified us that it is alive.. */ @@ -4231,18 +4221,26 @@ device_printf(sc->sc_dev, "%s: could not configure device, error %d\n", __func__, error); - goto fail; + return; } ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; +} + +void +iwn_init(void *arg) +{ + struct iwn_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + IWN_LOCK(sc); + iwn_init_locked(sc); IWN_UNLOCK(sc); - ieee80211_start_all(ic); - return; -fail: - IWN_UNLOCK(sc); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ieee80211_start_all(ic); } static void @@ -4452,16 +4450,17 @@ } break; case IWN_REINIT: - //XXX DEBUG - break; - iwn_stop_locked(sc); + IWN_UNLOCK(sc); iwn_init(sc); + IWN_LOCK(sc); ieee80211_notify_radio(ic, 1); break; case IWN_RADIO_ENABLE: KASSERT(sc->fw_fp != NULL, ("Fware Not Loaded, can't load from tq")); + IWN_UNLOCK(sc); iwn_init(sc); + IWN_LOCK(sc); break; case IWN_RADIO_DISABLE: ieee80211_notify_radio(ic, 0); ==== //depot/projects/vap/sys/dev/malo/if_malo.c#5 (text+ko) ==== @@ -1494,9 +1494,8 @@ } static void -malo_init(void *arg) +malo_init_locked(struct malo_softc *sc) { - struct malo_softc *sc = (struct malo_softc *) arg; struct ifnet *ifp = sc->malo_ifp; struct ieee80211com *ic = ifp->if_l2com; struct malo_hal *mh = sc->malo_mh; @@ -1505,7 +1504,7 @@ DPRINTF(sc, MALO_DEBUG_ANY, "%s: if_flags 0x%x\n", __func__, ifp->if_flags); - MALO_LOCK(sc); + MALO_LOCK_ASSERT(sc); /* * Stop anything previously setup. This is safe whether this is @@ -1518,7 +1517,7 @@ */ if (!malo_hal_reset(sc)) { if_printf(ifp, "%s: unable to reset hardware\n", __func__); - goto done; + return; } /* @@ -1528,7 +1527,7 @@ if (error != 0) { if_printf(ifp, "%s: unable to start recv logic, error %d\n", __func__, error); - goto done; + return; } /* @@ -1545,10 +1544,25 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; malo_hal_intrset(mh, sc->malo_imask); +} + +static void +malo_init(void *arg) +{ + struct malo_softc *sc = (struct malo_softc *) arg; + struct ifnet *ifp = sc->malo_ifp; + struct ieee80211com *ic = ifp->if_l2com; + + DPRINTF(sc, MALO_DEBUG_ANY, "%s: if_flags 0x%x\n", + __func__, ifp->if_flags); + + MALO_LOCK(sc); + malo_init_locked(sc); - ieee80211_start_all(ic); /* start all vap's */ -done: MALO_UNLOCK(sc); + + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ieee80211_start_all(ic); /* start all vap's */ } /* @@ -1720,11 +1734,11 @@ struct malo_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 0; + MALO_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: - MALO_LOCK(sc); if (MALO_IS_RUNNING(ifp)) { /* * To avoid rescanning another access point, @@ -1742,11 +1756,12 @@ * torn down much of our state. There's * probably a better way to deal with this. */ - if (!sc->malo_invalid) - malo_init(sc); + if (!sc->malo_invalid) { + malo_init_locked(sc); + startall = 1; + } } else malo_stop_locked(ifp, 1); - MALO_UNLOCK(sc); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -1756,6 +1771,10 @@ error = ether_ioctl(ifp, cmd, data); break; } + MALO_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; #undef MALO_IS_RUNNING } @@ -2304,9 +2323,6 @@ DPRINTF(sc, MALO_DEBUG_ANY, "%s: if_flags %x\n", __func__, ifp->if_flags); - if (ifp->if_flags & IFF_UP) { + if (ifp->if_flags & IFF_UP) malo_init(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - malo_start(ifp); - } } ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#6 (text+ko) ==== @@ -96,10 +96,10 @@ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]); static void mwl_vap_delete(struct ieee80211vap *); -static void mwl_ifinit(void *); static int mwl_setupdma(struct mwl_softc *); static int mwl_hal_reset(struct mwl_softc *sc); -static int mwl_init(struct mwl_softc *); +static int mwl_init_locked(struct mwl_softc *); +static void mwl_init(void *); static void mwl_stop_locked(struct ifnet *, int); static int mwl_reset(struct ieee80211vap *, u_long); static void mwl_stop(struct ifnet *, int); @@ -417,7 +417,7 @@ ifp->if_start = mwl_start; ifp->if_watchdog = mwl_watchdog; ifp->if_ioctl = mwl_ioctl; - ifp->if_init = mwl_ifinit; + ifp->if_init = mwl_init; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); @@ -819,11 +819,8 @@ DPRINTF(sc, MWL_DEBUG_ANY, "%s: if_flags %x\n", __func__, ifp->if_flags); - if (ifp->if_flags & IFF_UP) { + if (ifp->if_flags & IFF_UP) mwl_init(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - mwl_start(ifp); - } } void @@ -1004,14 +1001,6 @@ /* XXX 10MHz channels */ } -static void -mwl_ifinit(void *arg) -{ - struct mwl_softc *sc = arg; - - (void) mwl_init(sc); -} - /* * Inform firmware of our tx/rx dma setup. The BAR 0 * writes below are for compatibility with older firmware. @@ -1193,17 +1182,16 @@ } static int -mwl_init(struct mwl_softc *sc) +mwl_init_locked(struct mwl_softc *sc) { struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; struct mwl_hal *mh = sc->sc_mh; int error = 0; DPRINTF(sc, MWL_DEBUG_ANY, "%s: if_flags 0x%x\n", __func__, ifp->if_flags); - MWL_LOCK(sc); + MWL_LOCK_ASSERT(sc); /* * Stop anything previously setup. This is safe @@ -1216,8 +1204,7 @@ */ if (!mwl_hal_reset(sc)) { if_printf(ifp, "unable to reset hardware\n"); - error = EIO; - goto done; + return EIO; } /* @@ -1226,7 +1213,7 @@ error = mwl_startrecv(sc); if (error != 0) { if_printf(ifp, "unable to start recv logic\n"); - goto done; + return error; } /* @@ -1250,10 +1237,26 @@ ifp->if_drv_flags |= IFF_DRV_RUNNING; mwl_hal_intrset(mh, sc->sc_imask); - ieee80211_start_all(ic); /* start all vap's */ -done: + return 0; +} + +static void +mwl_init(void *arg) +{ + struct mwl_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + int error = 0; + + DPRINTF(sc, MWL_DEBUG_ANY, "%s: if_flags 0x%x\n", + __func__, ifp->if_flags); + + MWL_LOCK(sc); + error = mwl_init_locked(sc); MWL_UNLOCK(sc); - return error; + + if (error == 0) + ieee80211_start_all(ic); /* start all vap's */ } static void @@ -5191,11 +5194,12 @@ struct mwl_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *)data; - int error = 0; + int error = 0, startall; - MWL_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: + MWL_LOCK(sc); + startall = 0; if (IS_RUNNING(ifp)) { /* * To avoid rescanning another access point, @@ -5213,20 +5217,15 @@ * torn down much of our state. There's * probably a better way to deal with this. */ - if (!sc->sc_invalid) - mwl_init(sc); /* XXX lose error */ + if (!sc->sc_invalid) { + mwl_init_locked(sc); /* XXX lose error */ + startall = 1; + } } else mwl_stop_locked(ifp, 1); - break; - case SIOCADDMULTI: - case SIOCDELMULTI: - /* - * The upper layer has already installed/removed - * the multicast address(es), just recalculate the - * multicast filter for the card. - */ - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - mwl_mode_init(sc); + MWL_UNLOCK(sc); + if (startall) + ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -5237,7 +5236,6 @@ /* NB: embed these numbers to get a consistent view */ sc->sc_stats.mst_tx_packets = ifp->if_opackets; sc->sc_stats.mst_rx_packets = ifp->if_ipackets; - MWL_UNLOCK(sc); /* * NB: Drop the softc lock in case of a page fault; * we'll accept any potential inconsisentcy in the @@ -5249,18 +5247,18 @@ #ifdef MWL_DIAGAPI case SIOCGMVDIAG: /* XXX check privs */ - MWL_UNLOCK(sc); /* XXX copyout */ return mwl_ioctl_diag(sc, (struct mwl_diag *) ifr); case SIOCGMVRESET: /* XXX check privs */ + MWL_LOCK(sc); error = mwl_ioctl_reset(sc,(struct mwl_diag *) ifr); + MWL_UNLOCK(sc); break; #endif /* MWL_DIAGAPI */ default: error = ether_ioctl(ifp, cmd, data); break; } - MWL_UNLOCK(sc); return error; #undef IS_RUNNING } ==== //depot/projects/vap/sys/dev/ral/rt2560.c#28 (text) ==== @@ -459,11 +459,8 @@ struct rt2560_softc *sc = xsc; struct ifnet *ifp = sc->sc_ifp; - if (ifp->if_flags & IFF_UP) { - ifp->if_init(ifp->if_softc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - ifp->if_start(ifp); - } + if (ifp->if_flags & IFF_UP) + rt2560_init(sc); } static void @@ -2006,12 +2003,11 @@ struct rt2560_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0, startall; + int error = 0, startall = 0; + RAL_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: - RAL_LOCK(sc); - startall = 0; if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { rt2560_init_locked(sc); @@ -2022,9 +2018,6 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) rt2560_stop_locked(sc); } - RAL_UNLOCK(sc); - if (startall) /* NB: need to drop lock */ - ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -2034,6 +2027,10 @@ error = ether_ioctl(ifp, cmd, data); break; } + RAL_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; } ==== //depot/projects/vap/sys/dev/ral/rt2661.c#26 (text) ==== @@ -475,11 +475,8 @@ struct rt2661_softc *sc = xsc; struct ifnet *ifp = sc->sc_ifp; - if (ifp->if_flags & IFF_UP) { - ifp->if_init(ifp->if_softc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - ifp->if_start(ifp); - } + if (ifp->if_flags & IFF_UP) + rt2661_init(sc); } static void @@ -1748,12 +1745,11 @@ struct rt2661_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0, startall; + int error = 0, startall = 0; + RAL_LOCK(sc); switch (cmd) { case SIOCSIFFLAGS: - RAL_LOCK(sc); - startall = 0; if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { rt2661_init_locked(sc); @@ -1764,9 +1760,6 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) rt2661_stop_locked(sc); } - RAL_UNLOCK(sc); - if (startall) /* NB: need to drop lock */ - ieee80211_start_all(ic); break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: @@ -1776,6 +1769,10 @@ error = ether_ioctl(ifp, cmd, data); break; } + RAL_UNLOCK(sc); + + if (startall) + ieee80211_start_all(ic); return error; } ==== //depot/projects/vap/sys/dev/usb/if_rum.c#16 (text+ko) ==== @@ -186,6 +186,7 @@ static const char *rum_get_rf(int); static void rum_read_eeprom(struct rum_softc *); static int rum_bbp_init(struct rum_softc *); +static void rum_init_locked(struct rum_softc *); static void rum_init(void *); static void rum_stop(void *); static int rum_load_microcode(struct rum_softc *, const u_char *, @@ -1423,17 +1424,17 @@ struct rum_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 0; RUM_LOCK(sc); - switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if (ifp->if_drv_flags & IFF_DRV_RUNNING) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + rum_init(sc); + startall = 1; + } else rum_update_promisc(sc); - else - rum_init(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) rum_stop(sc); @@ -1446,9 +1447,10 @@ default: error = ether_ioctl(ifp, cmd, data); } - RUM_UNLOCK(sc); + if (startall) + ieee80211_start_all(ic); return error; } @@ -2020,10 +2022,9 @@ } static void -rum_init(void *priv) +rum_init_locked(struct rum_softc *sc) { #define N(a) (sizeof (a) / sizeof ((a)[0])) - struct rum_softc *sc = priv; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct rum_rx_data *data; @@ -2139,9 +2140,6 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - - ieee80211_start_all(ic); /* start all vap's */ - return; fail: rum_stop(sc); @@ -2149,6 +2147,21 @@ } static void +rum_init(void *priv) +{ + struct rum_softc *sc = priv; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + + RUM_LOCK(sc); + rum_init_locked(sc); + RUM_UNLOCK(sc); + + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ieee80211_start_all(ic); /* start all vap's */ +} + +static void rum_stop(void *priv) { struct rum_softc *sc = priv; ==== //depot/projects/vap/sys/dev/usb/if_ural.c#18 (text+ko) ==== @@ -177,6 +177,7 @@ static int ural_bbp_init(struct ural_softc *); static void ural_set_txantenna(struct ural_softc *, int); static void ural_set_rxantenna(struct ural_softc *, int); +static void ural_init_locked(struct ural_softc *); static void ural_init(void *); static void ural_stop(void *); static int ural_raw_xmit(struct ieee80211_node *, struct mbuf *, @@ -1517,17 +1518,17 @@ struct ural_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *) data; - int error = 0; + int error = 0, startall = 1; RAL_LOCK(sc); - switch (cmd) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if (ifp->if_drv_flags & IFF_DRV_RUNNING) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + ural_init_locked(sc); + startall = 1; + } else ural_update_promisc(sc); - else - ural_init(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) ural_stop(sc); @@ -1541,9 +1542,10 @@ error = ether_ioctl(ifp, cmd, data); break; } - RAL_UNLOCK(sc); + if (startall) + ieee80211_start_all(ic); return error; } @@ -2184,10 +2186,9 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 22:12:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9B1A1065670; Fri, 18 Apr 2008 22:12:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B55E106566B for ; Fri, 18 Apr 2008 22:12:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 789108FC12 for ; Fri, 18 Apr 2008 22:12:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3IMCHNU008497 for ; Fri, 18 Apr 2008 22:12:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IMCGZu008495 for perforce@freebsd.org; Fri, 18 Apr 2008 22:12:16 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 22:12:16 GMT Message-Id: <200804182212.m3IMCGZu008495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 22:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=140230 Change 140230 by sam@sam_ebb on 2008/04/18 22:11:38 IFC @ 140229 Affected files ... .. //depot/projects/vap/Makefile.inc1#9 integrate .. //depot/projects/vap/etc/rc.d/dhclient#5 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 integrate .. //depot/projects/vap/include/dirent.h#3 integrate .. //depot/projects/vap/include/stdio.h#4 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/vap/lib/libc/gen/directory.3#3 integrate .. //depot/projects/vap/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/vap/lib/libc/gen/tcgetsid.3#1 branch .. //depot/projects/vap/lib/libc/gen/termios.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/_flock_stub.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/asprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fgetwc.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fgetws.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fputwc.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fputws.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/freopen.c#5 integrate .. //depot/projects/vap/lib/libc/stdio/fseek.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/fwide.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/local.h#3 integrate .. //depot/projects/vap/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/snprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/sscanf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/ungetwc.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/vap/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vswprintf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vswscanf.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/vap/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/vap/lib/libc/sys/access.2#6 integrate .. //depot/projects/vap/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/vap/lib/libc/sys/chown.2#3 integrate .. //depot/projects/vap/lib/libc/sys/execve.2#3 integrate .. //depot/projects/vap/lib/libc/sys/link.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mkfifo.2#3 integrate .. //depot/projects/vap/lib/libc/sys/mknod.2#3 integrate .. //depot/projects/vap/lib/libc/sys/open.2#3 integrate .. //depot/projects/vap/lib/libc/sys/readlink.2#5 integrate .. //depot/projects/vap/lib/libc/sys/rename.2#3 integrate .. //depot/projects/vap/lib/libc/sys/stat.2#3 integrate .. //depot/projects/vap/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/vap/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/vap/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/vap/lib/libfetch/common.c#6 integrate .. //depot/projects/vap/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/vap/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/vap/share/man/man4/nfe.4#3 integrate .. //depot/projects/vap/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/vap/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/vap/sys/dev/ata/ata-disk.c#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/vap/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/vap/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/vap/sys/dev/ieee488/ibfoo.c#3 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/vap/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/vap/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/vap/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/vap/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.h#3 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/inode.h#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/vap/sys/i386/include/cpufunc.h#6 integrate .. //depot/projects/vap/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/vap/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/vap/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/vap/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/vap/sys/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/vap/sys/ia64/ia64/clock.c#6 integrate .. //depot/projects/vap/sys/ia64/ia64/nexus.c#7 integrate .. //depot/projects/vap/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#11 integrate .. //depot/projects/vap/sys/kern/kern_linker.c#8 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/vap/sys/kern/kern_subr.c#5 integrate .. //depot/projects/vap/sys/kern/kern_switch.c#9 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#9 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#11 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#14 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#9 integrate .. //depot/projects/vap/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#12 integrate .. //depot/projects/vap/sys/kern/tty.c#8 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#11 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/vap/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/vap/sys/mips/mips/cache.c#2 integrate .. //depot/projects/vap/sys/mips/mips/copystr.S#2 integrate .. //depot/projects/vap/sys/net/bpf.c#13 integrate .. //depot/projects/vap/sys/net/if_tap.c#6 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/include/ng_bluetooth.h#3 integrate .. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.c#8 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/vap/sys/netinet/in.h#7 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_options.c#4 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#9 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/vap/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#5 integrate .. //depot/projects/vap/sys/netinet/sctputil.h#3 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/vap/sys/nfsclient/nfs_lock.c#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/vap/sys/nfsclient/nfsnode.h#7 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/vap/sys/powerpc/aim/locore.S#4 integrate .. //depot/projects/vap/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/vap/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/vap/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/vap/sys/sparc64/pci/apb.c#6 integrate .. //depot/projects/vap/sys/sparc64/pci/ofw_pci_if.m#5 integrate .. //depot/projects/vap/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/vap/sys/sparc64/pci/ofw_pcib_subr.c#5 integrate .. //depot/projects/vap/sys/sparc64/pci/ofw_pcib_subr.h#3 integrate .. //depot/projects/vap/sys/sparc64/pci/ofw_pcibus.c#6 integrate .. //depot/projects/vap/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/vap/sys/sparc64/pci/psychovar.h#5 integrate .. //depot/projects/vap/sys/sys/lockf.h#7 integrate .. //depot/projects/vap/sys/sys/param.h#18 integrate .. //depot/projects/vap/sys/sys/proc.h#14 integrate .. //depot/projects/vap/sys/sys/sched.h#9 integrate .. //depot/projects/vap/sys/sys/sysctl.h#8 integrate .. //depot/projects/vap/sys/sys/termios.h#3 integrate .. //depot/projects/vap/sys/sys/ttycom.h#5 integrate .. //depot/projects/vap/sys/sys/vnode.h#12 integrate .. //depot/projects/vap/sys/ufs/ufs/inode.h#6 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/vap/sys/vm/vm_glue.c#8 integrate .. //depot/projects/vap/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/vap/usr.bin/env/env.1#3 integrate .. //depot/projects/vap/usr.bin/env/env.c#3 integrate .. //depot/projects/vap/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/vap/usr.sbin/ndiscvt/inf.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/info/perform.c#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,10 +963,12 @@ # # cross-tools: Build cross-building tools # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif +.endif +.if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif ==== //depot/projects/vap/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dhclient,v 1.31 2008/02/01 23:43:58 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.32 2008/04/15 23:03:35 brooks Exp $ # # PROVIDE: dhclient @@ -26,6 +26,10 @@ if [ -n "$pids" ]; then exit 0 fi + elif [ -e /var/run/dhclient.pid ]; then + if [ -n "`pgrep -F /var/run/dhclient.pid`" ]; then + exit 0 + fi fi fi ==== //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 (text+ko) ==== @@ -1,12 +1,19 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ +SRCS+= cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c + elflink.c \ + peigen.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec + +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/vap/include/dirent.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.15 2007/11/20 01:49:00 jb Exp $ + * $FreeBSD: src/include/dirent.h,v 1.16 2008/04/16 18:59:35 delphij Exp $ */ #ifndef _DIRENT_H_ @@ -100,6 +100,7 @@ int getdirentries(int, char *, int, long *); #endif DIR *opendir(const char *); +DIR *fdopendir(int); struct dirent * readdir(DIR *); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 ==== //depot/projects/vap/include/stdio.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $ */ #ifndef _STDIO_H_ @@ -72,9 +72,6 @@ int _size; }; -/* hold a buncha junk that would grow the ABI */ -struct __sFILEX; - /* * stdio state variables. * @@ -98,15 +95,19 @@ * that does not match the previous one in _bf. When this happens, * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. + * + * Certain members of __sFILE are accessed directly via macros or + * inline functions. To preserve ABI compat, these members must not + * be disturbed. These members are marked below with (*). */ typedef struct __sFILE { - unsigned char *_p; /* current position in (some) buffer */ - int _r; /* read space left for getc() */ - int _w; /* write space left for putc() */ - short _flags; /* flags, below; this FILE is free if 0 */ - short _file; /* fileno, if Unix descriptor, else -1 */ + unsigned char *_p; /* (*) current position in (some) buffer */ + int _r; /* (*) read space left for getc() */ + int _w; /* (*) write space left for putc() */ + short _flags; /* (*) flags, below; this FILE is free if 0 */ + short _file; /* (*) fileno, if Unix descriptor, else -1 */ struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ - int _lbfsize; /* 0 or -_bf._size, for inline putc */ + int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */ /* operations */ void *_cookie; /* cookie passed to io functions */ @@ -117,7 +118,7 @@ /* separate buffer for long sequences of ungetc() */ struct __sbuf _ub; /* ungetc buffer */ - struct __sFILEX *_extra; /* additions to FILE to not break ABI */ + unsigned char *_up; /* saved _p when _p is doing ungetc data */ int _ur; /* saved _r when _r is counting ungetc data */ /* tricks to meet minimum requirements even when malloc() fails */ @@ -130,6 +131,12 @@ /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ fpos_t _offset; /* current lseek offset */ + + struct pthread_mutex *_fl_mutex; /* used for MT-safety */ + struct pthread *_fl_owner; /* current owner */ + int _fl_count; /* recursive lock count */ + int _orientation; /* orientation for fwide() */ + __mbstate_t _mbstate; /* multibyte conversion state */ } FILE; #ifndef _STDSTREAM_DECLARED ==== //depot/projects/vap/lib/libc/gen/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.133 2008/03/29 16:19:35 das Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.135 2008/04/16 18:59:35 delphij Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -63,7 +63,7 @@ setjmp.3 setmode.3 setproctitle.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 \ statvfs.3 stringlist.3 \ - strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ + strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 tcgetsid.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3 @@ -72,6 +72,7 @@ MLINKS+=ctermid.3 ctermid_r.3 MLINKS+=devname.3 devname_r.3 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \ + directory.3 fdopendir.3 \ directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \ directory.3 seekdir.3 directory.3 telldir.3 MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \ ==== //depot/projects/vap/lib/libc/gen/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.8 2008/01/26 17:09:40 yar Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.10 2008/04/16 18:59:36 delphij Exp $ */ FBSD_1.0 { @@ -329,6 +329,7 @@ }; FBSD_1.1 { + fdopendir; fts_open; fts_close; fts_read; @@ -337,6 +338,7 @@ fts_get_clientptr; fts_get_stream; fts_set_clientptr; + tcgetsid; }; FBSDprivate_1.0 { ==== //depot/projects/vap/lib/libc/gen/directory.3#3 (text+ko) ==== @@ -26,13 +26,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.16 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.17 2008/04/16 18:59:36 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 16, 2008 .Dt DIRECTORY 3 .Os .Sh NAME .Nm opendir , +.Nm fdopendir , .Nm readdir , .Nm readdir_r , .Nm telldir , @@ -48,6 +49,8 @@ .In dirent.h .Ft DIR * .Fn opendir "const char *filename" +.Ft DIR * +.Fn fdopendir "int fd" .Ft struct dirent * .Fn readdir "DIR *dirp" .Ft int @@ -84,6 +87,36 @@ enough memory to hold the whole thing. .Pp The +.Fn fdopendir +function is equivalent to the +.Fn opendir +function except that the directory is specified by a file descriptor +.Fa fd +rather than by a name. +The file offset associated with the file descriptor at the time of the call +determines which entries are returned. +.Pp +Upon successful return from +.Fn fdopendir , +the file descriptor is under the control of the system, +and if any attempt is made to close the file descriptor, +or to modify the state of the associated description other than by means +of +.Fn closedir , +.Fn readdir , +.Fn readdir_r , +or +.Fn rewinddir , +the behavior is undefined. +Upon calling +.Fn closedir +the file descriptor is closed. +The +.Dv FD_CLOEXEC +flag is set on the file descriptor by a successful call to +.Fn fdopendir . +.Pp +The .Fn readdir function returns a pointer to the next directory entry. @@ -202,3 +235,7 @@ .Fn dirfd functions appeared in .Bx 4.2 . +The +.Fn fdopendir +function appeared in +.Fx 8.0 . ==== //depot/projects/vap/lib/libc/gen/opendir.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)opendir.c 8.8 (Berkeley) 5/1/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.23 2007/01/09 00:27:54 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.25 2008/04/16 18:59:36 delphij Exp $"); #include "namespace.h" #include @@ -47,32 +47,38 @@ #include "un-namespace.h" #include "telldir.h" + +static DIR * __opendir_common(int, const char *, int); + /* * Open a directory. */ DIR * -opendir(name) - const char *name; +opendir(const char *name) { return (__opendir2(name, DTF_HIDEW|DTF_NODUP)); } +/* + * Open a directory with existing file descriptor. + */ +DIR * +fdopendir(int fd) +{ + + return (__opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP)); +} + DIR * -__opendir2(name, flags) - const char *name; - int flags; +__opendir2(const char *name, int flags) { - DIR *dirp; int fd; - int incr; - int saved_errno; - int unionstack; struct stat statb; /* * stat() before _open() because opening of special files may be - * harmful. _fstat() after open because the file may have changed. + * harmful. */ if (stat(name, &statb) != 0) return (NULL); @@ -82,7 +88,24 @@ } if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1) return (NULL); + + return __opendir_common(fd, name, flags); +} + +/* + * Common routine for opendir(3), __opendir2(3) and fdopendir(3). + */ +static DIR * +__opendir_common(int fd, const char *name, int flags) +{ + DIR *dirp; + int incr; + int saved_errno; + int unionstack; + struct stat statb; + dirp = NULL; + /* _fstat() the open handler because the file may have changed. */ if (_fstat(fd, &statb) != 0) goto fail; if (!S_ISDIR(statb.st_mode)) { ==== //depot/projects/vap/lib/libc/gen/termios.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.14 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.15 2008/04/15 08:33:32 davidxu Exp $"); #include "namespace.h" #include @@ -99,6 +99,17 @@ return ((pid_t)s); } +pid_t +tcgetsid(int fd) +{ + int s; + + if (_ioctl(fd, TIOCGSID, &s) < 0) + return ((pid_t)-1); + + return ((pid_t)s); +} + speed_t cfgetospeed(t) const struct termios *t; ==== //depot/projects/vap/lib/libc/stdio/_flock_stub.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.15 2007/01/12 07:31:30 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.16 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -55,31 +55,21 @@ __weak_reference(_ftrylockfile, ftrylockfile); __weak_reference(_funlockfile, funlockfile); -/* - * We need to retain binary compatibility for a while. So pretend - * that _lock is part of FILE * even though it is dereferenced off - * _extra now. When we stop encoding the size of FILE into binaries - * this can be changed in stdio.h. This will reduce the amount of - * code that has to change in the future (just remove this comment - * and #define). - */ -#define _lock _extra - void _flockfile(FILE *fp) { pthread_t curthread = _pthread_self(); - if (fp->_lock->fl_owner == curthread) - fp->_lock->fl_count++; + if (fp->_fl_owner == curthread) + fp->_fl_count++; else { /* * Make sure this mutex is treated as a private * internal mutex: */ - _pthread_mutex_lock(&fp->_lock->fl_mutex); - fp->_lock->fl_owner = curthread; - fp->_lock->fl_count = 1; + _pthread_mutex_lock(&fp->_fl_mutex); + fp->_fl_owner = curthread; + fp->_fl_count = 1; } } @@ -98,15 +88,15 @@ pthread_t curthread = _pthread_self(); int ret = 0; - if (fp->_lock->fl_owner == curthread) - fp->_lock->fl_count++; + if (fp->_fl_owner == curthread) + fp->_fl_count++; /* * Make sure this mutex is treated as a private * internal mutex: */ - else if (_pthread_mutex_trylock(&fp->_lock->fl_mutex) == 0) { - fp->_lock->fl_owner = curthread; - fp->_lock->fl_count = 1; + else if (_pthread_mutex_trylock(&fp->_fl_mutex) == 0) { + fp->_fl_owner = curthread; + fp->_fl_count = 1; } else ret = -1; @@ -121,26 +111,26 @@ /* * Check if this file is owned by the current thread: */ - if (fp->_lock->fl_owner == curthread) { + if (fp->_fl_owner == curthread) { /* * Check if this thread has locked the FILE * more than once: */ - if (fp->_lock->fl_count > 1) + if (fp->_fl_count > 1) /* * Decrement the count of the number of * times the running thread has locked this * file: */ - fp->_lock->fl_count--; + fp->_fl_count--; else { /* * The running thread will release the * lock now: */ - fp->_lock->fl_count = 0; - fp->_lock->fl_owner = NULL; - _pthread_mutex_unlock(&fp->_lock->fl_mutex); + fp->_fl_count = 0; + fp->_fl_owner = NULL; + _pthread_mutex_unlock(&fp->_fl_mutex); } } } ==== //depot/projects/vap/lib/libc/stdio/asprintf.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.14 2008/04/17 22:17:53 jhb Exp $"); #include #include @@ -43,7 +43,6 @@ int ret; va_list ap; FILE f; - struct __sFILEX ext; f._file = -1; f._flags = __SWR | __SSTR | __SALC; @@ -54,8 +53,8 @@ return (-1); } f._bf._size = f._w = 127; /* Leave room for the NUL */ - f._extra = &ext; - INITEXTRA(&f); + f._orientation = 0; + memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */ va_end(ap); ==== //depot/projects/vap/lib/libc/stdio/fgetwc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.13 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -71,7 +71,7 @@ return (wc); } do { - nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); + nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_mbstate); if (nconv == (size_t)-1) break; else if (nconv == (size_t)-2) ==== //depot/projects/vap/lib/libc/stdio/fgetws.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.7 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -62,7 +62,7 @@ nl = memchr(fp->_p, '\n', fp->_r); nconv = __mbsnrtowcs(wsp, &src, nl != NULL ? (nl - fp->_p + 1) : fp->_r, - n - 1, &fp->_extra->mbstate); + n - 1, &fp->_mbstate); if (nconv == (size_t)-1) /* Conversion error */ goto error; @@ -86,7 +86,7 @@ if (wsp == ws) /* EOF */ goto error; - if (!__mbsinit(&fp->_extra->mbstate)) + if (!__mbsinit(&fp->_mbstate)) /* Incomplete character */ goto error; *wsp++ = L'\0'; ==== //depot/projects/vap/lib/libc/stdio/findfp.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.31 2007/01/09 00:28:06 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.32 2008/04/17 22:17:53 jhb Exp $"); #include #include @@ -54,36 +54,19 @@ #define NDYNAMIC 10 /* add ten more whenever necessary */ #define std(flags, file) \ - {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \ - {0}, __sFX + file} + {0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite} /* p r w flags file _bf z cookie close read seek write */ - /* _ub _extra */ + /* the usual - (stdin + stdout + stderr) */ static FILE usual[FOPEN_MAX - 3]; -static struct __sFILEX usual_extra[FOPEN_MAX - 3]; static struct glue uglue = { NULL, FOPEN_MAX - 3, usual }; -static struct __sFILEX __sFX[3]; - -/* - * We can't make this 'static' until 6.0-current due to binary - * compatibility concerns. This also means we cannot change the - * sizeof(FILE) until that time either and must continue to use the - * __sFILEX stuff to add to FILE. - */ -FILE __sF[3] = { +static FILE __sF[3] = { std(__SRD, STDIN_FILENO), std(__SWR, STDOUT_FILENO), std(__SWR|__SNBF, STDERR_FILENO) }; -/* - * The following kludge is done to ensure enough binary compatibility - * with future versions of libc. Or rather it allows us to work with - * libraries that have been built with a newer libc that defines these - * symbols and expects libc to provide them. We only have need to support - * i386 because it is the only "old" system we have deployed. - */ FILE *__stdinp = &__sF[0]; FILE *__stdoutp = &__sF[1]; FILE *__stderrp = &__sF[2]; @@ -109,25 +92,17 @@ { struct glue *g; static FILE empty; - static struct __sFILEX emptyx; FILE *p; - struct __sFILEX *fx; - g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) + - n * sizeof(struct __sFILEX)); + g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE)); if (g == NULL) return (NULL); p = (FILE *)ALIGN(g + 1); - fx = (struct __sFILEX *)&p[n]; g->next = NULL; g->niobs = n; g->iobs = p; - while (--n >= 0) { - *p = empty; - p->_extra = fx; - *p->_extra = emptyx; - p++, fx++; - } + while (--n >= 0) + *p++ = empty; return (g); } @@ -175,8 +150,8 @@ fp->_lb._base = NULL; /* no line buffer */ fp->_lb._size = 0; /* fp->_lock = NULL; */ /* once set always set (reused) */ - fp->_extra->orientation = 0; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + fp->_orientation = 0; + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); return (fp); } @@ -229,17 +204,8 @@ void __sinit() { - int i; - THREAD_LOCK(); - if (__sdidinit == 0) { - /* Set _extra for the usual suspects. */ - for (i = 0; i < FOPEN_MAX - 3; i++) - usual[i]._extra = &usual_extra[i]; - - /* Make sure we clean up on exit. */ - __cleanup = _cleanup; /* conservative */ - __sdidinit = 1; - } - THREAD_UNLOCK(); + /* Make sure we clean up on exit. */ + __cleanup = _cleanup; /* conservative */ + __sdidinit = 1; } ==== //depot/projects/vap/lib/libc/stdio/fputwc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.11 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -56,8 +56,7 @@ *buf = (unsigned char)wc; len = 1; } else { - if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == - (size_t)-1) { + if ((len = __wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } ==== //depot/projects/vap/lib/libc/stdio/fputws.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.6 2004/07/21 10:54:57 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.7 2008/04/17 22:17:53 jhb Exp $"); #include "namespace.h" #include @@ -55,7 +55,7 @@ iov.iov_base = buf; do { nbytes = __wcsnrtombs(buf, &ws, SIZE_T_MAX, sizeof(buf), - &fp->_extra->mbstate); + &fp->_mbstate); if (nbytes == (size_t)-1) goto error; iov.iov_len = uio.uio_resid = nbytes; ==== //depot/projects/vap/lib/libc/stdio/freopen.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.20 2008/02/27 21:25:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.21 2008/04/17 22:17:54 jhb Exp $"); #include "namespace.h" #include @@ -182,8 +182,8 @@ if (HASLB(fp)) FREELB(fp); fp->_lb._size = 0; - fp->_extra->orientation = 0; - memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); + fp->_orientation = 0; + memset(&fp->_mbstate, 0, sizeof(mbstate_t)); if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ ==== //depot/projects/vap/lib/libc/stdio/fseek.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)fseek.c 8.3 (Berkeley) 1/2/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.43 2007/06/18 02:09:08 ache Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 18 23:29:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C481065671; Fri, 18 Apr 2008 23:29:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE790106566C for ; Fri, 18 Apr 2008 23:29:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE7D48FC12 for ; Fri, 18 Apr 2008 23:29:45 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3INTjao012076 for ; Fri, 18 Apr 2008 23:29:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3INTjxh012074 for perforce@freebsd.org; Fri, 18 Apr 2008 23:29:45 GMT (envelope-from sam@freebsd.org) Date: Fri, 18 Apr 2008 23:29:45 GMT Message-Id: <200804182329.m3INTjxh012074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2008 23:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=140232 Change 140232 by sam@sam_ebb on 2008/04/18 23:28:59 make it build Affected files ... .. //depot/projects/vap/sys/dev/iwn/if_iwn.c#11 edit Differences ... ==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#11 (text+kox) ==== @@ -173,7 +173,9 @@ void iwn_stop_master(struct iwn_softc *); int iwn_reset(struct iwn_softc *); void iwn_hw_config(struct iwn_softc *); +void iwn_init_locked(struct iwn_softc *); void iwn_init(void *); +void iwn_stop_locked(struct iwn_softc *); void iwn_stop(struct iwn_softc *); static void iwn_scan_start(struct ieee80211com *); static void iwn_scan_end(struct ieee80211com *); @@ -4113,7 +4115,6 @@ iwn_init_locked(struct iwn_softc *sc) { struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; uint32_t tmp; int error, qid; @@ -4243,7 +4244,7 @@ ieee80211_start_all(ic); } -static void +void iwn_stop_locked(struct iwn_softc *sc) { struct ifnet *ifp = sc->sc_ifp; From owner-p4-projects@FreeBSD.ORG Sat Apr 19 02:52:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061161065670; Sat, 19 Apr 2008 02:52:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC7CB106566B for ; Sat, 19 Apr 2008 02:52:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB9E18FC17 for ; Sat, 19 Apr 2008 02:52:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J2qO2d031614 for ; Sat, 19 Apr 2008 02:52:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J2qOAI031612 for perforce@freebsd.org; Sat, 19 Apr 2008 02:52:24 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 02:52:24 GMT Message-Id: <200804190252.m3J2qOAI031612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 02:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=140233 Change 140233 by sam@sam_ebb on 2008/04/19 02:51:27 o convert to use common phy code o fixup ioctl path o fix rate selection in xmit path Now my 4309 can associate w/ wpa and pass traffic before it gets confused and stops working. Affected files ... .. //depot/projects/vap/sys/dev/bwi/bwimac.c#4 edit .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#8 edit .. //depot/projects/vap/sys/dev/bwi/if_bwivar.h#5 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/bwimac.c#4 (text+ko) ==== @@ -66,6 +66,7 @@ #include #include #include +#include #include @@ -89,6 +90,7 @@ static void bwi_mac_set_retry_lim(struct bwi_mac *, const struct bwi_retry_lim *); static void bwi_mac_set_ackrates(struct bwi_mac *, + const struct ieee80211_rate_table *rt, const struct ieee80211_rateset *); static int bwi_mac_gpio_init(struct bwi_mac *); @@ -1344,6 +1346,7 @@ struct bwi_phy *phy = &mac->mac_phy; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; + const struct ieee80211_rate_table *rt; struct bwi_retry_lim lim; uint16_t cw_min; @@ -1366,14 +1369,21 @@ /* * XXX MAC level acknowledge and CW min/max should depend * on the char rateset of the IBSS/BSS to join. + * XXX this is all wrong; should be done on channel change */ + if (phy->phy_mode == IEEE80211_MODE_11B) { + rt = ieee80211_get_ratetable( + ieee80211_find_channel(ic, 2412, IEEE80211_CHAN_B)); + bwi_mac_set_ackrates(mac, rt, + &ic->ic_sup_rates[IEEE80211_MODE_11B]); + } else { + rt = ieee80211_get_ratetable( + ieee80211_find_channel(ic, 2412, IEEE80211_CHAN_G)); + bwi_mac_set_ackrates(mac, rt, + &ic->ic_sup_rates[IEEE80211_MODE_11G]); + } /* - * Set MAC level acknowledge rates - */ - bwi_mac_set_ackrates(mac, &ic->ic_sup_rates[phy->phy_mode]); - - /* * Set CW min */ if (phy->phy_mode == IEEE80211_MODE_11B) @@ -1406,21 +1416,22 @@ } static void -bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rateset *rs) +bwi_mac_set_ackrates(struct bwi_mac *mac, const struct ieee80211_rate_table *rt, + const struct ieee80211_rateset *rs) { int i; /* XXX not standard conforming */ for (i = 0; i < rs->rs_nrates; ++i) { - enum ieee80211_modtype modtype; + enum ieee80211_phytype modtype; uint16_t ofs; - modtype = ieee80211_rate2modtype(rs->rs_rates[i]); + modtype = ieee80211_rate2phytype(rt, rs->rs_rates[i]); switch (modtype) { - case IEEE80211_MODTYPE_DS: + case IEEE80211_T_DS: ofs = 0x4c0; break; - case IEEE80211_MODTYPE_OFDM: + case IEEE80211_T_OFDM: ofs = 0x480; break; default: ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#8 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include #include +#include #include @@ -523,6 +524,8 @@ ic->ic_scan_end = bwi_scan_end; ic->ic_set_channel = bwi_set_channel; + sc->sc_rates = ieee80211_get_ratetable(ic->ic_curchan); + /* * Attach bpf. */ @@ -1301,8 +1304,6 @@ bwi_enable_intrs(sc, BWI_INIT_INTRS); BWI_UNLOCK(sc); - - ieee80211_start_all(ic); /* start all vap's */ return; bad: bwi_stop(sc, 1); @@ -1317,7 +1318,7 @@ struct bwi_softc *sc = ifp->if_softc; struct ieee80211com *ic = ifp->if_l2com; struct ifreq *ifr = (struct ifreq *)req; - int error = 0; + int error = 0, startall = 0; BWI_LOCK(sc); @@ -1347,17 +1348,15 @@ } if (ifp->if_flags & IFF_UP) { - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { bwi_init(sc); + startall = 1; + } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) bwi_stop(sc, 1); } break; - case SIOCADDMULTI: - case SIOCDELMULTI: - /* XXX */ - break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); @@ -1369,6 +1368,8 @@ BWI_UNLOCK(sc); + if (startall) + ieee80211_start_all(ic); return error; #undef IS_RUNNING } @@ -1715,7 +1716,7 @@ bwi_set_channel(struct ieee80211com *ic) { struct bwi_softc *sc = ic->ic_ifp->if_softc; - const struct ieee80211_channel *c = ic->ic_curchan; + struct ieee80211_channel *c = ic->ic_curchan; struct bwi_mac *mac; BWI_LOCK(sc); @@ -1724,6 +1725,8 @@ mac = (struct bwi_mac *)sc->sc_cur_regwin; bwi_rf_set_chan(mac, ieee80211_chan2ieee(ic, c), 0); + sc->sc_rates = ieee80211_get_ratetable(c); + /* * Setup radio tap channel freq and flags */ @@ -2936,18 +2939,18 @@ } static __inline void -bwi_plcp_header(void *plcp, int pkt_len, uint8_t rate) +bwi_plcp_header(const struct ieee80211_rate_table *rt, + void *plcp, int pkt_len, uint8_t rate) { - enum ieee80211_modtype modtype; + enum ieee80211_phytype modtype; /* * Assume caller has zeroed 'plcp' */ - - modtype = ieee80211_rate2modtype(rate); - if (modtype == IEEE80211_MODTYPE_OFDM) + modtype = ieee80211_rate2phytype(rt, rate); + if (modtype == IEEE80211_T_OFDM) bwi_ofdm_plcp_header(plcp, pkt_len, rate); - else if (modtype == IEEE80211_MODTYPE_DS) + else if (modtype == IEEE80211_T_DS) bwi_ds_plcp_header(plcp, pkt_len, rate); else panic("unsupport modulation type %u\n", modtype); @@ -2971,7 +2974,7 @@ uint32_t mac_ctrl; uint16_t phy_ctrl; bus_addr_t paddr; - int pkt_len, error; + int type, ismcast, pkt_len, error; #if 0 const uint8_t *p; int i; @@ -2982,6 +2985,8 @@ mac = (struct bwi_mac *)sc->sc_cur_regwin; wh = mtod(m, struct ieee80211_frame *); + type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; + ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1); /* Get 802.11 frame len before prepending TX header */ pkt_len = m->m_pkthdr.len + IEEE80211_CRC_LEN; @@ -2991,13 +2996,13 @@ */ bzero(tb->tb_rate_idx, sizeof(tb->tb_rate_idx)); tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; - if (IEEE80211_IS_MULTICAST(wh->i_addr1)) + if (type != IEEE80211_FC0_TYPE_DATA || (m->m_flags & M_EAPOL)) { + rate = rate_fb = tp->mgmtrate; + } else if (ismcast) { rate = rate_fb = tp->mcastrate; - else if (m->m_flags & M_EAPOL) - rate = rate_fb = tp->mgmtrate; - else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = rate_fb = tp->ucastrate; - else { + } else { tb->tb_rate_idx[0] = ieee80211_amrr_choose(ni, &BWI_NODE(ni)->amn); rate = ni->ni_txrate; @@ -3020,7 +3025,7 @@ sc->sc_tx_th.wt_flags = 0; if (wh->i_fc[1] & IEEE80211_FC1_WEP) sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP; - if (ieee80211_rate2modtype(rate) == IEEE80211_MODTYPE_DS && + if (ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_DS && (ic->ic_flags & IEEE80211_F_SHPREAMBLE) && rate != (1 * 2)) { sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE; @@ -3045,14 +3050,11 @@ bcopy(wh->i_fc, hdr->txh_fc, sizeof(hdr->txh_fc)); bcopy(wh->i_addr1, hdr->txh_addr1, sizeof(hdr->txh_addr1)); - if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { + if (!ismcast) { uint16_t dur; - uint8_t ack_rate; - ack_rate = ieee80211_ack_rate(ni, rate_fb); - dur = ieee80211_txtime(ni, - sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN, - ack_rate, ic->ic_flags & ~IEEE80211_F_SHPREAMBLE); + dur = ieee80211_ack_duration(sc->sc_rates, rate, + ic->ic_flags & ~IEEE80211_F_SHPREAMBLE); hdr->txh_fb_duration = htole16(dur); } @@ -3060,20 +3062,20 @@ hdr->txh_id = __SHIFTIN(BWI_TX_DATA_RING, BWI_TXH_ID_RING_MASK) | __SHIFTIN(idx, BWI_TXH_ID_IDX_MASK); - bwi_plcp_header(hdr->txh_plcp, pkt_len, rate); - bwi_plcp_header(hdr->txh_fb_plcp, pkt_len, rate_fb); + bwi_plcp_header(sc->sc_rates, hdr->txh_plcp, pkt_len, rate); + bwi_plcp_header(sc->sc_rates, hdr->txh_fb_plcp, pkt_len, rate_fb); phy_ctrl = __SHIFTIN(mac->mac_rf.rf_ant_mode, BWI_TXH_PHY_C_ANTMODE_MASK); - if (ieee80211_rate2modtype(rate) == IEEE80211_MODTYPE_OFDM) + if (ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_OFDM) phy_ctrl |= BWI_TXH_PHY_C_OFDM; else if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && rate != (2 * 1)) phy_ctrl |= BWI_TXH_PHY_C_SHPREAMBLE; mac_ctrl = BWI_TXH_MAC_C_HWSEQ | BWI_TXH_MAC_C_FIRST_FRAG; - if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) + if (!ismcast) mac_ctrl |= BWI_TXH_MAC_C_ACK; - if (ieee80211_rate2modtype(rate_fb) == IEEE80211_MODTYPE_OFDM) + if (ieee80211_rate2phytype(sc->sc_rates, rate_fb) == IEEE80211_T_OFDM) mac_ctrl |= BWI_TXH_MAC_C_FB_OFDM; hdr->txh_mac_ctrl = htole32(mac_ctrl); @@ -3218,13 +3220,8 @@ mac_ctrl = BWI_TXH_MAC_C_HWSEQ | BWI_TXH_MAC_C_FIRST_FRAG; if (!ismcast && (params->ibp_flags & IEEE80211_BPF_NOACK) == 0) { uint16_t dur; - uint8_t ack_rate; - /* XXX rate_fb? */ - ack_rate = ieee80211_ack_rate(ni, rate_fb); - dur = ieee80211_txtime(ni, - sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN, - ack_rate, 0); + dur = ieee80211_ack_duration(sc->sc_rates, rate_fb, 0); hdr->txh_fb_duration = htole16(dur); mac_ctrl |= BWI_TXH_MAC_C_ACK; @@ -3233,12 +3230,12 @@ hdr->txh_id = __SHIFTIN(BWI_TX_DATA_RING, BWI_TXH_ID_RING_MASK) | __SHIFTIN(idx, BWI_TXH_ID_IDX_MASK); - bwi_plcp_header(hdr->txh_plcp, pkt_len, rate); - bwi_plcp_header(hdr->txh_fb_plcp, pkt_len, rate_fb); + bwi_plcp_header(sc->sc_rates, hdr->txh_plcp, pkt_len, rate); + bwi_plcp_header(sc->sc_rates, hdr->txh_fb_plcp, pkt_len, rate_fb); phy_ctrl = __SHIFTIN(mac->mac_rf.rf_ant_mode, BWI_TXH_PHY_C_ANTMODE_MASK); - if (ieee80211_rate2modtype(rate) == IEEE80211_MODTYPE_OFDM) { + if (ieee80211_rate2phytype(sc->sc_rates, rate) == IEEE80211_T_OFDM) { phy_ctrl |= BWI_TXH_PHY_C_OFDM; mac_ctrl |= BWI_TXH_MAC_C_FB_OFDM; } else if (params->ibp_flags & IEEE80211_BPF_SHORTPRE) @@ -3798,8 +3795,6 @@ return bwi_rf_calc_rssi(mac, hdr); } -extern uint8_t ieee80211_plcp2rate(uint8_t, int); /* XXX temp */ - static __inline uint8_t bwi_ofdm_plcp2rate(const uint32_t *plcp0) { @@ -4052,163 +4047,6 @@ sc->sc_led_blinking = 0; } -enum ieee80211_modtype -ieee80211_rate2modtype(uint8_t rate) -{ - rate &= IEEE80211_RATE_VAL; - if (rate == 22 || rate < 12) - return IEEE80211_MODTYPE_DS; - else if (rate == 44) - return IEEE80211_MODTYPE_PBCC; - else - return IEEE80211_MODTYPE_OFDM; -} - -uint8_t -ieee80211_ack_rate(struct ieee80211_node *ni, uint8_t rate) -{ - const struct ieee80211_rateset *rs = &ni->ni_rates; - uint8_t ack_rate = 0; - enum ieee80211_modtype modtype; - int i; - - rate &= IEEE80211_RATE_VAL; - - modtype = ieee80211_rate2modtype(rate); - - for (i = 0; i < rs->rs_nrates; ++i) { - uint8_t rate1 = rs->rs_rates[i] & IEEE80211_RATE_VAL; - - if (rate1 > rate) { - if (ack_rate != 0) - return ack_rate; - else - break; - } - - if ((rs->rs_rates[i] & IEEE80211_RATE_BASIC) && - ieee80211_rate2modtype(rate1) == modtype) - ack_rate = rate1; - } - - switch (rate) { - /* CCK */ - case 2: - case 4: - case 11: - case 22: - ack_rate = rate; - break; - - /* PBCC */ - case 44: - ack_rate = 22; - break; - - /* OFDM */ - case 12: - case 18: - ack_rate = 12; - break; - case 24: - case 36: - ack_rate = 24; - break; - case 48: - case 72: - case 96: - case 108: - ack_rate = 48; - break; - default: - panic("unsupported rate %d\n", rate); - } - return ack_rate; -} - -/* IEEE Std 802.11a-1999, page 9, table 79 */ -#define IEEE80211_OFDM_SYM_TIME 4 -#define IEEE80211_OFDM_PREAMBLE_TIME 16 -#define IEEE80211_OFDM_SIGNAL_TIME 4 -/* IEEE Std 802.11g-2003, page 44 */ -#define IEEE80211_OFDM_SIGNAL_EXT_TIME 6 - -/* IEEE Std 802.11a-1999, page 7, figure 107 */ -#define IEEE80211_OFDM_PLCP_SERVICE_NBITS 16 -#define IEEE80211_OFDM_TAIL_NBITS 6 - -#define IEEE80211_OFDM_NBITS(frmlen) \ - (IEEE80211_OFDM_PLCP_SERVICE_NBITS + \ - ((frmlen) * NBBY) + \ - IEEE80211_OFDM_TAIL_NBITS) - -#define IEEE80211_OFDM_NBITS_PER_SYM(kbps) \ - (((kbps) * IEEE80211_OFDM_SYM_TIME) / 1000) - -#define IEEE80211_OFDM_NSYMS(kbps, frmlen) \ - howmany(IEEE80211_OFDM_NBITS((frmlen)), \ - IEEE80211_OFDM_NBITS_PER_SYM((kbps))) - -#define IEEE80211_OFDM_TXTIME(kbps, frmlen) \ - (IEEE80211_OFDM_PREAMBLE_TIME + \ - IEEE80211_OFDM_SIGNAL_TIME + \ - (IEEE80211_OFDM_NSYMS((kbps), (frmlen)) * IEEE80211_OFDM_SYM_TIME)) - -/* IEEE Std 802.11b-1999, page 28, subclause 18.3.4 */ -#define IEEE80211_CCK_PREAMBLE_LEN 144 -#define IEEE80211_CCK_PLCP_HDR_TIME 48 -#define IEEE80211_CCK_SHPREAMBLE_LEN 72 -#define IEEE80211_CCK_SHPLCP_HDR_TIME 24 - -#define IEEE80211_CCK_NBITS(frmlen) ((frmlen) * NBBY) -#define IEEE80211_CCK_TXTIME(kbps, frmlen) \ - (((IEEE80211_CCK_NBITS((frmlen)) * 1000) + (kbps) - 1) / (kbps)) - -uint16_t -ieee80211_txtime(struct ieee80211_node *ni, u_int len, uint8_t rs_rate, - uint32_t flags) -{ - struct ieee80211com *ic = ni->ni_ic; - enum ieee80211_modtype modtype; - uint16_t txtime; - int rate; - - rs_rate &= IEEE80211_RATE_VAL; - - rate = rs_rate * 500; /* ieee80211 rate -> kbps */ - - modtype = ieee80211_rate2modtype(rs_rate); - if (modtype == IEEE80211_MODTYPE_OFDM) { - /* - * IEEE Std 802.11a-1999, page 37, equation (29) - * IEEE Std 802.11g-2003, page 44, equation (42) - */ - txtime = IEEE80211_OFDM_TXTIME(rate, len); - if (ic->ic_curmode == IEEE80211_MODE_11G) - txtime += IEEE80211_OFDM_SIGNAL_EXT_TIME; - } else { - /* - * IEEE Std 802.11b-1999, page 28, subclause 18.3.4 - * IEEE Std 802.11g-2003, page 45, equation (43) - */ - if (modtype == IEEE80211_MODTYPE_PBCC) - ++len; - txtime = IEEE80211_CCK_TXTIME(rate, len); - - /* - * Short preamble is not applicable for DS 1Mbits/s - */ - if (rs_rate != 2 && (flags & IEEE80211_F_SHPREAMBLE)) { - txtime += IEEE80211_CCK_SHPREAMBLE_LEN + - IEEE80211_CCK_SHPLCP_HDR_TIME; - } else { - txtime += IEEE80211_CCK_PREAMBLE_LEN + - IEEE80211_CCK_PLCP_HDR_TIME; - } - } - return txtime; -} - static void bwi_restart(void *xsc, int pending) { ==== //depot/projects/vap/sys/dev/bwi/if_bwivar.h#5 (text+ko) ==== @@ -609,6 +609,7 @@ struct bwi_txstats_data *sc_txstats; int sc_tx_timer; + const struct ieee80211_rate_table *sc_rates; struct bwi_tx_radiotap_hdr sc_tx_th; int sc_tx_th_len; @@ -697,38 +698,6 @@ #define abs(a) __builtin_abs(a) -enum ieee80211_modtype { - IEEE80211_MODTYPE_DS, - IEEE80211_MODTYPE_PBCC, - IEEE80211_MODTYPE_OFDM -}; -#define IEEE80211_MODTYPE_CCK IEEE80211_MODTYPE_DS - -/* - * Contention window (slots). - */ -#define IEEE80211_CW_MAX 1023 /* aCWmax */ -#define IEEE80211_CW_MIN_0 31 /* DS/CCK aCWmin, ERP aCWmin(0) */ -#define IEEE80211_CW_MIN_1 15 /* OFDM aCWmin, ERP aCWmin(1) */ - -/* - * SIFS (microseconds). - */ -#define IEEE80211_DUR_SIFS 10 /* DS/CCK/ERP SIFS */ -#define IEEE80211_DUR_OFDM_SIFS 16 /* OFDM SIFS */ - -/* - * Slot time (microseconds). - */ -#define IEEE80211_DUR_SLOT 20 /* DS/CCK slottime, ERP long slottime */ -#define IEEE80211_DUR_SHSLOT 9 /* ERP short slottime */ -#define IEEE80211_DUR_OFDM_SLOT 9 /* OFDM slottime */ - -/* - * DIFS (microseconds). - */ -#define IEEE80211_DUR_DIFS(sifs, slot) ((sifs) + 2 * (slot)) - /* XXX does not belong here */ struct ieee80211_ds_plcp_hdr { uint8_t i_signal; @@ -737,9 +706,4 @@ uint16_t i_crc; } __packed; -enum ieee80211_modtype ieee80211_rate2modtype(uint8_t rate); -uint8_t ieee80211_ack_rate(struct ieee80211_node *ni, uint8_t rate); -uint16_t ieee80211_txtime(struct ieee80211_node *ni, u_int len, - uint8_t rs_rate, uint32_t flags); - #endif /* !_IF_BWIVAR_H */ From owner-p4-projects@FreeBSD.ORG Sat Apr 19 06:12:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9AE3106564A for ; Sat, 19 Apr 2008 06:12:04 +0000 (UTC) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: from me21507.mailengine1.com (me21507.mailengine1.com [66.59.24.112]) by mx1.freebsd.org (Postfix) with ESMTP id C57318FC15 for ; Sat, 19 Apr 2008 06:12:03 +0000 (UTC) (envelope-from streamsendbouncer@me21507.mailengine1.com) Received: by me21507.mailengine1.com (PowerMTA(TM) v3.2r22) id h166j80cg8kb for ; Fri, 18 Apr 2008 23:11:54 -0700 (envelope-from ) MIME-Version: 1.0 X-Mailer: StreamSend - 3326 X-Report-Abuse-At: abuse@streamsend.com X-Report-Abuse-Info: It is important to please include full email headers in the report X-Campaign-ID: 41 X-Streamsendid: 3326+5+511603+41+me21507.mailengine1.com Date: Fri, 18 Apr 2008 23:11:53 -0700 From: "University of Bridgeport" To: p4-projects@freebsd.org Message-Id: <20080419061203.C57318FC15@mx1.freebsd.org> Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: The Global Interdisciplinary MBA Program at the University of Bridgeport X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 06:12:04 -0000 The School of Business at the University of Bridgeport (UB) is committed to the mission of developing effective and responsible leaders for global business, industry and government by equipping graduates with the technical, analytical, and cultural competencies required in an increasingly complex international environment. The student body is recruited worldwide and its students typically represent fifty or more nations. Personal acquaintance with the cultures and peoples of the world and personal experiences offered by the University and the School of Business internationally accredited degree programs are an important product of the program. The MBA program provides several interdisciplinary studies and concentrations within the Colleges of Business, Engineering and Education & Human Resources. UB is currently the fastest growing university in the State of Connecticut and in New England. The MBA program offers concentrations in the following areas: Accounting; Bio-Technology Management; Corporate, Government & Information Security & Continuity; e-Commerce; Entrepreneurship; Environmental & Energy Management; Fashion Merchandising; Finance; Foundation of Doing Business in China; Foundation of Doing Business in India; Global Marketing; Global Program & Project Management; Health Care Management & Administration; Human Resources Management; Information Technology Management; Intellectual Property Management; Management and Operations; Manufacturing Management; New Product Development & Management; Service Management & Engineering; Strategic Sourcing / Outsourcing; and Supply Chain Management. The inter-disciplinary graduate concentrations may be incorporated into the MBA program or other graduate programs offered by the Colleges of Business, Engineering and/or Education & Human Resources or embedded within a dual graduate degree program. Students can elect, in addition to the MBA program, to enroll in one or more graduate degrees at the Masters level in Computer Science, Computer Engineering, Electrical Engineering, Mechanical Engineering, Technology Management, or the M.S. in MSIT (Masters of Science in Instructional Technology) program. For more information and/or to apply to the Masters of Business Administration (MBA) program please visit http://universityofbridgeport.net/ The MBA program offers several Graduate Assistantships, Teaching Assistantships and Research Assistantships for graduate students. UB offers excellent post-graduation job placement opportunities for both domestic and international students, with more than 600 companies, school districts, research labs, and industries that have employed UB graduates in the last several years. UB's School of Business is internationally accredited by the Association of Collegiate Business Schools and Programs to offer graduate and undergraduate business degrees. UB's innovative inter-disciplinary programs provide students with a variety of career enhancement options responsive to growing employer and employee needs for multiple competencies and skills in today's and tomorrows demanding global professional work force. UB's graduate programs and instructional philosophy emphasizes real-life experiences through extensive hands-on laboratory-based training, paid co-ops and internships. The School of Business has established very strong relationships with industry in the last few years through an active Industry Advisory Board and intensive networking with local, regional and global companies. For more information, and to enroll or apply to UB's graduate programs in Business and Management, please visit http://universityofbridgeport.net/ Please do not reply to this message. To contact us or apply to our programs please follow the above link. Looking forward to hearing from you. Best Regards, Susan Kristie School Administrative Manager Division of Graduate Studies and Research University of Bridgeport Click here on http://server1.streamsend.com/streamsend/unsubscribe.php?cd=3326&md=41&ud=1a837b6a9f3592909bae3f1e53174ce1 to update your profile or Unsubscribe From owner-p4-projects@FreeBSD.ORG Sat Apr 19 06:52:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B951065674; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44E70106566B for ; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34E188FC13 for ; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J6qZFx054162 for ; Sat, 19 Apr 2008 06:52:35 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J6qZ13054160 for perforce@freebsd.org; Sat, 19 Apr 2008 06:52:35 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 19 Apr 2008 06:52:35 GMT Message-Id: <200804190652.m3J6qZ13054160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 140243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 06:52:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=140243 Change 140243 by peter@peter_overcee on 2008/04/19 06:52:17 Experiment with having the compiler round up the size of struct pcpu to 64 bytes, and arrange linker layout so that the members of "struct pcpu pcpu[MAXCPU]" are each on their own L1 cache line. Affected files ... .. //depot/projects/hammer/sys/amd64/include/pcpu.h#29 edit .. //depot/projects/hammer/sys/i386/include/pcpu.h#16 edit .. //depot/projects/hammer/sys/sys/pcpu.h#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#29 (text+ko) ==== @@ -53,6 +53,8 @@ register_t pc_fsbase; /* User values of fsbase */ \ register_t pc_gsbase /* User values of gsbase */ +#define PCPU_MD_ALIGN __aligned(64) /* use unique cache line per entry */ + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/hammer/sys/i386/include/pcpu.h#16 (text+ko) ==== @@ -57,6 +57,8 @@ u_int pc_apic_id; \ int pc_private_tss /* Flag indicating private tss */ +#define PCPU_MD_ALIGN __aligned(64) /* max cache line size */ + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/hammer/sys/sys/pcpu.h#18 (text+ko) ==== @@ -58,6 +58,10 @@ struct rm_queue* volatile rmq_prev; }; +#ifndef PCPU_MD_ALIGN +#define PCPU_MD_ALIGN +#endif + /* * This structure maps out the global data that needs to be kept on a * per-cpu basis. The members are accessed via the PCPU_GET/SET/PTR @@ -104,7 +108,7 @@ * If only to make kernel debugging easier... */ PCPU_MD_FIELDS; -}; +} PCPU_MD_ALIGN; SLIST_HEAD(cpuhead, pcpu); From owner-p4-projects@FreeBSD.ORG Sat Apr 19 07:04:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB00F1065672; Sat, 19 Apr 2008 07:04:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD5601065670 for ; Sat, 19 Apr 2008 07:04:52 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D4168FC18 for ; Sat, 19 Apr 2008 07:04:52 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J74qBI055599 for ; Sat, 19 Apr 2008 07:04:52 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J74qt7055597 for perforce@freebsd.org; Sat, 19 Apr 2008 07:04:52 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 19 Apr 2008 07:04:52 GMT Message-Id: <200804190704.m3J74qt7055597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 140244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 07:04:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=140244 Change 140244 by peter@peter_overcee on 2008/04/19 07:04:13 GRRR. move some excessive noise to bootverbose. Affected files ... .. //depot/projects/hammer/sys/kern/subr_bus.c#60 edit Differences ... ==== //depot/projects/hammer/sys/kern/subr_bus.c#60 (text+ko) ==== @@ -3519,15 +3519,17 @@ return (error); if (handler != NULL && !(flags & INTR_MPSAFE)) device_printf(dev, "[GIANT-LOCKED]\n"); - if (bootverbose && (flags & INTR_MPSAFE)) - device_printf(dev, "[MPSAFE]\n"); - if (filter != NULL) { - if (handler == NULL) - device_printf(dev, "[FILTER]\n"); - else - device_printf(dev, "[FILTER+ITHREAD]\n"); - } else - device_printf(dev, "[ITHREAD]\n"); + if (bootverbose) { + if ((flags & INTR_MPSAFE) != 0) + device_printf(dev, "[MPSAFE]\n"); + if (filter != NULL) { + if (handler == NULL) + device_printf(dev, "[FILTER]\n"); + else + device_printf(dev, "[FILTER+ITHREAD]\n"); + } else + device_printf(dev, "[ITHREAD]\n"); + } return (0); } From owner-p4-projects@FreeBSD.ORG Sat Apr 19 08:18:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F36D71065672; Sat, 19 Apr 2008 08:18:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AB6A1065670 for ; Sat, 19 Apr 2008 08:18:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 895508FC15 for ; Sat, 19 Apr 2008 08:18:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J8IKR9059032 for ; Sat, 19 Apr 2008 08:18:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J8IKeL059030 for perforce@freebsd.org; Sat, 19 Apr 2008 08:18:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 Apr 2008 08:18:20 GMT Message-Id: <200804190818.m3J8IKeL059030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 08:18:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=140247 Change 140247 by hselasky@hselasky_laptop001 on 2008/04/19 08:18:02 Import "uslcom" driver into the new USB API. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uslcom.c#3 edit .. //depot/projects/usb/src/sys/modules/uslcom/Makefile#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uslcom.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -#if 0 /* $FreeBSD: src/sys/dev/usb/uslcom.c,v 1.2 2008/03/05 14:18:29 rink Exp $ */ /* $OpenBSD: uslcom.c,v 1.17 2007/11/24 10:52:12 jsg Exp $ */ @@ -21,35 +20,37 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include #include -#include +#include -#include -#include -#include +#include #include "usbdevs.h" -#include + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (uslcom_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) -#ifdef USLCOM_DEBUG -#define DPRINTFN(n, x) do { if (uslcomdebug > (n)) printf x; } while (0) -int uslcomdebug = 1; +static int uslcom_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, uslcom, CTLFLAG_RW, 0, "USB uslcom"); +SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, debug, CTLFLAG_RW, + &uslcom_debug, 0, "uslcom debug level"); #else -#define DPRINTFN(n, x) +#define DPRINTF(...) do { } while (0) #endif -#define DPRINTF(x) DPRINTFN(0, x) -#define USLCOMBUFSZ 256 -#define USLCOM_CONFIG_NO 0 -#define USLCOM_IFACE_NO 0 +#define USLCOM_BUF_SIZE 1024 +#define USLCOM_N_DATA_TRANSFER 4 +#define USLCOM_CONFIG_INDEX 0 +#define USLCOM_IFACE_INDEX 0 -#define USLCOM_SET_DATA_BITS(x) (x << 8) +#define USLCOM_SET_DATA_BITS(x) ((x) << 8) #define USLCOM_WRITE 0x41 #define USLCOM_READ 0xc1 @@ -71,7 +72,6 @@ #define USLCOM_CTRL_DSR 0x0020 #define USLCOM_CTRL_DCD 0x0080 - #define USLCOM_BAUD_REF 0x384000 #define USLCOM_STOP_BITS_1 0x00 @@ -84,34 +84,100 @@ #define USLCOM_BREAK_OFF 0x00 #define USLCOM_BREAK_ON 0x01 - struct uslcom_softc { + struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom; - device_t sc_dev; - usbd_device_handle sc_udev; + + struct usbd_xfer *sc_xfer_data[USLCOM_N_DATA_TRANSFER]; + struct usbd_device *sc_udev; - u_char sc_msr; - u_char sc_lsr; + uint8_t sc_msr; + uint8_t sc_lsr; - u_char sc_dying; + uint8_t sc_flag; +#define USLCOM_FLAG_READ_STALL 0x01 +#define USLCOM_FLAG_WRITE_STALL 0x02 +#define USLCOM_FLAG_INTR_STALL 0x04 }; -void uslcom_get_status(void *, int portno, u_char *lsr, u_char *msr); -void uslcom_set(void *, int, int, int); -int uslcom_param(void *, int, struct termios *); -int uslcom_open(void *sc, int portno); -void uslcom_close(void *, int); -void uslcom_break(void *sc, int portno, int onoff); +static device_probe_t uslcom_probe; +static device_attach_t uslcom_attach; +static device_detach_t uslcom_detach; + +static usbd_callback_t uslcom_write_callback; +static usbd_callback_t uslcom_read_callback; +static usbd_callback_t uslcom_write_clear_stall_callback; +static usbd_callback_t uslcom_read_clear_stall_callback; + +static void uslcom_start_read(struct ucom_softc *ucom); +static void uslcom_stop_read(struct ucom_softc *ucom); +static void uslcom_start_write(struct ucom_softc *ucom); +static void uslcom_stop_write(struct ucom_softc *ucom); + +static void uslcom_cfg_open(struct ucom_softc *ucom); +static void uslcom_cfg_close(struct ucom_softc *ucom); +static int uslcom_pre_param(struct ucom_softc *ucom, struct termios *t); +static void uslcom_cfg_param(struct ucom_softc *ucom, struct termios *t); +static void uslcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff); +static void uslcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff); +static void uslcom_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff); +static void uslcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr); +static void uslcom_cfg_do_request(struct uslcom_softc *sc, usb_device_request_t *req, void *data); + +static const struct usbd_config uslcom_config_data[USLCOM_N_DATA_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = USLCOM_BUF_SIZE, + .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, + .mh.callback = &uslcom_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = USLCOM_BUF_SIZE, + .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .mh.callback = &uslcom_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(usb_device_request_t), + .mh.callback = &uslcom_write_clear_stall_callback, + .mh.timeout = 1000, /* 1 second */ + .mh.interval = 50, /* 50ms */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(usb_device_request_t), + .mh.callback = &uslcom_read_clear_stall_callback, + .mh.timeout = 1000, /* 1 second */ + .mh.interval = 50, /* 50ms */ + }, +}; -struct ucom_callback uslcom_callback = { - uslcom_get_status, - uslcom_set, - uslcom_param, - NULL, - uslcom_open, - uslcom_close, - NULL, - NULL, +static const struct ucom_callback uslcom_callback = { + .ucom_cfg_open = &uslcom_cfg_open, + .ucom_cfg_close = &uslcom_cfg_close, + .ucom_cfg_get_status = &uslcom_cfg_get_status, + .ucom_cfg_set_dtr = &uslcom_cfg_set_dtr, + .ucom_cfg_set_rts = &uslcom_cfg_set_rts, + .ucom_cfg_set_break = &uslcom_cfg_set_break, + .ucom_cfg_param = &uslcom_cfg_param, + .ucom_pre_param = &uslcom_pre_param, + .ucom_start_read = &uslcom_start_read, + .ucom_stop_read = &uslcom_stop_read, + .ucom_start_write = &uslcom_start_write, + .ucom_stop_write = &uslcom_stop_write, }; static const struct usb_devno uslcom_devs[] = { @@ -135,224 +201,283 @@ {USB_VENDOR_USI, USB_PRODUCT_USI_MC60} }; -static device_probe_t uslcom_match; -static device_attach_t uslcom_attach; -static device_detach_t uslcom_detach; - static device_method_t uslcom_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, uslcom_match), + DEVMETHOD(device_probe, uslcom_probe), DEVMETHOD(device_attach, uslcom_attach), DEVMETHOD(device_detach, uslcom_detach), {0, 0} }; +static devclass_t uslcom_devclass; + static driver_t uslcom_driver = { - "ucom", - uslcom_methods, - sizeof(struct uslcom_softc) + .name = "uslcom", + .methods = uslcom_methods, + .size = sizeof(struct uslcom_softc), }; -DRIVER_MODULE(uslcom, uhub, uslcom_driver, ucom_devclass, usbd_driver_load, 0); +DRIVER_MODULE(uslcom, uhub, uslcom_driver, uslcom_devclass, usbd_driver_load, 0); MODULE_DEPEND(uslcom, usb, 1, 1, 1); MODULE_DEPEND(uslcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uslcom, 1); static int -uslcom_match(device_t self) +uslcom_probe(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(self); + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->usb_mode != USB_MODE_HOST) + return (UMATCH_NONE); if (uaa->iface != NULL) - return UMATCH_NONE; + return (UMATCH_NONE); return (usb_lookup(uslcom_devs, uaa->vendor, uaa->product) != NULL) ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE; } static int -uslcom_attach(device_t self) +uslcom_attach(device_t dev) { - struct uslcom_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usbd_device_handle dev = uaa->device; - struct ucom_softc *ucom; - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - usbd_status error; - int i; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uslcom_softc *sc = device_get_softc(dev); + uint8_t ifaces[1]; + int error; - ucom = &sc->sc_ucom; - ucom->sc_dev = self; - ucom->sc_udev = dev; - ucom->sc_iface = uaa->iface; + if (sc == NULL) { + return (ENOMEM); + } + usbd_set_device_desc(dev); - sc->sc_dev = self; sc->sc_udev = uaa->device; - if (usbd_set_config_index(sc->sc_udev, USLCOM_CONFIG_NO, 1) != 0) { - device_printf(self, "could not set configuration no\n"); - sc->sc_dying = 1; - return ENXIO; + if (usbd_set_config_index(uaa->device, USLCOM_CONFIG_INDEX, 1) != 0) { + device_printf(dev, "Could not set configuration 0.\n"); + return (ENXIO); } - /* get the first interface handle */ - error = usbd_device2interface_handle(sc->sc_udev, USLCOM_IFACE_NO, - &ucom->sc_iface); - if (error != 0) { - device_printf(self, "could not get interface handle\n"); - sc->sc_dying = 1; - return ENXIO; + ifaces[0] = USLCOM_IFACE_INDEX; + + error = usbd_transfer_setup(uaa->device, + ifaces, sc->sc_xfer_data, + uslcom_config_data, USLCOM_N_DATA_TRANSFER, + sc, &Giant); + if (error) { + goto detach; } - id = usbd_get_interface_descriptor(ucom->sc_iface); + /* clear stall at first run */ + sc->sc_flag |= (USLCOM_FLAG_READ_STALL | + USLCOM_FLAG_WRITE_STALL); - ucom->sc_bulkin_no = ucom->sc_bulkout_no = -1; - for (i = 0; i < id->bNumEndpoints; i++) { - ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i); - if (ed == NULL) { - device_printf(self, "no endpoint descriptor found for %d\n", - i); - sc->sc_dying = 1; - return ENXIO; - } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) - ucom->sc_bulkin_no = ed->bEndpointAddress; - else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) - ucom->sc_bulkout_no = ed->bEndpointAddress; + error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, + &uslcom_callback, &Giant); + if (error) { + goto detach; } + return (0); + +detach: + uslcom_detach(dev); + return (ENXIO); +} + +static int +uslcom_detach(device_t dev) +{ + struct uslcom_softc *sc = device_get_softc(dev); + + DPRINTF(0, "sc=%p\n", sc); + + ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); + + usbd_transfer_unsetup(sc->sc_xfer_data, USLCOM_N_DATA_TRANSFER); + + return (0); +} + +static void +uslcom_start_read(struct ucom_softc *ucom) +{ + struct uslcom_softc *sc = ucom->sc_parent; + + /* start read endpoint */ + usbd_transfer_start(sc->sc_xfer_data[1]); + return; +} + +static void +uslcom_stop_read(struct ucom_softc *ucom) +{ + struct uslcom_softc *sc = ucom->sc_parent; - if (ucom->sc_bulkin_no == -1 || ucom->sc_bulkout_no == -1) { - device_printf(self, "missing endpoint\n"); - sc->sc_dying = 1; - return ENXIO; - } - ucom->sc_parent = sc; - ucom->sc_portno = UCOM_UNK_PORTNO; - /* bulkin, bulkout set above */ - ucom->sc_ibufsize = USLCOMBUFSZ; - ucom->sc_obufsize = USLCOMBUFSZ; - ucom->sc_ibufsizepad = USLCOMBUFSZ; - ucom->sc_opkthdrlen = 0; - ucom->sc_callback = &uslcom_callback; + /* stop read endpoint */ + usbd_transfer_stop(sc->sc_xfer_data[3]); + usbd_transfer_stop(sc->sc_xfer_data[1]); + return; +} - DPRINTF(("uslcom: in = 0x%x, out = 0x%x\n", - ucom->sc_bulkin_no, ucom->sc_bulkout_no)); +static void +uslcom_start_write(struct ucom_softc *ucom) +{ + struct uslcom_softc *sc = ucom->sc_parent; - ucom_attach(&sc->sc_ucom); - return 0; + usbd_transfer_start(sc->sc_xfer_data[0]); + return; } -static int -uslcom_detach(device_t self) +static void +uslcom_stop_write(struct ucom_softc *ucom) { - struct uslcom_softc *sc = device_get_softc(self); + struct uslcom_softc *sc = ucom->sc_parent; - sc->sc_dying = 1; - return ucom_detach(&sc->sc_ucom); + usbd_transfer_stop(sc->sc_xfer_data[2]); + usbd_transfer_stop(sc->sc_xfer_data[0]); + return; } -int -uslcom_open(void *vsc, int portno) +static void +uslcom_cfg_open(struct ucom_softc *ucom) { - struct uslcom_softc *sc = vsc; + struct uslcom_softc *sc = ucom->sc_parent; usb_device_request_t req; - usbd_status err; - if (sc->sc_dying) - return (EIO); - req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_UART; USETW(req.wValue, USLCOM_UART_ENABLE); - USETW(req.wIndex, portno); + USETW(req.wIndex, 0); USETW(req.wLength, 0); - err = usbd_do_request(sc->sc_udev, &req, NULL); - if (err) - return (EIO); - - return (0); + uslcom_cfg_do_request(sc, &req, NULL); + return; } void -uslcom_close(void *vsc, int portno) +uslcom_cfg_close(struct ucom_softc *ucom) { - struct uslcom_softc *sc = vsc; + struct uslcom_softc *sc = ucom->sc_parent; usb_device_request_t req; - if (sc->sc_dying) - return; - req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_UART; USETW(req.wValue, USLCOM_UART_DISABLE); - USETW(req.wIndex, portno); + USETW(req.wIndex, 0); + USETW(req.wLength, 0); + uslcom_cfg_do_request(sc, &req, NULL); + return; +} + +static void +uslcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff) +{ + struct uslcom_softc *sc = ucom->sc_parent; + usb_device_request_t req; + uint16_t ctl; + + DPRINTF(0, "onoff=%d\n", onoff); + + if (onoff) + ctl = USLCOM_CTRL_DTR_ON; + else + ctl = 0; + + ctl |= USLCOM_CTRL_DTR_SET; + + req.bmRequestType = USLCOM_WRITE; + req.bRequest = USLCOM_CTRL; + USETW(req.wValue, ctl); + USETW(req.wIndex, 0); USETW(req.wLength, 0); - usbd_do_request(sc->sc_udev, &req, NULL); + uslcom_cfg_do_request(sc, &req, NULL); + return; } -void -uslcom_set(void *vsc, int portno, int reg, int onoff) +static void +uslcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff) { - struct uslcom_softc *sc = vsc; + struct uslcom_softc *sc = ucom->sc_parent; usb_device_request_t req; - int ctl; + uint16_t ctl; + + DPRINTF(0, "onoff=%d\n", onoff); + + if (onoff) + ctl = USLCOM_CTRL_RTS_ON; + else + ctl = 0; + + ctl |= USLCOM_CTRL_RTS_SET; - switch (reg) { - case UCOM_SET_DTR: - ctl = onoff ? USLCOM_CTRL_DTR_ON : 0; - ctl |= USLCOM_CTRL_DTR_SET; - break; - case UCOM_SET_RTS: - ctl = onoff ? USLCOM_CTRL_RTS_ON : 0; - ctl |= USLCOM_CTRL_RTS_SET; - break; - case UCOM_SET_BREAK: - uslcom_break(sc, portno, onoff); - return; - default: - return; - } req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_CTRL; USETW(req.wValue, ctl); - USETW(req.wIndex, portno); + USETW(req.wIndex, 0); USETW(req.wLength, 0); - usbd_do_request(sc->sc_udev, &req, NULL); + uslcom_cfg_do_request(sc, &req, NULL); + return; } -int -uslcom_param(void *vsc, int portno, struct termios *t) +static void +uslcom_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) { - struct uslcom_softc *sc = (struct uslcom_softc *)vsc; - usbd_status err; + struct uslcom_softc *sc = ucom->sc_parent; usb_device_request_t req; - int data; + uint16_t brk; + + DPRINTF(0, "onoff=%d\n", onoff); + + if (onoff) + brk = USLCOM_BREAK_ON; + else + brk = USLCOM_BREAK_OFF; + + req.bmRequestType = USLCOM_WRITE; + req.bRequest = USLCOM_BREAK; + USETW(req.wValue, brk); + USETW(req.wIndex, 0); + USETW(req.wLength, 0); + uslcom_cfg_do_request(sc, &req, NULL); + return; +} - if (t->c_ospeed <= 0 || t->c_ospeed > 921600) +static int +uslcom_pre_param(struct ucom_softc *ucom, struct termios *t) +{ + if ((t->c_ospeed < 1) || (t->c_ospeed > 921600)) return (EINVAL); + else + return (0); +} + +static void +uslcom_cfg_param(struct ucom_softc *ucom, struct termios *t) +{ + struct uslcom_softc *sc = ucom->sc_parent; + usb_device_request_t req; + uint16_t data; + DPRINTF(0, "sc=%p\n", sc); + + data = USLCOM_BAUD_REF / t->c_ospeed; + req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_BAUD_RATE; - USETW(req.wValue, USLCOM_BAUD_REF / t->c_ospeed); - USETW(req.wIndex, portno); + USETW(req.wValue, data); + USETW(req.wIndex, 0); USETW(req.wLength, 0); - err = usbd_do_request(sc->sc_udev, &req, NULL); - if (err) - return (EIO); + uslcom_cfg_do_request(sc, &req, NULL); - if (ISSET(t->c_cflag, CSTOPB)) + if (t->c_cflag & CSTOPB) data = USLCOM_STOP_BITS_2; else data = USLCOM_STOP_BITS_1; - if (ISSET(t->c_cflag, PARENB)) { - if (ISSET(t->c_cflag, PARODD)) + if (t->c_cflag & PARENB) { + if (t->c_cflag & PARODD) data |= USLCOM_PARITY_ODD; else data |= USLCOM_PARITY_EVEN; } else data |= USLCOM_PARITY_NONE; - switch (ISSET(t->c_cflag, CSIZE)) { + + switch (t->c_cflag & CSIZE) { case CS5: data |= USLCOM_SET_DATA_BITS(5); break; @@ -370,50 +495,139 @@ req.bmRequestType = USLCOM_WRITE; req.bRequest = USLCOM_DATA; USETW(req.wValue, data); - USETW(req.wIndex, portno); + USETW(req.wIndex, 0); USETW(req.wLength, 0); - err = usbd_do_request(sc->sc_udev, &req, NULL); - if (err) - return (EIO); + uslcom_cfg_do_request(sc, &req, NULL); + return; +} + +static void +uslcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr) +{ + struct uslcom_softc *sc = ucom->sc_parent; + + DPRINTF(0, "\n"); + + *lsr = sc->sc_lsr; + *msr = sc->sc_msr; + return; +} + +static void +uslcom_cfg_do_request(struct uslcom_softc *sc, usb_device_request_t *req, + void *data) +{ + uint16_t length; + usbd_status_t err; + + if (ucom_cfg_is_gone(&(sc->sc_ucom))) { + goto error; + } + err = usbd_do_request_flags(sc->sc_udev, &Giant, req, + data, 0, NULL, 1000); + + if (err) { + + DPRINTF(-1, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + +error: + length = UGETW(req->wLength); -#if 0 - /* XXX flow control */ - if (ISSET(t->c_cflag, CRTSCTS)) { - /* rts/cts flow ctl */ - } else if (ISSET(t->c_iflag, IXON | IXOFF)) { - /* xon/xoff flow ctl */ - } else { - /* disable flow ctl */ + if ((req->bmRequestType & UT_READ) && length) { + bzero(data, length); + } } -#endif + return; +} + +static void +uslcom_write_callback(struct usbd_xfer *xfer) +{ + struct uslcom_softc *sc = xfer->priv_sc; + uint32_t actlen; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_SETUP: + case USBD_ST_TRANSFERRED: + if (sc->sc_flag & USLCOM_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer_data[2]); + return; + } + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers, 0, + USLCOM_BUF_SIZE, &actlen)) { + + xfer->frlengths[0] = actlen; + usbd_start_hardware(xfer); + } + return; + + default: /* Error */ + if (xfer->error != USBD_ERR_CANCELLED) { + sc->sc_flag |= USLCOM_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer_data[2]); + } + return; - return (0); + } } -void -uslcom_get_status(void *vsc, int portno, u_char *lsr, u_char *msr) +static void +uslcom_write_clear_stall_callback(struct usbd_xfer *xfer) { - struct uslcom_softc *sc = vsc; + struct uslcom_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer_data[0]; - if (msr != NULL) - *msr = sc->sc_msr; - if (lsr != NULL) - *lsr = sc->sc_lsr; + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + sc->sc_flag &= ~USLCOM_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + } + return; } -void -uslcom_break(void *vsc, int portno, int onoff) +static void +uslcom_read_callback(struct usbd_xfer *xfer) { - struct uslcom_softc *sc = vsc; - usb_device_request_t req; - int brk = onoff ? USLCOM_BREAK_ON : USLCOM_BREAK_OFF; + struct uslcom_softc *sc = xfer->priv_sc; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: + + DPRINTF(0, "actlen=%d\n", xfer->actlen); + + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers, 0, + xfer->actlen); + + case USBD_ST_SETUP: + if (sc->sc_flag & USLCOM_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer_data[3]); + } else { + xfer->frlengths[0] = xfer->max_data_length; + usbd_start_hardware(xfer); + } + return; + + default: /* Error */ + if (xfer->error != USBD_ERR_CANCELLED) { + sc->sc_flag |= USLCOM_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer_data[3]); + } + return; - req.bmRequestType = USLCOM_WRITE; - req.bRequest = USLCOM_BREAK; - USETW(req.wValue, brk); - USETW(req.wIndex, portno); - USETW(req.wLength, 0); - usbd_do_request(sc->sc_udev, &req, NULL); + } } -#endif +static void +uslcom_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uslcom_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer_data[1]; + + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + sc->sc_flag &= ~USLCOM_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + } + return; +} ==== //depot/projects/usb/src/sys/modules/uslcom/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: $S/dev/usb KMOD= uslcom -SRCS= uslcom.c opt_usb.h \ +SRCS= uslcom.c opt_usb.h usb_if.h \ device_if.h bus_if.h usbdevs.h .include From owner-p4-projects@FreeBSD.ORG Sat Apr 19 08:31:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9E6D1065674; Sat, 19 Apr 2008 08:31:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CAC2106566B for ; Sat, 19 Apr 2008 08:31:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C5ED8FC17 for ; Sat, 19 Apr 2008 08:31:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J8VZx9059490 for ; Sat, 19 Apr 2008 08:31:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J8VYsl059488 for perforce@freebsd.org; Sat, 19 Apr 2008 08:31:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 Apr 2008 08:31:34 GMT Message-Id: <200804190831.m3J8VYsl059488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 08:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=140249 Change 140249 by hselasky@hselasky_laptop001 on 2008/04/19 08:31:09 Bring the ehci, ohci and uhci PCI ID match code closer to the original. In addition a switch statement is faster than a series of if's, hence the compile can optimise switch statements into using binary search, for example. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#35 (text+ko) ==== @@ -139,63 +139,68 @@ { uint32_t device_id = pci_get_devid(self); - if (device_id == 0x268c8086) + switch (device_id) { + case 0x268c8086: return ("Intel 63XXESB USB 2.0 controller"); - if (device_id == 0x523910b9) + case 0x523910b9: return "ALi M5239 USB 2.0 controller"; - if (device_id == 0x10227463) + case 0x10227463: return "AMD 8111 USB 2.0 controller"; - if (device_id == 0x20951022) + case 0x20951022: return ("AMD CS5536 (Geode) USB 2.0 controller"); - if (device_id == 0x43451002) + case 0x43451002: return "ATI SB200 USB 2.0 controller"; - if (device_id == 0x43731002) + case 0x43731002: return "ATI SB400 USB 2.0 controller"; - if (device_id == 0x25ad8086) + case 0x25ad8086: return "Intel 6300ESB USB 2.0 controller"; - if (device_id == 0x24cd8086) + case 0x24cd8086: return "Intel 82801DB/L/M (ICH4) USB 2.0 controller"; - if (device_id == 0x24dd8086) + case 0x24dd8086: return "Intel 82801EB/R (ICH5) USB 2.0 controller"; - if (device_id == 0x265c8086) + case 0x265c8086: return "Intel 82801FB (ICH6) USB 2.0 controller"; - if (device_id == 0x27cc8086) + case 0x27cc8086: return "Intel 82801GB/R (ICH7) USB 2.0 controller"; - if (device_id == 0x28368086) + case 0x28368086: return "Intel 82801H (ICH8) USB 2.0 controller USB2-A"; - if (device_id == 0x283a8086) + case 0x283a8086: return "Intel 82801H (ICH8) USB 2.0 controller USB2-B"; - if (device_id == 0x293a8086) + case 0x293a8086: return "Intel 82801I (ICH9) USB 2.0 controller"; - if (device_id == 0x293c8086) + case 0x293c8086: return "Intel 82801I (ICH9) USB 2.0 controller"; - if (device_id == 0x00e01033) { + case 0x00e01033: return ("NEC uPD 720100 USB 2.0 controller"); - } - if (device_id == 0x006810de) + + case 0x006810de: return "NVIDIA nForce2 USB 2.0 controller"; - if (device_id == 0x008810de) + case 0x008810de: return "NVIDIA nForce2 Ultra 400 USB 2.0 controller"; - if (device_id == 0x00d810de) + case 0x00d810de: return "NVIDIA nForce3 USB 2.0 controller"; - if (device_id == 0x00e810de) + case 0x00e810de: return "NVIDIA nForce3 250 USB 2.0 controller"; - if (device_id == 0x005b10de) + case 0x005b10de: return "NVIDIA nForce4 USB 2.0 controller"; - if (device_id == 0x15621131) + case 0x15621131: return "Philips ISP156x USB 2.0 controller"; - if (device_id == 0x31041106) { + case 0x31041106: return ("VIA VT6202 USB 2.0 controller"); + + default: + break; } + if ((pci_get_class(self) == PCIC_SERIALBUS) && (pci_get_subclass(self) == PCIS_SERIALBUS_USB) && (pci_get_progif(self) == PCI_INTERFACE_EHCI)) { ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#30 (text+ko) ==== @@ -126,43 +126,47 @@ { uint32_t device_id = pci_get_devid(self); - if (device_id == 0x523710b9) { + switch (device_id) { + case 0x523710b9: return ("AcerLabs M5237 (Aladdin-V) USB controller"); - } - if (device_id == 0x740c1022) { + + case 0x740c1022: return ("AMD-756 USB Controller"); - } - if (device_id == 0x74141022) { + + case 0x74141022: return ("AMD-766 USB Controller"); - } - if (device_id == 0x43741002) + + case 0x43741002: return "ATI SB400 USB Controller"; - if (device_id == 0x43751002) + case 0x43751002: return "ATI SB400 USB Controller"; - if (device_id == 0x06701095) { + case 0x06701095: return ("CMD Tech 670 (USB0670) USB controller"); - } - if (device_id == 0x06731095) { + + case 0x06731095: return ("CMD Tech 673 (USB0673) USB controller"); - } - if (device_id == 0xc8611045) { + + case 0xc8611045: return ("OPTi 82C861 (FireLink) USB controller"); - } - if (device_id == 0x00351033) { + + case 0x00351033: return ("NEC uPD 9210 USB controller"); - } - if (device_id == 0x00d710de) { + + case 0x00d710de: return ("nVidia nForce3 USB Controller"); - } - if (device_id == 0x70011039) { + + case 0x70011039: return ("SiS 5571 USB controller"); - } - if (device_id == 0x1103108e) + + case 0x1103108e: return "Sun PCIO-2 USB controller"; - if (device_id == 0x0019106b) { + case 0x0019106b: return ("Apple KeyLargo USB controller"); + + default: + break; } if ((pci_get_class(self) == PCIC_SERIALBUS) && (pci_get_subclass(self) == PCIS_SERIALBUS_USB) && ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#32 (text+ko) ==== @@ -111,110 +111,115 @@ { uint32_t device_id = pci_get_devid(self); - if (device_id == 0x26888086) + switch (device_id) { + case 0x26888086: return ("Intel 631XESB/632XESB/3100 USB controller USB-1"); - if (device_id == 0x26898086) + case 0x26898086: return ("Intel 631XESB/632XESB/3100 USB controller USB-2"); - if (device_id == 0x268a8086) + case 0x268a8086: return ("Intel 631XESB/632XESB/3100 USB controller USB-3"); - if (device_id == 0x268b8086) + case 0x268b8086: return ("Intel 631XESB/632XESB/3100 USB controller USB-4"); - if (device_id == 0x70208086) { + case 0x70208086: return ("Intel 82371SB (PIIX3) USB controller"); - } - if (device_id == 0x71128086) { + + case 0x71128086: return ("Intel 82371AB/EB (PIIX4) USB controller"); - } - if (device_id == 0x24128086) { + + case 0x24128086: return ("Intel 82801AA (ICH) USB controller"); - } - if (device_id == 0x24228086) { + + case 0x24228086: return ("Intel 82801AB (ICH0) USB controller"); - } - if (device_id == 0x24428086) { + + case 0x24428086: return ("Intel 82801BA/BAM (ICH2) USB controller USB-A"); - } - if (device_id == 0x24448086) { + + case 0x24448086: return ("Intel 82801BA/BAM (ICH2) USB controller USB-B"); - } - if (device_id == 0x24828086) { + + case 0x24828086: return ("Intel 82801CA/CAM (ICH3) USB controller USB-A"); - } - if (device_id == 0x24848086) { + + case 0x24848086: return ("Intel 82801CA/CAM (ICH3) USB controller USB-B"); - } - if (device_id == 0x24878086) { + + case 0x24878086: return ("Intel 82801CA/CAM (ICH3) USB controller USB-C"); - } - if (device_id == 0x24c28086) { + + case 0x24c28086: return ("Intel 82801DB (ICH4) USB controller USB-A"); - } - if (device_id == 0x24c48086) { + + case 0x24c48086: return ("Intel 82801DB (ICH4) USB controller USB-B"); - } - if (device_id == 0x24c78086) { + + case 0x24c78086: return ("Intel 82801DB (ICH4) USB controller USB-C"); - } - if (device_id == 0x24d28086) { + + case 0x24d28086: return ("Intel 82801EB (ICH5) USB controller USB-A"); - } - if (device_id == 0x24d48086) { + + case 0x24d48086: return ("Intel 82801EB (ICH5) USB controller USB-B"); - } - if (device_id == 0x24d78086) { + + case 0x24d78086: return ("Intel 82801EB (ICH5) USB controller USB-C"); - } - if (device_id == 0x24de8086) { + + case 0x24de8086: return ("Intel 82801EB (ICH5) USB controller USB-D"); - } - if (device_id == 0x26588086) { + + case 0x26588086: return ("Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-A"); - } - if (device_id == 0x26598086) { + + case 0x26598086: return ("Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-B"); - } - if (device_id == 0x265a8086) { + + case 0x265a8086: return ("Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-C"); - } - if (device_id == 0x265b8086) { + + case 0x265b8086: return ("Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D"); - } - if (device_id == 0x28308086) + + case 0x28308086: return ("Intel 82801H (ICH8) USB controller USB-A"); - if (device_id == 0x28318086) + case 0x28318086: return ("Intel 82801H (ICH8) USB controller USB-B"); - if (device_id == 0x28328086) + case 0x28328086: return ("Intel 82801H (ICH8) USB controller USB-C"); - if (device_id == 0x28348086) + case 0x28348086: return ("Intel 82801H (ICH8) USB controller USB-D"); - if (device_id == 0x28358086) + case 0x28358086: return ("Intel 82801H (ICH8) USB controller USB-E"); - if (device_id == 0x29348086) + case 0x29348086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x29358086) + case 0x29358086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x29368086) + case 0x29368086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x29378086) + case 0x29378086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x29388086) + case 0x29388086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x29398086) + case 0x29398086: return ("Intel 82801I (ICH9) USB controller"); - if (device_id == 0x719a8086) { + case 0x719a8086: return ("Intel 82443MX USB controller"); - } - if (device_id == 0x76028086) { + + case 0x76028086: return ("Intel 82372FB/82468GX USB controller"); - } - if (device_id == 0x30381106) { + + case 0x30381106: return ("VIA 83C572 USB controller"); + + default: + break; } + if ((pci_get_class(self) == PCIC_SERIALBUS) && (pci_get_subclass(self) == PCIS_SERIALBUS_USB) && (pci_get_progif(self) == PCI_INTERFACE_UHCI)) { From owner-p4-projects@FreeBSD.ORG Sat Apr 19 15:47:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7782E1065673; Sat, 19 Apr 2008 15:47:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21CF61065671 for ; Sat, 19 Apr 2008 15:47:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EC018FC1F for ; Sat, 19 Apr 2008 15:47:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JFlD5g002217 for ; Sat, 19 Apr 2008 15:47:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JFlDSs002215 for perforce@freebsd.org; Sat, 19 Apr 2008 15:47:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 Apr 2008 15:47:13 GMT Message-Id: <200804191547.m3JFlDSs002215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 15:47:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=140254 Change 140254 by hselasky@hselasky_laptop001 on 2008/04/19 15:46:32 Compile fix. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#16 (text) ==== @@ -71,14 +71,10 @@ if (sc == NULL) { return (ENXIO); } - /* store parent DMA tag */ - - sc->sc_ohci.sc_bus.dma_tag_parent = device_get_dma_tag(dev); - /* get all DMA memory */ if (usbd_bus_mem_alloc_all(&(sc->sc_ohci.sc_bus), - &ohci_iterate_hw_softc)) { + device_get_dma_tag(dev), &ohci_iterate_hw_softc)) { return ENOMEM; } sc->iclk = at91_pmc_clock_ref("ohci_clk"); From owner-p4-projects@FreeBSD.ORG Sat Apr 19 19:37:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BABF1065671; Sat, 19 Apr 2008 19:37:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E2F81065670 for ; Sat, 19 Apr 2008 19:37:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00BE48FC12 for ; Sat, 19 Apr 2008 19:37:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JJbGlC021003 for ; Sat, 19 Apr 2008 19:37:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JJbGm2021001 for perforce@freebsd.org; Sat, 19 Apr 2008 19:37:16 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 19:37:16 GMT Message-Id: <200804191937.m3JJbGm2021001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 19:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=140257 Change 140257 by sam@sam_ebb on 2008/04/19 19:37:05 remove unused variable Affected files ... .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#14 edit Differences ... ==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#14 (text+ko) ==== @@ -3033,7 +3033,6 @@ struct ndis_softc *sc; { struct ifnet *ifp; - struct ieee80211com *ic; int i; ifp = sc->ifp; From owner-p4-projects@FreeBSD.ORG Sat Apr 19 20:27:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 684D21065670; Sat, 19 Apr 2008 20:27:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B19D106566B for ; Sat, 19 Apr 2008 20:27:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F35528FC14 for ; Sat, 19 Apr 2008 20:27:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JKRBou025913 for ; Sat, 19 Apr 2008 20:27:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JKRBCg025911 for perforce@freebsd.org; Sat, 19 Apr 2008 20:27:11 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 20:27:11 GMT Message-Id: <200804192027.m3JKRBCg025911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 20:27:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=140258 Change 140258 by sam@sam_ebb on 2008/04/19 20:26:29 remove unused variable Affected files ... .. //depot/projects/vap/sys/dev/malo/if_malo.c#6 edit Differences ... ==== //depot/projects/vap/sys/dev/malo/if_malo.c#6 (text+ko) ==== @@ -1497,7 +1497,6 @@ malo_init_locked(struct malo_softc *sc) { struct ifnet *ifp = sc->malo_ifp; - struct ieee80211com *ic = ifp->if_l2com; struct malo_hal *mh = sc->malo_mh; int error; From owner-p4-projects@FreeBSD.ORG Sat Apr 19 20:30:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ACB1106566B; Sat, 19 Apr 2008 20:30:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D6921065677 for ; Sat, 19 Apr 2008 20:30:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 318AE8FC1E for ; Sat, 19 Apr 2008 20:30:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JKUFOc026029 for ; Sat, 19 Apr 2008 20:30:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JKUFNK026027 for perforce@freebsd.org; Sat, 19 Apr 2008 20:30:15 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 20:30:15 GMT Message-Id: <200804192030.m3JKUFNK026027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 20:30:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=140259 Change 140259 by sam@sam_ebb on 2008/04/19 20:29:45 wlan_scan_sta has been rolled into wlan Affected files ... .. //depot/projects/vap/sys/conf/NOTES#14 edit Differences ... ==== //depot/projects/vap/sys/conf/NOTES#14 (text+ko) ==== @@ -768,7 +768,6 @@ device wlan_xauth #802.11 external authenticator support device wlan_acl #802.11 MAC ACL support device wlan_amrr #AMRR transmit rate control algorithm -device wlan_scan_sta #802.11 STA mode scanning device token #Generic TokenRing device fddi #Generic FDDI device arcnet #Generic Arcnet From owner-p4-projects@FreeBSD.ORG Sat Apr 19 20:31:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A95C51065675; Sat, 19 Apr 2008 20:31:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C17E1065674 for ; Sat, 19 Apr 2008 20:31:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59D828FC15 for ; Sat, 19 Apr 2008 20:31:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JKVGaU026060 for ; Sat, 19 Apr 2008 20:31:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JKVGll026058 for perforce@freebsd.org; Sat, 19 Apr 2008 20:31:16 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 20:31:16 GMT Message-Id: <200804192031.m3JKVGll026058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 20:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=140260 Change 140260 by sam@sam_ebb on 2008/04/19 20:30:24 wlan_scan_* have been rolled into wlan Affected files ... .. //depot/projects/vap/sys/mips/conf/IDT#2 edit Differences ... ==== //depot/projects/vap/sys/mips/conf/IDT#2 (text+ko) ==== @@ -46,8 +46,6 @@ device wlan # 802.11 support device wlan_wep # 802.11 WEP support device wlan_tkip # 802.11 TKIP support -device wlan_scan_ap #802.11 AP mode scanning -device wlan_scan_sta #802.11 STA mode scanning device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) device ath_rate_sample # SampleRate tx rate control for ath From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:31:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC0F1065702; Sat, 19 Apr 2008 21:31:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5084810656FD for ; Sat, 19 Apr 2008 21:31:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FAE68FC1A for ; Sat, 19 Apr 2008 21:31:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLVLvY038951 for ; Sat, 19 Apr 2008 21:31:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLVLVT038949 for perforce@freebsd.org; Sat, 19 Apr 2008 21:31:21 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:31:21 GMT Message-Id: <200804192131.m3JLVLVT038949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=140261 Change 140261 by pgj@disznohal on 2008/04/19 21:31:19 (printing) MFen: 1.111 --> 1.112 Affected files ... .. //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/printing/chapter.sgml#6 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.112 --> @@ -3245,13 +3245,15 @@ A &os; Portgyûjteményében találhatunk egy apsfilter - elnevezésû szövegszûrõt, ami + elnevezésû szövegszûrõt + (print/apsfilter), ami képes ilyen automatikus konverzióra. - Képes észrevenni a nyers szöveget, - &postscript; programokat és DVI - állományokat, lefuttatni rájuk a - megfelelõ átalakítástokat, majd - kinyomtatni õket. + Képes felismerni a nyers szöveget, &postscript; + programokat, DVI és szinte bármilyen + formátumú állományokat, + lefuttatni rájuk a megfelelõ + átalakítástokat, majd kinyomtatni + õket. @@ -3412,7 +3414,7 @@ nyilvántartani a kinyomtatott lapokat. Kimeneti szûrõként is tud viselkedni. - Az lpf parancs rengeteg + Az lpf szûrõ rengeteg nyomtatási környezetben felhasználható. Habár nem képes a nyomtatónak inicializáló jelsorozatokat @@ -3583,8 +3585,9 @@ azonosító, egész lapot kitöltõ óriási betûket. Erre egy példa (amiben a rose nevû géprõl - kelly nyomtatta ki az outline - elnevezésû munkát): + kelly nyomtatta ki az + outline elnevezésû + munkát): k ll ll k l l @@ -4265,11 +4268,11 @@ rattan és bamboo nevû nyomtatókon is. Ezért, ha az orchid egyik felhasználója - beírja, hogy + beírja, hogy: &prompt.user; lpr -P bamboo -d sushi-review.dvi - akkor az orchid gépen + Az orchid gépen mûködõ LPD rendszer ezt a munkát a bemásolja a /var/spool/lpd/bamboo nevû From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:33:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A9810656D0; Sat, 19 Apr 2008 21:33:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EBDA1065676 for ; Sat, 19 Apr 2008 21:33:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9D98FC0A for ; Sat, 19 Apr 2008 21:33:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLXNjY039126 for ; Sat, 19 Apr 2008 21:33:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLXN8T039124 for perforce@freebsd.org; Sat, 19 Apr 2008 21:33:23 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:33:23 GMT Message-Id: <200804192133.m3JLXN8T039124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:33:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=140262 Change 140262 by pgj@disznohal on 2008/04/19 21:32:22 Cleanup in book.sgml. Affected files ... .. //depot/projects/docproj_hu/books/handbook/book.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/book.sgml#7 (text+ko) ==== @@ -60,7 +60,7 @@ &os; kézikönyv - A &os; dokumentációs projekt + A &os; Dokumentációs Projekt 1999. február @@ -79,7 +79,7 @@ 2006 2007 2008 - A &os; dokumentációs projekt + A &os; Dokumentációs Projekt &bookinfo.legalnotice; @@ -146,9 +146,10 @@ honlapjáról (a korábbi változatok pedig megtalálhatóak a címen). - Ezenkívül még rengeteg formátumban - és tömörítve is letölthetõ a - &os; FTP + Ezenkívül még rengeteg más + formátumban és tömörítve is + letölthetõ a &os; FTP szerverérõl vagy a tüköroldalak egyikérõl. Amennyiben a kézikönyv @@ -183,12 +184,12 @@ - Ismerteti a &unix; alapjait. + Ismertetik a &unix; alapjait. - Megmutatja, hogyan telepítsük fel a &os;-hez - elérhetõ temérdek külsõs + Megmutatják, hogyan telepítsük a + &os;-hez elérhetõ megannyi külsõ alkalmazást. @@ -196,7 +197,7 @@ Megismerhetjük az X-et, a &unix;-os ablakozórendszert, és részleteiben is láthatjuk, miként konfiguráljunk be egy - asztalkörnyezetet, amivel kényelmesebbé + munkakörnyezetet, amellyel kényelmesebbé válik a munka. @@ -231,9 +232,9 @@ Bemutatnak különféle hasznos és népszerû asztali alkalmazást: - böngészõket, termelést + böngészõket, irodai elõsegítõ eszközöket, - dokumentumnézegetõket stb. + dokumentum-megjelenítõket stb. @@ -242,12 +243,11 @@ - Kifejtik a &os; rendszermagjának - testreszabási folyamatát, és - ezáltal a rendszerünk - funkcionalitásának - növelésének - mikéntjét. + Kifejtik egy saját &os; rendszermag + elkészítésének + folyamatát, amellyel így bõvíteni + tudjuk rendszerünk + funkcionalitását. @@ -258,8 +258,8 @@ - Megmutatják, hogyan futassunk &linux;-ra - íródott alkalmazásokat &os; + Megmutatják, hogyan futassunk Linuxra + íródott alkalmazásokat a &os; rendszerünkön. @@ -285,20 +285,20 @@ A &os; kézikönyv fennmaradó fejezeteiben - a &os; rendszeradminisztráció + a &os; rendszerek adminisztrációjának különbözõ aspektusait mutatjuk be. - Mindegyik fejezet elején megtudhatjuk, mit is fogunk - megismerni a fejezet elolvasása során, ill. - arról is információkat kapunk, miket kell - tudnunk a tárgyalt anyag - feldolgozásához. + Mindegyik fejezet elején megtudhatjuk mit is fogunk + megismerni a fejezet elolvasása során, illetve + arról is információkat kapunk, hogy mivel + kell már tisztában lennünk a tárgyalt + anyag feldolgozásához. Ezeket a fejezeteket annak érdekében alakítottuk ki, hogy az adott témákban ismereteket adjunk. Nincs köztük semmilyen sorrendi - kötöttség, sõt, egyáltalán - nem is szükséges õket elolvasni a &os; - alapvetõ használatához. + kötöttség, sõt, ezeket + egyáltalán nem is szükséges elolvasni + a &os; alapvetõ használatához. @@ -358,10 +358,10 @@ Ezek a fejezetek nem állnak egymással szoros kapcsolatban, csupán egy adott témáról adnak ismereteket. - Ennélfogva nem kötelezõ õket sorrendben + Ennélfogva nem kötelezõ ezeket sorrendben elolvasni, valamint egyáltalán nem is kell mindegyikõjüket átolvasni ahhoz, hogy a &os;-t - hálózati környezetben használni + hálózati környezetben is használni tudjuk. From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:33:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6795910657CC; Sat, 19 Apr 2008 21:33:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C89EC10656CA for ; Sat, 19 Apr 2008 21:33:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6AAF8FC17 for ; Sat, 19 Apr 2008 21:33:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLXNr5039136 for ; Sat, 19 Apr 2008 21:33:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLXNjU039134 for perforce@freebsd.org; Sat, 19 Apr 2008 21:33:23 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:33:23 GMT Message-Id: <200804192133.m3JLXNjU039134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:33:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=140264 Change 140264 by pgj@disznohal on 2008/04/19 21:33:16 Cleanup in Chapter 1. Affected files ... .. //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#7 (text+ko) ==== @@ -15,7 +15,7 @@ Jim Mock Átszerkesztette, átszervezte és - bizonyos részeit újraírta: + bizonyos részeit átdolgozta: @@ -26,7 +26,7 @@ Áttekintés Köszönjük, hogy érdeklõdik a &os; - iránt! A fejezet a &os; projektet több + iránt! A fejezet a &os; Projektet több különbözõ vonatkozásban mutatja be: a történetét, a céljait, a fejlesztési modelljét és így @@ -38,21 +38,21 @@ hogyan viszonyul a &os; más operációs - rendszerekhez + rendszerekhez; - a &os; projekt történetét + a &os; Projekt történetét; - a &os; projekt célkitûzéseit + a &os; Projekt célkitûzéseit; a &os; nyílt forráskódú - fejlesztési modelljének alapjait + fejlesztési modelljének alapjait; és természetesen: hogyan is keletkezett a - &os; név + &os; név. @@ -72,11 +72,11 @@ linkend="history">&os; történetérõl vagy éppen az aktuális kiadásáról. Ha szeretnénk - hozzájárulni a projekt + hozzájárulni a Projekt fejlõdéséhez (forráskód, hardver vagy pénz), olvassuk el a Hozzájárulás - a &os;-hez c. cikket. + a &os;-hez c. cikket (angolul). Mire képes a &os;? @@ -129,15 +129,15 @@ A TCP/IP hálózati protokoll gyors és - megbízható implementációja, ill. - a legfontosabb ipari szabványok, mint az SCTP, DHCP, - NFS, NIS, PPP, SLIP, IPsec és IPv6 + megbízható implementációja, + illetve a legfontosabb ipari szabványok, mint az + SCTP, DHCP, NFS, NIS, PPP, SLIP, IPsec és IPv6 támogatása. Ezáltal egy &os;-s számítógép könnyedén képes együttmûködni más rendszerekkel vagy akár vállalati szerverként is üzemelni. Megbirkózik az - NFS (távoli + NFS (Network File System, távoli állományelérés) és az elektronikus levelezés megszervezésével ugyanúgy, ahogy a vállalatunk internetes @@ -177,13 +177,13 @@ szabványa (X11R7) alapján szolgáltatja a grafikus felhasználói felületet (GUI) bármelyik VGA-kártyán és - monitoron, ill. annak teljes forráskódja is + monitoron, illetve annak teljes forráskódja is elérhetõ. bináris kompatibilitás - &linux; + Linux bináris kompatibilitás @@ -204,8 +204,8 @@ Bináris szintû - kompatibilitás a &linux;-ra, SCO-ra, - SVR4-re, BSDI-re és NetBSD-re készített + kompatibilitás a Linuxra, SCO-ra, SVR4-re, + BSDI-re és NetBSD-re készített programok nagy részével. @@ -214,7 +214,7 @@ alkalmazások ezrei érhetõek el a &os; port- és csomaggyûjteményében. - Miért bújnánk a netet + Miért bújnánk az internetet értük, ha mindent egy helyen is megtalálhatunk? @@ -248,7 +248,7 @@ - Többprocesszoros (SMP) rendszerek + többprocesszoros (SMP) rendszerek támogatása @@ -305,30 +305,30 @@ - És még sok minden + Még sok minden más! 4.4BSD-Lite - Számítógépes rendszerek - kutatói csoport (CSRG) + Számítógépes + rendszerek kutatócsoport (CSRG) Berkeley - A &os; kaliforniai Berkeley Egyetem + A &os; Kaliforniai Egyetem (Berkeley) Számítógépes rendszerek kutatócsoportja által fejlesztett 4.4BSD-Lite - kiadásán alapszik, és ápolja a + kiadásán alapszik és ápolja a BSD-rendszerek fejlesztésének jellegzetes hagyományait. Túl a kutatócsoport - kivételes munkáján, a &os; projekt + kivételes munkáján, a &os; Projekt több ezernyi órát szentelt arra, hogy a legtöbbet hozza ki a rendszerbõl mind a teljesítményt, mind pedig a valós életben felbukkanó terhelési helyezetekben - történõ helytállást illetõen - egyaránt. Ahogy a legnagyobb piaci óriások + történõ helytállást + illetõen. Ahogy a legnagyobb piaci óriások igyekeznek egy hasonló képességû, teljesítményû és megbízhatóságó PC-s @@ -415,12 +415,12 @@ USENET - USENET hír- és - hirdetményrendszer + USENET hírrendszer és + üzenõfal - És sok minden más... + Sok minden más... @@ -441,7 +441,7 @@ operációs rendszerek, számítógépes architektúrák és - hálózatok mûködésével. + hálózatok mûködésével! Rengeteg szabadon használható mûszaki, matematikai és grafikai tervezõ programcsomag könnyíti meg azok munkáját is, @@ -466,8 +466,8 @@ együttmûködését is anélkül, hogy a résztvevõknek aggódnia kellene a különleges - licenszelési szerzõdések vagy a - nyílt fórumokon felmerülõ + licencszerzõdések vagy a nyílt + fórumokon felmerülõ korlátozások miatt. @@ -633,11 +633,11 @@ - A &os; projektrõl + A &os; Projektrõl A most következõ rész egy-két háttérinformációt tár fel a - projektrõl, többek között a + Projektrõl, többek között a történetét, céljait és a benne alkalmazott fejlesztési modellt. @@ -659,11 +659,11 @@ Williams, Nate Grimes, Rod - &os; project + &os; Projekt történet - A &os; projekt valamikor 1993 kezdetérõl + A &os; Projekt valamikor 1993 kezdetérõl eredeztethetõ, és részben a Nem hivatalos 386BSD Patchkit-bõl nõtt ki, a patchkit 3 legutolsó koordinátorának, Nate @@ -678,25 +678,26 @@ megoldását reméltük, melyeket a patchkitek gyártása önmagában egyszerûen nem tudott megoldani. Néhányan - még talán emlékeznek is a projekt kezdeti + még talán emlékeznek is a Projekt kezdeti munkaneveire: 386BSD 0.5 vagy 386BSD Interim, melyek pontosan erre a tényre hivatkoztak. Jolitz, Bill - A 386BSD Bill Jolitz operációs rendszere volt, - mely ennél a pontnál már közel egy - éve nem került ápolásra. Mivel a - hozzátartozó patchkit pedig napról-napra - duzzadt, egyre kényelmetlenebbé vált a + A 386BSD eredetileg Bill Jolitz operációs + rendszere volt, amely ennél a pontnál már + közel egy éve nem került + ápolásra. Mivel a hozzátartozó + patchkit pedig napról napra duzzadt, egyre + kényelmetlenebbé vált a karbantartása. Ezért egyhangúan úgy - döntöttünk, hogy segítünk Billnek - azzal, hogy létrehozunk idõnként egy + döntöttünk, segítünk Billnek azzal, + hogy idõnként létrehozunk egy letisztított változatot. Ez a próbálkozásunk csúnyán kudarcba fulladt, amikor Bill Jolitz hirtelen meggondolta - magát és visszalépett a projekt + magát és visszalépett a Projekt támogatásától. Semmilyen egyértelmû útmutatást nem adott arra, hogy mit csináljunk helyette. @@ -713,7 +714,7 @@ a rendszer akkori felhasználóival tartott egyeztetések után állítottuk fel. Miután teljesen tisztán - láthatóvá vált, hogy a projekt a + láthatóvá vált, hogy a Projekt a megvalósulás útján van, felvettem a kapcsolatot a Walnut Creek-kel, terjesztési mód után nézve azokra számára, akik nem @@ -721,7 +722,7 @@ az internethez. A Walnut Creek nem csak támogatta a &os; CD-n történõ terjesztését, hanem még egy számítógépet - és egy gyors internet kapcsolatot is a projekt + és egy gyors internetkapcsolatot is a Projekt számára bocsátott. A Walnut Creek szinte példátlan mértékû, egy akkoriban teljesen ismeretlen projektbe vetett hitével @@ -732,8 +733,8 @@ Net/2 Berkeley 386BSD - Szabad szoftver - alapítvány + Szabad Szoftver + Alapítvány Az elsõ CD-lemezen (és széles körben az interneten is megjelenõ) változat a &os; 1.0 @@ -742,11 +743,11 @@ (Net/2) szalagokon található források alapján készült, kiegészítve a 386BSD-bõl és a Szabad - szoftver alapítványtól - származó komponensekkel. Elsõ - kiadásként igen méltányos sikert - könyvelhetett el, melyet a még inkább sikeres - &os; 1.1-el folytattunk 1994 + Szoftver Alapítványtól (Free Software + Foundation, FSF) származó komponensekkel. + Elsõ kiadásként igen méltányos + sikert könyvelhetett el, melyet a még inkább + sikeres &os; 1.1-el folytattunk 1994 májusában. Novell @@ -761,7 +762,7 @@ lezárult a Berkeley Net/2 szalagjainak jogi formáját illetõen. Ennek eredményeképpen a Berkeley elfogadta, hogy a Net/2 - nagy része jelzáloggalt terhelt + nagy része jelzáloggal terhelt és a Novell tulajdona, aki pedig valamivel korábban az AT&T-tõl szerezte. Ezért cserébe a Berkeley megkapta a Novell @@ -770,11 +771,11 @@ megszûnik a rajta levõ jelzálog. Emiatt az összes Net/2 felhasználónak erõsen javasolt volt váltani. Ez érintette magát - a &os;-t is, és így a projekt 1994 + a &os;-t is, és így a Projekt 1994 júliusáig kapott határidõt, hogy leállítsa a Net/2 alapú termékeinek szállítását. A megegyezés - értelmében a projekt kiadhatott még egy + értelmében a Projekt kiadhatott még egy utolsó kiadást a határidõ elõtt, amely végül a &os; 1.1.5.1 lett. @@ -792,7 +793,7 @@ programrészek nagyobb részét, ill. a 4.4-es verzió Intel processzorokra készített portja nagyon is befejezetlen volt. A - projektnek egészen 1994 novemberéig tartott, hogy + Projektnek egészen 1994 novemberéig tartott, hogy megtegye ezt a lépést, ugyanis ekkor jelent meg a &os; 2.0 az interneten és (december vége felé) CD-n. Annak ellenére, hogy még @@ -804,7 +805,7 @@ A &os; 2.1.5-öt 1996 augusztusában adtuk ki, mely akkora népszerûségnek örvendett - az internetszolgáltatók és kereskedelmi + az internet-szolgáltatók és kereskedelmi közösségek körében, hogy a a 2.1-STABLE elágazásból egy újabb kiadást készítettünk. Ez volt a @@ -888,7 +889,7 @@ kapnak helyet, és a 7.X-bõl készült idõközönkénti pillanatkiadások folyamatosan elérhetõek CD-n (és - természetesen neten keresztül is) a pillanatkiadásokat tároló szerverrõl. @@ -906,19 +907,19 @@ - A &os; projekt céljai + A &os; Projekt céljai - &os; project + &os; Projekt célok - A &os; projekt célja, hogy olyan szoftvereket + A &os; Projekt célja, hogy olyan szoftvereket kínáljon, amelyek tetszõlegesen, bármilyen célra felhasználhatóak, mindenféle megkötések nélkül. Sokunk jelentõs energiát fektet a programokba - (és a projektbe) és minden bizonnyal egyikünk + (és a Projektbe) és minden bizonnyal egyikünk sem utasítana vissza semmilyen anyagi ellenszolgáltatást se most, se késõbb, de egyáltalán nem ragaszkodunk hozzá. @@ -933,13 +934,9 @@ és ez az, amit mi is lelkesen magunkénak vallunk. - - GNU General Public License (GPL) - - - GNU Lesser General Public License (LGPL) - - BSD licensz + GNU General Public License (GPL) + GNU Lesser General Public License (LGPL) + BSD licenc A forrásfánkban található GNU General Public License (GPL) vagy a Library General Public @@ -951,7 +948,7 @@ GPL-es szoftverek kereskedelmi használata további bonyodalmakat vethet fel, ha lehetõségünk adódik rá, inkább a sokkal enyhébb - BSD licensszel rendelkezõ szoftvereket + BSD licenccel rendelkezõ szoftvereket választjuk. @@ -970,7 +967,7 @@ A &os; fejlesztési modellje - &os; projekt + &os; Projekt fejlesztési modell @@ -987,7 +984,7 @@ keresztül mûködjön együtt. Folyamatosan várjuk az új fejlesztõket és ötleteket, és mindazok, akik komolyabban - érdeklõdnek a projekt iránt, egyszerûen + érdeklõdnek a Projekt iránt, egyszerûen felvehetik velünk a kapcsolatot a &a.hackers; címén. Egy &a.announce; is elérhetõ azok számára, akik értesíteni @@ -995,7 +992,7 @@ felhasználót munkájuk fõbb eredményeirõl. - A &os; projektrõl és annak fejlesztési + A &os; Projektrõl és annak fejlesztési modelljérõl hasznos tudni az alábbiakat, függetlenül attól, hogy egyedül vagy másokkal szoros együttmûködésben @@ -1026,7 +1023,7 @@ repository egy Santa Clara-i (California, USA) számítógépen található, ahonnan a világban - található rengeteg tükörre + található rengeteg tükörszerverre másolódik. A CVS-fa, mely tartalmazza a -CURRENT és -STABLE ágakat, @@ -1034,7 +1031,7 @@ számítógépünkre is. Ennek részleteirõl bõvebben a A forrásfa - szinkronizálása c. részben + szinkronizálása c. szakaszban olvashatunk. @@ -1047,10 +1044,10 @@ A hivatalos fejlesztõk - (committerek) azok az emberek, akik a - CVS-fához írási joggal rendelkeznek, - tehát módosítást hajthatnak - végre a &os; forrásaiban (a + (committerek) azok az emberek, akik + a CVS-fához írási joggal + rendelkeznek, tehát módosítást + hajthatnak végre a &os; forrásaiban (a committer kifejezés a &man.cvs.1; commit parancsából származik, amelyet arra használunk, hogy @@ -1066,32 +1063,30 @@ - A &os; irányító csoportja + A &os; Core Team - irányító - csoport + Core Team - Ha a &os; projekt egy vállalat lenne, akkor a - &os; irányító - csoportja foglalná magában a - vezetõséget. Ennek a csoportnak - elsõdleges feladata, hogy fenntartsa a projekt - egészének kondícióját - és gondoskodjon róla, hogy a megfelelõ - irányba haladjon. Az irányító - csoportnak ugyanígy feladata a - megbízható és odaadó - committerek tömörítése és - az új tagok beszervezése, ha a - csoportból kilépne valaki. A jelenlegi - irányító csoport tagjait 2006 + Ha a &os; Projekt egy vállalat lenne, akkor a + &os; Core Teamje + (irányító csoportja) foglalná + magában a vezetõséget. Ennek a + csoportnak elsõdleges feladata, hogy fenntartsa a + Projekt egészének + kondícióját és gondoskodjon + róla, hogy a megfelelõ irányba + haladjon. Az irányító csoportnak + ugyanígy feladata a megbízható + és odaadó committerek + tömörítése és az új + tagok beszervezése, ha a csoportból + kilépne valaki. A jelenlegi Core Team tagjait 2006 júliusában választották meg. A választásokat kétévente tartják. - Ebben a csoportban egyes tagoknak ezen felül + Ebben a csoportban egyes tagoknak ezenfelül még bizonyos területekre felügyelniük is kell. Ez azt jelenti, hogy felelõsek a rendszer valamelyik nagyobb @@ -1104,13 +1099,12 @@ résztvevõk listjában. - Az irányító csoport - legtöbb tagja pusztán önkéntesen - vesz részt a &os; fejlesztésében - és nem származik a projektbõl - semmilyen anyagi haszna. Emiatt a - részvétel nem - tévesztendõ össze a + A Core Team legtöbb tagja pusztán + önkéntesen vesz részt a &os; + fejlesztésében és nem + származik a projektbõl semmilyen anyagi + haszna. Emiatt a részvétel + nem tévesztendõ össze a garantált támogatással. A vezetõségre vonatkozó @@ -1146,14 +1140,14 @@ url="&url.articles.contributors;/article.html">A &os; résztvevõinek listája hosszú és - még most is növekszik, miért nem + még most is növekszik; miért nem próbálunk mi is visszaadni valamit a &os;-nek? Nem csak programozással lehet segíteni a - projektet: a megoldandó feladatok + Projektet: a megoldandó feladatok listáját megtalálhatjuk a &os; projekt + url="&url.base;/index.html">&os; Projekt honlapján. @@ -1191,13 +1185,11 @@ NetBSD OpenBSD 386BSD - Szabad szoftver - alapítvány + Szabad Szoftver + Alapítvány Berkeley - - Számítógépes rendszerek - kutatócsoport - + Számítógépes + rendszerek kutatócsoport (CSRG) A &os; egy szabadon elérhetõ, teljes forráskóddal érkezõ 4.4BSD-Lite @@ -1210,7 +1202,7 @@ Berkeley Számítógépes rendszerek kutatócsoportjának szoftverein alapszik, számos javítással a NetBSD, OpenBSD, 386BSD - és a Szabad szoftver alapítvány + és a Szabad Szoftver Alapítvány munkásságának köszönhetõen. @@ -1244,15 +1236,15 @@ keresett program portjaiból álló gyûjteményét. Ebben a pillanatban is már több, mint &os.numports; port érhetõ - el! A portok listája a http (WWW) szerverektõl, a + el! A portok listája a HTTP (WWW) szerverektõl, a játékokon, nyelveken és sok mindenen keresztül a szövegszerkesztõkig terjed. Az egész Portgyûjtemény közelítõleg &ports.size; tárhelyet kíván, minden portot az eredeti forráshoz viszonyított - eltérésként tárol. - Ennek következtében a portok + különbségként + tárol. Ennek következtében a portok frissítése sokkal könnyebb és nagyban csökkenti a korábbi, 1.0-ás Portgyûjteménynél kialakult From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:34:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60B50106567B; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20E4A1065677 for ; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EDAA8FC1C for ; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLYOHi039252 for ; Sat, 19 Apr 2008 21:34:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLYOYP039250 for perforce@freebsd.org; Sat, 19 Apr 2008 21:34:24 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:34:24 GMT Message-Id: <200804192134.m3JLYOYP039250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:34:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=140265 Change 140265 by pgj@disznohal on 2008/04/19 21:33:56 Cleanup in Chapter 2. Affected files ... .. //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#5 (text+ko) ==== @@ -12,10 +12,10 @@ - Jim + Jim Mock Átszervezte, átrendezte és egyes - részeit újraírta: + részeit átdolgozta: @@ -37,8 +37,9 @@ telepítés A &os; telepítéséhez egy könnyen - használható szöveges telepítõprogram, - a sysinstall használható. + használható szöveges + telepítõprogram, a + sysinstall használható. Ez a &os; alapértelmezett telepítõprogramja, habár ezt a különféle gyártók kedvük szerint lecserélhetik. @@ -52,24 +53,24 @@ - Hogyan készítsünk - telepítõlemezeket a &os;-hez + hogyan készítsünk + telepítõlemezeket a &os;-hez; - A &os; miként hivatkozza és osztja fel a - merevlemezeinket + a &os; miként hivatkozza és osztja fel a + merevlemezeinket; - Hogyan indítsuk el a - sysinstallt + hogyan indítsuk el a + sysinstall programot; - Milyen kérdéseket tesz fel nekünk a + milyen kérdéseket tesz fel nekünk a sysinstall, mire gondol, hogyan is - kell azokat megválaszolni + kell azokat megválaszolni. @@ -77,10 +78,10 @@ - A telepítõ &os; verzióhoz + a telepítendõ &os; verzióhoz tartozó támogatott hardvereket felsoroló lista átolvasása és benne a saját - hardvereszközeink ellenõrzése + hardvereszközeink megkeresése. @@ -89,18 +90,18 @@ következõ telepítési utasítások az &i386; (PC kompatibilis) architektúrájú - számítógépekre vonatkoznak. - Helyenként más platformokra (például - Alpha) vonatkozó utasítások is szerepelnek, - amennyiben erre szükség lenne. Habár ezt a + számítógépekre vonatkoznak. Ahol + erre szükség van, ott más platformokra + (például Alpha) vonatkozó + utasítások is szerepelhetnek. Habár ezt a leírás igyekszünk a lehetõ legjobban naprakészen tartani, elképzelhetõ, hogy - felfedezünk kisebb eltérésket a + felfedezhetünk kisebb eltérésket a telepítõben és az itt leírtak közt. Ezért ezt a fejezetet inkább egy - általános útmutatóként - javasoljuk, nem pedig egy szószerint - értelmezendõ kézikönyvnek. + általános útmutatónak javasoljuk, + nem pedig egy szó szerint értelmezendõ + kézikönyvként. @@ -112,9 +113,9 @@ Minimális konfiguráció A &os; telepítéséhez - szükséges minimális konfiguráció - &os; verziónként és - architektúránként + szükséges minimális + konfiguráció &os; verziónként + és architektúránként eltérõ. A minimális konfigurációt a &os; @@ -142,10 +143,12 @@ Régebbi konfigurációk esetén - többnyire inkább a több memória ill. - lemezterület beszerzése sokkal fontosabb, mint - egy gyorsabb processzor. + nem egy gyorsabb processzor, hanem inkább több + memória beszerzése, illetve több + lemezterület felszabadítása a + fontosabb. + @@ -154,7 +157,7 @@ Alpha A &os;/&arch.alpha; telepítéséhez egy - ismert platformra (ld. ), valamint a &os;-nek szánt külön lemezre van szükségünk. Pillanatnyilag nem @@ -170,19 +173,19 @@ SRM Szükségünk lesz a platformunkon az SRM - konzol firmware-jére. Sok esetben tudunk váltani - az AlphaBIOS (vagy ARC) és az SRM firmware-je - között. Minden más helyzetben le kell - töltenünk egy új firmware-t a + konzol firmware-jére. Sok esetben tudunk + váltani az AlphaBIOS (vagy ARC) és az SRM + firmware-je között. Minden más helyzetben le + kell töltenünk egy új firmware-t a gyártó honlapjáról. Az Alpha támogatás a &os; 7.0 - beindulásával eltávolításra - került. A &os; 6.X - sorozat az utolsó, amely valamilyen - támogatást ajánl ehhez az - architektúrához. + beindulásával + eltávolításra került. A + &os; 6.X sorozat az + utolsó, amely valamilyen támogatást + ajánl ehhez az architektúrához. @@ -201,7 +204,7 @@ csoportja az &intel; EM64T architektúrájára épülõ processzorok. Ilyen processzor például az - &intel; &core; 2 Dua, Quad és Extreme + &intel; &core; 2 Duo, Quad és Extreme processzorcsaládok, valamint az &intel; &xeon; 3000, 5000 és 7000 sorozatszámú processzorai. @@ -210,23 +213,26 @@ rendelkezük, ki kell kapcsolnunk a BIOS-ban az IO APIC használatát. Ha nem találnánk ilyen beállítást, - akkor helyette az ACPI-t kell kikapcsolnunk. A Pro-150 - chipsetnek vannak bizonyos hibái, amire eddig - még nem találtunk megfelelõ - megoldást. + akkor helyette magát az ACPI-t kell kikapcsolnunk. A + Pro-150 chipsetnek vannak bizonyos hibái, amelyekre + eddig még nem sikerült megfelelõ + megoldást találnunk. + &os;/&arch.sparc64; A &os;/&arch.sparc64; telepítéséhez - egy támogatott platformra van szükségünk - (ld. ). + egy támogatott platformra van + szükségünk (lásd: ). A &os;/&arch.sparc64; telepítéséhez - egy egész lemezre lesz szükségünk, mivel - a rendszer jelenleg nem képes megosztani azt más - operációs rendszerekkel. + egy egész lemezre lesz szükségünk, + mivel a rendszer jelenleg nem képes megosztani azt + más operációs rendszerekkel. + @@ -243,6 +249,7 @@ sysinstall dokumentációkat tartalmazó menüjében találhatunk meg. + @@ -273,24 +280,25 @@ helyesbíteni kell a &os; által megállapított értékeket. - Ha már van gépünkön egy másik - operációs rendszer, mondjuk &windows; vagy - &linux;, akkor mindenképpen hasznos lehet az - általa felkínált eszközökkel - lekérdezni a hardvereink - beállításait. Ha nem lennénk - biztosak benne, hogy az adott + Ha már van a gépünkön egy + másik operációs rendszer, + például &windows; vagy &linux;, akkor + mindenképpen hasznos lehet az általa + felkínált eszközökkel lekérdezni + a hardvereink beállításait. Ha nem + lennénk biztosak benne, hogy az adott bõvítõkártyákat pontosan milyen beállításokkal is használjuk, - nézzük meg magán a kártyán. A - népszerû IRQ értékék - általában a 3, 5 és 7, valamint az IO - portok számát általában tizenhatos - számrendszerben szerepeltetik, pl. 0x330. + nézzük meg ezeket magán a + kártyán. A népszerû IRQ + értékék általában a 3, 5 + és 7, valamint az IO portok számát + általában tizenhatos számrendszerben + szerepeltetik, például 0x330. Javasoljuk, hogy nyomtassuk ki vagy írjuk le ezeket a paramétereket a &os; telepítése elõtt. - Ehhez rendezzük õket egy táblázatban, + Ehhez rendezzük ezeket egy táblázatban, valahogy így: @@ -305,7 +313,7 @@ Eszköz neve IRQ - IO port(ok) + IO portok Megjegyzés @@ -346,7 +354,7 @@ Modem-- - &tm.3com; 56K faxmodem, COM1 + &tm.3com; 56K-s faxmodem, COM1 … @@ -356,10 +364,11 @@
Ahogy elkészítettük a - számítógépünk alkatrészeit - tartalmazó listát, vessük õket - össze a telepítendõ &os; kiadás + számítógépünk + alkatrészeit tartalmazó listát, vessük + ezeket össze a telepítendõ &os; kiadás által megkövetelt eszközökkel. + @@ -368,15 +377,16 @@ Amennyiben a &os; telepítéséhez használt számítógép számunkra értékes adatokat tárol, - igyekezzünk lementeni õket, és a &os; + igyekezzünk lementeni ezeket, és a &os; tényleges telepítése elõtt gyõzõdjünk is meg róla, hogy a mentés sikeres volt. A &os; telepítõrutinjai természetesen megerõsítést fognak kérni bármilyen adat lemezre írása elõtt, azonban ha egyszer már elindítottuk a - folyamatot, már semmit sem lehet + folyamatot, már semmit sem tudunk visszafordítani. + @@ -388,10 +398,10 @@ még nincs miért izgatnunk magunkat — nyugodtan átléphetjük ezt a szakaszt. - Azonban ha a &os;-t más operációs + Amikor viszont a &os;-t más operációs rendszerek mellé szeretnénk telepíteni, ismernünk kell, miként is helyezkednek el az adatok - a lemezeken és ez miként is érint + a lemezeken, és hogy ez miként is érint bennünket. @@ -402,46 +412,46 @@ különálló darabokra tagolhatóak. Ezeket a darabokat partícióknak nevezzük. - Mivel azonban &os; saját maga szintén tárol - partíciókat, ezért ez az elnevezés - pillanatok alatt megtévesztõvé válhat, - ezért ezeket a lemezdarabokat a &os; maga - lemezslice-oknak vagy egyszerûen csak slice-oknak - hívja. Például a PC-s - lemezpartíciókkal dolgozó - fdisk nevû &os;-s segédprogram - partíciók helyette is slice-okra hivatkozik. A PC - lemezenként alapvetõen csak négy - partíciót enged meg. Ezeket a + Mivel azonban &os; a saját maga szintén + tárol partíciókat, ezért ez az + elnevezés pillanatok alatt + megtévesztõvé válhat, ezért + ezeket a lemezdarabokat a &os; lemezslice-oknak vagy + egyszerûen csak slice-oknak hívja. + Például a PC-s lemezpartíciókkal + dolgozó, fdisk nevû &os;-s + segédprogram partíciók helyett is + slice-okra hivatkozik. A PC lemezenként alapvetõen + csak négy partíciót enged meg. Ezeket a partíciókat nevezik elsõdleges partícióknak. Ettõl a korlátozástól egy új típus, a kiterjesztett partíció létrehozásával szabadultak meg, amivel - négynél több partíció is - készíthetõ. Lemezenként egyetlen - ilyen kiterjesztett partíció - található, de ezen belül speciális, - ún. logikai + így négynél több + partíció is készíthetõ. + Lemezenként egyetlen ilyen kiterjesztett + partíció található, de ezen + belül speciális, ún. logikai partíciók hozhatóak létre. Minden partíciónak van egy - partícióazonosítója, + partíció-azonosítója, melyet a partíción található adatok típusának megállapítására használnak. - A &os; partícióinak azonosítója + A &os; partícióinak azonosítója a 165. Általánosságban véve minden operációs rendszer így azonosítja a partíciókat. Például a DOS - és annak leszármazottai, mint mondjuk a &windows;, - minden elsõdleges és logikai - partícióhoz egy + és annak leszármazottai, mint + például a &windows;, minden elsõdleges + és logikai partícióhoz egy C:-tõl induló - meghajtóbetûjelet + meghajtó-betûjelet társít. A &os;-t egy elsõdleges partícióra kell @@ -458,10 +468,10 @@ partíció, amelyen már nem használt adatok vannak. - Ha már mindegyik partíciónkat - lefoglalja valami, akkor a többi operációs - rendszer által felkínált eszközök - (pl. &ms-dos;-ban vagy &windows;-ban az + Ha már mindegyik partíciónk betelt, + akkor a többi operációs rendszer által + felkínált eszközök + (például &ms-dos;-ban vagy &windows;ban az fdisk) valamelyikével elõször fel kell közülük szabadítanunk egyet a &os; számára. @@ -469,67 +479,67 @@ Amennyiben akadna egy használható partíció, akkor használjuk azt. Ekkor azonban elõfordulhat, hogy ehhez elõször a - meglévõk közül valamelyiket össze - kell majd zsugorítanunk. + meglévõk közül össze kell majd + zsugorítanunk valamelyiket. A &os; legkisebb telepíthetõ változata nagyjából 100 MB lemezterületet igényel. Azonban ez egy nagyon - kicsi változat, és szinte semmi helyet nem hagy a - saját állományainknak. Sokkalta hûbb - a valósághoz, ha grafikus felület + kicsi változat és szinte semmi helyet nem hagy a + saját állományainknak. Sokkal + valósághûbb, ha grafikus felület nélkül nagyjából 250 MB-ot - mondunk, és legalább 350 MB-ot grafikus + mondunk, és legalább 350 MB-ot a grafikus felület használata esetén. Ha ezeken - felül még további szoftvereket is - telepíteni kívánunk, még több - helyre lesz szükségünk. + felül további szoftvereket is telepíteni + kívánunk, még több helyre lesz + szükségünk. - A &os; számára helyet csinálni - és a partíciók - átméretezéséhez használhatjuk - mondjuk a &partitionmagic; nevû - kereskedelmi szoftvert, vagy esetleg olyan szabad - eszközöket is, mint mondjuk + Amikor a &os; számára akarunk helyet + csinálni, vagy partíciókat akarunk + átméretezni, használjuk + például a + &partitionmagic; nevû + kereskedelmi szoftvert vagy esetleg egy olyan szabad + eszközt, mint például a GParted. A telepítõ CD-n megtalálható tools könyvtárban találhatunk erre a feladatra - két szabad szoftvert, név szerint a + két szabad szoftvert is, név szerint a FIPS és - PResizer programokat. A - hozzájuk tartozó dokumentáció - ugyanitt megtalálható. A - FIPS, a - PResizer és a + PResizer programokat. Ugyanitt a + hozzájuk tartozó dokumentáció is + megtalálható. A FIPS, + a PResizer és a &partitionmagic; egyaránt képes az &ms-dos; és a &windows; ME által használt FAT16 és FAT32 partíciókat - átméretezni. Ismereteink szerint + átméretezni. Ismereteink szerint a &partitionmagic; és a GParted is használható - az NTFS partíciók - esetén. A GParted - számos Live CD-s &linux;-os disztribúción + az NTFS partíciókkal. A + GParted számos Live CD-s + &linux;os disztribúción megtalálható, ilyen többek közt a SystemRescueCD. - Gondok lehetnek azonban a µsoft; Vistája - által használt partíciókkal. Nem - árt, ha az átméretezéskor a + Gondok lehetnek azonban a µsoft; Vista által + használt partíciókkal. Ezért nem + árt, ha az átméretezésekor a kezünk ügyében van a Vista telepítõ - CD-je. Mint minden lemezkarbantási mûvelet - esetén, ilyenkor is határozottan ajánlott - biztonsági mentéseket + CD-je. Természetesen, mint minden lemezkarbantási + mûvelet esetén, ilyenkor is határozottan + ajánlott biztonsági mentéseket készíteni. Az említett eszközök helytelen - használata megsemmisítheti a lemezeinket + használata megsemmisítheti a lemezeinken tárolt adatokat, ezért a használatuk - elõtt gondoskodjunk a friss, mûködõ - biztonsági mentések - készítésérõl. + elõtt gondoskodjunk friss, + mûködõképes biztonsági + mentésekrõl. @@ -548,14 +558,14 @@ van a C: meghajtón és fél GB a D:-n. - Mindez azt jelenti, hogy a lemezünkön két - partíció található, tehát - betûjelenként egy. Ha átmásoljuk a - D: meghajtón levõ - adatainkat a C: meghajtóra, - akkor ezzel felszabadíthatjuk a &os; - számára a második - partíciót. + Mindez tehát azt jelenti, hogy a + lemezünkön két partíció + található, betûjelenként egy. Ha + átmásoljuk a D: + meghajtón levõ adatainkat a + C: meghajtóra, akkor ezzel + felszabadíthatjuk a &os; számára a + második partíciót. @@ -569,12 +579,12 @@ példánya foglal el. A &windows; telepítése során ezért minden bizonnyal egyetlen nagy partíciót hoztunk - létre, ami a C: betûjelet - kapta és a mérete 4 GB. Jelen pillanatban - másfél GB helyet használunk a - lemezen, és szeretnénk a &os; - számára 2 GB helyet - felszabadítani./para> + létre, amely a C: + betûjelet kapta és a mérete 4 GB. + Jelen pillanatban másfél GB helyet + használunk a lemezen, és szeretnénk a + &os; számára 2 GB helyet + felszabadítani. A &os; telepítéséhez a következõk valamelyikét kell @@ -582,9 +592,9 @@ - Mentsük le a &windows;-os adatainkat, - telepítsük újra a &windows;-t úgy, - hogy egy 2 GB méretû + Mentsük le a &windows;szos adatainkat, + telepítsük újra a &windows;t + úgy, hogy egy 2 GB méretû partíciót választunk neki a telepítése során. @@ -611,11 +621,11 @@ telepítéséhez, mivel jelen pillanatban nem tud más rendszerekkel osztozni a lemezeken. A gépünkben található lemez - rendelkezhet IDE vagy SCSI csatolóval is, egyedül + rendelkezhet IDE- vagy SCSI-csatolóval is, egyedül az a fontos, hogy el tudjuk róla indítani a rendszert. - A Digital / Compaq leírásainak + A Digital, illetve Compaq leírásainak megfelelõen az SRM összes parancsát nagybetûkkel írjuk, habár az SRM nem különbözteti meg a kis- és @@ -641,9 +651,9 @@ három meghajtót csatlakoztattunk hozzá. Ezek közül az elsõ a DKA0 nevet viselõ CD-ROM - meghajtó, valamint van még további - lemezünk, DKC0 és - DKC100 néven. + meghajtó, valamint van még két + további lemezünk, DKC0 + és DKC100 néven. A DKx alakú névvel rendelkezõ eszközök a SCSI-lemezek. Ennek @@ -659,7 +669,7 @@ eszköznév magára a SCSI-vezérlõre vonatkozik. Ahogy az a SHOW DEVICE kimenetében is - látszik, ha SCSI csatolón keresztül + látszik, a SCSI csatolón keresztül csatlakoztatott CD-ROM meghajtókat a többi SCSI-merevlemezhez hasonlónak tekinti. @@ -673,7 +683,7 @@ Szedjük össze a hálózati - beállítasainkat + beállításainkat Amennyiben a &os; telepítésének részeként hálózatra is @@ -682,16 +692,16 @@ ismernünk kell a hálózatra vonatkozó beállításainkat is. A telepítõ rá fog kérdezni ezekre az - információkra, aminek megadása után + információkra, amelyek megadása után a &os; a telepítés befejezéséhez csatlakozni tud majd a hálózatra. - Csatlakozás Ethernetes hálózaton - vagy kábel-/DSL modemen keresztül + Csatlakozás Ethernet-hálózaton, + kábel- vagy DSL-modemen keresztül - Ha egy Ethernetes hálózathoz, vagy - magához az internethez csatlakozunk egy DSL vagy + Ha egy Ethernet-hálózathoz, vagy + magához az internethez csatlakozunk egy DSL- vagy kábelmodemen keresztül, akkor az alábbi adatokra lesz szükségünk: @@ -700,18 +710,18 @@ IP-cím - az alapértelmezett átjáró + Az alapértelmezett átjáró IP-címe - gépünk neve + A gépünk neve - DNS (névfeloldó) szerver(ek) - IP-címe(i) + DNS (névfeloldó) szerverek + IP-címei - hálózati maszk + Hálózati maszk @@ -721,43 +731,47 @@ Elképzelhetõ az is, hogy mindezen információkat DHCP segítségével, automatikusan kapjuk meg. - Ezt is mindenképpen jegyezzük fel! + Ezt is mindenképpen jegyezzük fel. + Kapcsolódás modemmel - Ha az internetszolgáltatónkhoz - hagyományos modemen keresztül csatlakozunk, akkor is - tudjuk telepíteni a &os;-t interneten keresztül, - azonban ez nagyon sokáig tarthat. + Ha az internet-szolgáltatónkhoz + hagyományos modemen keresztül csatlakozunk, akkor + is tudjuk telepíteni a &os;-t interneten + keresztül, azonban ez nagyon sokáig + tarthat. Ehhez tudnunk kell: - Az internetszolgáltatónk + Az internet-szolgáltatónk behívószámát - A soros (COM) port számát, amin + A soros (COM) port számát, amelyen keresztül a modem kapcsolódik a gépünkhöz - Az internetszolgáltatónktól + Az internet-szolgáltatónktól kapott felhasználói nevet és jelszót + + Olvassuk el &os; hibajegyzékét - Habár a &os; projekt igyekszik a &os; minden egyes + Habár a &os; Projekt igyekszik a &os; minden egyes kiadását a lehetõ - legmegbízhatóbbra felkészíteni, + legmegbízhatóbban felkészíteni, hibák óvatlanul is maradnak bennük. Nagyon ritka esetekben ezek a hibák magára a telepítés folyamatára is kihathatnak. @@ -766,11 +780,12 @@ megjelennek a &os; honlapján található - hibajegyzékben. Telepítés - elõtt mindig ajánlott átolvasni ezt a - dokumentumot, amivel megbizonyosodunk róla, hogy - semmilyen utólag felmerült probléma nem - akadályozza a munkánkat. + hibajegyzékben (angolul). A + telepítés elõtt ezért mindig + ajánlott átolvasni ezt a dokumentumot, így + megbizonyosodunk róla, hogy semmilyen utólag + felmerült probléma nem akadályozza + munkánkat. Az összes kiadáshoz tartozó információ, beleértve az egyes @@ -779,7 +794,9 @@ honlapjáról a kiadásokra vonatkozó információkat - tartalmazó részen érhetõ el. + tartalmazó részen érhetõ el + (angolul). + @@ -792,7 +809,7 @@ történik: - Helybõl + Lokálisan: CD vagy DVD @@ -804,39 +821,41 @@ - SCSI vagy QIC szalag + SCSI- vagy QIC-szalag - Floppy lemezek + Floppylemezek - Hálózaton keresztül + Hálózaton keresztül: - FTP oldal, tûzfalon keresztül vagy + FTP oldalról, tûzfalon keresztül vagy szükség szerint HTTP proxy használatával - NFS szerver + NFS szerverrõl - Párhuzamos vagy soros kapcsolat + Párhuzamos vagy soros vonali kapcsolaton + keresztül Ha megvásároltuk a &os; telepítõ - CD-jét vagy DVD-jét, akkor már minden megvan - a telepítéshez. Lépjünk bátran - tovább a következõ szakaszra ()! - Ha eddig még szereztük volna be a &os; + Ha eddig még nem szereztük volna be a &os; telepítéséhez szükséges állományokat, ugorjunk a hoz, ahol megtudhatjuk, hogyan @@ -845,6 +864,7 @@ helyzetekben. A szakasz elolvasása után pedig jöjjünk vissza ide, majd folytassuk az olvasást a ban. + @@ -869,140 +889,140 @@ Ha CD-n vagy DVD-n megvan a &os; telepítõje - (akár megvettük vagy éppen magunk + (akár megvettük, akár éppen magunk készítettük) és a számítógépünk tud CD-rõl vagy DVD-rõl rendszert indítani (a BIOS-ban van egy Boot Order vagy hozzá hasonló nevû beállítás), akkor kihagyhatjuk - ezt a szakaszt. A &os; CD- és DVD-képek + ezt a szakaszt. A &os; CD- és DVD image-ek kiírásával egy rendszerindításra alkalmas lemezt kapunk, amirõl minden további elõkészület nélkül telepíthetünk. - Rendszerindító floppy lemezt az alábbi - lépések mentén haladva tudunk - készíteni: + A rendszerindító floppy lemezt az + alábbi lépések mentén haladva tudjuk + elkészíteni: - A rendszerindító lemezek képeinek + <title>A rendszerindító lemezek image-einek beszerzése A rendszerindító lemezek a - telepítõeszköz floppies/ + telepítõeszköz + floppies/ könyvtárában találhatóak, illetve letölthetõek az ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<architektúra>/<változat>-RELEASE/floppies/ helyrõl. Az <architektúra> - és <version> - helyére természtesen - helyettesítsük be a telepíteni - kívánt architektúrát és - verziószámot. Így - például a + és <változat> + helyére természtesen írjuk be a + telepíteni kívánt + architektúrát és verziót. + Így például a &os;/&arch.i386; &rel.current;-RELEASE rendszerindító lemezei az címrõl érhetõek el. - A floppy-k képeinek .flp - kiterjesztése van. A floppies/ - könyvtár számos - különféle képet tartalmaz, ezek - közül leginkább a telepítendõ - &os; változat valamint emellett olykor a hardver - határozza meg a használandót. Az - esetek túlnyomó részében - négy floppy-ra lesz szükségünk: + A floppyk image-einek .flp + kiterjesztésûek. A + floppies/ könyvtár + számos különféle image-et tartalmaz, + ezek közül leginkább a + telepítendõ &os; változat, valamint + emellett olykor konkrétan a hardver határozza + meg a használandót. Az esetek + túlnyomó részében négy + floppyra lesz szükségünk: boot.flp, kern1.flp, kern2.flp és - kern3.flp. A lemezek képeit + kern3.flp. A lemezek image-eit illetõ legfrissebb információkat ugyanazon a könyvtáron belül szereplõ README.TXT állományban - olvashatjuk. + olvashatjuk (angolul). - Az FTP-hez használt programunkat a - lemezképek letöltése során ne - felejtsük el bináris - (binary) átviteli módban - használni. Egyes böngészõk - hajlamosak ugyanis szöveges (text, vagy - ASCII) átviteli módot - használni, ami viszont csak abból - vehetõ észre, hogy nem tudjuk a - lemezekrõl elindítani a rendszert. + Az FTP-hez használt programunkat az image-ek + letöltése során ne felejtsük el + bináris (binary) + átviteli módban használni. Egyes + böngészõk hajlamosak ugyanis + szöveges (text vagy ASCII) + átviteli módot használni, ami viszont + csak abból vehetõ észre, hogy nem + tudjuk a lemezekrõl elindítani a + rendszert. - A floppy-k + <title>A floppyk elõkészítése - Mindegyik letöltendõ képhez elõ - kell készíteni egy-egy hajlékonylemezt. + Mindegyik letöltendõ image-hez elõ kell + készíteni egy-egy hajlékonylemezt. Nagyon fontos, hogy ezek a lemezek teljesen hibátlanok legyenek. Errõl a legkönnyebben úgy gyõzõdhetünk meg, ha a lemezeket magunk formázzuk, és nem bízunk a különféle elõreformázott - (preformatted) floppy-kban. A &windows;-ban + (preformatted) floppykban. A &windows;ban található formázó segédprogram sem árul nekünk semmit a lemezeken található hibás részekrõl, egyszerûen csak rossznak (bad) jelöli meg és - figyelmen kívül hagyja õket. + figyelmen kívül hagyja ezeket. Határozottan ajánljuk, hogy amennyiben a telepítésnek ezt a módját választjuk, mindig használjunk teljesen - új floppy-kat. + új floppykat. Ha megpróbáljuk telepíteni a &os;-t, és a telepítõprogram összeomlik, lefagy vagy bármilyen furcsaságot mûvel, elsõként - mindenképpen a floppy-kra gyanakodhatunk. Ilyenkor - írjuk ki a lemezképeket új lemezekre + mindenképpen a floppykra gyanakodhatunk. Ilyenkor + írjuk ki az image-eket új lemezekre és próbálkozzunk újra a telepítéssel. - A lemezképek kiírása a - floppy-kra + Az image-ek kiírása a floppykra Az .flp kiterjesztésû állományok nem a lemezre másolható hagyományos állományok, hanem a lemezek teljes - tartalmának képei, ezért - nem másolhatjuk egyszerûen - õket egyik lemezrõl a másikra. A - képek közvetlenül a lemezekre - írására ehelyett kifejezetten erre a - célra alkalmas eszközöket kell - használnunk. + tartalmának képei, ezért ezeket + egyszerûen nem másolhatjuk + egyik lemezrõl a másikra. Az image-ek + közvetlen lemezreírásához ehelyett + kifejezetten erre a célra alkalmas + eszközöket kell használnunk. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:34:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D25431065676; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51DE71065678 for ; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FEB88FC2C for ; Sat, 19 Apr 2008 21:34:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLYPf1039257 for ; Sat, 19 Apr 2008 21:34:25 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLYPXn039255 for perforce@freebsd.org; Sat, 19 Apr 2008 21:34:25 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:34:25 GMT Message-Id: <200804192134.m3JLYPXn039255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=140266 Change 140266 by pgj@disznohal on 2008/04/19 21:34:18 Cleanup in Chapter 3. Affected files ... .. //depot/projects/docproj_hu/books/handbook/basics/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -14,7 +14,7 @@ Chris Shumway - Újraírta: + Átdolgozta: @@ -41,49 +41,51 @@ - Az ún. virtuális konzolok - használatát &os; alatt. + az ún. virtuális konzolok + használatát &os; alatt; - Hogyan mûködnek együtt a &unix; - állományokra vonatkozó engedélyei a - &os; saját - kiegészítéseivel. + hogyan mûködnek együtt a &unix; + állományokra vonatkozó engedélyei + a &os; saját + kiegészítéseivel; - Egy &os; állományrendszer - alapértelmezett kialakítását. + egy &os; állományrendszer + alapértelmezett + kialakítását; - A &os; lemezszervezését. + a &os; lemezszervezését; - Hogyan csatlakoztassunk és válasszunk le - állományrendszereket. + hogyan csatlakoztassunk és válasszunk le + állományrendszereket; - Mik a folyamatok, démonok és - jelzések. + mik azok a folyamatok, démonok és + jelzések; - Mi az a shell, és miként tudjuk - megváltoztatni az alapértelmezett - bejelentkezési környezetünket. + mik azok a parancsértelmezõk, és + miként tudjuk megváltoztatni az + alapértelmezett bejelentkezési + környezetünket; - Hogyan használjuk az alapvetõ - szövegszerkesztõket. + hogyan használjuk az alapvetõ + szövegszerkesztõket; - Mik az eszközök és az - eszközleírók. + mik az eszközök és az + eszközleírók; &os; alatt milyen bináris formátumokat - használhatunk. + használhatunk; - Szükség esetén hogyan olvassuk el a + szükség esetén hogyan olvassuk el a megfelelõ man oldalakat. @@ -92,27 +94,29 @@ Virtuális konzolok és terminálok + virtuális konzolok terminálok A &os; számos módon használható. Ezek közül az egyik az, ha parancsokat - gépelünk be a szöveges terminálon. A - &unix; operációs rendszer - rugalmasságának és erejének - jelentõs része érhetõ el egyszerûen, - amikor a &os;-t így használjuk. Ebben a szakaszban - megtudhatjuk, mik azok a terminálok - és konzolok és miként tudjuk - õket &os; alatt használni. + gépelünk be a szöveges terminálon. + Így érhetõ el egyszerûen a &unix; + operációs rendszer rugalmasságának + és erejének jelentõs része. Ebben a + szakaszban megtudhatjuk, mik azok a + terminálok és konzolok + és miként tudjuk ezeket &os; alatt + használni. A konzol + konzol Ha nem állítottuk volna be, hogy a &os; - indulása során automatikusan induljon el a grafikus - felület is, akkor a rendszer egy bejelentkezõ + indulása során automatikusan induljon el a + grafikus felület is, akkor a rendszer egy bejelentkezõ képernyõt fog mutatni közvetlenül a rendszerindítás befejezõdése után. Ekkor valami ilyesmit kell majd @@ -129,8 +133,8 @@ login: Egyes rendszereken ugyan némileg eltérhetnek - az üzenetek, de hasonlót kell látnunk. Minket - most az utolsó két sor érdekel. Az + az üzenetek, de hasonlót kell látnunk. + Minket most az utolsó két sor érdekel. Az utolsó elõtti sorban ez olvasható: FreeBSD/i386 (pc3.example.org) (ttyv0) @@ -144,8 +148,8 @@ jelzés. Még abban az esetben is a i386 kiírást fogjuk látni, hogy ha a &os;-t konkrétan nem is az - &intel; 386-os processzorán futtatjuk. Itt nem a - processzorunk típusát, hanem a processzorunk + &intel; 386-os processzorán futtatjuk. Itt ugyanis + nem a processzorunk típusát, hanem annak architektúráját láthatjuk. . A gépünk neve (mivel minden &unix;-os @@ -160,10 +164,11 @@ login: Ez az a rész, ahova a &os;-be - történõ bejelentkezéshez meg kell adnunk a - felhasználói nevünket (user + történõ bejelentkezéshez meg kell adnunk + a felhasználói nevünket (user name). A következõ szakaszban errõl olvashatunk. + @@ -176,22 +181,24 @@ számítógépen egyszerre rengeteg programot képesek futtatni. - Minden többfelhasználós rendszernek meg - kell tudnia különböztetnie egy + Minden többfelhasználós rendszernek + valamilyen módon meg kell tudnia + különböztetnie egy felhasználóját a - többitõl valamilyen módon. A &os;-ben - (és minden más &unix;-szerû - operációs rendszerben) ezt úgy érik - el, hogy a programok futtatása elõtt minden - felhasználónak be kell jelentkeznie - a rendszerbe. Minden felhasználó rendelkezik egy - egyedi névvel (ez a felhasználói - név) és ehhez egy titkos kulcssal (ez a + többitõl. A &os;-ben (és minden más + &unix;-szerû operációs rendszerben) ezt + úgy érik el, hogy a programok futtatása + elõtt minden felhasználónak be kell + jelentkeznie a rendszerbe. Minden + felhasználó rendelkezik egy egyedi névvel + (ez a felhasználói név) + és ehhez egy titkos kulcssal (ez a jelszó). A &os; a programok futtatásához ezt a kettõt fogja elkérni a felhasználótól. - indító szkriptek + rendszerindító szkriptek + Egybõl miután a &os; elindult és befejezte a rendszerindításhoz használt szkriptjeinek lefuttatását @@ -206,8 +213,9 @@ futtatandó, hasznos munkát végzõ szolgáltatásokat. , ez a kijelzés (vagy más néven - prompt) fog megjelenni és kérni egy - érvényes felhasználói nevet: + prompt) fog megjelenni és kér egy + érvényes felhasználói + nevet: login: @@ -215,20 +223,21 @@ hogy a felhasználói nevünk pgj. Az iménti prompthoz írjuk be, hogy pgj és nyomjuk - le az Entert. Ezt követõen meg kell - jelennie egy másik promptnak is, amely egy - jelszót (password) kér: + le az Enter billentyût. Ezt + követõen meg kell jelennie egy másik promptnak + is, amely egy jelszót (password) + kér: login: pgj Password: Most pedig gépeljük be pgj jelszavát és nyomjunk után egy - Entert. Vigyázzunk, hogy a - jelszót nem látjuk a + Enter billentyût. Vigyázzunk, hogy + a jelszót nem látjuk a beírás során! Emiatt most ne aggódjunk. Ezzel kapcsolatban elegendõ csak annyit - mondani, hogy mindez biztonsági + tudni, hogy mindez biztonsági megfontolásokból történik. Amennyiben jól adtuk meg a jelszavunkat, sikeresen @@ -241,7 +250,8 @@ üzenete jelenik meg, amelyet a parancssor követ (egy #, $ vagy % jel). Innen tudhatjuk meg, hogy - sikerült bejelentkeznünk./para> + sikerült bejelentkeznünk. + @@ -302,6 +312,7 @@ látszik, mintha több virtuális képernyõn és billentyûzeten adnánk parancsokat a &os;-nek. + @@ -314,24 +325,24 @@ könnyedén testreszabhatjuk úgy a telepített rendszerünket, hogy több vagy esetleg kevesebb virtuális konzollal induljon el. A - virtuális konzolok száma és pontos + virtuális konzolok száma és azok pontos beállítása az /etc/ttys állományon - keresztül végezhetõ el. + keresztül adható meg. A &os; virtuális konzoljait tehát az /etc/ttys állomány megfelelõ módosításával tudjuk - behangolni. Itt minden egyes olyan sor, ami nem + behangolni. Itt minden egyes olyan sor, amely nem megjegyzés (vagyis azok a sorok, amelyek nem a # karakterrel kezdõdnek), tartalmazza az egyes terminálok vagy virtuális konzolok beállításait. Az állomány a &os; telepítésében szereplõ, alapértelmezett változata kilenc virtuális - konzol konfigurációját tartalmazza, melyek + konzol konfigurációját tartalmazza, amelyek közül nyolc aktív. Ezek a - ttyv szöveggel kezdõdõ + ttyv résszel kezdõdõ sorok: # name getty type status comments @@ -348,33 +359,37 @@ ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure Az állományban található - oszlopok kimerítõ magyarázatát illetve a - virtuális konzolok + oszlopok kimerítõ magyarázatát illetve + a virtuális konzolok beállításához használható kapcsolókat a &man.ttys.5; man oldalon olvashatjuk. + - Egyfelhasználós mód konzolja + Az egyfelhasználós mód + konzolja Az egyfelhasználós mód részletes leírása a ban található. Fontos tudni, hogy amikor a &os;-t egyfelhasználós - módban futtatjuk, csupán egyetlen konzolunk van, a - virtuális konzolok nem érhetõek el. Az - egyfelhasználós mód erre vonatkozó + módban futtatjuk, csupán egyetlen konzolunk van, + és a virtuális konzolok nem érhetõek + el. Egyébként az egyfelhasználós + mód erre vonatkozó beállításai is megtalálhatóak - egyébként az /etc/ttys - állományban. Keressük meg a - console kezdetû sort: + az /etc/ttys állományban. + Ehhez keressük meg a console + kezdetû sort: # name getty type status comments # -# If console is marked "insecure", then init will ask for the root password -# when going to single-user mode. -console none unknown off secure +# Ha a konzolt "insecure" (nem biztonságos) típusúnak választjuk meg, +# akkor a használatához az egyfelhasználós mód aktivilásá elõtt a rendszer +# kérni fogja a rendszeradminisztrátori jelszót. +onsole none unknown off secure A console felett látható @@ -392,33 +407,33 @@ értéket insecure-ra állítjuk! Ha ugyanis véletlenül elfeledkeznénk a - root jelszaváról, azzal az - egyfelhasználós mód használata is - veszélybe kerülhet. Habár ettõl - függetlenül is lehetséges, azokra - számára mégis nehéz helyzetnek - bizonyulhat, akik nem mozognak elég otthonosan a &os; - rendszerindítás folyamatának és a - hozzá kapcsolódó programok + root jelszaváról, akkor + azzal az egyfelhasználós mód + használata is veszélybe kerülhet. + Habár ettõl függetlenül is + lehetséges, azokra számára mégis + nehéz helyzetnek bizonyulhat, akik nem mozognak + elég otthonosan a &os; rendszerindítási + folyamatának és a + hozzákapcsolódó programok ismeretében. + - A videómód váltása - konzolban + A videomód váltása konzolban - A &os; konzol alapértelmezett - videómódja átállítható - 1024x768-ra, 1280x1024-re, vagy bármilyen olyan - más méretre, amit a - videókártyánk és monitorunk - képes megjeleníteni. Az eltérõ - videómódok használatához - elõször a rendszermagunkat az alábbi két + A &os; konzol alapértelmezett videomódja + átállítható 1024x768-ra, + 1280x1024-re, vagy bármilyen olyan más + méretre, amit a videokártyánk + és monitorunk képes megjeleníteni. Az + eltérõ videomódok használatához + elõször újra kell fordítanunk a + rendszermagunkat az alábbi két beállítás - hozzáadásával kell - újrafordítanunk: + hozzáadásával: options VESA options SC_PIXEL_MODE @@ -427,34 +442,36 @@ újrafordítottuk a fenti beállításokkal, a &man.vidcontrol.1; segédprogrammal tudjuk megállapítani, hogy - a hardverünk milyen videómódokat enged + a hardverünk milyen videomódokat enged használni. Az összes támogatott - videómódot a következõképpen - tudjuk lekérdezni: + videomódot a következõképpen tudjuk + lekérdezni: &prompt.root; vidcontrol -i mode - A parancs eredményeképpen megkapjuk a - hardverünk által ismert videómódokat. - Ezek közül tudjuk kiválasztani - valamelyikõjüket és root - felhasználóként a &man.vidcontrol.1; - segítségével + A parancs eredményeképpen tehát + megkapjuk a hardverünk által ismert + videomódokat. Ezek közül tudjuk + kiválasztani valamelyikõjüket és + root felhasználóként a + &man.vidcontrol.1; segítségével beállítani: &prompt.root; vidcontrol MODE_279 - Ha az új videómód megfelel - számunkra, akkor ezt a beállítást az + Ha az új videomód megfelel számunkra, + akkor ezt a beállítást az /etc/rc.conf állományon keresztül véglegesíthetjük is: allscreens_flags="MODE_279" + Engedélyek + UNIX A &os;, mivel a BSD &unix; egyik közvetlen @@ -477,20 +494,19 @@ Mivel a rendszer több felhasználót is képes támogatni, az általa kezelt erõforrások rendelkeznek engedélyek egy adott - halmazával, melyek eldöntik, ki tudja õket - olvasni, írni és végrehajtani. Az - engedélyek háromszor három bit - formájában jelennek meg, melyek közül az - elsõ bitcsoport az állomány - tulajdonosára, a második az állomány - csoportjára, végül az utolsó pedig a - mindenki másra vonatkozó engedélyeket - tárolja. + halmazával, amelyek eldöntik ki tudja ezeket olvasni, + írni és végrehajtani. Az engedélyek + háromszor három bit formájában + jelennek meg, amelyek közül az elsõ bitcsoport az + állomány tulajdonosára, a második az + állomány csoportjára, végül az + utolsó pedig a mindenki másra vonatkozó + engedélyeket tárolja. engedélyek - - állományok engedélyei - + állományok + engedélyei + @@ -560,9 +576,8 @@ - - ls - + + ls könyvtárak A &man.ls.1; kapcsolójának @@ -577,9 +592,9 @@ &prompt.user; ls -l total 530 --rw-r--r-- 1 root wheel 512 Sep 5 12:31 myfile --rw-r--r-- 1 root wheel 512 Sep 5 12:31 otherfile --rw-r--r-- 1 root wheel 7680 Sep 5 12:31 email.txt +-rw-r--r-- 1 root wheel 512 Sep 5 12:31 egyik +-rw-r--r-- 1 root wheel 512 Sep 5 12:31 masik +-rw-r--r-- 1 root wheel 7680 Sep 5 12:31 e-mail.txt ... A példabeli ls -l parancs @@ -589,7 +604,7 @@ Az elsõ (legbaloldalibb) karakter mondja meg, hogy ez egy hagyományos állomány, könyvtár, - speciális karakteres eszköz, csatlakozás vagy + speciális karakteres eszköz, socket vagy bármilyen más különleges pszeudoállomány. Ebben az esetben a - jelzi, hogy egy hagyományos @@ -602,24 +617,24 @@ csoportjának engedélyeit. Az utolsó három karakter, vagyis itt a r-- adja meg a többiek engedélyeit. A kötõjel arra - utal, hogy az adott engedély tevekénység nem - engedélyezett. Tehát ennél az - állománynál az engedélyek a - következõek: a tulajdonosa tudja olvasni és - írni, a csoportja csak olvasni tudja, ugyanígy - bárki más. A fenti táblázatnak - megfelelõen az állomány - engedélyének kódja 644 - lesz, ahol az egyes számjegyek jelentik az - állomány engedélyeinek három - elemét. + utal, hogy az adott engedélyû + tevékenység nem engedélyezett. Tehát + ennél az állománynál az + engedélyek a következõek: a tulajdonosa tudja + olvasni és írni, a csoportja csak olvasni tudja, + ugyanígy bárki más. A fenti + táblázatnak megfelelõen az + állomány engedélyének kódja + 644 lesz, ahol az egyes számjegyek + jelentik az állomány engedélyeinek + három elemét. Ez mind szép és jó, de vajon a rendszer - milyen módon vezérli az állományok + milyen módon kezeli az állományok engedélyeit? A &os; a legtöbb hardveres eszközt - állománynak tekinti, melyek a programok meg tudnak - nyitni, tudnak róluk olvasni és adatokat tudnak - kiírni rájuk pontosan úgy, mint + állománynak tekinti, amelyeket a programok meg + tudnak nyitni, tudnak róluk olvasni és adatokat + tudnak kiírni rájuk pontosan úgy, mint bármilyen más állomány esetén. Ezeket a speciális állományokat a /dev könyvtárban @@ -655,13 +670,14 @@ Ezeken kívül még léteznek további engedélyek is, de ezeket csak olyan különleges esetekben használják, mint - mondjuk a felhasználóváltó programok - (setuid program) vagy a ragadós könyvtárak - (sticky directory) létrehozása. Az - állományok engedélyeinek behatóbb - megismeréséhez és - beállításához mindenképpen - nézzük át a &man.chmod.1; man oldalt. + például a + felhasználóváltó programok (setuid + program) vagy a ragadós könyvtárak (sticky + directory) létrehozása. Az állományok + engedélyeinek behatóbb megismeréséhez + és beállításához + mindenképpen nézzük át a &man.chmod.1; + man oldalt. @@ -675,18 +691,19 @@ Szimbolikus engedélyek + engedélyek szimbolikus - A szimbolikus engedélyek, vagy gyakran csak - szimbolikus kifejezések, karaktereket használnak a - számok helyett az állományok és + A szimbolikus engedélyek (gyakran csak szimbolikus + kifejezések) az állományok és könyvtárak engedélyeinek megadása - során. A szimbolikus kifejezések (ki) (hogyan) - (milyen engedélyt) alakúak, ahol az alábbi - értékek adhatóak meg: + során a számok helyett karaktereket + használnak. A szimbolikus kifejezések (ki) + (hogyan) (milyen engedélyt) alakúak, ahol az + alábbi értékek adhatóak meg: @@ -780,18 +797,20 @@ használhatóak, csak itt betûket kell megadnunk. Például az alábbi paranccsal akadályozhatjuk meg, hogy a tulajdonosán - kívül bárki hozzáférhessen a - FILE nevû + kívül bárki hozzáférhessen az + ÁLLOMÁNY nevû állományhoz: - &prompt.user; chmod go= FILE + &prompt.user; chmod go= ÁLLOMÁNY Amennyiben egy állománnyal kapcsolatban - több változtatást is el kívánunk - végezni, össze tudjuk õket fûzni egy - vesszõkkel elhatárolt felsorolásban: + több változtatást is el + kívánunk végezni, össze tudjuk ezeket + fûzni egy vesszõkkel elhatárolt + felsorolásban: + + &prompt.user; chmod go-w,a+x ÁLLOMÁNY - &prompt.user; chmod go-w,a+x FILE @@ -817,24 +836,24 @@ könyvtárakra nem vonatkoznak. Ezek az állományjelzõk az - állományok felett további + állományok felett további vezérlést adnak a kezünkbe, aminek - révén gondoskodhatunk róla, hogy még - akár a root + révén gondoskodhatunk róla, hogy + akár mgé a root felhasználó (a rendszer adminisztrátora) se legyen képes állományokat eltávolítani vagy módosítani. Az állományjelzõk értékei - egy egyszerûen felületen keresztül, a + egy egyszerû felületen keresztül, a &man.chflags.1; segédprogrammal változtathatóak meg. Például a - file1 nevû állományon a + következõ paranccsal állíthatjuk a rendszer törölhetetlen (undeletable) - jelzését a következõ parancs - kiadásával állíthatjuk be: + jelzését az allomany1 + állományon: - &prompt.root; chflags sunlink file1 + &prompt.root; chflags sunlink allomany1 A törölhetetlen jelzés eltávolításához egyszerûen csak @@ -843,10 +862,10 @@ még beszúrunk egy no szövegrészt. Így: - &prompt.root; chflags nosunlink file1 + &prompt.root; chflags nosunlink allomany1 Az állományokra éppen - érvényes jelzéseket a &man.ls.1; parancs + érvényes jelzéseket az &man.ls.1; parancs kapcsolójának segítségével jeleníthetjük meg: @@ -857,7 +876,7 @@ Ennek megfelelõen az eredménynek valahogy így kellene kinéznie: - -rw-r--r-- 1 trhodes trhodes sunlnk 0 Mar 1 05:54 file1 + -rw-r--r-- 1 trhodes trhodes sunlnk 0 Mar 1 05:54 allomany1 Sok jelzés csak a root felhasználón keresztül vehetõ fel vagy @@ -867,11 +886,13 @@ javasoljuk, hogy ezzel kapcsolatban a &man.chflags.1; és &man.chflags.2; man oldalakat tanulmányozzák át. + A könyvtárak elrendezése + könyvtárhierarchia A &os; könyvtárszerkezetének ismerete @@ -892,22 +913,23 @@ számára. A csatlakozási pont egy olyan könyvtár, - ahová a szülõ állományrendszeren (ami - gyakran maga a gyökér állományrendszer) - belül további állományrendszereket - tudunk beoltani. Errõl bõvebben a ban olvashatunk. A szabványos - csatlakozási pontok: /usr, - /var, /tmp, - /mnt és /cdrom. - Ezekre a könyvtárakra általában az + ahová a szülõ állományrendszeren + (ami gyakran maga a gyökér + állományrendszer) belül további + állományrendszereket tudunk beoltani. Errõl + bõvebben a ban olvashatunk. + A szabványos csatlakozási pontok: + /usr, /var, + /tmp, /mnt és + /cdrom. Ezekre a könyvtárakra + általában az /etc/fstab + állományban találunk hivatkozásokat. + Az /etc/fstab állomány a + rendszer számára a különbözõ + állományrendszerek és a hozzájuk + tartozó csatlakozási pontok + táblázatát tartalmazza. Az /etc/fstab állományban - találunk hivatkozásokat. Az - /etc/fstab állomány a rendszer - számára a különbözõ - állományrendszerek és a hozzájuk - tartozó csatlakozási pontok táblázata. - Az /etc/fstab állományban szereplõ legtöbb állományrendszer a rendszerindítás során automatikusan csatlakoztatásra kerül az &man.rc.8; szkriptbõl, @@ -916,8 +938,8 @@ linkend="disks-fstab">ban találhatjuk meg. Az állományrendszerek - hierarchiájának teljes leírását a - &man.hier.7; man oldalon olvashatjuk. Mi egyelõre most + hierarchiájának teljes leírását + a &man.hier.7; man oldalon olvashatjuk. Mi egyelõre most megelégszünk a leggyakrabban megjelenõ könyvtárak rövid áttekintésével. @@ -934,13 +956,15 @@ / - Az állományrendszer gyökere. + Az állományrendszer + gyökere. /bin/ Az egy- és - többfelhasználós környezetekben is - egyaránt alapvetõ felhasználói + többfelhasználós környezetekben + is egyaránt alapvetõ + felhasználói segédprogramok. @@ -954,12 +978,12 @@ /boot/defaults/ A rendszerindítás alapértelmezett konfigurációs - állományai. Ld. + állományai. Lásd &man.loader.conf.5; /dev/ - Eszközleírók, ld. + Eszközleírók, lásd &man.intro.4;. @@ -970,12 +994,13 @@ /etc/defaults/ Az alapértelmezett - rendszerkonfigurációs - állományok, ld. &man.rc.8;. + rendszerkonfigurációs + állományok, lásd + &man.rc.8;. /etc/mail/ - A &man.sendmail.8;-hez hasonló + A &man.sendmail.8; programhoz hasonló levélküldõ rendszerek konfigurációs állományai. @@ -983,20 +1008,20 @@ /etc/namedb/ A named program - konfigurációs állományai, ld. - &man.named.8;. + konfigurációs állományai, + lásd &man.named.8;. /etc/periodic/ A &man.cron.8; által naponta, hetente - és havonta lefuttatandó szkriptek, ld. - &man.periodic.8;. + és havonta lefuttatandó szkriptek, + lásd &man.periodic.8;. /etc/ppp/ A ppp program - konfigurációs állományai, ld. - &man.ppp.8;. + konfigurációs állományai, + lásd &man.ppp.8;. /mnt/ @@ -1008,13 +1033,13 @@ /proc/ A futó programokat tartalmazó - állományrendszer, ld. &man.procfs.5;, ill. - &man.mount.procfs.8;. + állományrendszer, lásd + &man.procfs.5;, illetve &man.mount.procfs.8;. /rescue/ Statikusan linkelt programok vészhelyzet - esetére, ld. &man.rescue.8;. + esetére, lásd &man.rescue.8;. /root/ @@ -1024,7 +1049,7 @@ /sbin/ Az egy- és - többfelhasználós környezetekben + többfelhasználós környezetekben fontos rendszerprogramok és rendszerfelügyeleti eszközök. @@ -1044,7 +1069,7 @@ beállításával lehet automatikussá tenni (vagy a /etc/fstab megfelelõ - módosításával, ld. + módosításával, lásd &man.mdmfs.8;). @@ -1126,7 +1151,7 @@ /usr/share/ Architektúrafüggõ - állományok + állományok. /etc/fstab megfelelõ - módosításával, ld. + módosításával, lásd &man.mdmfs.8;). @@ -1190,7 +1215,7 @@ /var/yp - NIS állományok. + A NIS állományai. @@ -1204,18 +1229,17 @@ Az állománynév a legkisebb szervezési egység, amin keresztül a &os; - megtalálja az állományokat. Az + képes megtalálni az állományokat. Az állományok neveiben a kis- és nagybetût megkülönböztetjük, tehát a readme.txt és a README.TXT elnevezés két különbözõ állományra utal. A - &os; az állomány kiterjesztését (ami a + &os; nem az állományok kiterjesztése (ami a konkrét példánkban a - .txt volt) nem használja annak - eldöntésére, hogy az adott - állomány vajon program, dokumentum vagy valamilyen - más fajtájú adat. + .txt volt) alapján dönti el, hogy + az adott állomány vajon program, dokumentum vagy + valamilyen más fajtájú adat. Az állományok könyvtárakban tárolódnak. Egy könyvtár lehet @@ -1227,30 +1251,30 @@ könyvtárak segítségével könyvtárak egy hierarchiáját tudjuk felépíteni. Ezzel sokkalta könnyebben - szervezhetõvé válnak az adatink. + szervezhetõvé válnak az adataink. Az állományokat és könyvtárakat úgy tudunk elérni, ha megadjuk az állomány vagy a könyvtárt - tároló könyvtár nevét, melyet egy + tároló könyvtár nevét, amit egy perjel, a / követ, valamint így összefûzve az eléréshez szükséges további könyvtárak felsorolása. Tehát, ha van egy - foo nevû könyvtárunk, amiben - található egy bar - könyvtár, amin belül pedig egy + ize nevû könyvtárunk, + amelyben található egy mize + könyvtár, amelyen belül pedig egy readme.txt, akkor ennek az állománynak a teljes neve, vagy másképpen szólva az elérési útja - foo/bar/readme.txt lesz. + ize/mize/readme.txt lesz. A könyvtárak és az állományok egy állományrendszerben tárolódnak. Minden állományrendszer pontosan egy könyvtárat tartalmaz a legfelsõ szintjén, - melyet az adott állományrendszer + amelyet az adott állományrendszer gyökérkönyvtárának nevezünk. Ez a gyökérkönyvtár tartalmazhat aztán további @@ -1268,16 +1292,17 @@ A &os; az elérési utakban sem betûkkel, sem pedig semmilyen más névvel nem jelöli meg a meghajtókat. Tehát a &os;-ben nem írhatjuk, - hogy a c:/foo/bar/readme.txt. + hogy a c:/ize/mize/readme.txt. - Helyette az egyik állományrendszert jelölik - ki - gyökérállományrendszernek. - A gyökér állományrendszer + Helyette az egyik állományrendszert + kijelölik gyökér + állományrendszernek. A + gyökér állományrendszer gyökérkönyvtárára hivatkoznak - / könyvtárként. - Ezután minden más állományrendszert a - gyökérállományrendszerhez + késõbb / + könyvtárként. Ezután minden más + állományrendszert a gyökér + állományrendszerhez csatlakoztatunk. Ennek értelmében nem számít, hogy a mennyi lemezünk is van a &os; rendszerünkben, hiszen minden @@ -1285,10 +1310,10 @@ meg. Tegyük fel, hogy van három - állományrendszerünk, hívjuk õket + állományrendszerünk, hívjuk ezeket A-nak, B-nek és C-nek. Minden állományrendszer - rendelkezik egy gyökérkönyvtárral, ami + rendelkezik egy gyökérkönyvtárral, amely két további könyvtárat tartalmaz: A1-et és A2-t (és ennek megfelelõen a többi @@ -1296,29 +1321,28 @@ valamint C1 és C2-t). - Nevezzük A-t a - gyökérállományrendszernek. Ha a - könyvtár tartalmának - megnézéséhez kiadnánk az - ls parancsot, két + Nevezzük A-t a gyökér + állományrendszernek. Ha a könyvtár >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:35:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6B6F1065679; Sat, 19 Apr 2008 21:35:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9777D1065674 for ; Sat, 19 Apr 2008 21:35:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8585A8FC27 for ; Sat, 19 Apr 2008 21:35:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLZQsX039398 for ; Sat, 19 Apr 2008 21:35:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLZQnj039396 for perforce@freebsd.org; Sat, 19 Apr 2008 21:35:26 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:35:26 GMT Message-Id: <200804192135.m3JLZQnj039396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:35:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=140267 Change 140267 by pgj@disznohal on 2008/04/19 21:34:47 Cleanup in Chapter 4. Affected files ... .. //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/ports/chapter.sgml#7 (text+ko) ==== @@ -41,31 +41,32 @@ hogyan telepítsünk külsõ - fejlesztésû bináris szoftvercsomagokat + fejlesztésû bináris + szoftvercsomagokat; hogyan fordítsunk le a forrásukból külsõ fejlesztésû szoftvereket a Portgyûjtemény - segítségével + segítségével; hogyan távolítsunk el korábban már telepített csomagokat és - portokat + portokat; hogyan bíráljuk felül a Portgyûjtemény által használt - alapértelmezett értékeket + alapértelmezett értékeket; hogyan keressük meg a megfelelõ - szoftvercsomagokat + szoftvercsomagokat; hogyan frissítsük a telepített - alkalmazásokat + alkalmazásokat. @@ -83,22 +84,22 @@ - Töltsük le a szoftvert, melyet vagy + Töltsük le a szoftvert, amelyet vagy forráskód vagy pedig bináris formátumban érhetünk el. Bontsuk ki az alkalmazás letöltött - változatát (általában a + változatát (ez általában a &man.compress.1;, &man.gzip.1; vagy a &man.bzip2.1; - által tömörített összevont + által tömörített tar állomány). Keressük meg dokumentációt - (többnyire a INSTALL vagy a + (többnyire az INSTALL vagy a README állományban található, vagy a doc/ alkönyvtárban) és olvassuk el benne, hogyan @@ -111,7 +112,7 @@ Elképzelhetõ, hogy ennek során szerkesztenünk kell a Makefile állományt vagy lefuttatnunk a - configure szkriptet, ill. más + configure szkriptet, illetve más lépéseket is el kell végeznünk. @@ -124,16 +125,16 @@ Ez annak a forgatókönyve, amikor minden hiba nélkül lezajlik. Megeshet azonban, ha olyan szoftvert - telepítünk, amelyet nem terveztek kifejezetten - &os;-hez, hogy javítanunk kell a forráskódban - a szoftver megfelelõ + telepítünk, amelyet nem kifejezetten a &os;-hez + terveztek, akkor javítanunk kell a + forráskódban a szoftver megfelelõ mûködéséhez. Ha sikerül mûködésre bírni, folytathatjuk &os;-n a szoftver telepítését a megszokott módon. Habár a &os; erre a célra két lehetõséget is - felkínál, mellyel rengeteg + felkínál, amivel rengeteg erõfeszítéstõl megkímélhet minket: ezek a csomagok és a portok. Az írás pillanatában közel &os.numports; külsõ @@ -147,9 +148,9 @@ telepítéséhez szükséges összes parancs elõre lefordított változtatát, ugyanígy magát a - dokumentációt is. A letöltött csomagokot + dokumentációt is. A letöltött csomagokat a &os; csomagkezelõ parancsaival vehetjük - használatba: ilyenek a &man.pkg.add.1;, &man.pkg.delete.1;, + használatba: ezek a &man.pkg.add.1;, &man.pkg.delete.1;, &man.pkg.info.1; és így tovább. Az új alkalmazások telepítése ennek köszönhetõen egyetlen paranccsal @@ -157,11 +158,10 @@ Egy alkalmazás &os;-s portja mögött lényegében állományok - gyûjteménye áll, melyek a - forráskódból történõ - telepítés folyamatának - automatizálását segítik - elõ. + gyûjteménye áll, amelyek abban + segítenek, hogy automatikusan tudjunk telepíteni a + forráskód + felhasználásával. Ne felejtsük el, hogy normális esetben számos lépcsõt végig kell járnunk @@ -172,11 +172,11 @@ alkotó állományok tartalmazzák az összes olyan szükséges információt, amelyek átengedik ezt a feladatot a rendszernek. Kiadunk - néhány egyszerû parancsot, és az + néhány egyszerû parancsot és az alkalmazás magától letöltõdik, kitömörítõdik, módosítja a forráskódját, lefordul és - feltelepül. + települ. Valójában a portrendszer használható olyan csomagok @@ -186,10 +186,10 @@ részletesebben is bemutatandó csomagkezelõ paranccsal is kezelni tudunk. - A csomagok és a portok is egyaránt - képesek függõségeket - kezelni. Tegyük fel, hogy egy olyan alkalmazást - akarunk telepíteni, amely egy adott + A csomagok és a portok egyaránt képesek + függõségeket kezelni. + Tegyük fel, hogy egy olyan alkalmazást akarunk + telepíteni, amely egy adott függvénykönyvtár meglététõl függ a rendszeren. Az alkalmazás és a könyvtár is @@ -204,11 +204,11 @@ Tudván, hogy a két említett megoldás szinte teljesen egyenértékû, - felmerülhet a kérdés, a &os; mégis + felmerülhet a kérdés: a &os; mégis miért rendelkezik mindkettõvel? A csomagoknak és a portoknak is megvannak a maguk elõnyei, és hogy a kettõ közül melyiket használjuk, csak - a saját ízlésünkön + az egyéni ízlésünkön múlik. @@ -217,7 +217,7 @@ Egy csomag általában kisebb, mint az alkalmazás forráskódját - tartalmazó tömörített összevont + tartalmazó tömörített tar állomány. @@ -228,15 +228,15 @@ KDE vagy GNOME esetén ez kulcsfontosságú lehet, fõleg abban az - esetben, ha a rendszerünk nem eléggé + esetben, ha a rendszerünk ehhez nem eléggé gyors. - A csomagok használata nem várja el a - szoftverek &os;-n történõ - fordítási folyamatának behatóbb - ismeretét. + A csomagok használata nem várja el + tõlünk, hogy behatóbban ismerjük + miként is kell &os;-n szoftvereket + lefordítani. @@ -268,7 +268,7 @@ létre, nem kell elfogadnunk ezek alapértelmezett értékeit, hanem a saját igényeinknek megfelelõen - átállíthatjuk õket. + átállíthatjuk ezeket. Egyes esetekben több különféle beállítást tükrözõ csomag @@ -288,7 +288,7 @@ - Néhány szoftver licenszelése tiltja a + Néhány szoftver licencelése tiltja a bináris terjesztést. Ezért ezek a szoftverek kizárólag csak forráskód formájában @@ -299,14 +299,14 @@ Néhányan nem bíznak meg a bináris verziókban. Ha látjuk a forráskódot is, akkor (elméletben) - át tudjuk nézni és mi magunk is + át tudjuk nézni, és mi magunk is megkereshetjük a benne lappangó hibákat. Ha vannak saját javításaink, csak a - forráskód birtokában tudjuk õket + forráskód birtokában tudjuk ezeket felhasználni. @@ -316,7 +316,7 @@ éppen unatkoznak, beléjük tudnak nézni, ötleteket és kódot tudnak belõlük meríteni (persze csak akkor, ha ezt a - licensz megengedi), vagy tovább tudják õket + licenc megengedi), vagy tovább tudják ezeket fejleszteni, orvosolni tudják a hibáikat stb. @@ -334,7 +334,7 @@ hozzátartozó ismert biztonsági problémákról olvashatunk. - Feltelepíthetjük a Telepíthetjük a ports-mgmt/portaudit programot is, amely automatikusan ellenõrzi a telepített alkalmazások ismert sebezhetõségeit. Ez az @@ -355,7 +355,7 @@ A számunkra szükséges alkalmazások - megtalálása + felkutatása Mielõtt telepítenénk bármilyen alkalmazást, tudnunk kell, hogyan is nevezik. @@ -371,13 +371,13 @@ rendszeresen frissülõ listát az összes elérhetõ alkalmazásról, a http://www.FreeBSD.org/ports/ - címen. A portok különbözõ - kategóriákba vannak sorolva, ahol név - szerint megkereshetjük az alkalmazást (amennyiben - ismerjük), vagy + címen. Itt a portok különbözõ + kategóriákba sorolva találhatóak + meg, ahol név szerint megkereshetjük az + alkalmazást (amennyiben ismerjük), vagy végigböngészhetjük az adott kategóriában elérhetõ - alkalmazások listáját is. + alkalmazásokat is. FreshPorts @@ -388,10 +388,9 @@ karbantartja a FreshPorts nevû oldalt. Ezen az oldalon folyamatosan nyomon lehet követni a Portgyûjteményben megtalálható - alkalmazásokkal történõ - változásokat, lehetõvé téve, - hogy egy vagy több portot is - figyeljünk, vagy e-mailt + alkalmazások változásait, + lehetõvé téve, hogy egy vagy több + portot is figyeljünk, vagy e-mailt küldjünk a frissítésükrõl. @@ -411,14 +410,14 @@ Ha pontosan ismerjük a port nevét, és csak a kategóriáját kellene - megkeresnünk, használhatjuk erre a &man.whereis.1; + megkeresnünk, használjuk a &man.whereis.1; parancsot. Egyszerûen csak adjuk ki a whereis név parancsot, ahol az név a telepítendõ program neve. Ha sikerült megtalálni, részletes információt - kapunk arról, hol található, valahogy - így: + kapunk arról, hogy hol található, + valahogy így: &prompt.root; whereis lsof lsof: /usr/ports/sysutils/lsof @@ -437,8 +436,8 @@ &prompt.root; echo /usr/ports/*/*lsof* /usr/ports/sysutils/lsof - Vegyük észre, hogy ez a módszer a - /usr/ports/distfiles + Ez a módszer a /usr/ports/distfiles könyvtárba letöltött összes illeszkedõ állományt is kilistázza. @@ -451,13 +450,14 @@ keresési mechanizmusát használjuk. Ennek használatához a /usr/ports könyvtárban kell lennünk. Miután - beléptünk ide, futtassuk le a make search + beléptünk ide, futtassuk le a make + search name=programnév parancsot, ahol a programnév a keresendõ program neve. Például, ha az - lsofot keressük: + lsof programot keressük: - &prompt.root; cd /usr/ports + &prompt.root; cd /usr/ports &prompt.root; make search name=lsof Port: lsof-4.56.4 Path: /usr/ports/sysutils/lsof @@ -467,31 +467,31 @@ B-deps: R-deps: - Az eredményben leginkább a - Path: kezdetû sorra kell odafigyelnünk, - mivel ez árulja el, hol is találhatjuk meg a - portot. Az itt szereplõ többi - információ nem szükséges a port - telepítéséhez, ezért azokkal itt - most nem foglalkozunk. + A keresés eredményében + leginkább a Path: kezdetû sorra kell + odafigyelnünk, mivel ez árulja el, hol is + találhatjuk meg a portot. Az itt szereplõ + többi információ nem szükséges + a port telepítéséhez, ezért + azokkal itt most nem foglalkozunk. - Mélyebb keresésekhez használhatjuk a - make search - key=szöveg parancsot - is, ahol a szöveg a - keresendõ szöveg(részlet) lesz. Ezt a rendszer - keresni fogja a portok neveiben, megjegyzésekben, - leírásokban és - függõségekben. Amikor nem ismerjük a - keresett program nevét, ez olyan portok - keresésére használható, amelyek egy - adott témához kapcsolódnak. + Mélyebb keresésekhez használhatjuk a + make search + key=szöveg parancsot + is, ahol a szöveg a + keresendõ szöveg(részlet) lesz. Ezt a + rendszer keresni fogja a portok neveiben, + megjegyzésekben, leírásokban és + függõségekben. Amikor nem ismerjük a + keresett program nevét, ez olyan portok + keresésére alkalmas, amelyek egy adott + témához kapcsolódnak. - A fenti esetek mindegyikében a keresés nem - különbözteti meg a kis- és - nagybetûket. Tehát a LSOF - keresése ugyanazt az eredményt adja, mint az - lsof esetén. + A fenti esetek mindegyikében a keresés nem + különbözteti meg a kis- és + nagybetûket. Tehát a LSOF + keresése ugyanazt az eredményt adja, mint az + lsof esetén. @@ -521,15 +521,15 @@ pkg_add A &man.pkg.add.1; segédprogram - segítségével telepíthetünk fel - &os;-hez készült szoftvercsomagokat helyben vagy a - hálózaton levõ egyik szerveren + segítségével telepíthetünk + &os;-hez készült szoftvercsomagokat lokálisan + vagy a hálózaton levõ egyik szerveren megtalálható állományokból: Csomagok letöltése manuálisan - és telepítése helybõl + és telepítése lokálisan &prompt.root; ftp -a ftp2.FreeBSD.org Connected to ftp2.FreeBSD.org. @@ -557,14 +557,14 @@ Ha nincsenek egyáltalán helyben csomagjaink - (pl. egy &os; CD-készletben), akkor a legjobban - úgy járunk, ha a használjuk a + (például egy &os; CD-készletben), akkor a + legjobban úgy járunk, ha a használjuk a &man.pkg.add.1; kapcsolóját. Ennek hatására a segédprogram önmagától meghatározza a szükséges állományformátumot - és verziót, majd letölti FTP-n keresztül - és feltelepíti a csomagot. + és verziót, majd FTP-n keresztül letölti + és telepíti a csomagot. pkg_add @@ -581,14 +581,13 @@ PACKAGESITE környezeti változó értékét. A &man.pkg.add.1; a &man.fetch.3; programot használja az állományok - letöltésére, ami pedig számos - egyéb környezeti változót is - tiszteletben tart, mint például az - FTP_PASSIVE_MODE, az FTP_PROXY - és az FTP_PASSWORD. Ha tûzfal - mögött vagyunk, ezek közül - néhányat biztosan be kell majd - állítanunk, vagy FTP/HTTP proxy-t kell + letöltésére, amely pedig számos + egyéb környezeti változót is figyel, + mint például az FTP_PASSIVE_MODE, + az FTP_PROXY és az + FTP_PASSWORD. Ha tûzfal mögött + vagyunk, ezek közül néhányat biztosan be + kell majd állítanunk, vagy FTP/HTTP proxyt kell használnunk. A &man.fetch.3; man oldalán megtaláljuk ezen változók teljes felsorolását. Figyeljük meg, hogy az @@ -614,9 +613,9 @@ &os; 5.4-RELEASE változatával dolgozunk, a &man.pkg.add.1; alapértelmezés szerint a ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-5.4-release/Latest/ - címrõl fogja letölteni a csomagokat. - Amennyiben ezzel szemben mi viszont a &os; 5-STABLE - csomagok letöltését akarjuk elérni, + címrõl fogja letölteni a csomagokat. Ha mi + viszont a &os; 5-STABLE csomagok + letöltését akarjuk elérni, állítsuk az PACKAGESITE értékét a ftp://ftp.freebsd.org/pub/FreeBSD/i386/packages-5-stable/Latest/ @@ -628,8 +627,8 @@ terjesztésre. Ezek az címen, vagy pedig a &os; CD-ken találhatóak - meg. A 4 CD-bõl álló készlet (ill. a - PowerPak stb.) minden CD-jén találhatunk + meg. A 4 CD-bõl álló készlet (illetve + a PowerPak stb.) minden CD-jén találhatunk csomagokat a packages/ könyvtárban. A csomagokat tároló könyvtár struktúrája hasonló a @@ -658,9 +657,9 @@ A &man.pkg.info.1; egy olyan segédprogram, amellyel készíteni lehet egy listát a - telepített csomagokról, és más - egyéb információkat tudhatunk meg - róluk. + telepített csomagokról, és emellett + még más egyéb információkat + tudhatunk meg róluk. pkg_info @@ -759,9 +758,8 @@ &prompt.root; pkg_delete xchat-1.7.1 - Vegyük figyelembe, hogy a &man.pkg.delete.1; - használatánál szükség van a - csomag teljes nevének és + A &man.pkg.delete.1; használatánál + szükség van a csomag teljes nevének és verziószámának megadására. A fenti parancs tehát nem mûködik, ha csak az xchat-et adjuk meg az @@ -795,38 +793,36 @@ A Portgyûjtemény használata - A most következõ szakaszok programok a - Portgyûjteményen keresztül - történõ telepítéséhez - és eltávolításához adnak - alapvetõ utasításokat. Az elérhetõ - make targetek neveinek és - környezeti változók részletesebb - leírását a &man.ports.7; man oldalán - lelhetjük meg. + A most következõ szakaszokban megismerhetjük + azokat az alapvetõ utasításokat, amelyekkel a + Portgyûjteményen keresztül tudunk programokat + telepíteni és eltávolítani. Az ehhez + használható make targetek + és környezeti változók + részletesebb leírását a &man.ports.7; + man oldalán lelhetjük meg. A Portgyûjtemény beszerzése - Elsõként magát a - Portgyûjteményt kell megszereznünk, - mielõtt bármelyik portot is tudnánk - telepíteni — ez lényegében a - /usr/ports könyvtárban - megtalálható Makefile-ok, + Mielõtt bármelyik portot is tudnánk + telepíteni, elsõként magát a + Portgyûjteményt kell megszereznünk — ez + lényegében a /usr/ports + könyvtárban megtalálható + Makefile állományok, javítások és leírások gyûjteménye. - A &os; telepítésében közben a + A &os; telepítése közben a sysinstall rákérdez a Portgyûjtemény telepítésére is. Ha erre nemet válaszoltunk volna, a portok - gyûjteményét az alábbi - utasítások mentén kaphatjuk meg: + gyûjteményét az alábbi módokon + szerezhetjük be: - Elérés CVSup - használatával + A CVSup használatával A CVSup protokoll használatával viszonylag gyorsan el tudjuk @@ -845,17 +841,17 @@ változatának használói ezt a programot a net/csup porton vagy csomagon keresztül tudják - feltelepíteni. + telepíteni. Gondoskodjunk róla, hogy a /usr/ports üres a + role="directory">/usr/ports üres legyen a csup elsõ futtatása - elõtt! Ha már más forrásból - felraktuk ide a Portgyûjteményt, a - csup nem fogja lenyesegetni a - javításokat tartalmazó - eltávolított állományokat. + elõtt! Ha más forrásból raktuk ide + a Portgyûjteményt, a + csup nem fogja lenyesegetni az + azóta eltávolított + javításokat. Futtassuk a csup programot: @@ -864,7 +860,7 @@ Itt írjuk át a cvsup.FreeBSD.org - címét a hozzánk (leg)közelebb + címét a hozzánk legközelebb levõ CVSup szerver címére. Az összes elérhetõ tükörszerver címét a Ha például el akarjuk kerülni a CVSup szerver megadását a parancssorban, akkor - mindenképpen érdemes a - ports-supfile - állományból készíteni - egy saját verziót. + mindenképpen a ports-supfile + állományból érdemes + készíteni egy saját + verziót. @@ -904,13 +900,13 @@ Írjuk át a CHANGE_THIS.FreeBSD.org értéket a hozzánk - (leg)közelebb található + legközelebb található CVSup szerverére. A CVSup tükrözések () címû - részben van felsorolva az összes - tükörszerver. + részben megtaláljuk az összes ilyen + tükörszervert. @@ -930,14 +926,13 @@ érvényesíti az észlelt változtatásokat a saját Portgyûjteményünkben, de a - rendszerünkben telepített portokat viszont nem - fogja újrafordítani. + telepített portokat viszont nem fogja + újrafordítani. - Elérés a Portsnap - használatával + A Portsnap használatával A Portsnap egy másik módszert képvisel a Portgyûjtemény @@ -950,12 +945,11 @@ &prompt.root; pkg_add -r portsnap - Kérjük, tekintse át A Portsnap + lehetõségeinek részletesebb + megismeréséhez tekintsük át A Portsnap használata - címû szakaszt a - Portsnap és - lehetõségeinek részletesebb - megismeréséhez. + címû szakaszt. Mivel a &os; 6.1-RELEASE és az utána @@ -967,7 +961,7 @@ magától létrejön a &man.portsnap.8; parancs elsõ futtatása során. A Portsnap - korábbi verziói esetén viszont ha nem + korábbi verziói esetén viszont, ha nem létezett, elõzetesen készíteni kellett egy könyvtárat: @@ -977,12 +971,11 @@ Töltsük le a Portgyûjtemény - pillanatnyi tömörített - állapotát a /var/db/portsnap - könyvtárba. Ha akarunk, ezután a + tömörített pillanatképét a + /var/db/portsnap + könyvtárba. Ha akarjuk, ezután a lépés után már - lekapcsolódhatunk az Internetrõl. + lekapcsolódhatunk az internetrõl. &prompt.root; portsnap fetch @@ -996,30 +989,28 @@ &prompt.root; portsnap extract - Ha viszont korábban már - feltöltöttük a /usr/ports könyvtárt - és most csak frissítünk, akkor helyette - ezt a parancsot adjuk ki: + Ha viszont már korábban is létezett + a /usr/ports + könyvtárunk és most csak + frissítjük, akkor helyette ezt a parancsot adjuk + ki: &prompt.root; portsnap update - Elérés a sysinstall + <title>A <application>sysinstall</application> használatával - Ebben a módszerben a - sysinstall nevû programot - használjuk a Portgyûjtemény valamilyen - telepítõeszközrõl - történõ telepítésére. - Megjegyezzük, hogy ebben az esetben a kiadás - dátumának megfelelõ, + Ebben az esetben a sysinstall + nevû programmal telepítjük a + Portgyûjteményt valamilyen + telepítõeszközrõl. Ilyenkor azonban a + kiadás dátumának megfelelõ, valószínûlég régebbi változat kerül fel. Ha rendelkezünk - Internet-hozzáféréssel, akkor + internet-hozzáféréssel, akkor inkább az elõbb tárgyalt módszerek valamelyikét alkalmazzuk. @@ -1027,7 +1018,7 @@ root felhasználóként adjuk ki a sysinstall (vagy a &os; 5.2 elõtti - verzióban /stand/sysinstall) + verzióban a /stand/sysinstall) parancsot, ahogy itt is láthatjuk: &prompt.root; sysinstall @@ -1037,14 +1028,15 @@ Menjünk le és álljunk meg a Configure (Beállítások), menüpontnál, - és nyomjunk Entert. + és nyomjunk Enter + billentyût. Menjünk le és keressük meg a Distributions - (Terjesztések) menüponot, majd nyomjunk - Entert. + (Terjesztések) menüponot, majd nyomjunk meg az + Enter billentyût. @@ -1056,8 +1048,8 @@ Menjünk fel az Exit - (Kilépés) ponthoz, nyomjunk - Entert. + (Kilépés) ponthoz, nyomjunk meg az + Enter billentyût. @@ -1068,15 +1060,15 @@ Menjünk fel az Exit - (Kilépés) menüpontig, majd nyomjunk - Entert. + (Kilépés) menüpontig, majd nyomjunk meg + az Enter billentyût. - Végezetül a - sysinstall programból - történõ kilépéshez nyomjunk - X-et. + Végezetül lépjünk ki a + sysinstall programból, + aminhez nyomjunk meg az X + billentyût. @@ -1091,12 +1083,13 @@ A váz fogalma az elsõ, amit a Portgyûjteménnyel kapcsolatban tisztázni - kell. Dióhéjban, egy port váza azon - állományok legszûkebb halmaza, amelyek - elárulják a &os; számára, hogyan - fordítsuk le hibamentesen és hogyan - telepítsük az adott programot. Minden port - vázában megtalálható: + kell. Dióhéjban összefoglalva, egy port + váza azon állományok legszûkebb + halmaza, amelyek elárulják a &os; + számára, hogyan fordítsuk le hibamentesen + és hogyan telepítsük az adott programot. + Ehhez minden port vázában + megtalálható: @@ -1112,24 +1105,24 @@ Egy distinfo nevû állomány. Ebben található információ a port - elkészítéséhez - szükséges állományok - letöltésérõl, valamint ezek - (&man.md5.1; és &man.sha256.1; programokkal - számolt) ellenõrzõösszegei a - letöltés utáni ellenõrzések - elvégzéséhez. + lefordításához szükséges + állományok + letöltésérõl, valamint a + letöltött állományok + ellenõrzéséhez szükséges (az + &man.md5.1; és &man.sha256.1; programokkal + számolt) ellenõrzõösszegek. Egy files alkönyvtár. - Itt találhatjuk meg a program &os;-n - történõ lefordításához - és telepítéséhez - szükséges javításokat. Ezek a - javítások többnyire bizonyos - állományok módosításaira - vonatkozó apró állományok + Itt találhatjuk meg azokat a + javításokat, amelyek + alkalmazásával le tudjuk fordítani a + programot &os;-n is. Ezek a javítások + többnyire bizonyos állományok + módosításaira vonatkozó + apró állományok formájában jelennek meg. Természetüknél fogva szöveges formátumúak, és általában @@ -1140,7 +1133,7 @@ (foltoknak) nevezik, vagy másképp diffeknek (eltéréseknek) is, mivel a &man.diff.1; program segítségével hozzák - õket létre. + ezeket létre. Ez a könyvtár tartalmazhat további állományokat is portok @@ -1149,19 +1142,17 @@ Egy pkg-descr nevû - állomány. Ez a program részletesebb - bemutatása, mely gyakran többsoros is - lehet. + állomány. Ez a program részletesebb, + gyakran többsoros bemutatása. Egy pkg-plist nevû állomány. Itt találjuk meg a port által telepítendõ összes - állomány felsorolását. Ez - egyben közli a portrendszerrel is, hogy az - eltávolítás során mely - állományokat kell majd + állományt. Ez egyben közli a + portrendszerrel is, hogy az eltávolítás + során mely állományokat kell majd törölnie. @@ -1181,13 +1172,12 @@ lefordításához szükséges utasításokat, de konkrétan a forráskódot viszont nem. Ezt egy CD-rõl vagy - az Internetrõl tudjuk megszerezni. A + az internetrõl tudjuk megszerezni. A forráskód általában a szerzõje által kedvelt formában jelenik meg: ez gyakran egy - összevont és gzip-pel tömörített - állomány, de lehet tömörítve - mással is, vagy éppen lehet - tömörítetlen. A program + gzip-pel tömörített tar állomány, + de lehet tömörítve mással is, vagy + éppen lehet tömörítetlen. A program forráskódját, legyen akármilyen formában is, nevezik distfile-nak (terjesztési állománynak). A &os; portok @@ -1232,7 +1222,7 @@ A Portgyûjtemény feltételezi, hogy mûködõ - Internet-hozzáféréssel rendelkezünk. + internet-hozzáféréssel rendelkezünk. Amennyiben ez nem így lenne, a terjesztési állományokat, forráskódokat saját magunknak kell bemásolnunk a @@ -1248,9 +1238,8 @@ Miután beléptünk az lsof könyvtárába, láthatjuk a port vázát. A - következõ lépés a - fordítás avagy a port - buildelése + következõ lépés a fordítás + avagy a port buildelése (elkészítése). Ezt egy szimpla make parancs kiadásával kezdeményezhetjük. Miután megtettük, @@ -1276,14 +1265,13 @@ ... &prompt.root; - Vegyük észre, hogy a fordítás - befejeztével visszakapjunk a parancssort. A - soron következõ lépés a port - telepítése lesz. Ehhez mindössze - egyetlen szóval kell kiegészítenünk - a make parancs - meghívását: ez a szó pedig az - install (telepít) lesz. + A fordítás befejeztével visszakapjunk a + parancssort. A soron következõ lépés a + port telepítése lesz. Ehhez mindössze + egyetlen szóval kell kiegészítenünk a + make parancs meghívását: + ez a szó pedig az install + (telepít) lesz. &prompt.root; make install ===> Installing for lsof-4.57 @@ -1301,19 +1289,19 @@ Miután ismét visszakaptuk a parancssort, már futtatni is tudjuk a frissen telepített alkalmazásunkat. Mivel az lsof - programnak megnövelt jogosultságokra van - szüksége, egy biztonsági - figyelmeztetést is láthatunk. A portok - létrehozása és telepítése - során érdemes figyelnünk az ehhez - hasonló felbukkanó + programnak tovább jogosultságokra is + szüksége van, egy errõl szóló + biztonsági figyelmeztetést is láthatunk. A + portok létrehozása és + telepítése során érdemes + figyelnünk az ehhez hasonló figyelmeztetésekre. - A telepítés befejeztével nem - árt törölnünk a fordításhoz + A telepítés befejeztével nem árt + törölnünk a fordításhoz felhasznált alkönyvtárat (work) is. Ezzel - nemcsak a drága lemezterületet spóroljuk - meg, hanem megelõzzük a port késõbbi + nemcsak a drága lemezterületet spóroljuk meg, + hanem megelõzzük a port késõbbi frissítése során felmerülõ esetleges problémákat is. @@ -1324,11 +1312,13 @@ Az eljárásból két lépést meg is tudunk takarítani, ha - egyszerûen csak a make install clean - parancsot adjuk ki az elõbb három - lépésben tagolt make, - make install és make - clean parancsok helyett. + egyszerûen csak a make install + clean parancsot adjuk ki az elõbb + három lépésben tagolt >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:35:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BD8B1065717; Sat, 19 Apr 2008 21:35:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCE1D1065675 for ; Sat, 19 Apr 2008 21:35:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAD5E8FC29 for ; Sat, 19 Apr 2008 21:35:26 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLZQ8G039403 for ; Sat, 19 Apr 2008 21:35:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLZQHn039401 for perforce@freebsd.org; Sat, 19 Apr 2008 21:35:26 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:35:26 GMT Message-Id: <200804192135.m3JLZQHn039401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:35:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=140268 Change 140268 by pgj@disznohal on 2008/04/19 21:35:10 Cleanup in Chapter 5. Affected files ... .. //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#5 (text+ko) ==== @@ -14,7 +14,7 @@ Ken Tom - Az X.Org X11 szerveréhez frissítette: + Az X.Org X11 szerveréhez igazította: @@ -46,7 +46,7 @@ és hivatalos változata az &xorg;, melyet az X.Org alapítvány a &os;-éhez nagyon hasonló - licensz alatt fejleszt. A &os;-hez kereskedelmi X szerverek is + licenc alatt fejleszt. A &os;-hez kereskedelmi X szerverek is elérhetõek. Ebben a fejezetben az X11 telepítését @@ -77,28 +77,28 @@ az X Window System különbözõ alkotóelemeit, és hogy ezek miként - mûködnek együtt + mûködnek együtt; hogyan telepítsük és - állítsuk be az X11-et + állítsuk be az X11-et; hogyan telepítsük és használjuk - a különféle ablakkezelõket + a különféle ablakkezelõket; hogyan használjunk &truetype; - betûtípusokat az X11-ben + betûtípusokat az X11-ben; hogyan állítsuk be rendszerünkön a grafikus bejelentkezést - (XDM) + (XDM). @@ -108,9 +108,10 @@ külsõ programok telepítésének ismerete () + linkend="ports">). + @@ -131,10 +132,10 @@ Miért X? - Az X ugyan nem az elsõ &unix;-ra íródott - ablakozó rendszer, de a legnépszerûbb a - fajtájában. Az X eredeti fejlesztõcsapata az - X elõtt egy másik ablakozó rendszeren + Az X ugyan nem az elsõ &unix;ra íródott + ablakozó rendszer, de fajtáját tekintve a + legnépszerûbb. Az X eredeti fejlesztõcsapata + az X elõtt egy másik ablakozó rendszeren dolgozott, aminek a neve W (mint Window, azaz ablak) volt. Az X pedig az arab ábécében pontosan ezt a betût @@ -150,7 +151,7 @@ - Az X kliens/szerver modellje + Az X kliens-szerver modellje Az X-et már az elejétõl kezdve hálózatközpontúnak tervezték, @@ -158,19 +159,20 @@ kliens-szerver modellt használja. Az X modelljében az X szerver egy - olyan számítógépen fut, amihez + olyan számítógépen fut, amelyhez billentyûzetet, monitort és egeret csatlakoztattunk. A szerver feladatai között találjuk a megjelenítés - irányítását, az egérrõl + irányítását az egérrõl és a billentyûzetrõl, valamint a többi bemeneti és kimeneti eszközrõl érkezõ adatok felfeldolgozását - és így tovább (pl. a digitális - táblák is használhatóak beviteli - eszközként, illetve egy projektor is lehet - megjelenítõ). Mindegyik X alkalmazás (mint - például az XTerm vagy a + és így tovább (például a + digitális táblák is + használhatóak beviteli eszközként, + illetve egy projektor is lehet megjelenítõ). + Mindegyik X alkalmazás (mint például az + XTerm vagy a &netscape;) egy kliens. A kliens üzeneteket küld a szervernek, például Kérlek, rajzolj egy ablakot ezekre a @@ -182,12 +184,12 @@ Az otthoni vagy a kisebb irodai környezetben az X szerver és az X kliensek általában ugyanazon a számítógépen futnak. - Azonban nagyon is lehetséges, hogy az X szerver egy - kevésbé erõs gépen fusson, + Emellett azonban nagyon is lehetséges, hogy az X szerver + egy kevésbé erõs gépen fusson, miközben az X alkalmazások (a kliensek) az irodát kiszolgáló erõsebb és drágább gépen fussanak. Egy ilyen - felállásban az X kliensei és szerverei + konfigurációban az X kliensei és szerverei közti kommunikáció a hálózaton keresztül zajlik. @@ -201,11 +203,10 @@ és a szerver ugyanazon az operációs rendszeren vagy éppen ugyanolyan típusú számítógépen fusson. Ezért - akár µsoft.windows;-on vagy az &apple; - &macos;-én is indíthatunk X szervert, - számos különbözõ szabad és - kereskedelmi alkalmazás képes pontosan - erre. + akár µsoft.windows;szon vagy &apple; &macos;-n is + indíthatunk X szervert, és számos + különbözõ szabad valamint kereskedelmi + alkalmazás képes pontosan erre. @@ -220,21 +221,21 @@ szabályokat. Ez tehát azt jelenti, hogy az X nem köti meg miként oldjuk meg vele a feladatokat. Helyette különféle - eszközeket ad a felhasználó kezébe + eszközeket ad a felhasználó kezébe, és onnantól a saját felelõssége eldönteni, hogyan használja ki ezeket. Ez a filozófia az X-ben egészen addig terjed, hogy nem rögzíti, hogyan nézzenek ki a képernyõn megjelenõ ablakok, miként kell - õket mozgatni az egérrel, milyen billentyûk + ezeket mozgatni az egérrel, milyen billentyûk lenyomásával közlekedhetünk az ablakok - között (ez az - AltTab a - µsoft.windows; esetén), hogyan nézzen ki az - ablakok címsora, legyen-e rajtuk gombja a - bezárás funkciónak, és így - tovább. + között (ami a µsoft.windows; esetén az + + AltTab), hogyan + nézzen ki az ablakok címsora, a + bezárás funkciónak legyen-e rajtuk gombja + és így tovább. Ehelyett az X az összes ezzel járó felelõsséget átadja az @@ -257,16 +258,16 @@ megengedi, hogy mi magunk állítsuk be az asztal irányításához használt gombkombinációkat; köztük - találhatunk olyat is, aminek van Start + találhatunk olyat is, amelynek van Start gombja vagy ehhez hasonló eszköze; némelyek közülük ismerik a témákat, aminek révén a kinézetük és hangulatuk teljesen megváltoztatható. Az említett - ablakkezelõk és társaik - elérhetõek a Portgyûjtemény - x11-wm - kategóriájában. + ablakkezelõk és társaik a + Portgyûjtemény x11-wm + kategóriájában érhetõek + el. Ráadásul a KDE és a GNOME @@ -279,26 +280,26 @@ összeállított konfigurációs állományt vár, mások pedig külön grafikus eszközöket tartalmaznak erre - a feladatra is. Az egyikük - (Sawfish) konfigurációs - állományát pedig a Lisp programozási - nyelv egyik dialektuásban kell megírni. + a feladatra is. Az egyikük (a + Sawfish) konfigurációs + állományát például a Lisp + programozási nyelv egyik dialektuásban kell + megírni. Az irányítás átadása - Az ablakkezelõ másik fontos feladata az - irányítás egérrel - történõ - átadásának, vagy rövidebben - szólva a fókusz átadásának - kezelése (focus policy). Minden ablakkezelõ - rendszerben el kell tudnunk valahogy dönteni, hogy a - beérkezõ billentyûleütések melyik - ablakhoz vándoroljanak, valamint az ilyen - értelemben aktív ablakot valamilyen módon - jeleznünk is kell. + Az ablakkezelõ másik fontos feladata + lekezelni, hogy az egérrel miként tudjuk + átadni az ablakok között az + irányítást, vagyis a fókuszt + (focus policy). Minden ablakkezelõ rendszerben el kell + tudnunk valahogy dönteni, hogy a beérkezõ + billentyûleütések melyik ablakhoz + vándoroljanak, valamint az ilyen értelemben + aktív ablakot valamilyen módon jeleznünk is + kell. Ennek egyik ismert módszere a fókusz kattintásra megoldás, amely modellt a @@ -308,13 +309,13 @@ Az X viszont nem kötelezi el magát egyik vezérlésátadási módszer - mellett, helyette az ablakkezelõ fogja majd + mellett sem, helyette az ablakkezelõ fogja majd eldönteni, melyik ablak birtokolja a fókuszt az adott pillanatban. A különbözõ ablakkezelõk különbözõ fókuszvezérlési technikákat ismernek. Mindegyikük ismeri a kattintásos - fókuszt, azonban a többségük + fókuszt, azonban a többségük emellett még sok más megoldást is felkínál. @@ -403,11 +404,10 @@ felületen megjelenõ elemekre használjuk, amelyekkel valamilyen módon kapcsolatba léphetünk: kattinthatunk rájuk, - piszkálhatjuk õket. Ilyenek - többek közt a gombok, - jelölõnégyzetek, rádiógombok, - ikonok, listák és a többi. A - µsoft.windows; nyelvén ezeket + piszkálhatjuk ezeket. Ilyenek többek + közt a gombok, jelölõnégyzetek, + rádiógombok, ikonok, listák és a + többi. A µsoft.windows; nyelvén ezeket vezérlõknek (control) nevezzük. @@ -415,22 +415,22 @@ téren nagyon merev. Az alkalmazások fejlesztõinek gondoskodniuk kell róla, hogy a programjaik az elterjedt kinézetet és - kialakítást kövessék. Az X - esetén semmilyen konkrét grafikai stílust - vagy a vezérlõeszközök következetes - használatát nem szerették volna - diktálni. + kialakítást kövessék. Az X viszont + nem várja az egységes + vezérlõeszközök vagy grafikai + stílus használatát. Ennek eredményeképpen az X cseppet sem - várja el az alkalmazásoktól, hogy + kívánja meg az alkalmazásoktól, hogy közös kinézetben vagy viselkedésben - osztozzanak. Léteznek ugyan népszerû - eszközrendszerek és azoknak számos - variációja is kialakult, beleértve az MIT - Athena-ját, a &motif;-ot - (amirõl a µsoft.windows; eszközeit is - mintázták, az összes ferde élet - és a három szürkeárnyalatot), az + osztozzanak. Természetesen léteznek + népszerû eszközrendszerek és azoknak + számos variációja is kialakult, + beleértve az MIT Athenaját, a + &motif;ot (amirõl a + µsoft.windows; eszközeit is mintázták, + az összes ferde élet és a három + szürkeárnyalatot), az OpenLookot és társaikat. @@ -468,7 +468,7 @@ Az &xorg;-ot a Portgyûjteménybõl így tudjuk - lefordítani majd telepíteni: + lefordítani, majd telepíteni: &prompt.root; cd /usr/ports/x11/xorg &prompt.root; make install clean @@ -479,7 +479,7 @@ szabad helyre van szükségünk. - Az X11-et természetesen feltelepíthetjük + Az X11-et természetesen telepíthetjük közvetlenül csomagok segítségével is. A &man.pkg.add.1; használatával telepíthetõ bináris csomagok is @@ -536,10 +536,10 @@ A monitor jellemzõi - A videókártya + A videokártya chipkészlete - A videókártya - memóriája + A videokártya + memóriájának mérete függõleges frissítési @@ -547,32 +547,31 @@ vízszintes frissítési frekvencia - A monitor jellemzõibõl állapítja meg - az X11, milyen felbontásban és - frissítési frekvenciával + Az X11 a monitor jellemzõibõl + állapítja meg, hogy milyen felbontásban + és frissítési frekvenciával mûködtesse azt. Ezek általában a monitorhoz tartozó dokumentációból vagy a gyártó honlapjáról - deríthetõek ki. Igazaból két + deríthetõek ki. Igazából két értékre van szükségünk: a függõleges és a vízszintes frissítési frekvenciára. - A videókártya chipkészlete - határozza meg, hogy az X11 melyik - meghajtóján keresztül kommunikál a - grafikus hardverrel. Ez a legtöbb chipkészlet - esetén magától + A videokártya chipkészlete határozza + meg, hogy az X11 melyik meghajtóján keresztül + kommunikál a grafikus hardverrel. Ez a legtöbb + chipkészlet esetén magától megállapítható, de ennek ellenére mégis jó tisztában lenni ezzel arra az esetre, ha az automatikus felismerés mégsem mûködne. - A grafikus kártya memóriája - határozza meg a rendszer által + A grafikus kártya memóriájának + mérete határozza meg a rendszer által kihasználható felbontást és színmélységet. Ezt fontos tudunk ahhoz, - hogy ismerjük a rendszer korlátait. + hogy ismerjük a rendszerünk korlátait. @@ -582,8 +581,8 @@ Az &xorg; 7.3-as változatában gyakran mindenféle konfigurációs állomány - használata nélkül ki adni a - következõ parancsot: + használata nélkül egyszerûen csak adjuk + ki a következõ parancsot: &prompt.user; startx @@ -629,11 +628,11 @@ &prompt.root; Xorg -config xorg.conf.new - Ha ezután egy fekete-fehér rácsot - látunk egy X alakú egérmutatóval a - közepén, akkor jó a - beállítás. A próbát a - + Ha ezután a képernyõn egy + fekete-fehér rácsot látunk egy X alakú + egérmutatóval a közepén, akkor + jó a beállítás. A + próbát a CtrlAltBackspace billentyûk együttes lenyomásával szakíthatjuk meg. @@ -656,18 +655,18 @@ nyissuk meg egy szövegszerkesztõben, például az &man.emacs.1;-ben vagy az &man.ee.1;-ben. Elsõként adjuk meg a - célrendszerhez csatlakoztatott monitor frekvencia - adatait. Ezek általában a függõleges - és a vízszintes frissítés - értékei, melyeket az - xorg.conf.new állomány - "Monitor" szakaszában kell - feltüntetni: + célrendszerhez csatlakoztatott monitor + frekvenciájára vonatkozó adatokat. Ezek + általában a függõleges és a + vízszintes frissítés értékei, + melyeket az xorg.conf.new + állomány "Monitor" + szakaszában (Section) kell feltüntetni: Section "Monitor" Identifier "Monitor0" - VendorName "Monitor Vendor" - ModelName "Monitor Model" + VendorName "A monitor gyártója" + ModelName "A monitor típusa" HorizSync 30-107 VertRefresh 48-120 EndSection @@ -695,7 +694,7 @@ bekapcsolását, és segítségével készenléti vagy energiatakarékos üzemmódba tudjuk helyezni - õket. Ha engedélyezni kívánjuk a + azokat. Ha engedélyezni kívánjuk a monitorunk DPMS lehetõségeit, egyszerûen csak tegyük hozzá az alábbi sort a monitorunkat leíró szakaszhoz: @@ -705,10 +704,11 @@ xorg.conf - Amíg a xorg.conf.new - konfigurációs állományt még - mindig javítgatjuk, válasszuk ki számunkra - kedvezõ alapértelmezett felbontást és + Ha már a xorg.conf.new + konfigurációs állomány + szerkesztésével vagyunk elfoglalva, + válasszuk ki számunkra kedvezõ + alapértelmezett felbontást és színmélységet is. Ezt a "Screen" (Képernyõ) nevû szakaszban tehetjük meg: @@ -733,14 +733,13 @@ a parancssorból. A Modes kulcsszó után jelennek meg azok a felbontások, amelyekben az adott - színmélység elérhetõ. - Megjegyezzük, hogy itt csak olyan VESA - szabványú módok jelenhetnek meg, amelyet a - célrendszer grafikus eszköze is támogat. A - fenti példában az alapértelmezett - színmélység képpontonként - huszonnégy bit, és ebben a - színmélységben az elfogadott + színmélység elérhetõ. Itt csak + olyan VESA szabványú módok jelenhetnek meg, + amelyet a célrendszer grafikus eszköze is + támogat. A fenti példában az + alapértelmezett színmélység + képpontonként huszonnégy bit, és + ebben a színmélységben az elfogadott felbontás 1024-szer 768 pixel. Végezetül mentsük el a szerkesztett @@ -767,7 +766,7 @@ konfigurációs állományt el kell tennünk egy olyan központi helyre, ahol az &man.Xorg.1; képes lesz majd megtalálni. Ez a - hely általában a + hely általában az /etc/X11/xorg.conf vagy a /usr/local/etc/X11/xorg.conf. @@ -817,8 +816,8 @@ chipkészletének meghajtásához szükségünk lesz az agpart nevû AGP - programozási felületre az X11-ben. Az &man.agp.4; - meghajtó man oldalán olvashatuk errõl + programozási felületre az X11-ben. Errõl az + &man.agp.4; meghajtó man oldalán olvashatuk többet. Ennek segítségével ezt a hardvert is @@ -850,9 +849,8 @@ naplóállományokból is kinyerhetünk elegendõ információt ahhoz, hogy mûködésre bírjuk - rendszerünket. Mindenképpen legyen - kéznél ehhez egy - szövegszerkesztõ! + rendszerünket. Ehhez mindenképpen legyen + kéznél egy szövegszerkesztõ! A jelenlegi szélesvásznú (WSXGA, WSXGA+, WUXGA, WXGA, WXGA+ és társai) @@ -897,9 +895,9 @@ Ha az alábbi ModeLine értékek nem szerepelnének a - meghajtókban, akkor velük kapcsolatban - súgnunk kell az &xorg;nak - egy kicsit. A /var/log/Xorg.0.log + meghajtókban, akkor velük kapcsolatban egy kicsit + súgnunk kell az &xorg;-nak. + A /var/log/Xorg.0.log átrágásával elegendõ információt tudunk gyûjteni ahhoz, hogy manuálisan vegyünk fel használható @@ -914,15 +912,15 @@ (II) MGA(0): Ranges: V min: 48 V max: 85 Hz, H min: 30 H max: 94 kHz, PixClock max 170 MHz Ezeket nevezik EDID-adatoknak (Extended display - identification data, vagyis kb. bõvített - megjelenítési azonosító adatok). - Belõlük a megfelelõ ModeLine - sor létrehozása csupán annyiból - áll, hogy a számértékeket a - megfelelõ sorrendbe tesszük: + identification data, vagyis bõvített + megjelenítési azonosító + adatoknak). Belõlük a megfelelõ + ModeLine sor létrehozása + csupán annyiból áll, hogy a + számértékeket a megfelelõ sorrendbe + tesszük: - ModeLine <name> <clock> <4 horiz. - timings> <4 vert. timings> + ModeLine <name> <clock> <4 horiz. timings> <4 vert. timings> Ezáltal a példában látott "Monitor" szakasz @@ -970,13 +968,13 @@ számára. A nagyobb méretû bemutatókon a betûi szögletesen és idétlenül néznek ki, a - &netscape;-ben megjelenõ kisebb + &netscape;ben megjelenõ kisebb betûk pedig szinte teljességgel olvashatatlanok. - Viszont rengeteg szabad, nagyon jó - minõségû és könnyen + Viszont manapság már rengeteg szabad, nagyon + jó minõségû és könnyen használható Type1 (&postscript;) - betûtípus érhetõ már el az - X11-hez. Például az URW + betûtípus érhetõ el az X11-hez. + Például az URW betûtípus-gyûjtemény (x11-fonts/urwfonts) a szabványos Type1 betûtípusok (Ugyanígy járjunk el a freefont és a többi gyûjtemény esetén is. Az X - szerver akkor fogja észlelni ezket a + szerver akkor fogja észlelni ezeket a betûtípusokat, ha hozzáadjuk a következõ sort a konfigurációs állományához @@ -1046,76 +1044,77 @@ &truetype; betûtípusok - TrueType - betûtípusok - - betûtípusok - TrueType - + TrueType + betûtípusok + + betûtípusok + TrueType + - Az &xorg; beépített - támogatást tartalmaz a &truetype; - betûtípusok rendereléséhez. Két - különbözõ modul valósítja meg - ezt a feladatot. Ebben példában a freetype - nevû modult használjuk, mivel sokkal jobban - illeszkedik a többi betûrenderelõhöz. A - freetype modul használatához mindössze az - /etc/X11/xorg.conf állomány - "Module" szakaszába kell beírnunk - a következõ sort: + Az &xorg; beépített + támogatást tartalmaz a &truetype; + betûtípusok rendereléséhez. + Két különbözõ modul + valósítja meg ezt a feladatot. Ebben + példában a freetype nevû modult + használjuk, mivel sokkal jobban illeszkedik a többi + betûrenderelõhöz. A freetype modul + használatához mindössze az + /etc/X11/xorg.conf állomány + "Module" szakaszába kell + beírnunk a következõ sort: - Load "freetype" + Load "freetype" - Most pedig hozzunk létre egy könyvtárat a - &truetype; betûtípusok számára (ez - legyen például a - /usr/local/lib/X11/fonts/TrueType), majd - másoljuk az összes &truetype; - betûtípusunkat ide. Vigyázzunk rá, hogy - &macintosh;-ról &truetype; betûtípusok - közvetlenül nem hozhatóak át, az X11 - számára &unix;/&ms-dos;/&windows; formátumban - kell lenniük. Miután sikerült - átmásolnunk az állományokat ebbe a - könyvtárba, használjuk a - ttmkfdir parancsot a - fonts.dir állomány - létrehozására, aminek révén az - X betûrenderelõje tudnia fogja, hogy új - állományokat telepítettünk. A - ttmkfdir x11-fonts/ttmkfdir néven - elérhetõ a &os; - Portgyûjteményébõl. + Most pedig hozzunk létre egy könyvtárat a + &truetype; betûtípusok számára (ez + legyen például a + /usr/local/lib/X11/fonts/TrueType), majd + másoljuk az összes &truetype; + betûtípusunkat ide. Vigyázzunk rá, + hogy &macintosh;-ról &truetype; betûtípusok + közvetlenül nem hozhatóak át, az X11 + számára &unix;/&ms-dos;/&windows; + formátumban kell lenniük. Miután + sikerült átmásolnunk az + állományokat ebbe a könyvtárba, + használjuk a ttmkfdir + parancsot a fonts.dir + állomány létrehozására, + aminek révén az X betûrenderelõje tudnia + fogja, hogy új állományokat + telepítettünk. A ttmkfdir + x11-fonts/ttmkfdir + néven elérhetõ a &os; + Portgyûjteményébõl. - &prompt.root; cd /usr/local/lib/X11/fonts/TrueType + &prompt.root; cd /usr/local/lib/X11/fonts/TrueType &prompt.root; ttmkfdir -o fonts.dir - Ezután adjuk hozzá a &truetype; - könyvtárat a betûtípusok - könyvtáraihoz. Itt is a Type1 betûtípusoknál - leírtak szerint kell eljárnunk, vagyis - használjunk a + Ezután adjuk hozzá a &truetype; + könyvtárat a betûtípusok + könyvtáraihoz. Itt is a Type1 betûtípusoknál + leírtak szerint kell eljárnunk, vagyis + használjunk a - &prompt.user; xset fp+ /usr/local/lib/X11/fonts/TrueType + &prompt.user; xset fp+ /usr/local/lib/X11/fonts/TrueType &prompt.user; xset fp rehash - parancsot, vagy adjunk hozzá a - xorg.conf állományhoz egy - további FontPath sort. + parancsot, vagy adjunk hozzá a + xorg.conf állományhoz egy + további FontPath sort. - Ezzel végeztünk is. Innentõl kezdve a - &netscape;, - Gimp, a - &staroffice; és mindegyik - más X alkalmazás fel fogja ismerni a frissen - telepített &truetype; betûtípusokat. A nagyon - kicsi betûk (egy honlap megtekintése során, - nagyfelbontásban) és a nagyon nagy betûk (a - &staroffice; használatakor) most - már sokkal jobban fognak mutatni. + Ezzel végeztünk is. Innentõl kezdve a + &netscape;, + Gimp, a + &staroffice; és mindegyik X + alkalmazás fel fogja ismerni a frissen telepített + &truetype; betûtípusokat. A nagyon kicsi betûk + (egy honlap megtekintése során, + nagyfelbontásban) és a nagyon nagy betûk (a + &staroffice; használatakor) + most már sokkal jobban fognak mutatni. @@ -1183,7 +1182,7 @@ Az állománynak XML formátumúnak kell lennie. Különösen ügyeljünk a - kis- és nagybetûkre és + kis- és nagybetûkre, illetve gyõzödjünk meg mindig róla, hogy lezártuk-e az összes taget. Az állomány a szokásos XML-fejléccel @@ -1211,7 +1210,7 @@ állományba, nagyjából ilyen alakban: - <dir>/az/én/betû/típusaim</dir> + <dir>/az/en/betu/tipusaim</dir> Az új betûtípusok, de legfõképpen az új betûtípusokat @@ -1344,10 +1343,10 @@ nevû állományt. Fésüljük össze ennek az állománynak a tartalmát a /usr/local/etc/fonts/local.conf - tartalmával és a Bitstream betûtípusok - maguktól felváltják az X11 - alapértelmezett talpas (serif), talpatlan (sans serif) - és egyenszélességû (monospaced) + tartalmával, és a Bitstream + betûtípusok maguktól felváltják + az X11 alapértelmezett talpas (serif), talpatlan (sans + serif) és egyenszélességû (monospaced) betûtípusait. Végezetül a felhasználók is @@ -1367,7 +1366,7 @@ Még egy utolsó ötlet: LCD képernyõk esetén szükségünk - lehet az ún. sub-pixel sampling + lehet az ún. sub-pixel sampling (részképpont mintavételezési) technikára. Ezzel lényegében a (vízszintesen elválasztott) vörös, @@ -1398,7 +1397,7 @@ értéket bgr-re, vrgb-re vagy vbgr-re kell cserélnünk. Próbálgassuk - és kiderül, melyikkel mûködik + és kiderül, hogy melyikkel mûködik jobban. @@ -1475,13 +1474,14 @@ Az XDM tulajdonképpen a felhasználó számára ugyanazokat a funkciókat nyújtja, mint a &man.getty.8; program - (errõl bõvebben ld. ). - Tehát: belépteti a felhasználót a - szerverre, ahova csatlakozott, illetve elindítja helyette - a hozzátartozó munkamenet kezelõjét - (ami általában egy X-es ablakkezelõ). Az - XDM megvárja ennek a - programnak a befejezõdését, ami egyben jelzi + (errõl bõvebben lásd ). Tehát: belépteti a + felhasználót a szerverre, ahova csatlakozott, + illetve elindítja helyette a hozzátartozó + munkamenet kezelõjét (ami általában + egy X-es ablakkezelõ). Az XDM + megvárja ennek a programnak a + befejezõdését, ami egyben jelzi számára, hogy a felhasználó elvégezte a dolgát, és kilépteti a szerverrõl. Ezután az @@ -1509,13 +1509,12 @@ bejegyzést az /etc/ttys állományhoz. Ennek a formai szabályairól és - használatáról bõvebben ld. . Az /etc/ttys - alapértelmezett változatában az - XDM démon virtuális - terminálon történõ - futtatását így találhatjuk - meg: + használatáról bõvebben lásd + . Az + /etc/ttys alapértelmezett + változatában az XDM + démont ebben a formában találjuk meg a + virtuális terminálok között: ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure @@ -1606,16 +1605,16 @@ xdm-pid A jelenleg futó XDM-hez tartozó - folyamat azonosítója. + azonosító. - Ebben a könyvtárban fellelhetõ még - néhány program és szkript az munkaasztalunk - beállításához az - XDM futása során. Ezen + Ebben a könyvtárban találunk még + néhány olyan programot és szkriptet, + amelyekkel be tudjuk állítani a munkaasztalunkat + az XDM futása alatt. Ezen állományok céljait egyenként ismertetni fogjuk. A felépítésükrõl és @@ -1650,8 +1649,8 @@ nem állítottuk a távoli számítógépek csatlakoztathatóságát. - Alapértelmezés szerint semmilyen klienst nem - enged csatlakozni. + Alapértelmezés szerint viszont semmilyen klienst + nem enged csatlakozni. @@ -1743,10 +1742,10 @@ is kapcsolódni, ha átírjuk a hozzáférésre vonatkozó szabályokat és engedélyezzük rajta a - kapcsolódást. A szabályok az - alapértelmezés szerint nagyon óvatosak. Az - XDM-hez történõ - kapcsolódás engedélyezéséhez + kapcsolódást. Az alapértelmezett + szabályok nagyon óvatosak. Ha tehát + engedélyezni akarjuk a kívülrõl + érkezõ kapcsolódásokat, akkor ahhoz elõször az xdm-config állományból vegyük ki az alábbi sort: @@ -1758,15 +1757,15 @@ Ezután indítsuk újra az XDM-et. Ne felejtsük el, hogy az app-defaults állományokban a - megjegyzéseket ! - (felkiáltójel)lel kezdõdnek, nem pedig a + megjegyzések ! + (felkiáltó)jellel kezdõdnek, nem pedig a megszokott # (kettõskereszt)tel. A fentieknél természetesen szigorúbb hozzáférési szabályok is szükségesek lehetnek — ezzel kapcsolatban nézzük meg Xaccess állományban szereplõ példákat, - illetve lapozzuk fel a &man.xdm.1; man oldalt. + illetve lapozzuk fel az &man.xdm.1; man oldalt. @@ -1808,9 +1807,9 @@ szó. Maga a munkakörnyezet elnevezés sok mindenre utalhat egy mezei ablakkezelõtõl kezdve az asztali alkalmazások - teljes garmadájáig, ahogy a + teljes garmadájáig, ahogy igaz ez a KDE vagy a - GNOME esetén is. + GNOME esetében is. A GNOME @@ -1902,18 +1901,18 @@ saját .xinitrc állományunk, akkor nincs más teendõnk, mint átírni az aktuális - ablakkezelõnket behívó sort a + ablakkezelõnket hívó sort a /usr/local/bin/gnome-session sorra. Ha nem csináltunk elõtte semmilyen különleges dolgot az említett - konfigurációs állománnyal, + konfigurációs állománnyal, akkor elegendõ csak ennyit beírnunk: &prompt.user; echo "/usr/local/bin/gnome-session" > ~/.xinitrc Ezt követõen írjuk be a startx parancsot, és a - GNOME munkakörnyezet fog + GNOME munkakörnyezete fog elindulni. @@ -1925,7 +1924,7 @@ állományt, amely ezt a parancsot tartalmazza. Ehhez nyissuk meg és cseréljük ki benne a korábbi ablakkezelõnk - meghívását a + hívását a /usr/local/bin/gnome-session utasításra: @@ -1966,14 +1965,20 @@ tehát a GNOME legfrissebb verzióiban már használhatjuk az élsimítást. Ehhez menjünk az - Alkalmazások - A munkaasztal - beállításai - Betûk - menübe, majd válasszuk vagy a A - legszebb betûforma, A legjobb - kontraszt vagy a Simítás - a képponton belül (LCD) + Applications + Desktop Preferences + Font (a magyar + változatban ez az + Alkalmazások A + munkaasztal beállításai + Betûk ) + menübe, majd válasszuk vagy a Best + shapes (A legszebb + betûforma), Best + contrast (A legjobb + kontraszt) vagy a Subpixel smoothing + (LCDs) (Simítás a + képponton belül (LCD)) menüpontot. A GTK+-ot használó, de közvetlenül a GNOME-hoz nem tartozó alkalmazások esetén pedig @@ -2052,13 +2057,14 @@ A KDE-hez egy Konqueror nevû böngészõ is tartozik, mely a többi - &unix;-os böngészõ komoly ellenfelének + &unix;os böngészõ komoly ellenfelének bizonyul. A KDE-rõl többet a KDE honlapján olvashatunk. A KDE &os;-re - vonatkozó tudnivalóiról és - anyagokról a &os; - KDE csapat honlapján találhatunk + vonatkozó tudnivalóiról és a + hozzátartozó anyagokról a &os; KDE csapat + honlapján találhatunk információkat. @@ -2068,13 +2074,13 @@ Ahogy a GNOME és a többi más munkakörnyezet esetében is, - maga a program könnyen feltelepíthetõ + maga a program könnyen telepíthetõ csomagból vagy a Portgyûjtemény segítségével is: A KDE csomagját hálózaton keresztül így tudjuk - feltelepíteni: + telepíteni: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 671B31065674; Sat, 19 Apr 2008 21:36:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC50C1065670 for ; Sat, 19 Apr 2008 21:36:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DAB6F8FC20 for ; Sat, 19 Apr 2008 21:36:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLaR9h039424 for ; Sat, 19 Apr 2008 21:36:27 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLaRT4039422 for perforce@freebsd.org; Sat, 19 Apr 2008 21:36:27 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:36:27 GMT Message-Id: <200804192136.m3JLaRT4039422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:36:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=140269 Change 140269 by pgj@disznohal on 2008/04/19 21:35:35 Cleanup in Preface. Affected files ... .. //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/preface/preface.sgml#6 (text+ko) ==== @@ -20,7 +20,7 @@ szabályokat. Ennek a résznek a végigjárása nem kíván többet, csupán egy kis felfedezõ kedvet, illetve a - menetközben bemutatott új fogalmak + menet közben bemutatott új fogalmak befogadását. Ha túljutottunk rajta, a kézikönyv @@ -33,9 +33,8 @@ fejezet áttekintésében említeni is fogunk. - Bõvebben információkért - kérjük, olvassa át az et. + További információkért olvassuk + át a et. Változtatások a harmadik @@ -49,18 +48,19 @@ - , a - beállításra és finomhangolásra - vonatkozó részeket bõvítettük az - ACPI energia- és erõforrás - gazdálkodásról szóló - részekkel, a cron rendszerprogrammal, - ill. még több rendszermag-tuningolási + : a + beállításra és + finomhangolásra vonatkozó részeket + bõvítettük az ACPI energia- és + erõforrás gazdálkodásról + szóló részekkel, a cron + rendszerprogrammal, ill. még több, a rendszermag + finomhangolását elõsegítõ opció leírásával. - , a biztonságról + : a biztonságról szóló részt bõvítettük a virtuális magánhálózatokról (VPN-ekrõl), állományrendszeri @@ -70,8 +70,8 @@ - , az elrendelõ - hozzáférésvezérlésrõl + : a kötelezõ + hozzáférés-vezérlésrõl (MAC-rõl) szóló fejezet teljesen új ebben a kiadásban. Bemutatja, mi is az a MAC és hogyan hasznosítható egy &os;-s rendszer @@ -79,47 +79,49 @@ - , a háttértárakat + : a háttértárakat tartalmazó részt bõvítettük az USB-tárakról, állományrendszeri - pillanatfelvételekrõl, - lemezkvótákról, - állományból- és - hálózaton bebiztosított + pillanatképeirõl, + lemezkvótákról, állomány- + és hálózat alapú állományrendszerekrõl, továbbá a titkosított partíciókról szóló részekkel. - , a Vinum egy új fejezet - ebben a kiadásban. Bemutatja a Vinum logikai - kötet-kezelõ használatát, aminek - segítségével eszköztõl - független módon hozhatunk létre logikai - lemezeket, szoftveres RAID-0, RAID-1 és RAID-5 + : a Vinum egy új fejezet + ebben a kiadásban. Bemutatja a Vinum + logikaikötet-kezelõ használatát, aminek + segítségével eszközfüggetlen + módon hozhatunk létre logikai lemezeket, + szoftveres RAID-0, RAID-1 és RAID-5 konfigurációkat. - Bekerült egy hibakeresésrõl - szóló rész a - PPP és SLIP leírásához. + Bekerült egy + hibaelhárításról szóló + rész a PPP és SLIP + leírásához. - , az elektronikus levelezést + : az elektronikus levelezést ismertetõ részt bõvítettük a - lehetséges levéltovábbító - rendszerekrõl, SMTP hitelesítésrõl, - UUCP-rõl, a fetchmail-rõl, - procmail-rõl szóló - elemekkel, valamint egyéb, haladókat - megcélzó témákkal. + különféle + levéltovábbító rendszerekrõl, + az SMTP hitelesítésrõl, UUCP + protokollról, a fetchmail + és procmail + programokról szóló elemekkel, valamint + egyéb, haladókat megcélzó + témákkal. - , a hálózati + : a hálózati szervereket ismertetõ rész egy teljesen új fejezet ebben a kiadásban. Benne megtalálható az Apache HTTP @@ -136,22 +138,22 @@ - , a haladó + : a haladó hálózati témákat tartalmazó részt kiegészítettük a &os; és a &bluetooth; eszközök kapcsolatáról, a - vezetéknélküli + vezeték nélküli hálózatokról és az aszinkron adatátvitel módról (ATM-rõl) szóló ismeretekkel. - Létrehoztunk egy szószedetet abból a - célból, hogy a könyvben használt - definíciók és szakkifejezések - egyetlen központi helyen össze legyenek - foglalva. + Létrehoztunk egy szójegyzéket + abból a célból, hogy a könyvben + használt definíciók és + szakkifejezések egyetlen központi helyen össze + legyenek foglalva. @@ -177,10 +179,12 @@ Bekerült egy teljes tárgy- és névmutató. + Mindegyik ASCII-ábrát grafikusak váltották fel. + Mindegyik fejezet elejére odakerült egy általános áttekintés, ami egy @@ -189,35 +193,38 @@ elolvasásához szükséges ismereteket. + A tartalmat felosztottuk logikailag három - részre: - Bevezetés, + részre: Bevezetés, Rendszeradminisztráció és Függelék. + - A (A &os; - telepítése) részt teljesen + A et (A &os; + telepítése) teljesen újraírtuk és sok-sok illusztráció is hozzáadásra került a könnyebb megértés érdekében. + A (A &unix; alapjai) - rész kiegészült a futó programokról, + kiegészült a futó programokról, démonokról és jelzésekrõl szóló további hasznos információkkal. + - A (Alkalmazások - telepítése) részt - bõvítettük a bináris - csomagkezelésrõl szóló további - ismeretekkel. + A et (Alkalmazások + telepítése) bõvítettük a + bináris csomagkezelésrõl szóló + további ismeretekkel. + A (Az X Window System) teljes újraíráson ment át, aminek @@ -228,11 +235,13 @@ történõ használatának leírására. + A (A &os; rendszerindítási folyamata) kibõvült. + A (Háttértárak) két, @@ -243,27 +252,31 @@ létre. Úgy éreztük, a bennük helyet kapott témákat sokkal könnyebb úgy megérteni, ha egyetlen fejezetben - tárjuk fel õket. Egy (hardveres és - szoftveres) RAID-rõl szóló rész is + tárgyaljuk ezeket. Egy (hardveres és szoftveres) + RAID-rõl szóló rész is belekerült. + A (Soros vonali kommunikáció) teljes átszervezésre került, valamint a &os; 4.X/5.X verziókhoz igazítottuk. + A (A PPP és a SLIP) lényegesen sokat fejlõdött. + Számos új rész került a be (Egyéb haladó hálózati témák). + A (Elektronikus levelezés) kibõvült a @@ -272,6 +285,7 @@ tartalmazó újabb információkkal. + A (Bináris Linux kompatibilitás) kiegészült az @@ -280,6 +294,7 @@ telepítését bemutató részekkel. + Az alábbi új témák kerültek tárgyalásra a második @@ -288,8 +303,9 @@ Beállítás és finomhangolás () - - + + + Multimédia () @@ -334,7 +350,7 @@ - , + : Bemutatkozás A &os; bemutatkozik az új @@ -344,20 +360,22 @@ fejlesztési modelljérõl. + - , - A &os; telepítése + : A &os; + telepítése Végigvezetjük a felhasználót a telepítési folyamat egészén. - Bizonyos rendhagyó kérdések, mint mondjuk - a soros konzolon keresztül történõ - telepítés is terítékre - kerülnek. + Bizonyos rendhagyó kérdések, mint + például a soros konzolon keresztül + történõ telepítés is + terítékre kerülnek. + - , A &unix; + : A &unix; alapjai Sorra vesszük a &os; operációs rendszer @@ -368,21 +386,23 @@ ezt a fejezetet. + - , Alkalmazások - telepítése: csomagok és + : Alkalmazások + telepítése, csomagok és portok Megismerhetjük, miként tudunk külsõ cégek által fejlesztett alkalmazásokat - telepíteni a &os; portjainak - gyûjteményén (&os; Ports - Collection) vagy a megszokott bináris csomagok + telepíteni a &os; + Portgyûjteményének (&os; + Ports Collection) vagy a megszokott bináris csomagok használatán keresztül. + - , Az X Window + : Az X Window System Általános bemutatásra kerül az X @@ -397,29 +417,31 @@ - , Asztali + : Asztali alkalmazások Felsoroljuk az ismertebb asztali alkalmazásokat: webböngészõket és alkalmazói programcsomagokat, és bemutatjuk, hogyan - telepítsük õket &os;-re. + telepítsük ezeket &os;-re. + - , + : Multimédia Megtudhatjuk, hogyan állítsuk be a zene- - és videólejátszást + és videolejátszást rendszerünkön. Emellett olvashatunk néhány multimédiás alkalmazás használatáról is. + - , A &os; rendszermag + : A &os; rendszermag testreszabása Kifejtjük, miért lehet @@ -432,28 +454,31 @@ lépéseit. + - , + : Nyomtatás Ismertetjük, hogyan lehet nyomtatókat - használni &os; alatt, beleértve a munkalapok, a - nyomtatóhasználat - számlázását és a kezdeti + használni &os; alatt, beleértve a munkalapok + készítésének + mikéntjét, a nyomtatóhasználat + nyilvántartását és a kezdeti beállításokat. + - , Bináris - Linux kompatibilitás + : Bináris Linux + kompatibilitás - Megismerhetjük a &os; bináris - &linux;-kompabilitásához kapcsolódó + Megismerhetjük a &os; bináris Linux + kompabilitásához kapcsolódó lehetõségeket. Ezenfelül részletekre is kitérõ telepítési útmutatót találhatunk - különbözõ népszerû &linux;-os - alkalmazásokhoz, mint mondjuk az + különbözõ népszerû Linuxos + alkalmazásokhoz, mint például az &oracle;, &sap.r3; és a &mathematica;. @@ -463,21 +488,23 @@ - , + : Beállítás és finomhangolás Megismerhetjük a &os; azon paramétereit, - amelyek a rendszergazdák által bevethetõek az - optimális teljesítmény - elérésének érdekében. + amelyek megfelelõ állításával + a rendszergazdák a lehetõ legtöbbet + képesek kihozni &os; rendszerükbõl. Ezenkívül bemutatásra kerül a &os;-ben használt számos konfigurációs - állomány, valamint ezek lelõhelye. + állomány, valamint hogy ezeket hol + találhatjuk meg. + - , A &os; + : A &os; rendszerindítási folyamata Tartalmazza a &os; rendszerindítási @@ -487,8 +514,9 @@ segítségével. + - , Felhasználók + : Felhasználók és hozzáférések alapvetõ kezelése @@ -501,8 +529,9 @@ egyéb fiókkezelési feladatokat. + - , + : Biztonság Bemutatásra kerül a &os; rendszerünk @@ -512,29 +541,33 @@ OpenSSH. + - , - A jail alrendszer + : A jail + alrendszer Megtudhatjuk, hogyan mûködik az az - alkalmazások elzárásért + alkalmazások elszigeteléséért felelõs jail alrendszer, valamint miben emelkedik ki a &os;-ben is megtalálható hagyományos chroot megoldással szemben. + - , Kötelezõ - hozzáférésvezérlés + : Kötelezõ + hozzáférés-vezérlés Megismerhetjük a kötelezõ - hozzáférésvezérlést (MAC-et), - valamint azt, hogyan is tudjuk felhasználni egy &os;-s - rendszer biztonsága érdekében. + hozzáférés-vezérlést + (MAC-et), valamint azt, hogyan is tudjuk felhasználni + egy &os;-s rendszer biztonsága + érdekében. + - , Biztonsági + : Biztonsági események vizsgálata Kiderül, mit jelent a &os;-ben az események @@ -546,21 +579,21 @@ - , + : Háttértárak Bemutatásra kerül, miként kezelhetjük a háttértárolókat és állományrendszereket a &os;-ben. Ide tartoznak a fizikai lemezek, RAID-tömbök, optikai - és szalagos egységek, - memória-alapú lemezek és a - hálózati + és szalagos egységek, memória + alapú lemezek és a hálózati állományrendszerek. + - , GEOM: A moduláris + : GEOM, a moduláris lemezszervezõ rendszer Megismerhetjük a &os;-ben jelenlevõ GEOM @@ -569,18 +602,21 @@ beállítását. + - , A Vinum + : A Vinum kötetkezelõ Megtudhatjuk, hogyan használjuk a Vinumot, a - logikai kötet-kezelõt, amely eszközfüggetlen - logikai lemezeket, szoftveres RAID-0, RAID-1 és RAID-5 - konfigurációkat biztosít. + logikaikötet-kezelõt, amely + eszközfüggetlen logikai lemezeket, szoftveres + RAID-0, RAID-1 és RAID-5 konfigurációkat + biztosít. + - , + : Virtualizáció Tartalmazza a virtualizációs rendszerek @@ -589,18 +625,20 @@ a &os;-vel. + - , Honosítás: Az + : Honosítás, az I18N/L10N használata és beállítása - Bemutatja, hogyan használjuk a &os;-t - angoltól eltérõ nyelveken, a rendszer - és az alkalmazások szintjén. + Bemutatja, hogyan használjuk a &os;-t a rendszer + és az alkalmazások szintjén az + angoltól eltérõ nyelveken. + - , Az + : Az élvonal Elmagyarázza, mik az alapvetõ @@ -617,17 +655,18 @@ - , Soros - vonali kommunikáció + : Soros vonali + kommunikáció Kifejti, hogyan csatlakoztassunk terminált vagy - modemet a &os; rendszerünkhöz, ha behívó - vagy betárcsázós kapcsolatot - szeretnénk létrehozni. + modemet a &os; rendszerünkhöz, ha + behívó vagy betárcsázós + kapcsolatot szeretnénk létrehozni. + - , A PPP és a + : A PPP és a SLIP Bemutatja, miként tudjuk PPP-n, SLIP-en és @@ -635,11 +674,12 @@ a &os;-t távoli rendszerekkel. + - , Elektronikus + : Elektronikus levelezés - Megismerhetjük egy elektronikus levelezõszerver + Megismerhetjük egy elektronikus levelezõ szerver különféle komponenseit, és elmélyedhetünk az egyik leghíresebb levelezõszerver-szoftver, a @@ -648,13 +688,14 @@ konfigurálásában. + - , + : Hálózati szerverek Részletekbe menõen és - konfigurációs példákkal mutatja be, - miként tudunk hálózati + konfigurációs példákkal mutatja + be, miként tudunk hálózati állományrendszer kiszolgálónak, névszervernek, hálózati információs rendszer kiszolgálónak @@ -663,8 +704,9 @@ számítógépet. + - , + : Tûzfalak Kifejti a szoftveres tûzfalak mögött @@ -674,8 +716,9 @@ tûzfalak konfigurációját. + - , Egyéb + : Egyéb haladó hálózati témák @@ -685,7 +728,7 @@ történõ megosztását több számítógép között, haladó forgalomirányítási - kérdéseket, vezetéknélküli + kérdéseket, vezeték nélküli hálózatok beállítását, &bluetooth;, ATM, IPv6 és sok minden mással kapcsolatos @@ -696,7 +739,7 @@ - , A &os; + : A &os; beszerzése Felsorolja azokat a forrásokat, ahonnan a &os; CD-n @@ -705,8 +748,9 @@ &os;. + - , + : Irodalomjegyzék A könyv sok tekintetben olyan témákat @@ -718,8 +762,9 @@ amelyekre hivatkozunk is a fejezetekben. + - , + : Erõforrások az interneten Tartalmazza a &os; felhasználók @@ -729,8 +774,9 @@ társalgásokat folytathatnak. + - , + : PGP-kulcsok Az egyes &os; fejlesztõk PGP-kulcsait sorolja @@ -755,11 +801,12 @@ Dõlt A dõlt betûket - állománynevek, URL-címek, kiemelt - szövegek és a szakmai kifejezések elsõ + állománynevek, URL-ek, kiemelt szövegek + és a szakmai kifejezések elsõ elõfordulásakor használjuk. + Írógépszerû @@ -774,6 +821,7 @@ használjuk. + Félkövér @@ -787,7 +835,7 @@ Felhasználói bevitel + renderas=sect2>Felhasználói bevitel A billentyûket félkövérrel írjuk, hogy @@ -825,19 +873,18 @@ Ez tehát azt jelenti, hogy a felhasználónak - elõször a Ctrl és X - billentyûket, majd a Ctrl és - S billentyûket kell egyszerre + elõször a Ctrl és + X billentyûket, majd a Ctrl + és S billentyûket kell egyszerre lenyomnia. - Példák A E:\> kijelzéssel kezdõdõ példák egy &ms-dos; parancsot jelölnek. Ha másképpen nem említjük, - ezeket a parancsokat a modern µsoft.windows;-okban + ezeket a parancsokat a modern µsoft.windows;szokban található Parancssorból kell kiadni. @@ -859,19 +906,19 @@ normál felhasználói fiókból érdemes kiadni. Hacsak másképpen nem jelezzük, a C-shell szintaxisát használjuk a - környezeti változók és egyéb shell + környezeti változók és egyéb parancsok megadásakor. &prompt.user; top Köszönetnyilvánítás + renderas=sect1>Köszönetnyilvánítás - A könyv, amit itt most láthatunk, több - száz ember együttes munkájának - eredménye a világ minden tájáról. - Akár csak elgépeléseket javítottak, vagy - komplett fejezeket adtak hozzá, minden + A könyv, amit itt most olvashatunk, több száz + ember együttes munkájának eredménye a + világ minden tájáról. Akár csak + elgépeléseket javítottak, vagy komplett + fejezeket adtak hozzá, minden hozzájárulás hasznosnak bizonyult. Emellett sok cég anyagilag is támogatta a @@ -879,22 +926,23 @@ téve ezáltal, hogy a szerzõk teljes munkaidõben dolgozhassanak rajta, pénzt kapjanak az írásaikért stb. Leginkább a BSDi - (melyet aztán felvásárolt a Wind River Systems) adott teljes munkaidõs fizetést a &os; Dokumentációs Projekt tagjainak a könyv gondozásához, amely végül az elsõ nyomtatott kiadás megjelentetéséhez vezetett - 2000. márciusában (ISBN 1-57176-241-8). A Wind River + 2000 márciusában (ISBN 1-57176-241-8). A Wind River Systems ezt követõen további szerzõket is finanszírozott a nyomtatási-szedési infrastruktúra továbbfejlesztéséhez és a könyv tartalmának bõvítéséhez. Ennek eredménye lett - a második nyomtatott kiadás, amely 2001. - novemberében jelent meg (ISBN 1-57176-303-1). 2003-2004 - folyamán a FreeBSD - Mall, Inc. támogatott anyagilag számos + a második nyomtatott kiadás, amely 2001 + novemberében jelent meg (ISBN 1-57176-303-1). 2003 — + 2004 folyamán a FreeBSD Mall, Inc. + támogatott anyagilag számos hozzájárulót a kézikönyvet illetõ munkájáért, a harmadik nyomtatott kiadásra történõ From owner-p4-projects@FreeBSD.ORG Sat Apr 19 21:36:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C57FF1065715; Sat, 19 Apr 2008 21:36:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19B24106564A for ; Sat, 19 Apr 2008 21:36:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0977B8FC22 for ; Sat, 19 Apr 2008 21:36:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JLaRkB039429 for ; Sat, 19 Apr 2008 21:36:27 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JLaRk0039427 for perforce@freebsd.org; Sat, 19 Apr 2008 21:36:27 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 21:36:27 GMT Message-Id: <200804192136.m3JLaRk0039427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 21:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=140270 Change 140270 by pgj@disznohal on 2008/04/19 21:35:51 Cleanup in Colophon. Affected files ... .. //depot/projects/docproj_hu/books/handbook/colophon.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/colophon.sgml#3 (text+ko) ==== @@ -9,22 +9,23 @@ Original Revision: 1.9 --> - Ez a könyv A &os; dokumentációs - projekt többszáz résztvevõjének - együttes munkájával jött létre. A - forrása SGML-ben készül a DocBook DTD - alapján, és ebbõl számos - különbözõ formátumba kerül - átalakításra a Jade, - a nyílt forráskódú DSSSL engine - segítségével. Norm Walsh DSSSL - stíluslapjait használtuk fel egy további - réteg hozzáadásával a + Ez a könyv A &os; Dokumentációs + Projekt több száz + résztvevõjének együttes + munkájával jött létre. A forrása + SGML-ben készül a DocBook DTD alapján, és + ebbõl számos különbözõ + formátumba kerül átalakításra a + Jade, a nyílt + forráskódú DSSSL engine + segítségével. Egy további réteg + hozzáadásával Norm Walsh DSSSL + stíluslapjait használtuk fel a Jade vezérlésére. A dokumentum nyomtatott változata nem jöhetett volna létre Donald Knuth &tex; - betûszedõ rendszere, ill. Leslie Lamport - &latex; vagy Sebastian Rahtz + betûszedõ rendszere, illetve Leslie Lamport + &latex;, valamint Sebastian Rahtz JadeTeX makrócsomagja nélkül. From owner-p4-projects@FreeBSD.ORG Sat Apr 19 22:21:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B561065676; Sat, 19 Apr 2008 22:21:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C4D61065670 for ; Sat, 19 Apr 2008 22:21:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2410A8FC1F for ; Sat, 19 Apr 2008 22:21:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JMLERp042778 for ; Sat, 19 Apr 2008 22:21:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JMLEUu042776 for perforce@freebsd.org; Sat, 19 Apr 2008 22:21:14 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 22:21:14 GMT Message-Id: <200804192221.m3JMLEUu042776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 22:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=140273 Change 140273 by sam@sam_ebb on 2008/04/19 22:20:20 remove unused variable Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#19 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#19 (text+ko) ==== @@ -3021,7 +3021,6 @@ wpi_init_locked(struct wpi_softc *sc, int force) { struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; uint32_t tmp; int ntries, qid; From owner-p4-projects@FreeBSD.ORG Sat Apr 19 22:42:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DD001065671; Sat, 19 Apr 2008 22:42:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 327C8106564A for ; Sat, 19 Apr 2008 22:42:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 219738FC19 for ; Sat, 19 Apr 2008 22:42:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JMgi7a043916 for ; Sat, 19 Apr 2008 22:42:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JMghft043914 for perforce@freebsd.org; Sat, 19 Apr 2008 22:42:43 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Apr 2008 22:42:43 GMT Message-Id: <200804192242.m3JMghft043914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 140275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 22:42:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=140275 Change 140275 by jb@jb_freebsd1 on 2008/04/19 22:41:54 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#69 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 integrate .. //depot/projects/dtrace/ports/MOVED#77 integrate .. //depot/projects/dtrace/ports/Mk/bsd.efl.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#12 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ocaml.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#28 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.xorg.mk#4 integrate .. //depot/projects/dtrace/ports/UPDATING#67 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#4 integrate .. //depot/projects/dtrace/src/include/dirent.h#5 integrate .. //depot/projects/dtrace/src/include/stdio.h#9 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/dtrace/src/lib/libc/gen/directory.3#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/opendir.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/_flock_stub.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fgetwc.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fgetws.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/findfp.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fputwc.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fputws.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/freopen.c#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fseek.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/fwide.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/local.h#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/refill.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/snprintf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/sprintf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/sscanf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/ungetc.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/ungetwc.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vasprintf.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vfprintf.c#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vsnprintf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vsprintf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vsscanf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vswprintf.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vswscanf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/xprintf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/strfmon.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/dtrace/src/lib/libc/sys/access.2#8 integrate .. //depot/projects/dtrace/src/lib/libc/sys/chmod.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/chown.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/execve.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/link.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mkdir.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mkfifo.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/mknod.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/open.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/readlink.2#7 integrate .. //depot/projects/dtrace/src/lib/libc/sys/rename.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/stat.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/symlink.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/unlink.2#6 integrate .. //depot/projects/dtrace/src/lib/libc/sys/utimes.2#7 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/dtrace/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_dummy.c#11 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_proto.h#17 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_syscall.h#17 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysent.c#17 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/syscalls.master#16 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/dtrace/src/sys/conf/files#83 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#19 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#27 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#6 delete .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.h#5 delete .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ieee488/ibfoo.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu401.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/denode.h#9 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/inode.h#4 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_dummy.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_proto.h#19 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_syscall.h#18 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/dtrace/src/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/dtrace/src/sys/ia64/include/vmparam.h#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#32 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_subr.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#36 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#34 integrate .. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/subr_trap.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/subr_turnstile.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_default.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#37 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/net/if.c#15 integrate .. //depot/projects/dtrace/src/sys/netgraph/netflow/ng_netflow.c#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/dtrace/src/sys/netinet/in.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_offload.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/pcrtc.c#1 branch .. //depot/projects/dtrace/src/sys/pc98/include/clock.h#5 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/locore.S#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#13 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pci_if.m#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcib_subr.h#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/dtrace/src/sys/sparc64/pci/psychovar.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/lockf.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#50 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#41 integrate .. //depot/projects/dtrace/src/sys/sys/sched.h#15 integrate .. //depot/projects/dtrace/src/sys/sys/sysctl.h#16 integrate .. //depot/projects/dtrace/src/sys/sys/termios.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/vnode.h#16 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/inode.h#6 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#13 integrate .. //depot/projects/dtrace/src/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/dtrace/src/usr.bin/env/env.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/env/env.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/sctp.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat.1#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/info/main.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/info/perform.c#4 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#13 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#6 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/errata.html#2 integrate .. //depot/projects/dtrace/www/share/sgml/advisories.xml#18 integrate .. //depot/projects/dtrace/www/share/sgml/notices.xml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#69 (text+ko) ==== @@ -1,4 +1,4 @@ - + - $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.2 2008/04/15 18:33:21 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.3 2008/04/19 12:45:43 danger Exp $ &tm-attrib.freebsd; @@ -154,9 +154,9 @@ directory to the directory where the mfsBSD scripts will reside: - &prompt.root; fetch http://people.freebsd.org/~mm/mfsbsd/mfsbsd-1.0-beta1.tar.gz -&prompt.root; tar xvzf mfsbsd-1.0-beta1.tar.gz -&prompt.root; cd mfsbsd-1.0-beta1/ + &prompt.root; fetch http://people.freebsd.org/~mm/mfsbsd/mfsbsd-latest.tar.gz +&prompt.root; tar xvzf mfsbsd-1.0-beta1.tar.gz +&prompt.root; cd mfsbsd-1.0-beta1/ Configuration of <application>mfsBSD</application> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#67 (text+ko) ==== @@ -1,7 +1,7 @@ memrchr function. 800034 + + 8.0-CURRENT after introduction of the + fdopendir function. + 800035 + ==== //depot/projects/dtrace/ports/MOVED#77 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1573 2008/04/14 09:54:46 sat Exp $ +# $FreeBSD: ports/MOVED,v 1.1574 2008/04/17 21:36:26 miwi Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3450,3 +3450,4 @@ graphics/libimg-tkstep80||2008-04-09|Has expired: tkstep80 scheduled for expiration x11-toolkits/tkstep80||2008-04-09|Has expired: development stalled for years, outdated, unmaintained devel/p5-Tie-Watch|x11-toolkits/p5-Tk|2008-04-14|bundled with p5-Tk +games/teewars|games/teeworls|2008-04-17|Project renamed ==== //depot/projects/dtrace/ports/Mk/bsd.efl.mk#3 (text+ko) ==== @@ -1,6 +1,6 @@ # # $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $ -# $FreeBSD: ports/Mk/bsd.efl.mk,v 1.2 2008/03/11 21:13:22 stas Exp $ +# $FreeBSD: ports/Mk/bsd.efl.mk,v 1.3 2008/04/19 17:46:02 miwi Exp $ # # bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL) # @@ -512,9 +512,9 @@ # # Initialize configure enviropment # -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH} ==== //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.45 2008/02/28 09:07:36 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.46 2008/04/19 17:46:02 miwi Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -517,7 +517,7 @@ .for i in ${USE_GNUSTEP_LDCONFIG} LDCONFIG_DIRS+= ${i} .endfor -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .endif # eof ==== //depot/projects/dtrace/ports/Mk/bsd.kde.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.75 2007/10/29 23:47:21 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.76 2008/04/19 17:46:02 miwi Exp $ # # Please view me with 4 column tabs! @@ -59,7 +59,7 @@ .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --disable-as-needed .endif @@ -83,7 +83,7 @@ .if ${USE_QT_VER} == CVS KDE_CVS_PREFIX?= ${LOCALBASE}/kde-cvs -QT_CVS_PREFIX?= ${X11BASE}/qt-cvs +QT_CVS_PREFIX?= ${LOCALBASE}/qt-cvs QTCPPFLAGS?= QTCFGLIBS?= @@ -110,14 +110,14 @@ QTCGFLIBS?= # Qt 3.x common stuff -QT_PREFIX?= ${X11BASE} +QT_PREFIX?= ${LOCALBASE} MOC?= ${QT_PREFIX}/bin/moc #LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33 QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -D_GETOPT_H -QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ +QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \ -L${QT_PREFIX}/lib .if defined(PACKAGE_BUILDING) TMPDIR?= /tmp ==== //depot/projects/dtrace/ports/Mk/bsd.ocaml.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=4 # # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $ -# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.1 2007/03/14 04:05:25 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.2 2008/04/19 17:46:02 miwi Exp $ # # bsd.ocaml.mk - Support for the Objective Caml language packages # @@ -177,7 +177,7 @@ # .if !target(add-plist-post) add-plist-post: -. if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && \ +. if (${PREFIX} != ${LOCALBASE} && \ ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} . else ==== //depot/projects/dtrace/ports/Mk/bsd.scons.mk#9 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.9 2007/06/05 02:06:10 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.scons.mk,v 1.10 2008/04/19 17:46:02 miwi Exp $ # # bsd.scons.mk - Python-based SCons build system interface. # Author: Alexander Botero-Lowry @@ -37,8 +37,8 @@ CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig -LIBPATH?= ${LOCALBASE}/lib ${X11BASE}/lib -CPPPATH?= ${LOCALBASE}/include ${X11BASE}/include +LIBPATH?= ${LOCALBASE}/lib +CPPPATH?= ${LOCALBASE}/include # # SCONS_ENV is where we pass all the stuff that should be the ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#28 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.444 2008/04/10 20:32:51 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.445 2008/04/16 21:58:03 pav Exp $ # # Where to put distfiles that don't have any other master site @@ -479,7 +479,6 @@ http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/%SUBDIR%/ \ http://ftp.uni-erlangen.de/pub/mirrors/gentoo/%SUBDIR%/ \ http://darkstar.ist.utl.pt/gentoo/%SUBDIR%/ \ - http://ftp.caliu.info/pub/gentoo/%SUBDIR%/ \ http://gentoo.inode.at/%SUBDIR%/ \ http://ftp.rhnet.is/pub/gentoo/%SUBDIR%/ \ http://gentoo.mirror.sdv.fr/%SUBDIR%/ \ @@ -506,7 +505,6 @@ ftp://linux.rz.ruhr-uni-bochum.de/gentoo-mirror/%SUBDIR%/ \ ftp://ftp.uni-erlangen.de/pub/mirrors/gentoo/%SUBDIR%/ \ ftp://darkstar.ist.utl.pt/pub/gentoo/%SUBDIR%/ \ - ftp://ftp.caliu.info/pub/gentoo/%SUBDIR%/ \ ftp://gentoo.inode.at/source/%SUBDIR%/ \ ftp://ftp.rhnet.is/pub/gentoo/%SUBDIR%/ \ ftp://files.gentoo.gr/%SUBDIR%/ \ ==== //depot/projects/dtrace/ports/Mk/bsd.wx.mk#8 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.12 2007/10/19 02:21:14 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.13 2008/04/19 17:46:02 miwi Exp $ # # bsd.wx.mk - Support for wxWidgets based ports. # @@ -48,7 +48,7 @@ # It determines the type of parameters that have to be passed # to the configure script. In the first case it adds # "--with-wx-config=${WX_CONFIG}" (absolute path of -# WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus +# WX_CONFIG), and in second one "--with-wx=${LOCALBASE}" plus # "--with-wx-config=${WX_CONFIG:T} (prefix and name). # WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION # after (in case the port needs to manually run @@ -189,7 +189,7 @@ . for ver in ${_WX_VERS_ALL} . if defined(_WX_LIB_${comp}_${ver}) _WX_SHVER_${comp}_${ver}= 0 -_WX_FILE_${comp}_${ver}= ${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}} +_WX_FILE_${comp}_${ver}= ${LOCALBASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}} . endif . if ${_WX_COMP} == "python" _WX_DEPTYPE_${comp}_${ver}= run @@ -494,8 +494,8 @@ # Set variables. # -WX_CONFIG?= ${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config -WXRC_CMD?= ${X11BASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} +WX_CONFIG?= ${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config +WXRC_CMD?= ${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER} WX_VERSION?= ${_WX_VER} .endif # _WX_Need_Version @@ -586,7 +586,7 @@ . if ${WX_CONF_ARGS:L} == "absolute" CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG} . elif ${WX_CONF_ARGS:L} == "relative" -CONFIGURE_ARGS+= --with-wx=${X11BASE} \ +CONFIGURE_ARGS+= --with-wx=${LOCALBASE} \ --with-wx-config=${WX_CONFIG:T} . else IGNORE?= selected an invalid wxWidgets configure argument type: ${WX_CONF_ARGS} ==== //depot/projects/dtrace/ports/Mk/bsd.xorg.mk#4 (text+ko) ==== @@ -7,7 +7,7 @@ # # !!! Here be dragons !!! (yeah, here as well...) # -# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.6 2008/03/13 10:33:52 flz Exp $ +# $FreeBSD: ports/Mk/bsd.xorg.mk,v 1.7 2008/04/19 17:46:02 miwi Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Xorg_Pre_Include) @@ -32,7 +32,6 @@ .if !defined(USE_TGZ) USE_BZIP2= yes .endif -PREFIX?= ${X11BASE} GNU_CONFIGURE= yes DIST_SUBDIR= xorg/${XORG_CAT} @@ -74,7 +73,7 @@ . elif ${PORTNAME:M*encodings*}x != x # This is terrific, we want mkfontscale at build time, but don't use it like for the other ports. NEED_MKFONTFOO= no -BUILD_DEPENDS+= ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale INSTALLS_TTF?= no . else INSTALLS_TTF?= no @@ -85,17 +84,17 @@ NEED_MKFONTFOO= no . elif ${INSTALLS_TTF} == "yes" USE_GNOME+= pkgconfig -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig . else -BUILD_DEPENDS+= ${X11BASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf +BUILD_DEPENDS+= ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf . endif . if ${NEED_MKFONTFOO} == "yes" -BUILD_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -RUN_DEPENDS+= ${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - ${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +BUILD_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale . endif post-install: @@ -133,7 +132,7 @@ DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USE_GNOME+= gnomehack -CONFIGURE_ARGS+= --with-xkb-path=${X11BASE}/share/X11/xkb +CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb . endif .endif @@ -149,85 +148,85 @@ XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm -bigreqsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto -compositeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto -damageproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto -dmx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx -dmxproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto -evieproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext -fixesproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto -fontcacheproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto -fontenc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc -fontsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto -fontutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util -glproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto -ice_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE -inputproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto -kbproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto -libfs_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS -oldx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX -pixman_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman -printproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto -randrproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto -recordproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto -renderproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto -resourceproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto -scrnsaverproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto -sm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM -trapproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto -videoproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto -x11_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 -xau_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau +bigreqsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto +compositeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto +damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto +dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx +dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto +evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext +fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto +fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto +fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc +fontsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto +fontutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util +glproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto +ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE +inputproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto +kbproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto +libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS +oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX +pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman +printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto +randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto +recordproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto +renderproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto +resourceproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto +scrnsaverproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto +sm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM +trapproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto +videoproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto +x11_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 +xau_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau xaw_LIB_PC_DEPENDS= ${xaw${XAWVER}_LIB_PC_DEPENDS} -xaw6_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw -xaw7_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw -xaw8_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw -xbitmaps_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps -xcmiscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto -xcomposite_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite -xcursor_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor -xdamage_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage -xdmcp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp -xevie_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie -xext_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext -xextproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto -xf86bigfontproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto -xf86dgaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto -xf86driproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto -xf86miscproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto -xf86rushproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto -xf86vidmodeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto -xfixes_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes -xfont_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont -xfontcache_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache -xft_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft -xi_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi -xinerama_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama -xineramaproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto -xkbfile_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile -xkbui_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui -xmu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu -xmuu_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu -xorg-server_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server -xp_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp -xpm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm -xprintapputil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil -xprintutil_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil -xproto_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto -xproxymngproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol -xrandr_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr -xrender_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender -xres_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres -xscrnsaver_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver -xt_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt -xtrans_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans -xtrap_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap -xtst_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst -xv_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv -xvmc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC -xxf86dga_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga -xxf86misc_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc -xxf86vm_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm +xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw +xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw +xaw8_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw +xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps +xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto +xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite +xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor +xdamage_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage +xdmcp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp +xevie_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie +xext_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext +xextproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto +xf86bigfontproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto +xf86dgaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto +xf86driproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto +xf86miscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto +xf86rushproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto +xf86vidmodeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto +xfixes_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes +xfont_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont +xfontcache_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache +xft_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft +xi_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi +xinerama_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama +xineramaproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto +xkbfile_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile +xkbui_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui +xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu +xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu +xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server +xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp +xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm +xprintapputil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil +xprintutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil +xproto_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto +xproxymngproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol +xrandr_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr +xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender +xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres +xscrnsaver_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver +xt_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt +xtrans_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans +xtrap_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap +xtst_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst +xv_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv +xvmc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC +xxf86dga_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga +xxf86misc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc +xxf86vm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm .for _module in ${USE_XORG:M*\:both:C/\:.*//g} . if ${XORG_MODULES:M${_module}} == "" ==== //depot/projects/dtrace/ports/UPDATING#67 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20080416: + AFFECTS: users of security/clamav + AUTHOR: garga@FreeBSD.org + + Clamav 0.93 does not support the daily.inc and main.inc directories format + for virus databases. You need to remove these directories manually and + force freshclam get new cvd format files before starting clamd. + + portupgrade clamav + /usr/local/etc/rc.d/clamav-clamd stop + /usr/local/etc/rc.d/clamav-freshclam stop + rm -rf /var/db/clamav/main.inc /var/db/clamav/daily.inc + freshclam + /usr/local/etc/rc.d/clamav-freshclam start + /usr/local/etc/rc.d/clamav-clamd start + 20080408: AFFECTS: users of www/p5-Apache-Test AUTHOR: pgollucci@p6m7g8.com @@ -131,8 +147,8 @@ AUTHOR: beech@FreeBSD.org For FreeBSD versions 7.0 and above: - It is recommended (and is now required for skype-devel) to - update to linux_base-fc6. Please do the following: + It is required with both skype and skype-devel to update to linux_base-fc6. + Please do the following: 1. Make sure there are no running linux applications. 2. Unmount linprocfs (umount /compat/linux/proc) @@ -6322,4 +6338,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.617 2008/04/15 05:46:21 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.619 2008/04/19 20:46:30 beech Exp $ ==== //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.i386#4 (text+ko) ==== @@ -1,12 +1,19 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c \ +SRCS+= cofflink.c \ + cpu-i386.c \ + efi-app-ia32.c \ elf32-i386.c \ elf32-target.h \ elf32.c \ - elflink.c + elflink.c \ + peigen.c VECS= ${DEFAULT_VECTOR} \ - bfd_elf32_i386_vec + bfd_elf32_i386_vec \ + bfd_efi_app_ia32_vec + +peigen.c: peXXigen.c + sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/dtrace/src/include/dirent.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.15 2007/11/20 01:49:00 jb Exp $ + * $FreeBSD: src/include/dirent.h,v 1.16 2008/04/16 18:59:35 delphij Exp $ */ #ifndef _DIRENT_H_ @@ -100,6 +100,7 @@ int getdirentries(int, char *, int, long *); #endif DIR *opendir(const char *); +DIR *fdopendir(int); struct dirent * readdir(DIR *); #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 ==== //depot/projects/dtrace/src/include/stdio.h#9 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $ + * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $ */ #ifndef _STDIO_H_ @@ -72,9 +72,6 @@ int _size; }; -/* hold a buncha junk that would grow the ABI */ -struct __sFILEX; - /* * stdio state variables. * @@ -98,15 +95,19 @@ * that does not match the previous one in _bf. When this happens, * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff * _ub._base!=NULL) and _up and _ur save the current values of _p and _r. + * + * Certain members of __sFILE are accessed directly via macros or + * inline functions. To preserve ABI compat, these members must not + * be disturbed. These members are marked below with (*). */ typedef struct __sFILE { - unsigned char *_p; /* current position in (some) buffer */ - int _r; /* read space left for getc() */ - int _w; /* write space left for putc() */ - short _flags; /* flags, below; this FILE is free if 0 */ - short _file; /* fileno, if Unix descriptor, else -1 */ + unsigned char *_p; /* (*) current position in (some) buffer */ + int _r; /* (*) read space left for getc() */ + int _w; /* (*) write space left for putc() */ + short _flags; /* (*) flags, below; this FILE is free if 0 */ + short _file; /* (*) fileno, if Unix descriptor, else -1 */ struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */ - int _lbfsize; /* 0 or -_bf._size, for inline putc */ + int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */ /* operations */ void *_cookie; /* cookie passed to io functions */ @@ -117,7 +118,7 @@ /* separate buffer for long sequences of ungetc() */ struct __sbuf _ub; /* ungetc buffer */ - struct __sFILEX *_extra; /* additions to FILE to not break ABI */ + unsigned char *_up; /* saved _p when _p is doing ungetc data */ int _ur; /* saved _r when _r is counting ungetc data */ /* tricks to meet minimum requirements even when malloc() fails */ @@ -130,6 +131,12 @@ /* Unix stdio files get aligned to block boundaries on fseek() */ int _blksize; /* stat.st_blksize (may be != _bf._size) */ fpos_t _offset; /* current lseek offset */ + + struct pthread_mutex *_fl_mutex; /* used for MT-safety */ + struct pthread *_fl_owner; /* current owner */ + int _fl_count; /* recursive lock count */ + int _orientation; /* orientation for fwide() */ + __mbstate_t _mbstate; /* multibyte conversion state */ } FILE; #ifndef _STDSTREAM_DECLARED ==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.134 2008/04/15 08:33:32 davidxu Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.135 2008/04/16 18:59:35 delphij Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -72,6 +72,7 @@ MLINKS+=ctermid.3 ctermid_r.3 MLINKS+=devname.3 devname_r.3 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \ + directory.3 fdopendir.3 \ directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \ directory.3 seekdir.3 directory.3 telldir.3 MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \ ==== //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#7 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.9 2008/04/15 08:33:32 davidxu Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.10 2008/04/16 18:59:36 delphij Exp $ */ FBSD_1.0 { @@ -329,6 +329,7 @@ }; FBSD_1.1 { + fdopendir; fts_open; fts_close; fts_read; ==== //depot/projects/dtrace/src/lib/libc/gen/directory.3#5 (text+ko) ==== @@ -26,13 +26,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.16 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/directory.3,v 1.17 2008/04/16 18:59:36 delphij Exp $ .\" -.Dd June 4, 1993 +.Dd April 16, 2008 .Dt DIRECTORY 3 .Os .Sh NAME .Nm opendir , +.Nm fdopendir , .Nm readdir , .Nm readdir_r , .Nm telldir , @@ -48,6 +49,8 @@ .In dirent.h .Ft DIR * .Fn opendir "const char *filename" +.Ft DIR * +.Fn fdopendir "int fd" .Ft struct dirent * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 19 23:01:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C314D106566C; Sat, 19 Apr 2008 23:01:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85DF21065675 for ; Sat, 19 Apr 2008 23:01:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7769D8FC4B for ; Sat, 19 Apr 2008 23:01:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JN18wO045774 for ; Sat, 19 Apr 2008 23:01:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JN16Qd045772 for perforce@freebsd.org; Sat, 19 Apr 2008 23:01:06 GMT (envelope-from sam@freebsd.org) Date: Sat, 19 Apr 2008 23:01:06 GMT Message-Id: <200804192301.m3JN16Qd045772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 23:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=140276 Change 140276 by sam@sam_ebb on 2008/04/19 23:00:43 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#31 edit Differences ... ==== //depot/projects/vap/sys/conf/files#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1289 2008/04/13 05:45:13 qingli Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1290 2008/04/16 17:24:18 rrs Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1919,20 +1919,20 @@ netinet/ip_options.c optional inet netinet/ip_output.c optional inet netinet/raw_ip.c optional inet -netinet/sctp_asconf.c optional inet inet6 sctp -netinet/sctp_auth.c optional inet inet6 sctp -netinet/sctp_bsd_addr.c optional inet inet6 sctp -netinet/sctp_cc_functions.c optional inet inet6 sctp -netinet/sctp_crc32.c optional inet inet6 sctp -netinet/sctp_indata.c optional inet inet6 sctp -netinet/sctp_input.c optional inet inet6 sctp -netinet/sctp_output.c optional inet inet6 sctp -netinet/sctp_pcb.c optional inet inet6 sctp -netinet/sctp_peeloff.c optional inet inet6 sctp -netinet/sctp_sysctl.c optional inet inet6 sctp -netinet/sctp_timer.c optional inet inet6 sctp -netinet/sctp_usrreq.c optional inet inet6 sctp -netinet/sctputil.c optional inet inet6 sctp +netinet/sctp_asconf.c optional inet sctp +netinet/sctp_auth.c optional inet sctp +netinet/sctp_bsd_addr.c optional inet sctp +netinet/sctp_cc_functions.c optional inet sctp +netinet/sctp_crc32.c optional inet sctp +netinet/sctp_indata.c optional inet sctp +netinet/sctp_input.c optional inet sctp +netinet/sctp_output.c optional inet sctp +netinet/sctp_pcb.c optional inet sctp +netinet/sctp_peeloff.c optional inet sctp +netinet/sctp_sysctl.c optional inet sctp +netinet/sctp_timer.c optional inet sctp +netinet/sctp_usrreq.c optional inet sctp +netinet/sctputil.c optional inet sctp netinet/tcp_debug.c optional tcpdebug netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet From owner-p4-projects@FreeBSD.ORG Sat Apr 19 23:22:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80F201065672; Sat, 19 Apr 2008 23:22:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42AF0106564A for ; Sat, 19 Apr 2008 23:22:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 330D78FC17 for ; Sat, 19 Apr 2008 23:22:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3JNMU5A047482 for ; Sat, 19 Apr 2008 23:22:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3JNMUuu047480 for perforce@freebsd.org; Sat, 19 Apr 2008 23:22:30 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 19 Apr 2008 23:22:30 GMT Message-Id: <200804192322.m3JNMUuu047480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 140277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 23:22:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=140277 Change 140277 by pgj@disznohal on 2008/04/19 23:22:25 Cleanup in Appendix A. Affected files ... .. //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/mirrors/chapter.sgml#7 (text+ko) ==== @@ -47,7 +47,7 @@ -
+
BSD Mall (Daemon News) PO Box 161 Nauvoo, IL 62354 @@ -56,19 +56,19 @@ Fax: +1 217 453-9956 e-mail: sales@bsdmall.com WWW: -
+
-
+
BSD-Systems e-mail: info@bsd-systems.co.uk WWW: -
+
-
+
FreeBSD Mall, Inc. 3623 Sanford Street Concord, CA 94520-1405 @@ -77,7 +77,7 @@ Fax: +1 925 674-0821 e-mail: info@freebsdmall.com WWW: -
+
@@ -88,7 +88,7 @@ Németország Telefon: (089) 428 419 WWW: - + @@ -98,7 +98,7 @@ 92000 Nanterre Franciaország WWW: - + @@ -131,7 +131,7 @@ Telefon: +44 1491 837010 Fax: +44 1491 837016 WWW: - + @@ -157,7 +157,7 @@ Telefon: +61 3 9857 5918 Fax: +61 3 9857 8974 WWW: - + @@ -181,7 +181,7 @@ Ha viszonteladók vagyunk és szeretnénk CD-s &os; termékeket forgalmazni, akkor az alábbi - terjesztõk valamelyikével kell felvennünk a + terjesztõk valamelyikével vegyük fel a kapcsolatot: @@ -198,7 +198,7 @@ - +
Ingram Micro 1600 E. St. Andrew Place @@ -206,8 +206,8 @@ Egyesült Államok Telefon: 1 (800) 456-8000 WWW: -
- + +
@@ -246,6 +246,7 @@
+ @@ -253,10 +254,10 @@ FTP oldalak A &os; hivatalos forrásai anonim FTP-n keresztül - is elérhetõek a világban levõ - különféle tükrözésekrõl. - Az oldal - ugyan jó minõségû kapcsolattal rendelkezik + is elérhetõek különféle + tükrözésekrõl. Az oldal ugyan + jó minõségû kapcsolattal rendelkezik és rengeteg felhasználót is enged egyidejûleg kapcsolódni, azonban valószínûleg jobban járunk, ha egy @@ -268,13 +269,13 @@ A &os; tükrözések adatbázisában az - itt megtalálhatónál sokkalta pontosabb + itt megtalálhatónál sokkal pontosabb leltárt kaphatunk az elérhetõ - tükrözésekrõl, mivel az - közvetlenül névfeloldás - segítségével állapítja meg a - szükséges adatokat és nem egy - rögzített listát tárol. + tükrözésekrõl, mivel közvetlenül a + névfeloldás segítségével + állapítja meg a szükséges adatokat + és nem egy rögzített listát + tárol. Emellett az alábbi tükrözésekrõl a &os; elérhetõ anonim FTP-n keresztül is. @@ -291,15 +292,16 @@ gyorsabban tudunk majd letölteni. A regionális oldalakon gyakorta csak a népszerûbb architektúrákon futó népszerûbb - változatokat találhatjuk meg, nem a teljes &os; + változatokat találjuk meg, nem a teljes &os; archívumot. Minden szerver elérhetõ anonim FTP-vel, de közülük néhány még további más módszereket is támogat. Az egyes oldalak által ismert konkrét - módszereket a névük után + módszereket a nevük után zárójelben közüljük. &chap.mirrors.ftp.inc; + @@ -314,16 +316,15 @@ Az anonim CVS (vagy más néven - anoncvs) a &os;-hez mellékelt CVS - segédprogramok által nyújtott - lehetõség, amely a távoli CVS - tárházakkal történõ - szinkronizálásra használható. - Több más dolog mellett lehetõvé teszi - a &os; felhasználói számára, hogy - kiemelt jogosultságok nélkül képesek + anoncvs) a &os;-hez mellékelt + CVS-es segédprogramok által nyújtott + olyan lehetõség, amivel távoli CVS + repositorykkal tudunk szinkronizálni. Több + más dolog mellett lehetõvé teszi a &os; + felhasználói számára, hogy kiemelt + jogosultságok nélkül képesek legyenek olvasással kapcsolatos CVS mûveleteket - végrehajtani a &os; projekt hivatalos anoncvs + végrehajtani a &os; Projekt hivatalos anoncvs szerverein. A használatához egyszerûen csak a kiválasztott anoncvs szervert kell beállítani a CVSROOT @@ -363,7 +364,7 @@ kettejük közül ez a fejlettebb, azonban ennek meg kell fizetnünk az árát. A CVSup használatához - elõször ugyanis fel kell telepítenünk + elõször ugyanis telepítenünk kell és be kell állítanunk egy speciális klienst, illetve az adatokat a CVSup által @@ -381,11 +382,12 @@ anoncvs segítségével csupán az olvasást igénylõ CVS mûveleteket - végezhetjük el, ezért ha a &os; projekt + végezhetjük el, ezért ha a &os; Projekt keretein belül fejleszteni is szeretnénk, akkor inkább érdemes a CVSup alkalmazást választani. + @@ -393,11 +395,11 @@ használata A &man.cvs.1; parancsot nagyon könnyû - beállítani az anonim CVS tárházak + beállítani az anonim CVS repositoryk használatához, hiszen mindössze annyit kell tennünk, hogy a CVSROOT környezeti változó értékének megadjuk - a &os; projekt valamelyik anoncvs + a &os; Projekt valamelyik anoncvs szerverét. Ezen sorok írásának pillanatában a következõ szerverek érhetõek el: @@ -417,14 +419,15 @@ Németország: - :pserver:anoncvs@anoncvs.de.FreeBSD.org:/home/ncvs - (rsh, pserver, ssh, ssh/2022) + :pserver:anoncvs@anoncvs.de.FreeBSD.org:/home/ncvs (rsh, + pserver, ssh, ssh/2022) Japán: - :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs (Use - cvs login and enter the password - anoncvs when prompted.) + :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs (a + cvs login + használatánál a jelszó + anoncvs.) Tajvan: @@ -433,7 +436,7 @@ használatával tetszõleges jelszó megadható), ssh (nincs jelszó)) - SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub + SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub @@ -463,8 +466,8 @@ megismerkednünk a &man.cvs.1; által alkalmazott revízió (revision) (az opcióval állítható) - fogalmával és a &os; projekt - tárházain belül engedélyezett + fogalmával és a &os; Projekt repositoryjain + belül engedélyezett értékeivel. Címkéket (tag) két esetben @@ -498,6 +501,7 @@ megadásával meg tudjuk adni annak idõpontját. Errõl részletesebben a &man.cvs.1; man oldalán olvashatunk. + @@ -514,6 +518,7 @@ Valami (az &man.ls.1;) kikérése a -CURRENT ágból + &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs &prompt.user; cvs login Jelszóként ezután bármit megadhatunk. @@ -524,6 +529,7 @@ Az <filename>src/</filename> fa kikérése SSH-n keresztül + &prompt.user; cvs -d freebsdanoncvs@anoncvs.FreeBSD.org:/home/ncvs co src The authenticity of host 'anoncvs.freebsd.org (128.46.156.46)' can't be established. DSA key fingerprint is 52:02:38:1a:2f:a8:71:d3:f5:83:93:8d:aa:00:6f:65. @@ -565,6 +571,7 @@ &prompt.user; more modules/modules + @@ -589,8 +596,8 @@ A CVSweb - a &os; projekt által használt CVS + url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVSweb + a &os; Projekt által használt CVS rendszerének webes felülete. @@ -604,18 +611,19 @@ CTM - A CTM a távoli - könyvtárak központi változatukkal - szinkronban tartásának egyik módszere. + A CTM használatáva + a távoli könyvtárakat tudunk egy + központi változattal szinkronban tartani. Eredetileg a &os; forrásaihoz fejlesztették ki, de - idõvel mások más célokra is hasznosnak - találhatják majd. Az eltérések - (delták) feldolgozásával kapcsolatban - kevéske dokumentáció áll - rendelkezésre, ezért a &a.ctm-users.name; - levelezési listát érdemes felkeresni, ha - többet szeretnénk megtudni a - CTM egyéb célú + idõvel mások más célokra is + alkalmasnak találhatják majd. Az + eltérések (delták) + feldolgozásával kapcsolatban kevéske + dokumentáció áll rendelkezésre, + ezért a &a.ctm-users.name; levelezési + listát érdemes felkeresni, ha többet + szeretnénk megtudni a CTM + egyéb célú alkalmazásairól. @@ -634,8 +642,8 @@ részét kívánjuk csak figyelemmel követni. Ha netalán &os; fejlesztõk lennénk, és híján vagyunk vagy - éppen gyenge az adatátvitele a TCP/IP - kapcsolatnak, esetleg egyszerûen csak automatikusan + éppen gyenge TCP/IP kapcsolattal rendelkezünk, + esetleg egyszerûen csak automatikusan értesülni szeretnénk a változásokról, a CTM-et nekünk @@ -649,8 +657,8 @@ igyekszünk minimalizálni. Ez egyébként általában alig 5 KB, de néha (tízbõl egyszer) elõfordul, hogy - 10 és 50 KB között van, és - idõnként 100 KB vagy afeletti + 10 és 50 KB között van, és + idõnként 100 KB vagy afeletti mennyiségû frissítés is érkezhet. @@ -661,12 +669,13 @@ megoldásáról. Ez kiváltképp igaz abban az esetben, amikor az aktuális, vagy hivatalos nevén - current ágat követjük. + CURRENT ágat követjük. Mielõtt azonban egy ilyenbe belevágnánk, - érdemes fellapozni a &os; + érdemes fellapozni a &os; legfrissebb változatának használatáról szóló fejezetet. + @@ -677,15 +686,15 @@ A mûködéshez két komponens szükségeltetik: a CTM kliensprogramja és hozzá a kezdeti delták - (amivel majd letöltjük a current + (amivel majd letöltjük a CURRENT forrásait). A CTM program már a 2.0 kiadástól kezdve a &os; része, és a források között a /usr/src/usr.sbin/ctm - könyvtárban találjuk meg (ha felraktuk - õket). + könyvtárban találjuk meg (amennyiben + felraktuk). A CTM mûködéséhez kellõ @@ -696,10 +705,11 @@ CTM-hez használható adatokat: - + - valamint ld. a tükrözéseket. + valamint lásd a tükrözéseket. FTP-n keresztül lépjünk be a könyvtárba, töltsük le a @@ -712,7 +722,7 @@ Iratkozzunk fel a CTM terjesztési listáinak egyikére. A - &a.ctm-cvs-cur.name; lista az egész CVS fát, + &a.ctm-cvs-cur.name; lista az egész CVS-fát, míg a &a.ctm-src-cur.name; a fõ fejlesztési ágat teszi elérhetõvé. A &a.ctm-src-4.name; a 4.X kiadásaihoz ágakat @@ -758,10 +768,10 @@ használata Mielõtt nekilátnánk a - CTM-hez tartozó delták - használatának, elõször el kell jutnunk - egy kiindulási ponthoz, ahonnan majd létre - tudjuk hozni a rákövetkezõ + CTM-hez tartozó + delták használatának, elõször + el kell jutnunk egy kiindulási ponthoz, ahonnan majd + létre tudjuk hozni a rákövetkezõ deltákat. Ehhez elsõként vegyük számba, @@ -772,23 +782,24 @@ deltával tudjuk megkezdeni az CTM által ismert fa szinkronizálását. Erre a célra - lesznek szintén alkalmasak a megkezdett - delták is, amelyeket CD-ken fogunk majd valamikor - terjeszteni. + lesznek majd szintén alkalmasak a + megkezdett delták is, amelyek valamikor + a CD-re fognak felkerülni. - Mivel a fák maguk több tíz - megabájtnyi méretûek, ezért - érdemes inkább valami kéznél - levõ eszközzel megkezdeni a folyamatot. Ha van - -RELEASE verziójú CD-nk, akkor másoljuk - le róla és bontsuk ki a - kiindulásként használt forrásokat. - Ezzel jelentõs mennyiségû adat - átvitelét takaríthatjuk meg. + Mivel a fák maguk több tíz megabyte-nyi + méretûek, ezért érdemes + inkább valami kéznél levõ + eszközzel megkezdeni a folyamatot. Ha van -RELEASE + verziójú CD-nk, akkor másoljuk le + róla és bontsuk ki a kiindulásként + használt forrásokat. Ezzel jelentõs + mennyiségû adat átvitelét + takaríthatjuk meg. A kezdõ deltákat könnyen - megismerjük a szám után X - karakterrel leválasztott nevükrõl (pl. + megismerjük a szám után + X karakterrel leválasztott + nevükrõl (például src-cur.3210XEmpty.gz). Az X után szereplõ megnevezés a kezdeti kiindulás @@ -798,15 +809,16 @@ Empty állapotból 100 deltánként jön létre újabb (kiindulásra alkalmas) alapváltozat. Ezek - azonban nagyon nagyok is lehetnek! A 70 vagy 80 - megabájtos gzippel csomagolt adatok - gyakoriak az XEmpty delták + azonban nagyon nagyok is lehetnek. A 70 vagy 80 megabyte-os + gzippel csomagolt adatok gyakoriak az + XEmpty delták esetén. Miután kiválasztottuk a számunkra megfelelõ alapváltozatot, szükségünk lesz a tõle nagyobb sorszámú összes deltára is. + @@ -840,8 +852,8 @@ során. A CTM-nek vannak még - további kapcsolói is, melyekrõl bõvebben - a man oldalakból és a + további kapcsolói is, melyekrõl + bõvebben a man oldalakból és a forráskódokból tájékozódhatunk. @@ -850,12 +862,14 @@ frissítéséhez csak futtassuk át a CTM-en. - Ne töröljük le a deltákat, melyeket - nehezen tudtunk letölteni. Helyette érdemes - inkább megtartani õket arra az esetre, ha valami - rossz történne. Még ha csak floppy lemezek - is állnak rendelkezésünkre, másoljuk - le õket az fdwrite paranccsal. + Ne töröljük le azokat a deltákat, + melyeket nehezen tudtunk letölteni. Helyette + érdemes inkább megtartani ezeket arra az esetre, + ha valami rossz történne. Még ha csak + floppylemezek is állnak rendelkezésünkre, + mindenképpen másoljuk le ezeket az + fdwrite paranccsal. + @@ -863,16 +877,17 @@ megtartása Fejlesztõként biztosan szeretnénk - kísérletezni és állományokat - megváltoztatni a forrásfában. A - CTM a helyben elkövetett - változtatásokat csak korlátozottan - támogatja: az ize nevû - állomány meglétének - vizsgálata elõtt az ize.ctm - állományt fogja keresni. Ha létezik, - akkor a CTM az - ize helyett ezen fog dolgozni. + kísérletezni és + állományokat megváltoztatni a + forrásfában. A CTM a + helyben elkövetett változtatásokat csak + korlátozottan támogatja: az + ize nevû állomány + meglétének vizsgálata elõtt az + ize.ctm állományt fogja + keresni. Ha létezik, akkor a + CTM az ize + helyett ezen fog dolgozni. Ezzel a viselkedéssel nyerjük a saját változtatásaink megtartásának @@ -884,6 +899,7 @@ CTM a .ctm kiterjesztésû állományokat folyamatosan szinkronban tartja. + @@ -907,6 +923,7 @@ módosított állományokat, esetleg szimplán elõvigyázatosak akarunk lenni. + @@ -921,19 +938,21 @@ frissítés elõtt. A + mentés-állomány beállítás megadásával az adott CTM delta által módosítandó összes állomány tárolásra kerül a - mentés-állományba. + mentés-állomány + nevû állományba. + A frissíthetõ állományok korlátozása - Egyes esetekben érdekünkben áll + Egyes esetekben érdekünkben állhat leszûkíteni a CTM által eszközölt frissítések hatáskörét, vagy egyszerûen csak @@ -949,26 +968,27 @@ határozhatjuk meg. Például ha a - lib/libc/Makefile állomány - az összegyûjtött + lib/libc/Makefile + állomány az összegyûjtött CTM delták szerinti legfrissebb verziójához kívánunk hozzájutni, akkor futtassuk az alábbi parancsot: - &prompt.root; cd /akárhova/ahova/ki/akarjuk/bontani/ + &prompt.root; cd /akarhova/ahova/ki/akarjuk/bontani/ &prompt.root; ctm -e '^lib/libc/Makefile' ~ctm/src-xxx.* A CTM deltákban - megadott minden egyes állomány esetén az - az opciók a - parancssorban történt megadásuk + megadott minden egyes állomány esetén + az az opciók + a parancssorban történt megadásuk sorrendjében kerülnek feldolgozásra. Egy állományt kizárólag csak akkor dolgoz fel a CTM, ha az az és opciók kiértékelése után is indokolt. + @@ -980,7 +1000,7 @@ - valamiféle hitelesítés + Valamiféle hitelesítés bevezetése a CTM rendszerbe, amivel észlelhetõek a meghamisított @@ -988,11 +1008,11 @@ - a CTM + A CTM beállításainak letisztázása, mivel eléggé megtévesztõek és nehézkesen - használhatóak + használhatóak. @@ -1004,78 +1024,81 @@ gyûjteményéhez is, azonban még nem mutatkozott túlzottan nagy érdeklõdés irántuk. + CTM tükrözések - A CTM/FreeBSD anonim FTP-n - keresztül elérhetõ az alábbi - tüköroldalak valamelyikérõl. Amennyiben - ezen a módon kívánjuk letölteni a - CTM rendszerhez tartozó - állományokat, elõször - próbálkozzunk a hozzánk legközelebb - levõ szerverrel. + A CTM/FreeBSD anonim FTP-n + keresztül elérhetõ az alábbi + tüköroldalak valamelyikérõl. Amennyiben + ezen a módon kívánjuk letölteni a + CTM rendszerhez tartozó + állományokat, elõször + próbálkozzunk a hozzánk legközelebb + levõ szerverrel. - Ha bármilyen gond merülne fel, - értesítsük a &a.ctm-users.name; levelezési - listát. + Ha bármilyen gond merülne fel, + értesítsük a &a.ctm-users.name; + levelezési listát. - - - Kalifornia, Bay Area (hivatalos forrás) + + + Kalifornia, Bay Area (hivatalos forrás) - - - - - - - - + + + + + + + + - - Dél-Afrika (a korábbi delták - biztonsági másolatai) + + Dél-Afrika (a korábbi delták + biztonsági másolatai) - - - - - - - - + + + + + + + + - - Tajvan/R.O.C. + + Tajvan/R.O.C. - - - - - + + + + + - - - + + + - - - - - - + + + + + + - Ha nem találtunk volna hozzánk közel - esõ tükrözést, vagy ha talált - tükör nem elég friss, akkor - próbálkozzunk egy olyan keresõmotor - használatával, mint mondjuk az alltheweb. - + Ha nem találtunk volna hozzánk közel + esõ tükrözést, vagy ha talált + tükör nem elég friss, akkor + próbálkozzunk egy olyan keresõmotor + használatával, mint például az + alltheweb. + + + A CVSup használata @@ -1084,13 +1107,13 @@ Bevezetés A CVSup távoli szervereken - található központi tárházakban - levõ forrásfák terjesztésére - és a rajtuk keresztüli frissítésre - alkalmas programcsomag. A &os; forrásait a + található központi repositorykban levõ + forrásfák terjesztésére és a + rajtuk keresztüli frissítésre alkalmas + programcsomag. A &os; forrásait egy CVS repositoryban + tartják karban Kaliforniában egy fejlesztéseket tároló központi - számítógépen tartják karban - egy CVS tárházban Kaliforniában. A + számítógépen. A CVSup segítségével a &os; felhasználói könnyen szinkronban @@ -1110,8 +1133,8 @@ így vagy maguknak kell meghívniuk a CVSup kliensét, vagy a frissítések rendszeres automatikus - letöltéséhez be meg kell adniuk egy - cron feladatot. + letöltéséhez be kell állítaniuk + a cron rendszerprogramot. A CVSup kifejezés ebben az írásmódban az egész programcsomagra @@ -1134,9 +1157,9 @@ a sup konfigurációs állományaival visszafele kompatibilis formátumot használ. Mivel a - CVSup sokkalta gyorsabb és - rugalmasabb, a sup-ot már nem - használja a &os; projekt. + CVSup sokkal gyorsabb és + rugalmasabb, a supot már nem + használja a &os; Projekt. A csup a @@ -1154,35 +1177,36 @@ verzióinak alaprendszerei ugyan nem tartalmazzák a &man.csup.1; parancsot, viszont a net/csup port vagy csomag - segítségével pillanatok alatt fel tudjuk - telepíteni. Emellett a csup - segédprogram nem támogatja a CVS módot - sem. Teljes tárházak + segítségével pillanatok alatt + telepíteni tudjuk. Emellett a + csup segédprogram nem + támogatja a CVS módot sem. Teljes repositoryk tükrözéséhez ezért továbbra is a CVSup kell használnunk. Amennyiben a csup mellett tennénk le a - voksunkat, egyszerûen hagyjuk ki a - CVSup + voksunkat, a szakasz fennmaradó részében + egyszerûen hagyjuk ki a CVSup telepítésérõl szóló - lépéseket és a szakasz fennmaradó - részében a CVSup - hivatkozásait helyettesítsük a - csup programmal. + lépéseket és a + CVSup hivatkozásait + helyettesítsük a csup + programmal. + Telepítés A CVSup - telepítésének legegyszerûbb módja - a &os; csomaggyûjteményében található elõrefordított net/cvsup csomag használata. Ha viszont inkább forrásból akarjuk - telepíteni a CVSup-ot, akkor + telepíteni a CVSupot, akkor helyette használjuk a net/cvsup portot. De legyünk elõvigyázatosak: a Ha olyan gépen akarjuk használni a - CVSup-ot, ahol nincs + CVSupot, ahol nincs &xfree86;, &xorg; vagy bármilyen más ilyen szerver, akkor használjuk a net/cvsup-without-gui - portot, ami nem tartalmaz GUI-t. + portot, ami nem tartalmazza a hozzátartozó + grafikus felületet. Ha a &os; 6.1 vagy korábbi változatain szeretnénk telepíteni a - csup-ot, használjuk a &os; + csupot, használjuk a &os; csomaggyûjteményében megtalálható csup programot, akkor helyette használjuk a net/csup portot. + @@ -1224,8 +1250,8 @@ url="file://localhost/usr/share/examples/cvsup/"> /usr/share/examples/cvsup/ könyvárban találhatunk néhány - minta supfile - állományt. + példát a supfile + állományokra. A supfile állományban szereplõ információk a @@ -1242,19 +1268,18 @@ Milyen - verziói(k)ra van + verzióikra van szükségünk? - Honnan akarjuk - õket beszerezni? + Honnan akarjuk ezeket + beszerezni? - Hova akarjuk õket - rakni a - számítógépünkön? + Hova akarjuk rakni a + számítógépünkön? @@ -1281,8 +1306,8 @@ kerülnek feldolgozásra. Az összes többi fennmaradó sorban pedig - azokat az állományokat írjuk le, amelyeket a - felhasználó le akar tölteni. Az ilyen + azokat az állományokat írjuk le, amelyeket + a felhasználó le akar tölteni. Az ilyen fajtájú sorok egy gyûjtemény (collection) nevével kezdõdnek, ami állományok egy @@ -1291,23 +1316,24 @@ megfelelõen elárulja a szervernek, hogy pontosan milyen állományokra van szükségünk. Ezután következik - láthatatlan karakterekkel elválasztva nulla vagy - több mezõ, amelyek rendre választ fognak adni a - korábban említett kérdésekre. + whitespace-szel elválasztva nulla vagy több + mezõ, amelyek a korábban feltett + kérdéseinket válaszolják meg rendre. Ezeknek a mezõknek két típusa létezik: a beállításokat és a konkrét értéket tároló mezõk. A beállításokat tároló mezõk különbözõ kulcsszavakat - tartalmaznak, pl. delete + tartalmaznak, például a delete (törlés) vagy compress (tömörítés). Az értéket tároló mezõk is egy kulcsszóval >>> TRUNCATED FOR MAIL (1000 lines) <<<