From owner-p4-projects@FreeBSD.ORG Sun Jan 4 01:37:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8B7106568A; Sun, 4 Jan 2009 01:37: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 36FF21065686 for ; Sun, 4 Jan 2009 01:37:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 235EF8FC0C for ; Sun, 4 Jan 2009 01:37:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n041b4H3091247 for ; Sun, 4 Jan 2009 01:37:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n041b1Lu091241 for perforce@freebsd.org; Sun, 4 Jan 2009 01:37:01 GMT (envelope-from trasz@freebsd.org) Date: Sun, 4 Jan 2009 01:37:01 GMT Message-Id: <200901040137.n041b1Lu091241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 155601 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, 04 Jan 2009 01:37:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=155601 Change 155601 by trasz@trasz_victim7 on 2009/01/04 01:36:09 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/config.h.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/configure.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/version#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/TODO#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/devd/asus.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/code.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/isc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libauditd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libbsm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/arith.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/kinfo_getfile.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/kinfo_getvmmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ddb/ddb.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/savecore/savecore.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/doc/bind9/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ndis.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/textdump.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/uscanner.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/domain.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/USB2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/EP80219#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/HL200#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/NSLU#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/armreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/ieee.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/bsm/audit_record.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_sim.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sparc64#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umass.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_atmelarm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/USB2#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/XEN#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_param.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/copyright.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_generic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/file.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/link_elf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tree.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/features.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/gnttab.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/hypervisor.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xen_intr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_xs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbusvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/ether_reflect.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ether_reflect/ether_reflect.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/mctest/mctest.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csplit/csplit.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/elf2aout/elf2aout.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/fstat/zfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/for.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/parse.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/suff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_files.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat_vm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/top/machine.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/inf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/windrv_stub.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/nscd.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/powerd/powerd.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ugidfw/ugidfw.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbdevs/usbdevs.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.10 2008/11/28 19:21:10 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $ +# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ # # The user-driven targets are: # @@ -298,7 +298,7 @@ .endif .for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: ipprotosw.h removed +OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz # 20081023: FREE.9 and MALLOC.9 removed ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#15 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081225: + ng_tty(4) module updated to match the new TTY subsystem. + Due to API change, user-level applications must be updated. + New API support added to mpd5 CVS and expected to be present + in next mpd5.3 release. + 20081219: With __FreeBSD_version 800060 the makefs tool is part of the base system (it was a port). @@ -1195,4 +1201,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ +$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 (text+ko) ==== @@ -146,6 +146,7 @@ #include #include +#include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,14 +1,158 @@ - --- 9.4.2-P2 released --- + + --- 9.4.3 released --- + +2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO + is cleared when IPV6_V6ONLY is set. [RT #18785] + +2489. [port] solaris: Workaround Solaris's kernel bug about + /dev/poll: + http://bugs.opensolaris.org/view_bug.do?bug_id=6724237 + Define ISC_SOCKET_USE_POLLWATCH at build time to enable + this workaround. [RT #18870] + + --- 9.4.3rc1 released --- + +2473. [port] linux: raise the limit on open files to the possible + maximum value before spawning threads; 'files' + specified in named.conf doesn't seem to work with + threads as expected. [RT #18784] + +2472. [port] linux: check the number of available cpu's before + calling chroot as it depends on "/proc". [RT #16923] + +2471. [bug] named-checkzone was not reporting missing manditory + glue when sibling checks were disabled. [RT #18768] + +2469. [port] solaris: Work around Solaris's select() limitations. + [RT #18769] + +2468. [bug] Resolver could try unreachable servers multiple times. + [RT #18739] + +2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740] + +2466. [doc] ARM: explain max-cache-ttl 0 SERVFAIL issue. + [RT #18302] + +2465. [bug] Adb's handling of lame addresses was different + for IPv4 and IPv6. [RT #18738] + +2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket + API and glibc hides parts of the IPv6 Advanced Socket + API as a result. This is stupid as it breaks how the + two halves (Basic and Advanced) of the IPv6 Socket API were designed to be used but we have to live with it. + Define _GNU_SOURCE to pull in the IPv6 Advanced Socket + API. [RT #18388] + +2462. [doc] Document -m (enable memory usage debugging) + option for dig. [RT #18757] + +2461. [port] sunos: Change #2363 was not complete. [RT #17513] + +2458. [doc] ARM: update and correction for max-cache-size. + [RT #18294] + +2455. [bug] Stop metadata being transfered via axfr/ixfr. + [RT #18639] + +2453. [bug] Remove NULL pointer dereference in dns_journal_print(). + [RT #18316] + +2449. [bug] libbind: Out of bounds reference in dns_ho.c:addrsort. + [RT #18044] + +2445. [doc] ARM out-of-date on empty reverse zones (list includes + RFC1918 address, but these are not yet compiled in). + [RT #18578] + +2444. [port] Linux, FreeBSD, AIX: Turn off path mtu discovery + (clear DF) for UDP responses and requests. + + --- 9.4.3b3 released --- + +2443. [bug] win32: UDP connect() would not generate an event, + and so connected UDP sockets would never clean up. + Fix this by doing an immediate WSAConnect() rather + than an io completion port type for UDP. + +2438. [bug] Timeouts could be logged incorrectly under win32. + [RT #18617] + +2437. [bug] Sockets could be closed too early, leading to + inconsistent states in the socket module. [RT #18298] + +2436. [security] win32: UDP client handler can be shutdown. [RT #18576] + +2433. [tuning] Set initial timeout to 800ms. + +2432. [bug] More Windows socket handling improvements. Stop + using I/O events and use IO Completion Ports + throughout. Rewrite the receive path logic to make + it easier to support multiple simultaneous + requestrs in the future. Add stricter consistency + checking as a compile-time option (define + ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off). + +2430. [bug] win32: isc_interval_set() could round down to + zero if the input was less than NS_INTERVAL + nanoseconds. Round up instead. [RT #18549] + +2429. [doc] nsupdate should be in section 1 of the man pages. + [RT #18283] + +2426. [bug] libbind: inet_net_pton() can sometimes return the + wrong value if excessively large netmasks are + supplied. [RT #18512] + +2425. [bug] named didn't detect unavailable query source addresses + at load time. [RT #18536] + +2424. [port] configure now probes for a working epoll + implementation. Allow the use of kqueue, + epoll and /dev/poll to be selected at compile + time. [RT #18277] + +2422. [bug] Handle the special return value of a empty node as + if it was a NXRRSET in the validator. [RT #18447] + +2421. [func] Add new command line option '-S' for named to specify + the max number of sockets. [RT #18493] + Use caution: this option may not work for some + operating systems without rebuilding named. + +2420. [bug] Windows socket handling cleanup. Let the io + completion event send out cancelled read/write + done events, which keeps us from writing to memeory + we no longer have ownership of. Add debugging + socket_log() function. Rework TCP socket handling + to not leak sockets. + +2417. [bug] Connecting UDP sockets for outgoing queries could + unexpectedly fail with an 'address already in use' + error. [RT #18411] + +2416. [func] Log file descriptors that cause exceeding the + internal maximum. [RT #18460] + +2414. [bug] A masterdump context held the database lock too long, + causing various troubles such as dead lock and + recursive lock acquisition. [RT #18311, #18456] + +2413. [bug] Fixed an unreachable code path in socket.c. [RT #18442] + +2412. [bug] win32: address a resourse leak. [RT #18374] + +2411. [bug] Allow using a larger number of sockets than FD_SETSIZE + for select(). To enable this, set ISC_SOCKET_MAXSOCKETS + at compilation time. [RT #18433] + +2410. [bug] Correctly delete m_versionInfo. [RT #18432] + +2408. [bug] A duplicate TCP dispatch event could be sent, which + could then trigger an assertion failure in + resquery_response(). [RT #18275] -2406. [bug] Some operating systems have FD_SETSIZE set to a - low value by default, which can cause resource - exhaustion when many simultaneous connections are - open. Linux in particular makes it difficult to - increase this value. To use more sockets with - select(), set ISC_SOCKET_FDSETSIZE. Example: - STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure - (This should not be necessary in most cases, and - never for an authoritative-only server.) [RT #18328] +2407. [port] hpux: test for sys/dyntune.h. [RT #18421] 2404. [port] hpux: files unlimited support. @@ -39,15 +183,271 @@ 2392. [bug] remove 'grep -q' from acl test script, some platforms don't support it. [RT #18253] +2391 [port] hpux: cover additional recvmsg() error codes. + [RT #18301] + +2390 [bug] dispatch.c could make a false warning on 'odd socket'. + [RT #18301]. + +2389 [bug] Move the "working directory writable" check to after + the ns_os_changeuser() call. [RT #18326] + +2386. [func] Add warning about too small 'open files' limit. + [RT #18269] + + --- 9.4.3b2 released --- + +2385. [bug] A condition variable in socket.c could leak in + rare error handling [RT #17968]. + +2384. [security] Additional support for query port randomization (change + #2375) including performance improvement and port range + specification. [RT #17949, #18098] + +2383. [bug] named could double queries when they resulted in + SERVFAIL due to overkilling EDNS0 failure detection. + [RT #18182] + +2382. [doc] Add descriptions of IPSECKEY, SPF and SSHFP to ARM. + +2381. [port] dlz/mysql: support multiple install layouts for + mysql. /include/{,mysql/}mysql.h and + /lib/{,mysql/}. [RT #18152] + +2380. [bug] dns_view_find() was not returning NXDOMAIN/NXRRSET + proofs which, in turn, caused validation failures + for insecure zones immediately below a secure zone + the server was authoritative for. [RT #18112] + +2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant + TLDs and supported RRs with TTLs [RT #17972] + +2377. [bug] Address race condition in dnssec-signzone. [RT #18142] + +2376. [bug] Change #2144 was not complete. + +2375. [security] Fully randomize UDP query ports to improve + forgery resilience. [RT #17949] + +2372. [bug] fixed incorrect TAG_HMACSHA256_BITS value [RT #18047] + +2369. [bug] libbind: Array bounds overrun on read in bitncmp(). + [RT #18054] + +2364. [bug] named could trigger a assertion when serving a + malformed signed zone. [RT #17828] + +2363. [port] sunos: pre-set "lt_cv_sys_max_cmd_len=4096;". + [RT #17513] + +2361. [bug] "recursion" statistics counter could be counted + multiple times for a single query. [RT #17990] + + --- 9.4.3b1 released --- + +2358. [doc] Update host's default query description. [RT #17934] + +2356. [bug] Built in mutex profiler was not scalable enough. + [RT #17436] + +2353. [func] libbind: nsid support. [RT #17091] + +2350. [port] win32: IPv6 support. [RT #17797] + +2347. [bug] Delete now traverses the RB tree in the canonical >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 02:02:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0630E1065670; Sun, 4 Jan 2009 02:02: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 9E3E4106566B for ; Sun, 4 Jan 2009 02:02:39 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A8178FC08 for ; Sun, 4 Jan 2009 02:02:39 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0422dGU093109 for ; Sun, 4 Jan 2009 02:02:39 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0422Wcv093099 for perforce@freebsd.org; Sun, 4 Jan 2009 02:02:32 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 4 Jan 2009 02:02:32 GMT Message-Id: <200901040202.n0422Wcv093099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 155603 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, 04 Jan 2009 02:02:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=155603 Change 155603 by gonzo@gonzo_figaro on 2009/01/04 02:02:12 IFC @155601 Affected files ... .. //depot/projects/mips2/src/COPYRIGHT#4 integrate .. //depot/projects/mips2/src/Makefile#13 integrate .. //depot/projects/mips2/src/Makefile.inc1#26 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#25 integrate .. //depot/projects/mips2/src/UPDATING#25 integrate .. //depot/projects/mips2/src/bin/df/df.1#3 integrate .. //depot/projects/mips2/src/bin/df/df.c#5 integrate .. //depot/projects/mips2/src/bin/ps/print.c#3 integrate .. //depot/projects/mips2/src/bin/sh/eval.c#4 integrate .. //depot/projects/mips2/src/bin/sh/exec.c#3 integrate .. //depot/projects/mips2/src/cddl/Makefile.inc#4 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/mips2/src/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/mips2/src/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/mips2/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/mips2/src/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.bin/Makefile#6 integrate .. //depot/projects/mips2/src/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/mips2/src/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/mips2/src/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/mips2/src/contrib/bind9/CHANGES#8 integrate .. //depot/projects/mips2/src/contrib/bind9/COPYRIGHT#6 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ#5 integrate .. //depot/projects/mips2/src/contrib/bind9/FAQ.xml#5 integrate .. //depot/projects/mips2/src/contrib/bind9/README#6 integrate .. //depot/projects/mips2/src/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/mips2/src/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/client.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/config.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/controlconf.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/interfacemgr.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/server.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.8#5 delete .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/mips2/src/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/mips2/src/contrib/bind9/config.h.in#1 branch .. //depot/projects/mips2/src/contrib/bind9/configure.in#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#8 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#7 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dig.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.host.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/assertions.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/isc/logging.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/bind9/check.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/api#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dispatch.c#8 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/request.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/mips2/src/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/timer.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isc/unix/time.c#3 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/mips2/src/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/mips2/src/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/mips2/src/contrib/bind9/version#8 integrate .. //depot/projects/mips2/src/contrib/binutils/bfd/config.bfd#4 integrate .. //depot/projects/mips2/src/contrib/binutils/gas/config/tc-mips.c#4 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/mips2/src/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/mips2/src/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/mips2/src/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/FREEBSD-vendor#3 delete .. //depot/projects/mips2/src/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/NEWS#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.guess#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/config.sub#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/configure.in#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_getcchar.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/mips2/src/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/mips2/src/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_addch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_freeall.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_initscr.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_overlay.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_restart.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slk.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_ungetch.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/lib_window.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/use_window.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/base/wresize.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/llib-lncursesw#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_options.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/make_keys.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/read_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_trace.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_buf.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/trace/visbuf.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/lib_twait.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/tty/tty_update.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/mips2/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/p_new.c#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/dump_entry.h#3 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/mips2/src/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/mips2/src/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/mips2/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/mips2/src/contrib/netcat/netcat.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/CREDITS#1 branch .. //depot/projects/mips2/src/contrib/openbsm/HISTORY#6 delete .. //depot/projects/mips2/src/contrib/openbsm/INSTALL#1 branch .. //depot/projects/mips2/src/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/NEWS#1 branch .. //depot/projects/mips2/src/contrib/openbsm/README#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/TODO#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/VERSION#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.1#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/configure.ac#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/audit_submit.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_event.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_control.5#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/auditon.2#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getaudit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/getauid.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setaudit.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/man/setauid.2#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/mips2/src/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/mips2/src/contrib/openbsm/tools/Makefile.in#4 integrate .. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/mips2/src/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/mips2/src/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/mips2/src/etc/Makefile#13 integrate .. //depot/projects/mips2/src/etc/defaults/rc.conf#14 integrate .. //depot/projects/mips2/src/etc/devd.conf#8 integrate .. //depot/projects/mips2/src/etc/devd/Makefile#1 branch .. //depot/projects/mips2/src/etc/devd/asus.conf#1 branch .. //depot/projects/mips2/src/etc/gss/mech#4 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/mips2/src/etc/mtree/BSD.root.dist#4 integrate .. //depot/projects/mips2/src/etc/newsyslog.conf#3 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#11 integrate .. //depot/projects/mips2/src/etc/rc.d/defaultroute#2 integrate .. //depot/projects/mips2/src/etc/rc.d/gssd#1 branch .. //depot/projects/mips2/src/etc/rc.d/nfsd#4 integrate .. //depot/projects/mips2/src/etc/regdomain.xml#2 integrate .. //depot/projects/mips2/src/etc/syslog.conf#2 integrate .. //depot/projects/mips2/src/gnu/lib/libstdc++/Makefile#6 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/libbfd/bfd.h#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/mips2/src/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/mips2/src/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/mips2/src/gnu/usr.bin/sort/config.h#4 integrate .. //depot/projects/mips2/src/include/Makefile#9 integrate .. //depot/projects/mips2/src/include/arpa/nameser.h#3 integrate .. //depot/projects/mips2/src/include/resolv.h#3 integrate .. //depot/projects/mips2/src/include/rpc/xdr.h#2 integrate .. //depot/projects/mips2/src/include/string.h#3 integrate .. //depot/projects/mips2/src/include/strings.h#2 integrate .. //depot/projects/mips2/src/include/utmp.h#2 integrate .. //depot/projects/mips2/src/kerberos5/include/config.h#3 integrate .. //depot/projects/mips2/src/lib/Makefile#17 integrate .. //depot/projects/mips2/src/lib/bind/bind/config.h#4 integrate .. //depot/projects/mips2/src/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/mips2/src/lib/bind/bind/port_before.h#5 integrate .. //depot/projects/mips2/src/lib/bind/config.h#6 integrate .. //depot/projects/mips2/src/lib/bind/dns/code.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/mips2/src/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/mips2/src/lib/bind/isc/Makefile#3 integrate .. //depot/projects/mips2/src/lib/bind/isc/isc/platform.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.h#10 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_private.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_compress.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#12 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#12 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#17 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#12 integrate .. //depot/projects/mips2/src/lib/libarchive/test/main.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_pax_truncated.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk_perms.c#8 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#7 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#5 integrate .. //depot/projects/mips2/src/lib/libauditd/Makefile#1 branch .. //depot/projects/mips2/src/lib/libbsm/Makefile#5 integrate .. //depot/projects/mips2/src/lib/libc/amd64/SYS.h#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/_setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/modf.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/rfork_thread.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/div.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/ldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/stdlib/lldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bcopy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/bzero.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/memcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/memset.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcat.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/exect.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/getcontext.S#2 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/ptrace.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/reboot.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/sbrk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/setlogin.S#3 integrate .. //depot/projects/mips2/src/lib/libc/amd64/sys/vfork.S#3 integrate .. //depot/projects/mips2/src/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/arm/arith.h#3 integrate .. //depot/projects/mips2/src/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/Symbol.map#10 integrate .. //depot/projects/mips2/src/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/dirname.c#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/mips2/src/lib/libc/gen/getvfsbyname.3#4 integrate .. //depot/projects/mips2/src/lib/libc/gen/times.3#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/SYS.h#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/_setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/fabs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/modf.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/setjmp.S#4 integrate .. //depot/projects/mips2/src/lib/libc/i386/gen/sigsetjmp.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/abs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/div.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/labs.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/stdlib/ldiv.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bcopy.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/bzero.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/ffs.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/index.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/memset.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/rindex.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcat.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strcpy.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strlen.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strncmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/strrchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/swab.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcschr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcscmp.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wcslen.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/string/wmemchr.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/Ovfork.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/brk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/exect.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/getcontext.S#2 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/pipe.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/ptrace.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/reboot.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/sbrk.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/setlogin.S#3 integrate .. //depot/projects/mips2/src/lib/libc/i386/sys/syscall.S#3 integrate .. //depot/projects/mips2/src/lib/libc/ia64/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/mips2/src/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/mips2/src/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/mips2/src/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/mips2/src/lib/libc/mips/sys/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_calc_mask.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_calc_mask.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_clear_perms.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_copy.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_copy_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_create_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_delete_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_delete_perm.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_perm_np.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_permset.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_qualifier.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_get_tag_type.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_perm.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_permset.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/acl_size.c#2 integrate .. //depot/projects/mips2/src/lib/libc/powerpc/sys/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_debug.c#5 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_mkquery.c#4 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_query.c#4 integrate .. //depot/projects/mips2/src/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/mips2/src/lib/libc/sparc64/sys/Makefile.inc#4 integrate .. //depot/projects/mips2/src/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/mips2/src/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.3#8 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/mips2/src/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/mips2/src/lib/libc/string/Symbol.map#4 integrate .. //depot/projects/mips2/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/mips2/src/lib/libc/string/ffsl.c#3 integrate .. //depot/projects/mips2/src/lib/libc/string/ffsll.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/flsll.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/strdup.3#3 integrate .. //depot/projects/mips2/src/lib/libc/string/strndup.c#1 branch .. //depot/projects/mips2/src/lib/libc/string/strsep.3#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#14 integrate .. //depot/projects/mips2/src/lib/libc/sys/cpuset_getaffinity.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/jail.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/kldunload.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/recv.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/rename.2#4 integrate .. //depot/projects/mips2/src/lib/libc/xdr/Symbol.map#3 integrate .. //depot/projects/mips2/src/lib/libc/xdr/xdr.c#2 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.3#5 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.c#3 integrate .. //depot/projects/mips2/src/lib/libfetch/fetch.h#2 integrate .. //depot/projects/mips2/src/lib/libfetch/http.c#6 integrate .. //depot/projects/mips2/src/lib/libkvm/Makefile#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_arm.c#3 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_minidump_arm.c#1 branch .. //depot/projects/mips2/src/lib/libkvm/kvm_private.h#4 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/mips2/src/lib/libmagic/config.h#4 integrate .. //depot/projects/mips2/src/lib/libmd/Makefile#2 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/mips2/src/lib/libpmc/pmc.3#11 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/mips2/src/lib/libpmc/pmclog.c#3 integrate .. //depot/projects/mips2/src/lib/libproc/libproc.h#2 integrate .. //depot/projects/mips2/src/lib/libproc/proc_create.c#2 integrate .. //depot/projects/mips2/src/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/bootp.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/if_ether.h#3 integrate .. //depot/projects/mips2/src/lib/libstand/nfs.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/printf.c#3 integrate .. //depot/projects/mips2/src/lib/libstand/stand.h#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_rtld.c#7 integrate .. //depot/projects/mips2/src/lib/libusb20/Makefile#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.3#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat01.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat01.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat10.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_compat10.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_desc.c#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_desc.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_int.h#1 branch .. //depot/projects/mips2/src/lib/libusb20/libusb20_ugen20.c#1 branch .. //depot/projects/mips2/src/lib/libutil/Makefile#7 integrate .. //depot/projects/mips2/src/lib/libutil/gr_util.c#2 integrate .. //depot/projects/mips2/src/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/mips2/src/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/mips2/src/lib/libutil/libutil.h#7 integrate .. //depot/projects/mips2/src/lib/libutil/login_cap.c#3 integrate .. //depot/projects/mips2/src/lib/libutil/login_class.c#5 integrate .. //depot/projects/mips2/src/lib/libutil/pty.c#8 integrate .. //depot/projects/mips2/src/lib/libutil/realhostname.c#3 integrate .. //depot/projects/mips2/src/lib/msun/src/math_private.h#7 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/mips2/src/lib/ncurses/ncurses/ncurses_cfg.h#4 integrate .. //depot/projects/mips2/src/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/extern.h#2 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpcmd.y#3 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpd.c#4 integrate .. //depot/projects/mips2/src/libexec/rpc.rquotad/Makefile#2 integrate .. //depot/projects/mips2/src/libexec/rpc.rquotad/rquotad.c#2 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#11 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld_lock.c#5 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/rtld_lock.h#3 integrate .. //depot/projects/mips2/src/libexec/telnetd/Makefile#5 integrate .. //depot/projects/mips2/src/release/Makefile#14 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#13 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate .. //depot/projects/mips2/src/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/mips2/src/sbin/atacontrol/atacontrol.8#5 integrate .. //depot/projects/mips2/src/sbin/bsdlabel/bsdlabel.8#4 integrate .. //depot/projects/mips2/src/sbin/ddb/ddb.8#6 integrate .. //depot/projects/mips2/src/sbin/devd/devd.cc#3 integrate .. //depot/projects/mips2/src/sbin/devd/devd.conf.5#3 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#10 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/mips2/src/sbin/geom/class/part/gpart.8#5 integrate .. //depot/projects/mips2/src/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/mips2/src/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/mips2/src/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#16 integrate .. //depot/projects/mips2/src/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/config.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/login.c#2 integrate .. //depot/projects/mips2/src/sbin/iscontrol/misc.c#3 integrate .. //depot/projects/mips2/src/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/mips2/src/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/mips2/src/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/mips2/src/sbin/mount/mount.c#8 integrate .. //depot/projects/mips2/src/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/mips2/src/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/mips2/src/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/mips2/src/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/mips2/src/sbin/newfs/Makefile#2 integrate .. //depot/projects/mips2/src/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.8#6 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.c#5 integrate .. //depot/projects/mips2/src/sbin/newfs/newfs.h#5 integrate .. //depot/projects/mips2/src/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/mips2/src/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/mips2/src/sbin/route/route.c#5 integrate .. //depot/projects/mips2/src/sbin/routed/table.c#2 integrate .. //depot/projects/mips2/src/sbin/savecore/savecore.8#3 integrate .. //depot/projects/mips2/src/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/mips2/src/secure/usr.sbin/sshd/Makefile#6 integrate .. //depot/projects/mips2/src/share/doc/bind9/Makefile#3 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#25 integrate .. //depot/projects/mips2/src/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ale.4#1 branch .. //depot/projects/mips2/src/share/man/man4/altq.4#7 integrate .. //depot/projects/mips2/src/share/man/man4/atapicam.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/bce.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/cxgb.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ddb.4#13 integrate .. //depot/projects/mips2/src/share/man/man4/fxp.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/mips2/src/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/mips2/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/mips2/src/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/mips2/src/share/man/man4/miibus.4#7 integrate .. //depot/projects/mips2/src/share/man/man4/ndis.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/mips2/src/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/rl.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/route.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/snd_hda.4#8 integrate .. //depot/projects/mips2/src/share/man/man4/snp.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/textdump.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/upgt.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/usb2_bluetooth.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_controller.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_core.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_ethernet.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_image.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_input.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_misc.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_ndis.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_quirk.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_serial.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_sound.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_storage.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_template.4#1 branch .. //depot/projects/mips2/src/share/man/man4/usb2_wlan.4#1 branch .. //depot/projects/mips2/src/share/man/man4/uscanner.4#6 integrate .. //depot/projects/mips2/src/share/man/man4/vlan.4#8 integrate .. //depot/projects/mips2/src/share/man/man4/zyd.4#4 integrate .. //depot/projects/mips2/src/share/man/man5/fstab.5#4 integrate .. //depot/projects/mips2/src/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/mips2/src/share/man/man7/hier.7#6 integrate .. //depot/projects/mips2/src/share/man/man7/ports.7#9 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#19 integrate .. //depot/projects/mips2/src/share/man/man9/VFS_SET.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/mips2/src/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/mips2/src/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/domain.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/ifnet.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/ktr.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/pseudofs.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/rtentry.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/style.9#6 integrate .. //depot/projects/mips2/src/share/man/man9/vfs_busy.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/mips2/src/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#12 integrate .. //depot/projects/mips2/src/share/misc/committers-doc.dot#7 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#13 integrate .. //depot/projects/mips2/src/share/mk/bsd.libnames.mk#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 4 11:33:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA48B1065673; Sun, 4 Jan 2009 11:33: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 88E7D106564A for ; Sun, 4 Jan 2009 11:33:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77C248FC0C for ; Sun, 4 Jan 2009 11:33:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n04BXIVA077978 for ; Sun, 4 Jan 2009 11:33:18 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n04BXIic077976 for perforce@freebsd.org; Sun, 4 Jan 2009 11:33:18 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 4 Jan 2009 11:33:18 GMT Message-Id: <200901041133.n04BXIic077976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155606 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, 04 Jan 2009 11:33:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=155606 Change 155606 by rene@rene_self on 2009/01/04 11:33:05 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -901,12 +901,26 @@ Slaven Rezic eserte@cs.tu-berlin.de wrote a - tutorial how to use umlauts on a FreeBSD machine. The tutorial - is written in German and available at + tutorial on using umlauts on a FreeBSD machine. The tutorial + is written in German and is available at . + Greek Language Localization + + + localization + Greek + + Nikos Kokkalis nickkokkalis@gmail.com has written + a complete article on Greek support in &os;. It is available as + part of the official &os; Greek documentation, in http://www.freebsd.org/doc/el_GR.ISO8859-7/articles/greek-language-support/index.html. + Please note this is in Greek only. + + + Japanese and Korean Language Localization localization @@ -925,7 +939,7 @@ Non-English FreeBSD Documentation - Some FreeBSD contributors have translated parts of FreeBSD to + Some FreeBSD contributors have translated parts of FreeBSD documentation to other languages. They are available through links on the main site or in /usr/share/doc. From owner-p4-projects@FreeBSD.ORG Sun Jan 4 11:45:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB76C106566B; Sun, 4 Jan 2009 11: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 6BC9D1065670 for ; Sun, 4 Jan 2009 11:45:31 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ABFC8FC19 for ; Sun, 4 Jan 2009 11:45:31 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n04BjV1N078952 for ; Sun, 4 Jan 2009 11:45:31 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n04BjVTW078950 for perforce@freebsd.org; Sun, 4 Jan 2009 11:45:31 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 4 Jan 2009 11:45:31 GMT Message-Id: <200901041145.n04BjVTW078950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155607 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, 04 Jan 2009 11:45:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=155607 Change 155607 by rene@rene_self on 2009/01/04 11:45:02 MFen handbook/l10n 1.126 -> 1.127 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#6 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.34 2006/08/12 22:53:14 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml - %SRCID% 1.126 + %SRCID% 1.127 --> @@ -23,7 +23,7 @@ Wu Herschreven door - + @@ -1035,13 +1035,31 @@ Slaven Rezic eserte@cs.tu-berlin.de heeft - een tutorial geschreven over hoe umlauten in &os; gebruikt - kunnen worden. De tutorial is in het Duits geschreven en staat + een tutorial geschreven over het gebruik van umlauten op een + &os;-machine. De tutorial is in het Duits geschreven en staat op . + Grieks + + + lokalisatie + + Grieks + + + Nikos Kokkalis nickkokkalis@gmail.com heeft + een compleet artikel over Griekse ondersteuning in &os; + geschreven. Het is beschikbaar als deel van de officiële + Griekse &os;-documentatie, in http://www.freebsd.org/doc/el_GR.ISO8859-7/articles/greek-language-support/index.html. + Merk opdat dit alleen in het Grieks + beschikbaar is. + + + Japans en Koreaans @@ -1065,8 +1083,8 @@ Niet-Engelstalige &os; documentatie - Sommige delen van &os; zijn naar andere talen vertaald. - Hiernaar staan links op de Sommige delen van de &os;-documentatie zijn naar andere + talen vertaald. Hiernaar staan links op de hoofdsite of in /usr/share/doc. From owner-p4-projects@FreeBSD.ORG Sun Jan 4 19:41:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A6AC106567E; Sun, 4 Jan 2009 19:41: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 13FD41065678 for ; Sun, 4 Jan 2009 19:41:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 020028FC08 for ; Sun, 4 Jan 2009 19:41:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n04Jfg0u048901 for ; Sun, 4 Jan 2009 19:41:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n04Jfg0C048899 for perforce@freebsd.org; Sun, 4 Jan 2009 19:41:42 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 4 Jan 2009 19:41:42 GMT Message-Id: <200901041941.n04Jfg0C048899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155615 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, 04 Jan 2009 19:41:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=155615 Change 155615 by rene@rene_self on 2009/01/04 19:41:28 committers-guide: process trhodes' and pgj's comments. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#11 (text+ko) ==== @@ -186,9 +186,9 @@ Commit bits allocated prior to the development of the notion of areas of authority may be appropriate for use in many parts of the tree. However, common sense dictates that a committer who has not - previously worked in an area of the tree seeks review prior to - committing, seeks approval from the appropriate responsible party, - and/or works with a mentor. Since the rules regarding code + previously worked in an area of the tree seek review prior to + committing, seek approval from the appropriate responsible party, + and/or work with a mentor. Since the rules regarding code maintenance differ by area of the tree, this is as much for the benefit of the committer working in an area of less familiarity as it is for others working on the tree. @@ -1214,7 +1214,7 @@ check in place but that may change. Some people blame these checks for bouncing valid email. If you want these checks turned off for your email you can place a file named - ~/.spam_lover + .spam_lover in your home directory on freefall.FreeBSD.org to disable the checks for your email. @@ -1410,7 +1410,7 @@ You can run a local copy of GNATS, and then integrate the FreeBSD - GNATS tree in to it using CVSup. Then you can run the GNATS commands + GNATS tree in to it using CVSup. Then you can run GNATS commands locally. This lets you query the PR database without needing to be connected to the Internet. @@ -1680,7 +1680,7 @@ - If you do not wish to type in your password every + If you do not wish to type your password in every time you use &man.ssh.1;, and you use RSA or DSA keys to authenticate, &man.ssh-agent.1; is there for your convenience. If you want to use &man.ssh-agent.1;, make @@ -1703,7 +1703,7 @@ ($HOME/.ssh/id_dsa.pub or $HOME/.ssh/id_rsa.pub) to the person setting you up as a committer so it can be put - into yourlogin in + into the yourlogin file in /etc/ssh-keys/ on freefall. @@ -1859,7 +1859,7 @@ Do not commit to anything under the src/contrib, - src/crypto, or + src/crypto, or src/sys/contrib trees without explicit approval from the respective maintainer(s). @@ -2112,7 +2112,7 @@ flame-o-gram at least had the grace to send it privately, then have the grace to keep it private yourself. If you feel you are being unfairly treated by another developer, - and it is causing you anguish, bring up the matter with + and it is causing you anguish, bring the matter up with core rather than taking it public. Core will do its best to play peace makers and get things back to sanity. In cases where the dispute involves a change to the codebase and @@ -2209,17 +2209,17 @@ Policy on Multiple Architectures - &os; has added several new architecture ports during recent + FreeBSD has added several new architecture ports during recent release cycles and is truly no longer an &i386; centric operating system. In an effort to make it easier to keep FreeBSD portable across the platforms we support, core has developed the following mandate:
- Our 32 bit reference platform is i386, and our 64 bit + Our 32-bit reference platform is i386, and our 64-bit reference platform is Sparc64. Major design work (including major API and ABI changes) must prove itself on at least one - 32 bit and at least one 64 bit platform, preferably the + 32-bit and at least one 64-bit platform, preferably the primary reference platforms, before it may be committed to the source tree.
@@ -2236,7 +2236,7 @@ developers. We will continue to re-evaluate this policy as cost and - availability of the 64 bit platforms change. + availability of the 64-bit platforms change. Developers should also be aware of our Tier Policy for the long term support of hardware architectures. The rules @@ -2334,7 +2334,7 @@ security officer, and release engineering teams. Diversity in hardware support broadens the options for FreeBSD consumers by offering new features and usage opportunities (such as support - for 64 bit CPUs, use in embedded environments, etc.), but these + for 64-bit CPUs, use in embedded environments, etc.), but these benefits must always be carefully considered in terms of the real-world maintenance cost associated with additional platform support. @@ -3310,6 +3310,18 @@ a busy machine. + + + Free 4-CD and DVD sets + + + &os; committers can get a free 4-CD or DVD set at + conferences from + &os; Mall, Inc.. The sets are no longer available + as a subscription due to the high shipment costs to + countries outside the USA. + + @@ -3393,7 +3405,7 @@ well. This information consists of one or more lines containing the - key word or phrase, a colon, tabs and/or spaces for formatting, and then the + key word or phrase, a colon, tabs for formatting, and then the additional information. The key words or phrases are: From owner-p4-projects@FreeBSD.ORG Sun Jan 4 19:58:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D85991065672; Sun, 4 Jan 2009 19:57: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 962ED106566C for ; Sun, 4 Jan 2009 19:57:59 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 849DC8FC14 for ; Sun, 4 Jan 2009 19:57:59 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n04Jvxwq050079 for ; Sun, 4 Jan 2009 19:57:59 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n04JvxGJ050077 for perforce@freebsd.org; Sun, 4 Jan 2009 19:57:59 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 4 Jan 2009 19:57:59 GMT Message-Id: <200901041957.n04JvxGJ050077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 155616 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, 04 Jan 2009 19:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155616 Change 155616 by brueffer@brueffer_haakonia on 2009/01/04 19:57:34 Fix the example, ad matches both successful and failed events. Discussed with: rwatson Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#13 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#14 $ .\" -.Dd February 5, 2006 +.Dd January 4, 2008 .Dt AUDIT_USER 5 .Os .Sh NAME @@ -67,7 +67,7 @@ .Ed .Pp These settings would cause login/logout and administrative events that -succeed on behalf of user +are performed on behalf of user .Dq Li root to be audited. No failure events are audited. From owner-p4-projects@FreeBSD.ORG Sun Jan 4 23:14:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC8B01065672; Sun, 4 Jan 2009 23:14: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 678A1106566C for ; Sun, 4 Jan 2009 23:14:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 560CC8FC08 for ; Sun, 4 Jan 2009 23:14:23 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n04NENQK080650 for ; Sun, 4 Jan 2009 23:14:23 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n04NENxT080648 for perforce@freebsd.org; Sun, 4 Jan 2009 23:14:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 4 Jan 2009 23:14:23 GMT Message-Id: <200901042314.n04NENxT080648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 155618 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, 04 Jan 2009 23:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=155618 Change 155618 by gonzo@gonzo_figaro on 2009/01/04 23:13:41 - KERNVIRTADDR i snot required any more - LDSCRIPT_NAME is not required too. Now, when we have trampolined kernel - disable bfe/mii ATM. Need to figure SSB voodoo first Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#16 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#16 (text+ko) ==== @@ -41,13 +41,8 @@ options CFE_CONSOLE options ALT_BREAK_TO_DEBUGGER -# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards -# offsets in the linked elf image (see ldscript hack) -# XXX can we conditionalize the linker stuff on options CFE? -options KERNVIRTADDR=0x80001000 +# makeoptions LDSCRIPT_NAME= ldscript.mips.cfe -makeoptions LDSCRIPT_NAME= ldscript.mips.cfe - #makeoptions ARCH_FLAGS=-march=mips32 makeoptions MIPS_LITTLE_ENDIAN=defined makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols @@ -73,8 +68,8 @@ device siba # Sonics SiliconBackplane device pci # siba_pcib -device bfe # XXX will build both pci and siba -device miibus # attachments +# device bfe # XXX will build both pci and siba +# device miibus # attachments # pci devices # notyet: From owner-p4-projects@FreeBSD.ORG Mon Jan 5 10:53:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA1061065670; Mon, 5 Jan 2009 10:53:22 +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 98881106566C for ; Mon, 5 Jan 2009 10:53:22 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84F488FC18 for ; Mon, 5 Jan 2009 10:53:22 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05ArM8I082571 for ; Mon, 5 Jan 2009 10:53:22 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05ArJUm082565 for perforce@freebsd.org; Mon, 5 Jan 2009 10:53:19 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 5 Jan 2009 10:53:19 GMT Message-Id: <200901051053.n05ArJUm082565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155642 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, 05 Jan 2009 10:53:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=155642 Change 155642 by weongyo@weongyo_ws on 2009/01/05 10:52:36 IFC Affected files ... .. //depot/projects/ndisusb/COPYRIGHT#3 integrate .. //depot/projects/ndisusb/Makefile#5 integrate .. //depot/projects/ndisusb/ObsoleteFiles.inc#6 integrate .. //depot/projects/ndisusb/UPDATING#6 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/CHANGES#4 integrate .. //depot/projects/ndisusb/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/ndisusb/contrib/bind9/FAQ#2 integrate .. //depot/projects/ndisusb/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/ndisusb/contrib/bind9/README#2 integrate .. //depot/projects/ndisusb/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/ndisusb/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/config.h.in#1 branch .. //depot/projects/ndisusb/contrib/bind9/configure.in#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/ndisusb/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/version#4 integrate .. //depot/projects/ndisusb/contrib/file/AUTHORS#1 branch .. //depot/projects/ndisusb/contrib/file/COPYING#1 branch .. //depot/projects/ndisusb/contrib/file/ChangeLog#2 integrate .. //depot/projects/ndisusb/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/ndisusb/contrib/file/INSTALL#1 branch .. //depot/projects/ndisusb/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/ndisusb/contrib/file/MAINT#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/c64#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/clarion#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/compress#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/console#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/database#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/diff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/dump#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/erlang#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/flash#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/frame#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/games#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/hp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/iff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/images#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/inform#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/java#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/kde#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/lex#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/linux#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/llvm#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/lua#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/luks#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/mup#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/netware#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/os2#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/palm#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/perl#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/printer#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/psion#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/riff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/ruby#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/sc#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/tex#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/troff#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/warc#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/weak#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/windows#1 branch .. //depot/projects/ndisusb/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/ndisusb/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/ndisusb/contrib/file/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/file/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/file/Makefile.std#2 delete .. //depot/projects/ndisusb/contrib/file/NEWS#1 branch .. //depot/projects/ndisusb/contrib/file/PORTING#2 delete .. //depot/projects/ndisusb/contrib/file/README#2 integrate .. //depot/projects/ndisusb/contrib/file/TODO#1 branch .. //depot/projects/ndisusb/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ndisusb/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/file/apprentice.c#2 integrate .. //depot/projects/ndisusb/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/asprintf.c#1 branch .. //depot/projects/ndisusb/contrib/file/compile#1 branch .. //depot/projects/ndisusb/contrib/file/compress.c#2 integrate .. //depot/projects/ndisusb/contrib/file/config.guess#1 branch .. //depot/projects/ndisusb/contrib/file/config.h.in#2 integrate .. //depot/projects/ndisusb/contrib/file/config.sub#1 branch .. //depot/projects/ndisusb/contrib/file/configure#2 integrate .. //depot/projects/ndisusb/contrib/file/configure.ac#1 branch .. //depot/projects/ndisusb/contrib/file/configure.in#2 delete .. //depot/projects/ndisusb/contrib/file/elfclass.h#1 branch .. //depot/projects/ndisusb/contrib/file/file.c#2 integrate .. //depot/projects/ndisusb/contrib/file/file.h#2 integrate .. //depot/projects/ndisusb/contrib/file/file.man#2 integrate .. //depot/projects/ndisusb/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/funcs.c#2 integrate .. //depot/projects/ndisusb/contrib/file/getopt_long.c#1 branch .. //depot/projects/ndisusb/contrib/file/is_tar.c#2 integrate .. //depot/projects/ndisusb/contrib/file/libmagic.man#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.h#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.man#2 integrate .. //depot/projects/ndisusb/contrib/file/magic.mime#2 delete .. //depot/projects/ndisusb/contrib/file/magic2mime#2 delete .. //depot/projects/ndisusb/contrib/file/mkinstalldirs#2 delete .. //depot/projects/ndisusb/contrib/file/mygetopt.h#1 branch .. //depot/projects/ndisusb/contrib/file/names.h#2 integrate .. //depot/projects/ndisusb/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ndisusb/contrib/file/print.c#2 integrate .. //depot/projects/ndisusb/contrib/file/readelf.c#2 integrate .. //depot/projects/ndisusb/contrib/file/readelf.h#2 integrate .. //depot/projects/ndisusb/contrib/file/softmagic.c#2 integrate .. //depot/projects/ndisusb/contrib/file/tar.h#2 integrate .. //depot/projects/ndisusb/contrib/file/test.c#2 delete .. //depot/projects/ndisusb/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/file/tests/README#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/ndisusb/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/ndisusb/contrib/file/tests/test.c#1 branch .. //depot/projects/ndisusb/contrib/file/vasprintf.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/NEWS#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/README#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/TODO#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/VERSION#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/ndisusb/etc/devd.conf#5 integrate .. //depot/projects/ndisusb/etc/devd/asus.conf#2 integrate .. //depot/projects/ndisusb/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/ndisusb/gnu/usr.bin/man/manpath/manpath.config#2 integrate .. //depot/projects/ndisusb/lib/Makefile#3 integrate .. //depot/projects/ndisusb/lib/bind/bind/config.h#2 integrate .. //depot/projects/ndisusb/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/ndisusb/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/ndisusb/lib/bind/config.h#3 integrate .. //depot/projects/ndisusb/lib/bind/dns/code.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/ndisusb/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/ndisusb/lib/bind/isc/Makefile#2 integrate .. //depot/projects/ndisusb/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/ndisusb/lib/libauditd/Makefile#1 branch .. //depot/projects/ndisusb/lib/libbsm/Makefile#2 integrate .. //depot/projects/ndisusb/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/ndisusb/lib/libc/arm/arith.h#2 integrate .. //depot/projects/ndisusb/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/ndisusb/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/ndisusb/lib/libelf/README#1 branch .. //depot/projects/ndisusb/lib/libmagic/Makefile#2 integrate .. //depot/projects/ndisusb/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/ndisusb/lib/libutil/kinfo_getfile.c#2 integrate .. //depot/projects/ndisusb/lib/libutil/kinfo_getvmmap.c#2 integrate .. //depot/projects/ndisusb/lib/msun/src/math_private.h#2 integrate .. //depot/projects/ndisusb/sbin/ddb/ddb.8#3 integrate .. //depot/projects/ndisusb/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/ndisusb/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/ndisusb/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/ndisusb/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/ndisusb/sbin/mount/mount.c#4 integrate .. //depot/projects/ndisusb/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/ndisusb/sbin/savecore/savecore.8#2 integrate .. //depot/projects/ndisusb/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/ndisusb/share/doc/bind9/Makefile#2 integrate .. //depot/projects/ndisusb/share/man/man4/Makefile#5 integrate .. //depot/projects/ndisusb/share/man/man4/ae.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ndis.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/ndisusb/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/textdump.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/uscanner.4#2 integrate .. //depot/projects/ndisusb/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/ndisusb/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/domain.9#2 integrate .. //depot/projects/ndisusb/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/ndisusb/sys/amd64/conf/USB2#1 branch .. //depot/projects/ndisusb/sys/arm/conf/AVILA#4 integrate .. //depot/projects/ndisusb/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/EP80219#4 integrate .. //depot/projects/ndisusb/sys/arm/conf/HL200#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/NSLU#3 integrate .. //depot/projects/ndisusb/sys/arm/include/armreg.h#4 integrate .. //depot/projects/ndisusb/sys/arm/include/ieee.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/ndisusb/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/ndisusb/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_errno.h#1 branch .. //depot/projects/ndisusb/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/ndisusb/sys/bsm/audit_record.h#4 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/ndisusb/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/ndisusb/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#10 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#36 integrate .. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#9 integrate .. //depot/projects/ndisusb/sys/conf/files#6 integrate .. //depot/projects/ndisusb/sys/conf/files.amd64#4 integrate .. //depot/projects/ndisusb/sys/conf/files.i386#5 integrate .. //depot/projects/ndisusb/sys/conf/files.ia64#3 integrate .. //depot/projects/ndisusb/sys/conf/files.powerpc#5 integrate .. //depot/projects/ndisusb/sys/conf/files.sparc64#4 integrate .. //depot/projects/ndisusb/sys/conf/options#5 integrate .. //depot/projects/ndisusb/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/ndisusb/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/ndisusb/sys/dev/agp/agp.c#3 integrate .. //depot/projects/ndisusb/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/ndisusb/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/ndisusb/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/ndisusb/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/ndisusb/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/ndisusb/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/ndisusb/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/ndisusb/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/ndisusb/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/ndisusb/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/ndisusb/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/ndisusb/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/ndisusb/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/ndisusb/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/ndisusb/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/umass.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/ndisusb/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/ndisusb/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/ndisusb/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/ndisusb/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/ndisusb/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/ndisusb/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/ndisusb/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ndisusb/sys/i386/conf/USB2#1 branch .. //depot/projects/ndisusb/sys/i386/conf/XEN#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/ndisusb/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/ndisusb/sys/i386/include/xen/evtchn.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/xen_intr.h#2 delete .. //depot/projects/ndisusb/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/ndisusb/sys/i386/isa/npx.c#3 integrate .. //depot/projects/ndisusb/sys/i386/xen/clock.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/ndisusb/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/ndisusb/sys/kern/kern_jail.c#5 integrate .. //depot/projects/ndisusb/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_proc.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_xxx.c#4 integrate .. //depot/projects/ndisusb/sys/kern/sched_ule.c#4 integrate .. //depot/projects/ndisusb/sys/kern/subr_param.c#5 integrate .. //depot/projects/ndisusb/sys/kern/tty.c#4 integrate .. //depot/projects/ndisusb/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/ndisusb/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_export.c#5 integrate .. //depot/projects/ndisusb/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/ndisusb/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/ndisusb/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/ndisusb/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/ndisusb/sys/net/if_tun.c#5 integrate .. //depot/projects/ndisusb/sys/net/route.c#4 integrate .. //depot/projects/ndisusb/sys/net/route.h#4 integrate .. //depot/projects/ndisusb/sys/net/rtsock.c#5 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/ndisusb/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/ndisusb/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/ndisusb/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/ndisusb/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/ndisusb/sys/netinet/if_ether.c#5 integrate .. //depot/projects/ndisusb/sys/netinet/in.c#5 integrate .. //depot/projects/ndisusb/sys/netinet/ip_output.c#4 integrate .. //depot/projects/ndisusb/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/ndisusb/sys/netinet6/in6.c#5 integrate .. //depot/projects/ndisusb/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/ndisusb/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ndisusb/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/ndisusb/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/ndisusb/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/ndisusb/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/ndisusb/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/ndisusb/sys/pc98/cbus/scterm-sck.c#3 integrate .. //depot/projects/ndisusb/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/ndisusb/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/ndisusb/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_bsm_errno.c#1 branch .. //depot/projects/ndisusb/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/ndisusb/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/ndisusb/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/ndisusb/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/ndisusb/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/ndisusb/sys/sys/copyright.h#3 integrate .. //depot/projects/ndisusb/sys/sys/elf64.h#2 integrate .. //depot/projects/ndisusb/sys/sys/elf_common.h#4 integrate .. //depot/projects/ndisusb/sys/sys/elf_generic.h#2 integrate .. //depot/projects/ndisusb/sys/sys/file.h#4 integrate .. //depot/projects/ndisusb/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/ndisusb/sys/sys/link_elf.h#3 integrate .. //depot/projects/ndisusb/sys/sys/protosw.h#3 integrate .. //depot/projects/ndisusb/sys/sys/tree.h#2 integrate .. //depot/projects/ndisusb/sys/vm/vm_map.c#3 integrate .. //depot/projects/ndisusb/sys/vm/vm_map.h#2 integrate .. //depot/projects/ndisusb/sys/vm/vm_page.c#4 integrate .. //depot/projects/ndisusb/sys/vm/vm_page.h#3 integrate .. //depot/projects/ndisusb/sys/xen/evtchn.h#1 branch .. //depot/projects/ndisusb/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/ndisusb/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/ndisusb/sys/xen/features.c#2 integrate .. //depot/projects/ndisusb/sys/xen/gnttab.c#3 integrate .. //depot/projects/ndisusb/sys/xen/gnttab.h#3 integrate .. //depot/projects/ndisusb/sys/xen/hypervisor.h#1 branch .. //depot/projects/ndisusb/sys/xen/xen_intr.h#1 branch .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_client.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_comms.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_comms.h#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_dev.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_probe.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_probe_backend.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbus_xs.c#3 integrate .. //depot/projects/ndisusb/sys/xen/xenbus/xenbusvar.h#2 integrate .. //depot/projects/ndisusb/tools/tools/README#2 integrate .. //depot/projects/ndisusb/tools/tools/ether_reflect/Makefile#1 branch .. //depot/projects/ndisusb/tools/tools/ether_reflect/ether_reflect.1#1 branch .. //depot/projects/ndisusb/tools/tools/ether_reflect/ether_reflect.c#1 branch .. //depot/projects/ndisusb/tools/tools/mctest/mctest.1#3 integrate .. //depot/projects/ndisusb/usr.bin/csplit/csplit.1#2 integrate .. //depot/projects/ndisusb/usr.bin/fstat/zfs.c#2 integrate .. //depot/projects/ndisusb/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/ndisusb/usr.bin/make/for.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/globals.h#3 integrate .. //depot/projects/ndisusb/usr.bin/make/job.c#4 integrate .. //depot/projects/ndisusb/usr.bin/make/job.h#3 integrate .. //depot/projects/ndisusb/usr.bin/make/main.c#4 integrate .. //depot/projects/ndisusb/usr.bin/make/make.1#4 integrate .. //depot/projects/ndisusb/usr.bin/make/make.h#2 integrate .. //depot/projects/ndisusb/usr.bin/make/parse.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/suff.c#2 integrate .. //depot/projects/ndisusb/usr.bin/make/var.c#2 integrate .. //depot/projects/ndisusb/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/ndisusb/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ndisusb/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/ndisusb/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_files.c#5 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_kstack.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_threads.c#2 integrate .. //depot/projects/ndisusb/usr.bin/procstat/procstat_vm.c#3 integrate .. //depot/projects/ndisusb/usr.bin/top/machine.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/auditd/Makefile#3 integrate .. //depot/projects/ndisusb/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/cpucontrol/cpucontrol.8#2 integrate .. //depot/projects/ndisusb/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/gssd/Makefile#2 integrate .. //depot/projects/ndisusb/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ndisusb/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/ndisusb/usr.sbin/ndiscvt/inf.c#5 integrate .. //depot/projects/ndisusb/usr.sbin/ndiscvt/windrv_stub.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/main.c#5 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/lib/lib.h#4 integrate .. //depot/projects/ndisusb/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/powerd/powerd.8#4 integrate .. //depot/projects/ndisusb/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/ndisusb/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/ndisusb/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/ndisusb/usr.sbin/ugidfw/ugidfw.c#2 integrate .. //depot/projects/ndisusb/usr.sbin/usbdevs/usbdevs.c#2 integrate Differences ... ==== //depot/projects/ndisusb/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.10 2008/11/28 19:21:10 imp Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/ndisusb/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $ +# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ # # The user-driven targets are: # @@ -298,7 +298,7 @@ .endif .for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} ==== //depot/projects/ndisusb/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz +# 20081223: ipprotosw.h removed +OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz # 20081023: FREE.9 and MALLOC.9 removed ==== //depot/projects/ndisusb/UPDATING#6 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081225: + ng_tty(4) module updated to match the new TTY subsystem. + Due to API change, user-level applications must be updated. + New API support added to mpd5 CVS and expected to be present + in next mpd5.3 release. + 20081219: With __FreeBSD_version 800060 the makefs tool is part of the base system (it was a port). @@ -1195,4 +1201,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ +$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ ==== //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 (text+ko) ==== @@ -146,6 +146,7 @@ #include #include +#include #include #include ==== //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ndisusb/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,14 +1,158 @@ - --- 9.4.2-P2 released --- + + --- 9.4.3 released --- + +2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO + is cleared when IPV6_V6ONLY is set. [RT #18785] + +2489. [port] solaris: Workaround Solaris's kernel bug about + /dev/poll: + http://bugs.opensolaris.org/view_bug.do?bug_id=6724237 + Define ISC_SOCKET_USE_POLLWATCH at build time to enable + this workaround. [RT #18870] + + --- 9.4.3rc1 released --- + +2473. [port] linux: raise the limit on open files to the possible + maximum value before spawning threads; 'files' + specified in named.conf doesn't seem to work with + threads as expected. [RT #18784] + +2472. [port] linux: check the number of available cpu's before + calling chroot as it depends on "/proc". [RT #16923] + +2471. [bug] named-checkzone was not reporting missing manditory + glue when sibling checks were disabled. [RT #18768] + +2469. [port] solaris: Work around Solaris's select() limitations. + [RT #18769] + +2468. [bug] Resolver could try unreachable servers multiple times. + [RT #18739] + +2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740] + +2466. [doc] ARM: explain max-cache-ttl 0 SERVFAIL issue. + [RT #18302] + +2465. [bug] Adb's handling of lame addresses was different + for IPv4 and IPv6. [RT #18738] + +2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket + API and glibc hides parts of the IPv6 Advanced Socket >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 11:37:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 484481065672; Mon, 5 Jan 2009 11:37: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 0071E106564A for ; Mon, 5 Jan 2009 11:37:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E14998FC23 for ; Mon, 5 Jan 2009 11:37:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05Bb6MW086884 for ; Mon, 5 Jan 2009 11:37:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05Bb65H086882 for perforce@freebsd.org; Mon, 5 Jan 2009 11:37:06 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 5 Jan 2009 11:37:06 GMT Message-Id: <200901051137.n05Bb65H086882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155643 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, 05 Jan 2009 11:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=155643 Change 155643 by rene@rene_self on 2009/01/05 11:36:10 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#8 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#13 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/hardware.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/readme.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/relnotes.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/releases/index.sgml#5 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#11 integrate .. //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#24 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/hubs/article.sgml#2 (text+ko) ==== @@ -7,7 +7,7 @@
Mirroring FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.66 2008/02/24 19:27:21 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.67 2009/01/05 05:35:03 kuriyama Exp $ Jun @@ -79,8 +79,8 @@ Here are some approximate figures: - Full FTP Distribution: 412 GB - CVS repository: 3.3 GB + Full FTP Distribution: 739 GB + CVS repository: 3.8 GB CTM deltas: 3.2 GB Web pages: 463 MB ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -638,12 +638,13 @@ The tree was branched again in July 2005, this time for RELENG_6. 6.0-RELEASE, the first release of the 6.X branch, was released in November 2005. The most recent &rel2.current;-RELEASE came out in - &rel2.current.date;. There will be additional releases from the + &rel2.current.date;. This will probably be the final release from the RELENG_6 branch. - The RELENG_7 branch was created in October 2007. The most - recent release of this branch was &rel.current;-RELEASE, which came - out in &rel.current.date;. There will be additional releases from the + The RELENG_7 branch was created in October 2007. The first + release of this branch was 7.0-RELEASE, which came + out in February 2008. The most recent &rel.current;-RELEASE came out + in &rel.current.date;. There will be additional releases from the RELENG_7 branch. For now, long-term development projects continue to take place ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#13 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.477 2008/12/31 05:47:03 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.479 2009/01/05 08:20:23 hrs Exp $ --> @@ -564,6 +564,7 @@ + @@ -3387,6 +3388,7 @@ + ==== //depot/projects/docproj_nl/www/en/index.xsl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + @@ -303,7 +303,7 @@
  • - More + More
  • Security Advisories RSS Feed ==== //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/7.1R/Makefile,v 1.2 2008/12/31 06:17:26 hrs Exp $ +# $FreeBSD: www/en/releases/7.1R/Makefile,v 1.3 2009/01/05 04:08:29 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,8 +7,7 @@ .include "../Makefile.inc" .endif -#DOCS= announce.sgml schedule.sgml -DOCS= schedule.sgml +DOCS= announce.sgml schedule.sgml DATA= docbook.css DATA+= errata.html ==== //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#2 (text+ko) ==== @@ -1,13 +1,424 @@ - + ]> &header; -

    Not announced yet

    - &footer; +

    The FreeBSD Release Engineering Team is pleased to announce the + availability of FreeBSD 7.1-RELEASE. This is the second release + from the 7-STABLE branch which improves on the functionality of + FreeBSD 7.0 and introduces some new features. Some of the + highlights:

    + +
      +

    • The ULE scheduler is now the default in GENERIC kernels for + amd64 and i386 architectures. The ULE scheduler significantly + improves performance on multicore systems for many workloads.

      • + +

    • Support for using DTrace inside the kernel has been imported + from OpenSolaris. DTrace is a comprehensive dynamic tracing + framework.

      • + +

    • A new and much-improved NFS Lock Manager (NLM) client.

      • + +

    • Boot loader changes allow, among other things, booting from + USB devices and booting from GPT-labeled devices.

      • + +

    • The cpuset(2) system call and cpuset(1) command have been added, + providing an API for thread to CPU binding and CPU resource + grouping and assignment.

      • + +

    • KDE updated to 3.5.10, GNOME updated to 2.22.3.

      • + +

    • DVD-sized media for the amd64 and i386 architectures

      • +
    + +

    For a complete list of new features and known problems, please + see the online release notes and errata list, available at:

    + + + +

    For more information about FreeBSD release engineering activities, + please see:

    + +

    http://www.FreeBSD.org/releng/

    + +

    Availability

    + +

    FreeBSD 7.1-RELEASE is now available for the amd64, i386, ia64, + pc98, powerpc, and sparc64 architectures.

    + +

    FreeBSD 7.1 can be installed from bootable ISO images or over the + network; the required files can be downloaded via FTP or + BitTorrent as described in the sections below. While some of the + smaller FTP mirrors may not carry all architectures, they will all + generally contain the more common ones, such as i386 and + amd64.

    + +

    MD5 and SHA256 hashes for the release ISO images are included at + the bottom of this message.

    + +

    The purpose of the ISO images provided as part of the release are + as follows:

    + +
    +
    dvd1:
    +

    Contains everything necessary to install the base FreeBSD + operating system, a collection of pre-built packages, the + documentation, and supports booting into a "livefs" based + rescue mode. This should be all you need if you can burn + and use DVD-sized media.

    + +
    disc1, disc2, disc3, livefs, docs:
    +

    disc1 contains the base FreeBSD + system and a few pre-built packages. disc2 and disc3 contain + more pre-built packages. Those three can be burned to CDROM + sized media and should be all you need to do a normal installation. + livefs contains support for entering into a "livefs" based + rescue mode but you need disc1 to do the initial boot first. + docs contains the documentation.

    + +
    bootonly:
    +

    This supports booting a machine using the CDROM drive but + does not contain the support for installing FreeBSD from the + CD itself, you would need to perform a network based install + (e.g. from an FTP server) after booting from the CD.

    +
    + +

    FreeBSD 7.1-RELEASE can also be purchased on CD-ROM or DVD from + several vendors. One of the vendors that will be offering FreeBSD + 7.1-based products is:

    + + + +

    BitTorrent

    + +

    7.1-RELEASE ISOs are available via BitTorrent. A collection of + torrent files to download the images is available at:

    + +

    http://torrents.freebsd.org:8080

    + +

    FTP

    + +

    At the time of this announcement the following FTP sites have + FreeBSD 7.1-RELEASE available.

    + + + +

    However before trying these sites you may want to check your regional + mirror(s) first by going to:

    + +

    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD

    + +

    Any additional mirror sites will be labeled ftp2, + ftp3 and so on.

    + +

    More information about FreeBSD mirror sites can be found at:

    + +

    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html

    + +

    For instructions on installing FreeBSD, please see Chapter 2 of The + FreeBSD Handbook. It provides a complete installation walk-through + for users new to FreeBSD, and can be found online at:

    + +

    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html

    + +

    Updating Existing Systems

    + +

    NOTE: If updating from a 7.0 or earlier system due to a + change in the Vendor's drivers certain Intel NICs will now come up + as igb(4) instead of em(4). We normally try to avoid changes like + that in stable branches but the vendor felt it necessary in order + to support the new adapters. See the UPDATING entry dated + 20080811 for details. There are only 3 PCI ID's that should have + their name changed from em(4) to igb(4): 0x10A78086, 0x10A98086, + and 0x10D68086. You should be able to determine if your card will + change names by running the command "pciconf -l", and for the line + representing your NIC (should be named em on older systems, + e.g. em0 or em1, etc) check the fourth column. If that says + "chip=0x10a78086" (or one of the other two IDs given above) you + will have the adapter's name change.

    + +

    Updates from Source

    + +

    The procedure for doing a source code based update is described + in the FreeBSD Handbook:

    + + + +

    The branch tag to use for updating the source is RELENG_7_1.

    + +

    FreeBSD Update

    + +

    The freebsd-update(8) utility supports binary upgrades of i386 + and amd64 systems running earlier FreeBSD releases. Systems + running 7.0-RELEASE, 7.1-BETA, 7.1-BETA2, 7.1-RC1, or 7.1-RC2 can + upgrade as follows:

    + +

    # freebsd-update upgrade -r 7.1-RELEASE

    + +

    During this process, FreeBSD Update may ask the user to help by merging + some configuration files or by confirming that the automatically performed + merging was done correctly.

    + +

    # freebsd-update install

    + +

    The system must be rebooted with the newly installed kernel before continuing.

    + +

    # shutdown -r now

    + +

    After rebooting, freebsd-update needs to be run again to install the new + userland components, and the system needs to be rebooted again:

    + +

    # freebsd-update install

    +

    # shutdown -r now

    + +

    Users of Intel network interfaces which are changing their name from "em" to + "igb" should make necessary changes to configuration files BEFORE running + freebsd-update, since otherwise the network interface will not be configured + appropriately after rebooting for the first time.

    + +

    Users of earlier FreeBSD releases (FreeBSD 6.x) can also use + freebsd-update to upgrade to FreeBSD 7.1, but will be prompted to + rebuild all third-party applications (e.g., anything installed from + the ports tree) after the second invocation of "freebsd-update + install", in order to handle differences in the system libraries + between FreeBSD 6.x and FreeBSD 7.x.

    + +

    For more information, see:

    + +

    http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.html

    + +

    Support

    + +

    The FreeBSD Security Team currently plans to support FreeBSD 7.1 + until January 31st 2011. For more information on the Security + Team and their support of the various FreeBSD branches see:

    + +

    http://www.freebsd.org/security/

    + +

    Acknowledgments

    + +

    Many companiews donated equipment, network access, or man-hours + to support the release engineering activities for FreeBSD 7.1 + including The FreeBSD Foundation, FreeBSD Systems, + Hewlett-Packard, Yahoo!, Network Appliances, and Sentex + Communications.

    + +

    The release engineering team for 7.1-RELEASE includes:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Ken Smith <kensmith@FreeBSD.org>Release Engineering, + amd64, i386, sparc64 Release Building, + Mirror Site Coordination
    Robert Watson <rwatson@FreeBSD.org>Release Engineering, Security
    Konstantin Belousov <kib@FreeBSD.org>Release Engineering
    Marc Fonvieille <blackend@FreeBSD.org>Release Engineering, Documentation
    Maxime Henrion <mux@FreeBSD.org>Release Engineering
    Bruce A. Mah <bmah@FreeBSD.org>Release Engineering, Documentation
    George Neville-Neil <gnn@FreeBSD.org>Release Engineering
    Hiroki Sato <hrs@FreeBSD.org>Release Engineering, Documentation
    Murray Stokely <murray@FreeBSD.org>Release Engineering
    Marcel Moolenaar <marcel@FreeBSD.org>ia64, powerpc Release Building
    Takahashi Yoshihiro <nyan@FreeBSD.org>PC98 Release Building
    Kris Kennaway <kris@FreeBSD.org>Package Building
    Joe Marcus Clarke <marcus@FreeBSD.org>Package Building
    Erwin Lansing <erwin@FreeBSD.org>Package Building
    Mark Linimon <linimon@FreeBSD.org>Package Building
    Pav Lucistnik <pav@FreeBSD.org>Package Building
    Colin Percival <cperciva@FreeBSD.org>Security Officer
    Peter Wemm <peter@FreeBSD.org>Bittorrent Coordination
    + +

    Trademark

    + +

    FreeBSD is a registered trademark of The FreeBSD Foundation.

    + +

    ISO Image Checksums

    + + 
    MD5 (7.1-RELEASE-amd64-bootonly.iso) = f127de85eb1f3a945b56ef750fa610ae
+MD5 (7.1-RELEASE-amd64-disc1.iso) = ac88bfa3359aea242450d74c20347bde
+MD5 (7.1-RELEASE-amd64-disc2.iso) = 918d89e3ee330f5bd13535bc82def802
+MD5 (7.1-RELEASE-amd64-disc3.iso) = d01747e4de48acb052f827d723ef9672
+MD5 (7.1-RELEASE-amd64-docs.iso) = 4558db657d0b021849c2b1a802e1bea4
+MD5 (7.1-RELEASE-amd64-dvd1.iso) = df1a3604d4f99b7cf3511d42d33c550a
+MD5 (7.1-RELEASE-amd64-livefs.iso) = 83dd8e10ff27f8799c66bd4bd26ac5b3
+
+MD5 (7.1-RELEASE-i386-bootonly.iso) = 6988cd1662a03e5465cb38b1100a28eb
+MD5 (7.1-RELEASE-i386-disc1.iso) = ebdea2ebae35597bed323047cd70bcf2
+MD5 (7.1-RELEASE-i386-disc2.iso) = e20444a71dd709d92f3340323e58535c
+MD5 (7.1-RELEASE-i386-disc3.iso) = e64fab3db2917e1ba15bc72ab2af35f6
+MD5 (7.1-RELEASE-i386-docs.iso) = e04e8dc0261fc947efb699faf8852eb8
+MD5 (7.1-RELEASE-i386-dvd1.iso) = bbb47ab60bda55270ddd9ff4f73b9dc8
+MD5 (7.1-RELEASE-i386-livefs.iso) = 148b2aae58b4a9e27970ff77b5dd6f08
+
+MD5 (7.1-RELEASE-ia64-bootonly.iso) = 43c55b764bcc0b6c7ec07037cdca12a7
+MD5 (7.1-RELEASE-ia64-disc1.iso) = 47ffbdbdf8b258c6b1018e3a75b3cab3
+MD5 (7.1-RELEASE-ia64-disc2.iso) = e603d24d1c8e21dbc8e85e4bf30f0482
+MD5 (7.1-RELEASE-ia64-disc3.iso) = ef356f4e4efc7258899a9ead3fa834ea
+MD5 (7.1-RELEASE-ia64-docs.iso) = 7dba36505623251068e7fc1f06099634
+MD5 (7.1-RELEASE-ia64-livefs.iso) = d3f6f2d47b1bd2b46cb7db7180215385
+
+MD5 (7.1-RELEASE-pc98-bootonly.iso) = c46d9eed8fb421f294ffd6a6770dbd46
+MD5 (7.1-RELEASE-pc98-disc1.iso) = 90d8d8c24d8a14c166428df037addc68
+MD5 (7.1-RELEASE-pc98-livefs.iso) = 4c578bfe71d3dd7c2de4ba490fae04ee
+
+MD5 (7.1-RELEASE-powerpc-bootonly.iso) = c7f8b40c7b7194f4b40776b86864e257
+MD5 (7.1-RELEASE-powerpc-disc1.iso) = 228c53863c604298f66a86f0a1fd4f88
+MD5 (7.1-RELEASE-powerpc-disc2.iso) = a1d8c054fdfa420ac1965ca0795f6693
+MD5 (7.1-RELEASE-powerpc-disc3.iso) = 24aa15c263cebf28e1d2f66f7c6b9215
+MD5 (7.1-RELEASE-powerpc-docs.iso) = 3073516ccd548a979794ea0aaba7b732
+
+MD5 (7.1-RELEASE-sparc64-bootonly.iso) = 0fd076346a8d6d49601f4aaa2148edb1
+MD5 (7.1-RELEASE-sparc64-disc1.iso) = 715680a781ed8649271430c10f7907db
+MD5 (7.1-RELEASE-sparc64-disc2.iso) = 7179853c118549dbe780f94e74e90ddf
+MD5 (7.1-RELEASE-sparc64-disc3.iso) = f640b3a800c18020279158f444cf1643
+MD5 (7.1-RELEASE-sparc64-docs.iso) = 94d5661906826735b0a4264197a5f4b4
+
+SHA256 (7.1-RELEASE-amd64-bootonly.iso) = a633924d756812eb6916d0e9cc2821c20935daaf76eb741319bcabd246a2d4ab
+SHA256 (7.1-RELEASE-amd64-disc1.iso) = 4f7deebbd5e3211d144c6e630b808e918fcbb901ff4689b64087ed4c2d6e781d
+SHA256 (7.1-RELEASE-amd64-disc2.iso) = 2236148b61b896d62086889bc6fedaf36a24dbf327c1d1f30f79a6c1ff677b8d
+SHA256 (7.1-RELEASE-amd64-disc3.iso) = 19035ad37eae028bf27b060ea10ecff7a9cc9feae10f951d63907b6be852c458
+SHA256 (7.1-RELEASE-amd64-docs.iso) = ac17871f20b9438ce27ec6598c2441c8ad58f19b5696cacddc332976c2e24a4c
+SHA256 (7.1-RELEASE-amd64-dvd1.iso) = 1c148191e8c01191011d5fde4688aaa567a166838ed9722d1ae73451c4ef2b7d
+SHA256 (7.1-RELEASE-amd64-livefs.iso) = 1a30fca92c806b2f58c569c894bec221e7e2aad9c2937e6c09cd8e340bfb0903
+
+SHA256 (7.1-RELEASE-i386-bootonly.iso) = ad848e85c0a8e83fc5c26fad4f370eb6c34d2e3154966cd460788f56f734085c
+SHA256 (7.1-RELEASE-i386-disc1.iso) = 58e588c26d06b84d8c3c01d8507b2ffe2e237b167f72604c82d34011dc850a46
+SHA256 (7.1-RELEASE-i386-disc2.iso) = 6d0476f77e3a17863eddf59eadb41ecb52c4399614442a0df39f97c8e4c74b2e
+SHA256 (7.1-RELEASE-i386-disc3.iso) = b58d19c5bcb88e5651dce06ccf55bd9a309efaec2b2fe47a9277343a8f6646fe
+SHA256 (7.1-RELEASE-i386-docs.iso) = 521e45641f4e50168a74ea315720d13844e8a1220f28656302aca8281261ac5b
+SHA256 (7.1-RELEASE-i386-dvd1.iso) = 303be4ce844f0cb18aa38a41988dc5fba960427dbcc69263410308176cb5875f
+SHA256 (7.1-RELEASE-i386-livefs.iso) = db1609e72ad3f979b3f6d954ac2811588cc99c460c57e3035835cb604447dc0d
+
+SHA256 (7.1-RELEASE-ia64-bootonly.iso) = 059c82e3e4b535730795a52b939d3085c7cd891a37570a3567e47dee6a345787
+SHA256 (7.1-RELEASE-ia64-disc1.iso) = e97ad79b9f21e3554e47bd125a25dea5adac112608bbcba8c60d45aebc0b1837
+SHA256 (7.1-RELEASE-ia64-disc2.iso) = f1c91524eebe8d1933057669ad7ce1343f18aecbad092d1402652e6c0d69f7a9
+SHA256 (7.1-RELEASE-ia64-disc3.iso) = ed838b4c4801d6244f33cdd02abcca4c208b0dd2d89c6f0446a1913d95662096
+SHA256 (7.1-RELEASE-ia64-docs.iso) = dd7c1dc8fe4968bd32b2fef42b21460211bef5284ecf9be53490de595f4b6a8b
+SHA256 (7.1-RELEASE-ia64-livefs.iso) = 81a8cad96e8540e32a9197d4dcba587b1266a8d56ff75db3755381471793e90f
+
+SHA256 (7.1-RELEASE-pc98-bootonly.iso) = 8b4038d22b59464e7df7cc1273a1929bdf89be77bc8fecfa88faf4d81db049c9
+SHA256 (7.1-RELEASE-pc98-disc1.iso) = 43eae1bc95cc307f0b228cd8388c94cfad0db1402650e5b31262c8a2040ead7a
+SHA256 (7.1-RELEASE-pc98-livefs.iso) = ba4e744629fb5a7f40e288b15a39dc971c3a5108a38e9952ec00fd951292f677
+
+SHA256 (7.1-RELEASE-powerpc-bootonly.iso) = e1c0e47b3aa66604853e9a27ccad381d1abb3b6dbe49fc7a773ba91720dd5862
+SHA256 (7.1-RELEASE-powerpc-disc1.iso) = e672b975d10502677076014804d486c406e79cd7724353f76abc68b55dd5972e
+SHA256 (7.1-RELEASE-powerpc-disc2.iso) = 9f6aff26f127a229cdae1e73c4eb25d6d51b595380110bb99f9882b88c0a2a20
+SHA256 (7.1-RELEASE-powerpc-disc3.iso) = 0c0c3a012fad489b425d35e4df539f23be4c26cc46a950f5699b84da4a37bdb2
+SHA256 (7.1-RELEASE-powerpc-docs.iso) = 4fc75610e7bed8c05e474053266b4a8cce40c039707e39970ca2cf78ff99dee9
+
+SHA256 (7.1-RELEASE-sparc64-bootonly.iso) = d8259fa546988201cb629ce606a10f8928e7b93a6e317e4078abbe6804bd5068
+SHA256 (7.1-RELEASE-sparc64-disc1.iso) = 020030fff08be2a2e99dfa057096a27305c762ad5aebc4b880de84587dd3ef1a
+SHA256 (7.1-RELEASE-sparc64-disc2.iso) = 0d287b855a94317332d0dada8ac6ba2e216200f76551e463e94af30dc14cebdc
+SHA256 (7.1-RELEASE-sparc64-disc3.iso) = 246c73be0f35fcdc7437b346a796c6224a9de887325cdc99f3008fd961c47edb
+SHA256 (7.1-RELEASE-sparc64-docs.iso) = 30e298e8d36cdabcf6b48eea5d5fb784351c44f8cb97df29695037d9513843cc
    + + &footer; ==== //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#2 (text+ko) ==== @@ -16,10 +16,10 @@

    The FreeBSD Project

    -

    Copyright © 2008 The FreeBSD Documentation Project

    +

    Copyright © 2008, 2009 The FreeBSD Documentation Project

    -

    $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/errata/article.sgml -186637 2008-12-31 05:56:22Z hrs $
    +

    $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml +186764 2009-01-05 08:56:45Z hrs $

    @@ -43,7 +43,7 @@
    -
    +

    This document lists errata items for FreeBSD 7.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as @@ -73,8 +73,8 @@ target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date mirrors of this location.

    -

    Source and binary snapshots of FreeBSD 7.1-STABLE also contain up-to-date copies of -this document (as of the time of the snapshot).

    +

    Source and binary snapshots of FreeBSD 7-STABLE also contain up-to-date copies of this +document (as of the time of the snapshot).

    For a list of all FreeBSD CERT security advisories, see

    3 Open Issues

    -

    No open issues.

    +

    [20090105] As in the Announcement of 7.1-RELEASE, certain Intel NICs will come up as +igb(4) instead of em(4) in this +release. There are only 3 PCI ID's that should have their name changed from em(4) to igb(4):

    + +
      +
    • +

      0x10A78086

      +
      • + +
    • +

      0x10A98086

      +
      • + +
    • +

      0x10D68086

      +
      • +
    + +

    You should be able to determine if your card will change names by running the +following command:

    + +
    +% pciconf -l
+. . .
+em0@pci0:0:25:0: class=0x020000 card=0x02381028 chip=0x10c08086 rev=0x02 hdr=0x00
+
    + +

    and for the line representing your NIC (should be named em on older systems, e.g. em0 or em1, etc) check the fourth column. If that says chip=0x10a78086 (or one of the other two IDs given above) you will +have the adapter's name change.

    @@ -102,18 +142,173 @@

    4 Late-Breaking News and Corrections

    -

    No news.

    +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the ae(4) driver has been +added to provide support for the Attansic/Atheros L2 FastEthernet controllers. This +driver is not enabled in GENERIC kernels for this release.

    + +

    [20090105] The Release Notes for 7.1-RELEASE included the following +misdescriptions:

    + +
      +
    • +

      In the entry of +linux(4) ABI +support, get_setaffinity() should have been sched_setaffinity().

      +
      • +
    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the jme(4) driver has +been added to provide support for PCIe adapters based on JMicron JMC250 gigabit Ethernet +and JMC260 fast Ethernet controllers.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the age(4) driver has +been added to provide support for Attansic/Atheros L1 gigabit Ethernet controller.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +malo(4) driver +has been added to provide support for Marvell Libertas 88W8335 based PCI network +adapters.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +bm(4) driver has been added to provide support for Apple Big Mac (BMAC) Ethernet +controller, found on various Apple G3 models.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +et(4) driver has been added to provide support for Agere ET1310 10/100/Gigabit Ethernet +controller.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the +glxsb(4) driver +has been added to provide support for the Security Block in AMD Geode LX processors.

    + +

    [20090105] The Release Notes for 7.1-RELEASE should have mentioned that FreeBSD now +supports multiple routing tables. To enable this, the following steps are needed:

    + +
      +
    • +

      Add the following kernel configuration option and rebuild the kernel. The 2 is the number of FIB (Forward Information Base, synonym for a +routing table here). The maximum value is 16.

      + +
      +options    ROUTETABLES=2
+
      + +

      The procedure for rebuilding the FreeBSD kernel is described in the FreeBSD Handbook.

      + +

      This number can be modified on boot time. To do so, add the following to /boot/loader.conf and reboot the system:

      + +
      +net.fibs=6
+
      +
      • + +
    • +

      Set a loader tunable net.my_fibnum if needed. This means +the default number of routing tables. If not specified, 0 will +be used.

      +
      • + +
    • +

      Set a loader tunable net.add_addr_allfibs if needed. This +enables to add routes to all FIBs for new interfaces by default. When this is set to 0, it will only allocate routes on interface changes for the FIB of +the caller when adding a new set of addresses to an interface. Note that this tunable is +set to 1 by default.

      +
      • +
    + +

    To select one of the FIBs, the new +setfib(1) +utility can be used. This set an associated FIB with the process. For example:

    + +
    +# setfib -3 ping target.example.com
+
    + +

    The FIB #3 will be used for the +ping(8) +command.

    + +

    The FIB which the packet will be associated with will be determined in the following +rules:

    + +
      +
    • +

      All packets which have a FIB associated with them will use the FIB. If not, FIB #0 +will be used.

      +
      • + +
    • +

      A packet received on an interface for forwarding uses FIB #0.

      +
      • + +
    • +

      A TCP listen socket associated with an FIB will generate accept sockets which are +associated with the same FIB.

      +
      • + +
    • +

      A packet generated in response to other packet uses the FIB associated with the packet +being responded to.

      +
      • + +
    • +

      A packet generated on tunnel interfaces such as gif(4) and tun(4) will be +encapsulated using the FIB of the process which set up the tunnel.

      +
      • + +
    • +

      Routing messages will be associated with the process's FIB.

      +
      • +
    + +

    Also, the +ipfw(8) now +supports an action rule setfib. The following action:

    + +
    +setfib fibnum
+
    + +

    will make the matched packet use the FIB specified in fibnum. The rule processing continues at the next +rule.

    This file, and other release-related documents, can be -downloaded from ftp://ftp.FreeBSD.org/.

    +downloaded from http://www.FreeBSD.org/snapshots/.

    For questions about FreeBSD, read the documentation before contacting <questions@FreeBSD.org>.

    +

    All users of FreeBSD 7-STABLE should subscribe to the <stable@FreeBSD.org> mailing list.

    +

    For questions about this documentation, e-mail <doc@FreeBSD.org>.

    ==== //depot/projects/docproj_nl/www/en/releases/7.1R/hardware.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

    Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

    -

    $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/hardware/article.sgml -186206 2008-12-17 03:57:28Z murray $
    +

    $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/hardware/article.sgml 186206 2008-12-17 +03:57:28Z murray $

    @@ -3347,15 +3348,11 @@
    • -

      Broadcom NetXtreme II BCM5706 1000Base-SX

      -
      • - -

    • Broadcom NetXtreme II BCM5706 1000Base-T

    • -

      Broadcom NetXtreme II BCM5708 1000Base-SX

      +

      Broadcom NetXtreme II BCM5706 1000Base-SX

    • @@ -3363,15 +3360,7 @@
    • -

      Broadcom NetXtreme II BCM5709 1000Base-SX

      -
      • - -
    • -

      Broadcom NetXtreme II BCM5709 1000Base-T

      -
      • - -
    • -

      Broadcom NetXtreme II BCM5716 1000Base-T

      +

      Broadcom NetXtreme II BCM5708 1000Base-SX

    • ==== //depot/projects/docproj_nl/www/en/releases/7.1R/readme.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

      Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 The FreeBSD Documentation Project

      -

      $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/readme/article.sgml -171891 2007-08-18 17:11:14Z bmah $
      +

      $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/readme/article.sgml 171891 2007-08-18 17:11:14Z +bmah $

      ==== //depot/projects/docproj_nl/www/en/releases/7.1R/relnotes.html#2 (text+ko) ==== @@ -19,8 +19,9 @@

      Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

      -

      $FreeBSD: releng/7.1/release/doc/en_US.ISO8859-1/relnotes/article.sgml -186639 2008-12-31 06:27:09Z hrs $
      +

      $FreeBSD: +release/7.1.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml 186643 2008-12-31 +08:07:10Z hrs $

      @@ -146,7 +147,7 @@

      2.1 Security Advisories

      -

      Problems described in the following security advisories has been fixed. For more +

      Problems described in the following security advisories have been fixed. For more information, consult the individual advisories available from http://security.FreeBSD.org/.

      ==== //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -177,7 +177,7 @@ Announcement 13 October 2008 - -- + 5 January 2009 Announcement sent out after a majority of the mirrors have received the bits. ==== //depot/projects/docproj_nl/www/en/releases/index.sgml#5 (text+ko) ==== @@ -1,10 +1,10 @@ - + ]> - + &header; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 11:45:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CACD61065675; Mon, 5 Jan 2009 11:45: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 8987C106564A for ; Mon, 5 Jan 2009 11:45:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 786498FC12 for ; Mon, 5 Jan 2009 11:45:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05BjFl4087546 for ; Mon, 5 Jan 2009 11:45:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05BjFbO087544 for perforce@freebsd.org; Mon, 5 Jan 2009 11:45:15 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 5 Jan 2009 11:45:15 GMT Message-Id: <200901051145.n05BjFbO087544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155644 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, 05 Jan 2009 11:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=155644 Change 155644 by rene@rene_self on 2009/01/05 11:44:14 MFen handbook/introduction 1.131 -> 1.132 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#13 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.131 + %SRCID% 1.132 --> @@ -776,12 +776,14 @@ De RELENG_6 tak is gemaakt in juli 2005, de eerste uitgave van de 6.X tak werd vrijgegeven in november 2005. De meest recente &rel2.current;-RELEASE kwam uit op &rel2.current.date;. - Er staan nog andere versies gepland in de RELENG_6 tak. + Dit zal waarschijnlijk de laatste uitgave zijn van de 6.X + tak. - De RELENG_7 tak is gemaakt in oktober 2007. De recentste - uitgave van deze tak is &rel.current;-RELEASE, welke is - uitgekomen in &rel.current.date;. Er zullen nog andere uitgaven - van de RELENG_7 tak uitkomen. + De RELENG_7 tak is gemaakt in oktober 2007. De eerste + uitgave van deze tak is 7.0-RELEASE, welke is uitgekomen in + februari 2008. De meest recente &rel.current;-RELEASE kwam uit + in &rel.current.date;. Er zullen nog andere uitgaven van de + RELENG_7 tak uitkomen. Op dit moment vinden lange-termijn ontwikkelprojecten plaats in de 8.X-CURRENT tak, en snapshot uitgaven van 8.X op From owner-p4-projects@FreeBSD.ORG Mon Jan 5 15:34:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32EDC106566B; Mon, 5 Jan 2009 15:34: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 DD1CE106567D for ; Mon, 5 Jan 2009 15:34:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8B518FC13 for ; Mon, 5 Jan 2009 15:34:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05FY9AL018664 for ; Mon, 5 Jan 2009 15:34:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05FY9ig018662 for perforce@freebsd.org; Mon, 5 Jan 2009 15:34:09 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 5 Jan 2009 15:34:09 GMT Message-Id: <200901051534.n05FY9ig018662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 155654 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, 05 Jan 2009 15:34:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155654 Change 155654 by nwhitehorn@nwhitehorn_trantor on 2009/01/05 15:33:51 IFC Affected files ... .. //depot/projects/ppc-g5/ObsoleteFiles.inc#7 integrate .. //depot/projects/ppc-g5/contrib/file/AUTHORS#1 branch .. //depot/projects/ppc-g5/contrib/file/COPYING#1 branch .. //depot/projects/ppc-g5/contrib/file/ChangeLog#2 integrate .. //depot/projects/ppc-g5/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/file/INSTALL#1 branch .. //depot/projects/ppc-g5/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/ppc-g5/contrib/file/MAINT#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/apple#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/archive#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/audio#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/c64#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/clarion#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/commands#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/compress#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/console#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/database#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/diff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/dump#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/elf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/erlang#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/flash#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/frame#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/games#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/hp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/iff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/images#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/inform#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/java#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/kde#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/linux#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/llvm#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/lua#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/luks#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/mup#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/netware#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/os2#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/palm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/perl#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/printer#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/psion#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/revision#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/riff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/ruby#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/tex#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/troff#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/warc#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/weak#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/windows#1 branch .. //depot/projects/ppc-g5/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/ppc-g5/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/ppc-g5/contrib/file/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/Makefile.std#2 delete .. //depot/projects/ppc-g5/contrib/file/NEWS#1 branch .. //depot/projects/ppc-g5/contrib/file/PORTING#2 delete .. //depot/projects/ppc-g5/contrib/file/README#2 integrate .. //depot/projects/ppc-g5/contrib/file/TODO#1 branch .. //depot/projects/ppc-g5/contrib/file/acinclude.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/aclocal.m4#2 integrate .. //depot/projects/ppc-g5/contrib/file/apprentice.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/ascmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/asprintf.c#1 branch .. //depot/projects/ppc-g5/contrib/file/compile#1 branch .. //depot/projects/ppc-g5/contrib/file/compress.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.guess#1 branch .. //depot/projects/ppc-g5/contrib/file/config.h.in#2 integrate .. //depot/projects/ppc-g5/contrib/file/config.sub#1 branch .. //depot/projects/ppc-g5/contrib/file/configure#2 integrate .. //depot/projects/ppc-g5/contrib/file/configure.ac#1 branch .. //depot/projects/ppc-g5/contrib/file/configure.in#2 delete .. //depot/projects/ppc-g5/contrib/file/elfclass.h#1 branch .. //depot/projects/ppc-g5/contrib/file/file.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/file.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/fsmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/funcs.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/getopt_long.c#1 branch .. //depot/projects/ppc-g5/contrib/file/is_tar.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/libmagic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.man#2 integrate .. //depot/projects/ppc-g5/contrib/file/magic.mime#2 delete .. //depot/projects/ppc-g5/contrib/file/magic2mime#2 delete .. //depot/projects/ppc-g5/contrib/file/mkinstalldirs#2 delete .. //depot/projects/ppc-g5/contrib/file/mygetopt.h#1 branch .. //depot/projects/ppc-g5/contrib/file/names.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/patchlevel.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/print.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/readelf.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/softmagic.c#2 integrate .. //depot/projects/ppc-g5/contrib/file/tar.h#2 integrate .. //depot/projects/ppc-g5/contrib/file/test.c#2 delete .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/README#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/ppc-g5/contrib/file/tests/test.c#1 branch .. //depot/projects/ppc-g5/contrib/file/vasprintf.c#1 branch .. //depot/projects/ppc-g5/lib/libc/sys/socket.2#2 integrate .. //depot/projects/ppc-g5/lib/libelf/README#1 branch .. //depot/projects/ppc-g5/lib/libmagic/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/ppc-g5/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/ppc-g5/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ae.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/ppc-g5/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/domain.9#3 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_if.m#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofwvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/ppc-g5/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvscom2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/route.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#11 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#10 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#8 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/protosw.h#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.c#4 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/globals.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/job.c#4 integrate .. //depot/projects/ppc-g5/usr.bin/make/main.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/make.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/make/var.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.sh#4 integrate .. //depot/projects/ppc-g5/usr.sbin/pkg_install/add/pkg_add.1#2 integrate Differences ... ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/ppc-g5/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,4 +1,135 @@ -2007-12-28 15:06 Christos Zoulas +2008-08-30 12:54 Christos Zoulas + + * Don't eat trailing \n in magic enties. + + * Cast defines to allow compilation using a c++ compiler. + +2008-07-26 00:59 Reuben Thomas + + * Add MIME types for special files. + + * Use access to give more accurate information for files that + can't be opened. + + * Add a TODO list. + +2008-07-02 11:15 Christos Zoulas + + * add !:strength op to adjust magic strength (experimental) + +2008-06-16 21:41 Reuben Thomas + + * Fix automake error in configure.ac. + + * Add MIME type for Psion Sketch files. + +2008-06-05 08:59 Christos Zoulas + + * Don't print warnings about bad namesize in stripped + binaries with PT_NOTE is still there, and the actual + note is gone (Jakub Jelinek) + +2008-05-28 15:12 Robert Byrnes + + * magic/Magdir/elf: + Note invalid byte order for little-endian SPARC32PLUS. + Add SPARC V9 vendor extensions and memory model. + + * src/elfclass.h: + Pass target machine to doshn (for Solaris hardware capabilities). + + * src/readelf.c (doshn): + Add support for Solaris hardware/software capabilities. + + * src/readelf.h: + Ditto. + + * src/vasprintf.c (dispatch): + Add support for ll modifier. + +2008-05-16 10:25 Christos Zoulas + + * Fix compiler warnings. + + * remove stray printf, and fix a vprintf bug. (Martin Dorey) + +2008-05-06 00:13 Robert Byrnes + + * src/Makefile.am: + Ensure that getopt_long and [v]asprintf are included in libmagic, + as needed. + + Remove unnecessary EXTRA_DIST. + + * src/Makefile.in: + Rerun automake. + + * src/vasprintf.c (dispatch): + Fix variable precision bug: be sure to step past '*'. + + * src/vasprintf.c (core): + Remove unreachable code. + + * src/apprentice.c (set_test_type): + Add cast to avoid compiler warning. + +2008-04-22 23:45 Christos Zoulas + + * Add magic submission guidelines (Abel Cheung) + + * split msdos and windows magic (Abel Cheung) + +2008-04-04 11:00 Christos Zoulas + + * >= <= is not supported, so fix the magic and warn about it. + reported by: Thien-Thi Nguyen + +2008-03-27 16:16 Robert Byrnes + + * src/readelf.c (donote): + ELF core file command name/line bug fixes and enhancements: + + Try larger offsets first to avoid false matches + from earlier data that happen to look like strings; + this primarily affected SunOS 5.x 32-bit Intel core files. + + Add support for command line (instead of just short name) + for SunOS 5.x. + + Add information about NT_PSINFO for SunOS 5.x. + + Only trim whitespace from end of command line. + +2007-02-11 01:36 Reuben Thomas + + * Change strength of ! from MULT to 0, as it matches almost + anything (Reuben Thomas) + + * Debian fixes (Reuben Thomas) + +2007-02-11 00:17 Reuben Thomas + + * Clarify UTF-8 BOM message (Reuben Thomas) + + * Add HTML comment to token list in names.h + +2007-02-04 15:50 Christos Zoulas + + * Debian fixes (Reuben Thomas) + +2007-02-04 11:31 Christos Zoulas + + * !:mime annotations in magic files (Reuben Thomas) + +2007-01-29 15:35 Christos Zoulas + + * zero out utime/utimes structs (Gavin Atkinson) + +2007-01-26 13:45 Christos Zoulas + + * reduce writable data from Diego "Flameeyes" Petten + +2007-12-28 15:06 Christos Zoulas * strtof detection @@ -6,7 +137,7 @@ * better mismatch version message -2007-12-27 11:35 Christos Zoulas +2007-12-27 11:35 Christos Zoulas * bring back some fixes from OpenBSD @@ -14,46 +145,46 @@ * fix gcc warnings -2007-12-01 19:55 Christos Zoulas +2007-12-01 19:55 Christos Zoulas * make sure we have zlib.h and libz to compile the builtin decompress code -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * float and double magic support (Behan Webster) -2007-10-28 20:48 Christos Zoulas +2007-10-28 20:48 Christos Zoulas * Convert fortran to a soft test (Reuben Thomas) -2007-10-23 5:25 Christos Zoulas +2007-10-23 5:25 Christos Zoulas * Add --with-filename, and --no-filename (Reuben Thomas) -2007-10-23 3:59 Christos Zoulas +2007-10-23 3:59 Christos Zoulas * Rest of the mime split (Reuben Thomas) * Make usage message generated from the flags so that they stay consistent (Reuben Thomas) -2007-10-20 3:06 Christos Zoulas +2007-10-20 3:06 Christos Zoulas * typo in comment, missing ifdef QUICK, remove unneeded code (Charles Longeau) -2007-10-17 3:33 Christos Zoulas +2007-10-17 3:33 Christos Zoulas * Fix problem printing -\012 in some entries * Separate magic type and encoding flags (Reuben Thomas) -2007-10-09 3:55 Christos Zoulas +2007-10-09 3:55 Christos Zoulas * configure fix for int64 and strndup (Reuben Thomas) -2007-09-26 4:45 Christos Zoulas +2007-09-26 4:45 Christos Zoulas * Add magic_descriptor() function. @@ -62,7 +193,7 @@ * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson) -2007-08-19 6:30 Christos Zoulas +2007-08-19 6:30 Christos Zoulas * Make mime format consistent so that it can be easily parsed: @@ -79,38 +210,38 @@ This work was done by Reuben Thomas -2007-05-24 10:00 Christos Zoulas +2007-05-24 10:00 Christos Zoulas * Fix another integer overflow (Colin Percival) -2007-03-26 13:58 Christos Zoulas +2007-03-26 13:58 Christos Zoulas * make sure that all of struct magic_set is initialized appropriately (Brett) -2007-03-25 17:44 Christos Zoulas +2007-03-25 17:44 Christos Zoulas * reset left bytes in the buffer (Dmitry V. Levin) * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS (Peter Avalos) -2007-03-15 10:51 Christos Zoulas +2007-03-15 10:51 Christos Zoulas * fix fortran and nroff reversed tests (Dmitry V. Levin) * fix exclude option (Dmitry V. Levin) -2007-02-08 17:30 Christos Zoulas +2007-02-08 17:30 Christos Zoulas * fix integer underflow in file_printf which can lead to to exploitable heap overflow (Jean-Sebastien Guay-Lero) -2007-02-05 11:35 Christos Zoulas +2007-02-05 11:35 Christos Zoulas * make socket/pipe reading more robust -2007-01-25 16:01 Christos Zoulas +2007-01-25 16:01 Christos Zoulas * Centralize all the tests in file_buffer. @@ -184,7 +315,7 @@ * make file.c compile with gcc warnings and pass lint -2006-12-11 16:49 Christos Zoulas +2006-12-11 16:49 Christos Zoulas * fix byteswapping issue @@ -193,7 +324,7 @@ * add a few missed cases in the strength routine -2006-12-08 16:32 Christos Zoulas +2006-12-08 16:32 Christos Zoulas * store and print the line number of the magic entry for debugging. @@ -210,7 +341,7 @@ * propagate the error return from match to file_softmagic. -2006-11-25 13:35 Christos Zoulas +2006-11-25 13:35 Christos Zoulas * Don't store the current offset in the magic struct, because it needs to be restored and @@ -221,12 +352,12 @@ print it as an additional separator; print it as the only separator. -2006-11-17 10:51 Christos Zoulas +2006-11-17 10:51 Christos Zoulas * Added a -0 option to print a '\0' separator Etienne Buira -2006-10-31 15:14 Christos Zoulas +2006-10-31 15:14 Christos Zoulas * Check offset before copying (Mike Frysinger) @@ -242,7 +373,7 @@ * use calloc to initialize the ascii buffers (Jos van den Oever) -2006-06-08 11:11 Christos Zoulas +2006-06-08 11:11 Christos Zoulas * QNX fixes (Mike Gorchak) @@ -256,7 +387,7 @@ * Magic format function improvent (Karl Chen) -2006-05-03 11:11 Christos Zoulas +2006-05-03 11:11 Christos Zoulas * Pick up some elf changes and some constant fixes from SUSE @@ -264,13 +395,13 @@ * When keep going, don't print spurious newlines (Radek Vokál) -2006-04-01 12:02 Christos Zoulas +2006-04-01 12:02 Christos Zoulas * Use calloc instead of malloc (Mike Frysinger) * Fix configure script to detect wctypes.h (Mike Frysinger) -2006-03-02 16:06 Christos Zoulas +2006-03-02 16:06 Christos Zoulas * Print empty if the file is (Mike Frysinger) @@ -278,21 +409,21 @@ * Sort magic entries by strength [experimental] -2005-11-29 13:26 Christos Zoulas +2005-11-29 13:26 Christos Zoulas * Use iswprint() to convert the output string. (Bastien Nocera) -2005-10-31 8:54 Christos Zoulas +2005-10-31 8:54 Christos Zoulas * Fix regression where the core info was not completely processed (Radek Vokál) -2005-10-20 11:15 Christos Zoulas +2005-10-20 11:15 Christos Zoulas * Middle Endian magic (Diomidis Spinellis) -2005-10-17 11:15 Christos Zoulas +2005-10-17 11:15 Christos Zoulas * Open with O_BINARY for CYGWIN (Corinna Vinschen) @@ -300,39 +431,39 @@ * Look for note sections in non executables. -2005-09-20 13:33 Christos Zoulas +2005-09-20 13:33 Christos Zoulas * Don't print SVR4 Style in core files multiple times (Radek Vokál) -2005-08-27 04:09 Christos Zoulas +2005-08-27 04:09 Christos Zoulas * Cygwin changes Corinna Vinschen -2005-08-18 09:53 Christos Zoulas +2005-08-18 09:53 Christos Zoulas * Remove erroreous mention of /etc/magic in the file man page This is gentoo bug 101639. (Mike Frysinger) * Cross-compile support and detection (Mike Frysinger) -2005-08-12 10:17 Christos Zoulas +2005-08-12 10:17 Christos Zoulas * Add -h flag and dereference symlinks if POSIXLY_CORRECT is set. -2005-07-29 13:57 Christos Zoulas +2005-07-29 13:57 Christos Zoulas * Avoid search and regex buffer overflows (Kelledin) -2005-07-12 11:48 Christos Zoulas +2005-07-12 11:48 Christos Zoulas * Provide stub implementations for {v,}nsprintf() for older OS's that don't have them. * Change mbstate_t autoconf detection macro from AC_MBSTATE_T to AC_TYPE_MBSTATE_T. -2005-06-25 11:48 Christos Zoulas +2005-06-25 11:48 Christos Zoulas * Dynamically allocate the string buffers and make the default read size 256K. @@ -361,43 +492,43 @@ With CRLF, the line length was not computed correctly, and even lines of length MAXLINELEN - 1 were treated as ``very long''. -2004-12-07 14:15 Christos Zoulas +2004-12-07 14:15 Christos Zoulas * bzip2 needs a lot of input buffer space on some files before it can begin uncompressing. This makes file -z fail on some bz2 files. Fix it by giving it a copy of the file descriptor to read as much as it wants if we - have access to it. + have access to it. -2004-11-24 12:39 Christos Zoulas +2004-11-24 12:39 Christos Zoulas * Stack smash fix, and ELF more conservative reading. Jakub Bogusz -2004-11-20 18:50 Christos Zoulas +2004-11-20 18:50 Christos Zoulas * New FreeBSD version parsing code: Jon Noack - * Hackish support for ucs16 strings + * Hackish support for ucs16 strings -2004-11-13 03:07 Christos Zoulas +2004-11-13 03:07 Christos Zoulas * print the file name and line number in syntax errors. -2004 10-12 10:50 Christos Zoulas +2004 10-12 10:50 Christos Zoulas * Fix stack overwriting on 0 length strings: Tim Waugh Ned Ludd -2004-09-27 11:30 Christos Zoulas +2004-09-27 11:30 Christos Zoulas * Remove 3rd and 4th copyright clause; approved by Ian Darwin. * Fix small memory leaks; caught by: Tamas Sarlos -2004-07-24 16:33 Christos Zoulas +2004-07-24 16:33 Christos Zoulas * magic.mime update Danny Milosavljevic @@ -407,19 +538,19 @@ * errors reading elf magic Jakub Bogusz -2004-04-12 10:55 Christos Zoulas +2004-04-12 10:55 Christos Zoulas * make sure that magic formats match magic types during compilation * fix broken sgi magic file -2004-04-06 20:36 Christos Zoulas +2004-04-06 20:36 Christos Zoulas * detect present of mbstate_t Petter Reinholdtsen * magic fixes -2004-03-22 15:25 Christos Zoulas +2004-03-22 15:25 Christos Zoulas * Lots of mime fixes (Joerg Ostertag) @@ -428,7 +559,7 @@ (Edwin Groothuis) * correct cleanup in all cases; don't just close the file. - (Christos Zoulas) + (Christos Zoulas) * add gettext message catalogue support (Michael Piefel) @@ -446,37 +577,37 @@ or name and description note sizes. Reported by (Mikael Magnusson) -2004-03-09 13:55 Christos Zoulas +2004-03-09 13:55 Christos Zoulas * Fix possible memory leak on error and add missing regfree (Dmitry V. Levin) -2003-12-23 12:12 Christos Zoulas +2003-12-23 12:12 Christos Zoulas * fix -k flag (Maciej W. Rozycki) -2003-11-18 14:10 Christos Zoulas +2003-11-18 14:10 Christos Zoulas * Try to give us much info as possible on corrupt elf files. (Willy Tarreau) * Updated python bindings (Brett Funderburg) -2003-11-11 15:03 Christos Zoulas +2003-11-11 15:03 Christos Zoulas * Include file.h first, because it includes config.h breaks largefile test macros otherwise. (Paul Eggert via Lars Hecking ) -2003-10-14 21:39 Christos Zoulas +2003-10-14 21:39 Christos Zoulas * Python bindings (Brett Funderburg) * Don't lookup past the end of the buffer (Chad Hanson) * Add MAGIC_ERROR and api on magic_errno() -2003-10-08 12:40 Christos Zoulas +2003-10-08 12:40 Christos Zoulas * handle error conditions from compile as fatal (Antti Kantee) @@ -486,32 +617,32 @@ * describe magic file handling (Bryan Henderson) -2003-09-12 15:09 Christos Zoulas +2003-09-12 15:09 Christos Zoulas * update magic files. * remove largefile support from file.h; it breaks things on most OS's -2003-08-10 10:25 Christos Zoulas +2003-08-10 10:25 Christos Zoulas * fix unmapping'ing of mmaped files. -2003-07-10 12:03 Christos Zoulas +2003-07-10 12:03 Christos Zoulas * don't exit with -1 on error; always exit 1 (Marty Leisner) * restore utimes code. -2003-06-10 17:03 Christos Zoulas +2003-06-10 17:03 Christos Zoulas * make sure we don't access uninitialized memory. * pass lint * #ifdef __cplusplus in magic.h -2003-05-25 19:23 Christos Zoulas +2003-05-25 19:23 Christos Zoulas * rename cvs magic file to revision to deal with case insensitive filesystems. -2003-05-23 17:03 Christos Zoulas +2003-05-23 17:03 Christos Zoulas * documentation fixes from Michael Piefel * magic fixes (various) @@ -521,30 +652,30 @@ close files Maciej W. Rozycki +2003-04-21 20:12 Christos Zoulas * fix zsh magic -2003-04-04 16:59 Christos Zoulas +2003-04-04 16:59 Christos Zoulas * fix operand sort order in string. -2003-04-02 17:30 Christos Zoulas +2003-04-02 17:30 Christos Zoulas * cleanup namespace in magic.h -2003-04-02 13:50 Christos Zoulas +2003-04-02 13:50 Christos Zoulas * Magic additions (Alex Ott) * Fix bug that broke VPATH compilation (Peter Breitenlohner) -2003-03-28 16:03 Christos Zoulas +2003-03-28 16:03 Christos Zoulas * remove packed attribute from magic struct. * make the magic struct properly aligned. * bump version number of compiled files to 2. -2003-03-27 13:10 Christos Zoulas +2003-03-27 13:10 Christos Zoulas * separate tar detection and run it before softmagic. * fix reversed symlink test. @@ -552,7 +683,7 @@ * make separator a string instead of a char. * update manual page and sort options. -2003-03-26 11:00 Christos Zoulas +2003-03-26 11:00 Christos Zoulas * Pass lint * make NULL in magic_file mean stdin ==== //depot/projects/ppc-g5/contrib/file/MAINT#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$File: MAINT,v 1.9 2007/01/19 21:15:27 christos Exp $ +$File: MAINT,v 1.10 2008/02/05 19:08:11 christos Exp $ Maintenance notes: @@ -41,5 +41,4 @@ readelf.c file_tryelf() "unknown" -Christos Zoulas -christos@astron.com +Christos Zoulas (see README for email address) ==== //depot/projects/ppc-g5/contrib/file/Magdir/adventure#2 (text+ko) ==== @@ -73,3 +73,13 @@ >10 belong 0x0A0D1A00 >>14 string >\0 %s saved game data +# Danny Milosavljevic +# this are adrift (adventure game standard) game files, extension .taf +# depending on version magic continues with 0x93453E6139FA (V 4.0) +# 0x9445376139FA (V 3.90) +# 0x9445366139FA (V 3.80) +# this is from source (http://www.adrift.org.uk/) and I have some taf +# files, and checked them. +#0 belong 0x3C423FC9 +#>4 belong 0x6A87C2CF Adrift game file +#!:mime application/x-adrift ==== //depot/projects/ppc-g5/contrib/file/Magdir/animation#2 (text+ko) ==== @@ -8,57 +8,78 @@ # SGI and Apple formats 0 string MOVI Silicon Graphics movie file +!:mime video/x-sgi-movie 4 string moov Apple QuickTime +!:mime video/quicktime >12 string mvhd \b movie (fast start) >12 string mdra \b URL >12 string cmov \b movie (fast start, compressed header) >12 string rmra \b multiple URLs 4 string mdat Apple QuickTime movie (unoptimized) -4 string wide Apple QuickTime movie (unoptimized) -4 string skip Apple QuickTime movie (modified) -4 string free Apple QuickTime movie (modified) +!:mime video/quicktime +#4 string wide Apple QuickTime movie (unoptimized) +#!:mime video/quicktime +#4 string skip Apple QuickTime movie (modified) +#!:mime video/quicktime +#4 string free Apple QuickTime movie (modified) +#!:mime video/quicktime 4 string idsc Apple QuickTime image (fast start) -4 string idat Apple QuickTime image (unoptimized) +!:mime image/x-quicktime +#4 string idat Apple QuickTime image (unoptimized) +#!:mime image/x-quicktime 4 string pckg Apple QuickTime compressed archive +!:mime application/x-quicktime-player 4 string/B jP JPEG 2000 image +!:mime image/jp2 4 string ftyp ISO Media >8 string isom \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string iso2 \b, MPEG v4 system, part 12 revision >8 string mp41 \b, MPEG v4 system, version 1 +!:mime video/mp4 >8 string mp42 \b, MPEG v4 system, version 2 +!:mime video/mp4 >8 string mp7t \b, MPEG v4 system, MPEG v7 XML >8 string mp7b \b, MPEG v4 system, MPEG v7 binary XML >8 string/B jp2 \b, JPEG 2000 +!:mime image/jp2 >8 string 3gp \b, MPEG v4 system, 3GPP +!:mime video/3gpp >>11 byte 4 \b v4 (H.263/AMR GSM 6.10) >>11 byte 5 \b v5 (H.263/AMR GSM 6.10) >>11 byte 6 \b v6 (ITU H.264/AMR GSM 6.10) >8 string mmp4 \b, MPEG v4 system, 3GPP Mobile +!:mime video/mp4 >8 string avc1 \b, MPEG v4 system, 3GPP JVT AVC +!:mime video/3gpp >8 string/B M4A \b, MPEG v4 system, iTunes AAC-LC +!:mime audio/mp4 +>8 string/B M4V \b, MPEG v4 system, iTunes AVC-LC +!:mime video/mp4 >8 string/B M4P \b, MPEG v4 system, iTunes AES encrypted >8 string/B M4B \b, MPEG v4 system, iTunes bookmarked >8 string/B qt \b, Apple QuickTime movie >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 15:46:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C44801065673; Mon, 5 Jan 2009 15:46:22 +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 84BB2106566B for ; Mon, 5 Jan 2009 15:46:22 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 729438FC14 for ; Mon, 5 Jan 2009 15:46:22 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05FkMfr019780 for ; Mon, 5 Jan 2009 15:46:22 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05FkMbl019778 for perforce@freebsd.org; Mon, 5 Jan 2009 15:46:22 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 5 Jan 2009 15:46:22 GMT Message-Id: <200901051546.n05FkMbl019778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 155656 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, 05 Jan 2009 15:46:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=155656 Change 155656 by nwhitehorn@nwhitehorn_trantor on 2009/01/05 15:46:15 Adapt the CPC 9xx PCI driver to the new icell-independent interrupt map interface. As a status update on this project, we now boot SMP inside the Mambo simulator, and I don't know of any bugs at this time. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#11 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#11 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -317,7 +317,7 @@ cpcpci_attach(device_t dev) { struct cpcpci_softc *sc; - phandle_t node, iparent; + phandle_t node; u_int32_t reg[2], busrange[2], config_base; struct cpcpci_range *rp, *io, *mem[2]; struct cpcpci_range fakeio; @@ -414,12 +414,6 @@ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); - /* We need the number of interrupt cells to read the imap */ - sc->sc_icells = 2; - if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0) - OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, - sizeof(sc->sc_icells)); - device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); @@ -611,15 +605,14 @@ { struct cpcpci_softc *sc; struct ofw_pci_register reg; - uint32_t pintr, mintr[2]; + uint32_t pintr, mintr; uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; sc = device_get_softc(bus); pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, - sizeof(reg), &pintr, sizeof(pintr), &mintr, - sizeof(mintr[0])*sc->sc_icells, maskbuf)) - return (mintr[0]); + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) + return (mintr); /* Maybe it's a real interrupt, not an intpin */ if (pin > 4) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2002 Benno Rice. + * Copyright (C) 2008 Nathan Whitehorn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -53,7 +53,6 @@ bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; struct ofw_bus_iinfo sc_pci_iinfo; - int sc_icells; }; #endif /* _POWERPC_POWERMAC_CPCHTVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jan 5 17:51:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A89C71065672; Mon, 5 Jan 2009 17:51: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 6128F106566C for ; Mon, 5 Jan 2009 17:51:30 +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 4D7708FC20 for ; Mon, 5 Jan 2009 17:51:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05HpTv6049975 for ; Mon, 5 Jan 2009 17:51:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05HpTcS049973 for perforce@freebsd.org; Mon, 5 Jan 2009 17:51:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 5 Jan 2009 17:51:29 GMT Message-Id: <200901051751.n05HpTcS049973@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 155662 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, 05 Jan 2009 17:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=155662 Change 155662 by hselasky@hselasky_laptop001 on 2009/01/05 17:51:08 Integrate latest USB changes in -current. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_fw.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_reg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#10 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#10 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_3g/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#4 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#25 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.2 2008/11/19 08:56:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#17 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.6 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.7 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.4 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#13 (text) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.4 2009/01/03 14:33:48 marius Exp $"); /* * USB Open Host Controller driver. @@ -211,6 +211,13 @@ pci_enable_busmaster(self); + /* + * Some Sun PCIO-2 USB controllers have their intpin register + * bogusly set to 0, although it should be 4. Correct that. + */ + if (pci_get_devid(self) == 0x1103108e && pci_get_intpin(self) == 0) + pci_set_intpin(self, 4); + rid = PCI_CBMEM; sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /* * USB Universal Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uhci2.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uhci2.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.3 2008/12/23 17:36:25 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.5 2008/12/23 17:36:25 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.4 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#45 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#18 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#44 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.6 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.7 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.c,v 1.2 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.c,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#38 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.h,v 1.3 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#28 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.6 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.h,v 1.3 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.h,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#10 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_axe2.c,v 1.4 2008/12/23 19:59:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_axe2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. Used in the ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb2/ethernet/if_axe2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ + * $FreeBSD: src/sys/dev/usb2/ethernet/if_axe2_reg.h,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#13 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/image/uscanner2.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/image/uscanner2.c,v 1.4 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/usb/src/sys/dev/usb2/include/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#20 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#20 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/include/usb2_ioctl.h,v 1.2 2008/11/19 08:56:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/include/usb2_ioctl.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/include/usb2_standard.h,v 1.2 2008/11/25 08:04:40 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/include/usb2_standard.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#11 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#4 (text+ko) ==== @@ -16,7 +16,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/usb/u3g.c,v 1.20 2008/11/13 21:49:07 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb2/serial/u3g2.c,v 1.2 2009/01/04 00:12:01 alfred Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#17 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#15 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uchcom2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uchcom2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * driver for WinChipHead CH341/340, the worst USB-serial chip in the world. ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#14 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uftdi2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uftdi2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /* * NOTE: all function names beginning like "uftdi_cfg_" can only ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#18 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#12 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#15 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#15 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uplcom2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uplcom2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#19 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#13 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#14 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: usb/uvscom.c,v 1.1 2002/03/19 15:08:42 augustss Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uvscom2.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/serial/uvscom2.c,v 1.6 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#23 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/usb2/sound/uaudio2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/sound/uaudio2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#12 (text) ==== ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $"); /*- * Copyright (c) 1999 MAEKAWA Masahide , @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb2/storage/umass2.c,v 1.5 2009/01/04 00:12:01 alfred Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ ==== //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#13 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 5 21:27:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A51B210656FD; Mon, 5 Jan 2009 21:27: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 54D7010656F6 for ; Mon, 5 Jan 2009 21:27:18 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40BDC8FC23 for ; Mon, 5 Jan 2009 21:27:18 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05LRIrs093552 for ; Mon, 5 Jan 2009 21:27:18 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05LRIPU093550 for perforce@freebsd.org; Mon, 5 Jan 2009 21:27:18 GMT (envelope-from remko@freebsd.org) Date: Mon, 5 Jan 2009 21:27:18 GMT Message-Id: <200901052127.n05LRIPU093550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 155680 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, 05 Jan 2009 21:27:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=155680 Change 155680 by remko@remko_nakur on 2009/01/05 21:27:08 Import WIP version that I did at the Snow HQ today. Facilitated by: Snow B.V. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#14 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSD$ %SOURCE% en_US.ISO8859-1/books/faq/book.sgml - %SRCID% 1.1078 + %SRCID% 1.1104 --> 2006 2007 2008 + 2009 The &os; Dutch Documentation Project @@ -372,12 +373,12 @@ &os.current; + url="&url.books.handbook;/cutting-stable.html#CURRENT">&os.current; is de ontwikkel versie van het besturingssysteem, welke over enige tijd de nieuwe &os.stable; tak wordt. Hierdoor is het eigenlijk alleen interessant voor ontwikkelaars die aan het systeem werken, en voor die-hard hobbyisten. Ze de relevante sectie + url="&url.books.handbook;/cutting-stable.html#CURRENT">relevante sectie in het handboek voor details over het draaien van @@ -663,15 +664,9 @@ Het project produceert een grote verscheidenheid aan documentatie welke online beschikbaar is via de volgende link . Deze - documenten zijn beschikbaar als pakket, zodat het makkelijk - geïnstalleerd kan worden op het &os; systeem. Meer - details over documentatie pakketten kan gevonden worden - in de volgende paragraven. - - Daarnaast refereren de bibliografie aan het - eind van deze FAQ en . Daarnaast + is er de bibliografie + aan het eind van deze FAQ en de versie in het handbook naar andere aangeraden boeken. @@ -911,17 +906,7 @@ rtf - Microsoft's Rich Text Format - Pagina nummers worden niet automatisch - geupdate wanneer ze worden ingeladen in - Word. Druk op CTRLA, - CTRLEND, - F9 nadat het document geladen - is om de pagina nummering te updaten. - - + Microsoft's Rich Text Format @@ -932,6 +917,16 @@ + + + Page numbers are not automatically updated when + loading Rich Text Format into Word. Press CtrlA, + CtrlEnd, + F9 after loading the document, to + update the page numbers. + @@ -982,8 +977,8 @@ bz2 - Het BZip2 formaat. Minder verspreid - dan Zip, maar levert gemiddeld kleinere + Het bzip2 formaat. Minder verspreid + dan zip, maar levert gemiddeld kleinere betanden. Installeer de archivers/bzip2 port om deze bestanden te @@ -1174,6 +1169,12 @@ kan meer informatie krijgen op de web site. + BSD Certification Group, Inc. provides system + administration certifications for DragonFly BSD, &os;, NetBSD, + OpenBSD. If you are interested in them, visit their site. + + Elke andere organisatie die training en ondersteuning aanbied, zou het project moeten informeren om hier ook vermeld te worden. @@ -1524,362 +1525,384 @@ laptop &os; niet kan opstarten en waar het mogelijk is om de BIOS te upgraden of downgraden. - If you have an earlier BIOS, and upgrading is not an - option, a workaround is to install &os;, change the partition - ID &os; uses, and install new boot blocks that can handle - the different partition ID. + Als je een eerdere BIOS hebt, en upgraden is geen + optie is er nog een workaround om &os; te installeren, + verander het partitie ID dat &os; gebruikt en installeer + de nieuwe opstart blokken zodat deze overweg kan met + een ander partitie ID. - First, you will need to restore the machine to a state - where it can get through its self-test screen. Doing this - requires powering up the machine without letting it find a - &os; partition on its primary disk. One way is to remove - the hard disk and temporarily move it to an older ThinkPad - (such as a ThinkPad 600) or a desktop PC with an appropriate - conversion cable. Once it is there, you can delete the &os; - partition and move the hard disk back. The ThinkPad should - now be in a bootable state again. + Als eerste moet de machine in een staat worden + teruggebracht waardoor het door zijn zelf-test scherm + heen komt. Om dit te doen moet de machine aangezet worden + zonder dat het een &os; parititie kan vinden op de primaire + schijf. Één mogelijkheid is om de harde + schijf te verwijderen en deze tijdelijk in een oudere + ThinkPad (zoals de ThinkPad 600) stoppen of in een + desktop PC met een juiste conversie kabel. Zodra deze + er is kun je de &os; partitie verwijderen en de harde + schijf terugzetten. De ThinkPAd zou nu weer opstartbaar + moeten zijn. - With the machine functional again, you can use the - workaround procedure described here to get a working &os; - installation. + Als de machine wederom functioneel is, kan de + workaround procedure die hier beschreven is gebruikt + worden om een werkende &os; installatie te krijgen: - Download boot1 and - boot2 from Download boot1 en + boot2 van . - Put these files somewhere you will be able to retrieve - them later. + Plaats deze bestanden ergens zodat ze later nog opgehaald + kunnen worden. - Install &os; as normal on to the ThinkPad. - Do not use Dangerously - Dedicated mode. Do not - reboot when the install has finished. + Installeer &os; zoals normaal op de ThinkPad. + Maak geen gebruik van de + Dangerously Dedicated mode. + Herstart niet nadat de installatie + voltooid is. - Either switch to the Emergency Holographic - Shell (AltF4) - or start a fixit shell. + Wissel of naar de Emergency Holographic + Shell ( + AltF4) + of start een fixit shell. - Use &man.fdisk.8; to change the &os; partition ID - from 165 to 166 - (this is the type used by OpenBSD). + Gebruik &man.fdisk.8; om de &os; parititie ID + van 165 naar 166 + te wijzigen (dit is het type dat gebruikt wordt door + OpenBSD). - Bring the boot1 and - boot2 files to the local file - system. + Haal de boot1 en + boot2 bestanden naar het lokale + bestandssysteem. - Use &man.disklabel.8; to write - boot1 and boot2 - to your &os; slice. + Gebruik &man.disklabel.8; om + boot1 en boot2 + naar de &os; partitie te schrijven. &prompt.root; disklabel -B -b boot1 -s boot2 ad0sn - n is the number of the - slice where you installed &os;. + n is het nummer van de + partitie waarop &os; geïnstalleerd is. - Reboot. At the boot prompt you will be given the - option of booting OpenBSD. This will - actually boot &os;. + Reboot. Op de boot prompt wordt de optie getoond + om OpenBSD op te starten. + Uiteindelijk zal dit &os; opstarten. - Getting this to work in the case where you want to dual - boot OpenBSD and &os; on the same laptop is left as an - exercise for the reader. + Om zowel OpenBSD als &os; op te kunnen starten, zult u + zelf één en ander moeten uitzoeken en + proberen. - Can I install on a disk with bad blocks? + Kan ik een installatie doen op een schijf met + bad blocks? - You can, but it is a bad idea. + Ja dit kan, maar het is een slecht idee. - If you are seeing bad block errors with a modern IDE - drive, chances are the drive is going to die very soon (the - drive's internal remapping functions are no longer - sufficient to fix the bad blocks, which means the disk is - heavily corrupted); we suggest you buy a new hard - drive. + Als je bad block errors ziet op een + moderne IDE schijf, is de kans groot dat deze spoedig + stuk gaat (de interne herstel functies van de schijf zijn + niet langer in staat om de bad blocks te repareren wat + betekend dat de disk ernstig corrupt is); we raden aan + dat u een nieuwe harde schijf koopt. - If you have a SCSI drive with bad blocks, see this answer. + Als u een SCSI schijf heeft met bad blocks zie dan + dit antwoord. - Strange things happen when I boot the install floppy! - What is happening? + Er gebeuren rare dingen wanneer ik opstart met de + installatie floppy. Wat is er aan de hand? - If you are seeing things like the machine grinding to a - halt or spontaneously rebooting when you try to boot the - install floppy, here are three questions to ask - yourself: + Als u dingen ziet zoals dat de machine krakend en + piepend tot stilstand komt, of spontaan herstart wanneer + u start met de installatie floppy, zijn er drie vragen die + u zichzelf moet stellen: - Did you use a new, freshly-formatted, error-free - floppy (preferably a brand-new one straight out of the - box, as opposed to the magazine cover disk that has been - lying under the bed for the last three years)? + Heeft u een nieuwe, vers geformatteerde, error-vrije + floppy gebruikt (bij voorkeur een hele nieuwe direct uit + het doosje, in tegenstelling tot de boekenlegger die al + jaren onder bed ligt)? - Did you download the floppy image in binary (or - image) mode? (do not be embarrassed, even the best of us - have accidentally downloaded a binary file in ASCII mode - at least once!) + Heeft u de floppy bestanden gedownload in binary + (of image) mode? (Geneer u niet, zelfs de besten van ons + hebben per ongeluk een binair bestand gedownload in + ASCII mode!) - If you are using &windows; 95 or - &windows; 98 did you run fdimage - or rawrite in pure DOS mode? These - operating systems can interfere with programs that write - directly to hardware, which the disk creation program - does; even running it inside a DOS shell in the GUI can - cause this problem. + Als u gebruik maakt van &windows; 95 of + &windows; 98 heeft u dan gebruik gemaakt van + fdimage of rawrite + in pure DOS mode? Deze besturingssystemen kunnen + invloed hebben op programma's die direct schrijven + naar de hardware, welke het disk creatie programma + gebruikt; zelfs het draaien in een DOS shell vanuit + de GUI kan problemen veroorzaken. - There have also been reports of &netscape; causing - problems when downloading the boot floppy, so it is probably - best to use a different FTP client if you can. + Er zijn ook rapporten van &netscape; welke problemen + geeft wanneer de opstart floppy's gedownload worden, dus + het is waarschijnlijk slim om een andere FTP cliënt + te gebruiken waar mogelijk. - I booted from my ATAPI CD-ROM, but the install program - says no CD-ROM is found. Where did it go? + Ik ben opgestart vanaf mijn ATAPI CD-ROM, maar het + installatie programma zegt dat er geen CD-ROM is + gevonden. Waar is deze heen? - The usual cause of this problem is a mis-configured - CD-ROM drive. Many PCs now ship with the CD-ROM as the slave - device on the secondary IDE controller, with no master - device on that controller. This is illegal according to the - ATAPI specification, but &windows; plays fast and loose with - the specification, and the BIOS ignores it when booting. - This is why the BIOS was able to see the CD-ROM to boot from - it, but why &os; cannot see it to complete the - install. + De meest voorkomende oorzaak van dit probleem is een + foutief geconfigureerde CD-ROM drive. De meeste PC's + worden nu verscheept met de CD-ROM speler als het slaaf + apparaat op de tweede IDE controller zonder master + apparaat op de controller. Dit mag eigenlijk niet vanuit de + ATAPI specificatie, maar &windows; speelt met deze + specificatie, en de BIOS negeert dit wanneer er wordt + opgestart. Dit is de reden waarom het BIOS in staat was om + de CD-ROM te zien waarvanaf opgestart moest worden, maar + ook waarom &os; deze niet kan zien om de installatie af te + maken. - Reconfigure your system so that the CD-ROM is either the - master device on the IDE controller it is attached to, or - make sure that it is the slave on an IDE controller that - also has a master device. + Herconfigureer uw systeem dusdanig dat de CD-ROM ofwel + het master apparaat is op de IDE controller waaraan hij + vast zit, of zorg ervoor dat het d slaaf is op een IDE + controller waar ook een master apparaat aan vast zit. - Can I install on my laptop over PLIP (Parallel Line - IP)? + Kan ik een installatie op mijn laptop doen over PLIP + (Parallel Line IP)? - Yes. Use a standard Laplink cable. If necessary, you - can check out the PLIP section of the Handbook - for details on parallel port networking. + Ja. Gebruik een standaard Laplink kabel. Indien nodig + kunt u de PLIP sectie van het handbook + raadplegen voor meer informatie over paralelle poort netwerken. - Which geometry should I use for a disk drive? + Welke geometrie moet gebruikt worden door een disk drive? - By the geometry of a disk, we mean - the number of cylinders, heads and sectors/track on a - disk. We will refer to this as C/H/S for convenience. - This is how the PC's BIOS works out which area on a disk - to read/write from. + Met de geometrie van een schijf, + bedoelen we het aantal cylinders, heads en sectoren/tracks + op een disk. We verwijzen hiernaar als C/H/S voor de + makkelijkheid. Dit wordt gebruikt door de PC's BIOS + om uit te vinden op welk deel van de schijf gelezen of + geschreven moet worden. - This causes a lot of confusion among new system - administrators. First of all, the - physical geometry of a SCSI drive is - totally irrelevant, as &os; works in term of disk blocks. - In fact, there is no such thing as the - physical geometry, as the sector density varies across the - disk. What manufacturers claim is the physical - geometry is usually the geometry that they have - determined wastes the least space. For IDE disks, &os; does - work in terms of C/H/S, but all modern drives internally - convert this into block references. + Dit zorgt voor een berg verwarring voor nieuwe systeem + beheerders. Als eerste is de fysieke + geometrie van een SCSI schijf totaal irrelevant, omdat &os; + werkt in termen van disk blokken. In feite s er niet zoiets + als de fysieke geometrie, omdat de sector + dichtheid varieert op de schijf. Wat de leverancier claimt + is dat de fysieke geometrie meestal geometrie + is waarvan ze denken dat het de minste schijfruimte kost. + Voor IDE schijven doet &os; dit in termen van C/H/S, maar + alle moderne schijven veranderen dit intern in blok + referenties. - All that matters is the logical - geometry. This is the answer that the BIOS gets when it - asks the drive what is your geometry? It then - uses this geometry to access the disk. As &os; uses the - BIOS when booting, it is very important to get this right. - In particular, if you have more than one operating system on - a disk, they must all agree on the geometry. Otherwise you - will have serious problems booting! + Alles wat van belang is, is de + logische geometrie. Dit is het + antwoord dat de BIOS krijgt wanneer het deze de disk + vraagt wat is jouw geometrie? Daarna + wordt deze geometrie gebruikt om de disk te benaderen. + Omdat &os; de BIOS gebruikt tijdens het opstarten, is + het belangrijk om dit juist te hebben. In het bijzonder + als je meer dan één besturingssysteem op + een schijf hebt, moeten ze het allemaal eens zijn over + de geometrie. Anders zult u serieuze problemen zijn + tijdens het opstarten! - For SCSI disks, the geometry to use depends on whether - extended translation support is turned on in your controller - (this is often referred to as support for DOS disks - >1GB or something similar). If it is turned off, - then use N cylinders, 64 heads - and 32 sectors/track, where N is - the capacity of the disk in MB. For example, a 2GB disk - should pretend to have 2048 cylinders, 64 heads and 32 - sectors/track. + Voor SCSI schijven is de geometrie die gebruikt + wordt afhankelijk van of extended translation + support is ingeschakeld in de controller (meestal + wordt hiernaar toe verwezen als support voor DOS + schijven >1GB of iets soortgelijks). Als deze + uitstaat, gebruik dan N cylinders, + 64 heads en 32 sectoren/tracks, waar + N de capaciteit in MB's is. + Bijvoorbeeld een 2GB disk zou moeten doen alsof het 2048 + cylinders heeft, 64 heads en 32 sectoren/tracks. - If it is turned on (it is often - supplied this way to get around certain limitations in - &ms-dos;) and the disk capacity is more than 1 GB, use - M cylinders, 63 sectors per track - (not 64), and 255 heads, where - M is the disk capacity in MB - divided by 7.844238 (!). So our example 2 GB drive - would have 261 cylinders, 63 sectors per track and 255 - heads. + Als het is ingeschakeld (het wordt + meestal gebruikt als manier om bepaalde beperkingen van + &ms-dos; te omzeilen), en de capaciteit van de schijf is + meer dan 1 GB, gebruik M + cylinders, 63 sectoren per track (niet + 64) en 255 heads, waar M de disk + capaciteit in MB's is gedeeld door 7.844238(!). Dus onze + voorbeeld 2 GB schijven zou 261 cylinders, 63 sectoren + per track moeten hebben en 255 heads. - If you are not sure about this, or &os; fails to detect - the geometry correctly during installation, the simplest way - around this is usually to create a small DOS partition on - the disk. The BIOS should then detect the correct geometry, - and you can always remove the DOS partition in the partition - editor if you do not want to keep it. You might want to - leave it around for programming network cards and the like, - however. + Als u niet zeker hierover bent, of als &os; faalt om de + geometrie goed te detecteren tijdens de installatie, is de + simpelste manier om dit omzeilen door een kleine DOS + partitie aan te maken op de schijf. De BIOS zou dan de + juiste geometrie moeten detecteren, de DOS parititie kan + altijd verwijderd worden in de partitie editor als u deze + niet wilt bewaren. U kunt echter overwegen hem te bewaren + voor als u uw netwerk kaarten en dergelijke moet + inprogrammeren. - Alternatively, there is a freely available utility - distributed with &os; called - pfdisk.exe. You can find it in the - tools subdirectory on - the &os; CD-ROM or on the various &os; FTP sites. This - program can be used to work out what geometry the other - operating systems on the disk are using. You can then enter - this geometry in the partition editor. + Als alternatief is er een vrijelijk beschikbare tool + welke geleverd wordt bij &os; genaamd + pfdisk.exe. U kunt deze vinden in de + tools subdirectory op + de &os; CD-ROM of op de verschillende FTP servers. Dit + programma kan gebruikt worden om te bepalen welke geometrie + de andere besturingssystemen gebruiken op de schijven die u + gebruikt. Daarna kunt u deze geometrie invoeren in de + partitie bewerker. - Are there any restrictions on how I divide the disk - up? + Zijn er enige restricties over hoe ik de disk moet + indelen? - Yes. You must make sure that your root partition is - below 1024 cylinders so the BIOS can boot the kernel from it. - (Note that this is a limitation in the PC's BIOS, not - &os;). + Ja. U moet ervoor zorgen dat uw root partitie zich + onder de 1024 cylinders bevind zodat de BIOS in staat is + om de kernel ervanaf te starten (Let op, dit is een + limitatie van de BIOS van de PC en niet van &os;). - For a SCSI drive, this will normally imply that the root - partition will be in the first 1024 MB (or in the first - 4096 MB if extended translation is turned on - see - previous question). For IDE, the corresponding figure is - 504 MB. + Voor een SCSI schijf betekend dit normaal gesproken dat + de root partitie in de eerste 1024 MB zit (of in de + eerste 4096 MB als extended translation is + ingeschakeld - zie de vorige vraag). Voor IDE is het + corresponderende plaatje 504 MB. - Is &os; compatible with any disk managers? + Is &os; compatible met enige schijf managers? - &os; recognizes the Ontrack Disk - Manager and makes allowances for it. Other disk - managers are not supported. + &os; herkent d Ontrack Disk + Manager en accepteert deze. Andere schijf + managers worden niet ondersteund. - If you just want to use the disk with &os; you do not - need a disk manager. Just configure the disk for as much - space as the BIOS can deal with (usually - 504 megabytes), and &os; should figure out how much - space you really have. If you are using an old disk with an - MFM controller, you may need to explicitly tell &os; how - many cylinders to use. + Als u de schijf alleen wilt gebruiken met &os; heeft + u geen schijf manager nodig. Configureer de schijf voor + zoveel mogelijk ruimte als de BIOS mee overweg kan (meestal + 504 megabytes) waarna &os; in staat is om uit te zoeken + hoeveel ruimte u daadwerkelijk heeft. Als u een oude schijf + gebruikt met een MFM controller, is het mogelijk dat u &os; + moet vertellen hoeveel cylinders u precies heeft. - If you want to use the disk with &os; and another - operating system, you may be able to do without a disk - manager: just make sure the &os; boot partition and the - slice for the other operating system are in the first 1024 - cylinders. If you are reasonably careful, a - 20 megabyte boot partition should be plenty. + Als u de disk wilt gebruiken met &os; en een ander + besturingssysteem, kan dit wellicht gedaan worden zonder + schijf manager: zorg er alleen voor dat de &os; opstart + partitie en de slice voor het andere besturingssysteem zich + in de eerste 1024 cylinders bevind. Als u redelijk + voorzichtib bent is een 20 megabyte opstart partitie + voldoende. - When I boot &os; for the first time after install I get - Missing Operating System. What is - happening? + Wanneer ik &os; opstart voor de eerste keer na de + installatie krijg ik de melding Missing + Operating System. Wat is er aan de hand? - This is classically a case of &os; and DOS or some other - OS conflicting over their ideas of disk geometry. You will have to - reinstall &os;, but obeying the instructions given above - will almost always get you going. + Dit is een klassiek geval van &os; en DOS of en ander + OS die conflicteert met hun ideëen over de schijf geometrie. U moet &os; opnieuw + installeren, maar door het luisteren naar de instructies + die hierboven gegeven zijn, krijgt u bijna altijd wat u + wilt. - Why can I not get past the boot manager's + Waarom kom ik niet langs de boot manager's F? prompt? - This is another symptom of the problem described in the - preceding question. Your BIOS geometry and &os; geometry - settings do not agree! If your controller or BIOS supports - cylinder translation (often marked as >1GB drive - support), try toggling its setting and reinstalling - &os;. + Dit is een ander symptoom van het proleem beschreven in + voorgaande vraag. Uw BIOS geometrie en &os; geometrie + instellingen komen niet overeen! Als uw controller of BIOS + cylinder translation ondersteund (veelal gemarkeerd als + >1GB drive support), probeert u dan de + instelling in te schakelen en vervolgens &os; te + herinstalleren. - Do I need to install the complete sources? + Moet ik de complete bronnen installeren? - In general, no. However, we would strongly recommend - that you install, at a minimum, the base - source kit, which includes several of the files mentioned - here, and the sys (kernel) source kit, - which includes sources for the kernel. There is nothing in - the system which requires the presence of the sources to - operate, however, except for the kernel-configuration - program &man.config.8;. With the exception of the kernel - sources, our build structure is set up so that you can - read-only mount the sources from elsewhere via NFS and still - be able to make new binaries (due to the kernel-source - restriction, we recommend that you not mount this on - /usr/src directly, but - rather in some other location with appropriate symbolic - links to duplicate the top-level structure of the source - tree). + In het algemeen, nee. Echter, we raden u sterk aan dat + u minstens de base source kit te + installeren, welke een aantal van de bestanden die hier + genoemd zijn hebben, en de sys (kernel) + source kit welke de bronnen bevat voor de kernel. Er is + niets in het systeem dat vereist dat de broncode aanwezig + is om te kunnen draaien, apart van het kernel configuratie + programma &man.config.8;. Met de uitzondering van de + kernel broncode, is onze bouw structuur dermate opgezet + dat u deze alleen-lezen kunt lezen door de broncode via + NFS te benaderen, waarbij het nog steeds mogelijk is om + nieuwe binaries te maken (door de kernel-broncode + restricties, raden we u aan om deze niet te koppelen aan + de /usr/src directory, + , maar in een andere directory met een symbolische link + om de top-level structuur te dupliceren van de broncode + boom). Having the sources on-line and knowing how to build a system with them will make it much easier for you to upgrade @@ -2593,9 +2616,9 @@ &man.kbdmux.4; driver type the following commands: &prompt.root; kbdcontrol -K < /dev/console > /dev/null -kbdcontrol -a atkbd0 < /dev/kbdmux0 > /dev/null -kbdcontrol -a ukbd1 < /dev/kbdmux0 > /dev/null -kbdcontrol -k /dev/kbdmux0 < /dev/console > /dev/null +&prompt.root; kbdcontrol -a atkbd0 < /dev/kbdmux0 > /dev/null +&prompt.root; kbdcontrol -a ukbd1 < /dev/kbdmux0 > /dev/null +&prompt.root; kbdcontrol -k /dev/kbdmux0 < /dev/console > /dev/null See the &man.ukbd.4;, &man.kbdcontrol.1; and &man.kbdmux.4; manual pages for more information. @@ -5255,13 +5278,13 @@ tolerate this much risk, do not use Soft Updates on the root file system! - / is traditionally one of the + / is traditionally one of the smallest partitions. If you put the - /tmp directory on - / and you have a busy - /tmp, you might see intermittent space - problems. Symlinking /tmp to - /var/tmp will solve this + /tmp directory on + / and you have a busy + /tmp, you might see intermittent space + problems. Symlinking /tmp to + /var/tmp will solve this problem. @@ -6392,6 +6415,12 @@ &prompt.root; sysctl hw.syscons.kbd_reboot=0 + + The above two methods are exclusive: The &man.sysctl.8; + does not exist if you compile your kernel with the + SC_DISABLE_REBOOT option. + + If you use the &man.pcvt.4; console driver, use the following kernel configuration line instead and rebuild the kernel: @@ -6502,45 +6531,22 @@ - If you have lot of telnet, - ssh, X, or screen users, - you will probably run out of pseudoterminals. Here is how - to add more: + If you have a lot of telnet, + ssh, X, or screen + users, you might run out of pseudoterminals. By default, + &os; 6.2 and earlier support 256 pseudoterminals, while + &os; 6.3 and later support 512 pseudoterminals. - - - Build and install a new kernel with the line in - the configuration file: - - device pty N - - where N is the number - of requested pseudoterminals. - - - - Edit /etc/ttys and add lines - for each of the N terminals. - They should match the form of the existing entries, i.e. - they look like this: - - ttyqc none network - - The order of the letter designations is - tty[pqrsPQRSlmnoLMNO][0123456789abcdefghijklmnopqrstuv], - using a regular expression. - - - - Reboot the system with the new kernel and you are - ready to go. - - - - - Using more than 256 (up to 512) &man.pty.4; devices - requires &os; 6.3 or later. - + + If needed, more pseudoterminals can be added. + However, this requires patching the standard C library, + the kernel, and /etc/ttys. For + example, + expands the number of pseudoterminals to 1152. Note that + the patch will only apply cleanly to &os; 6.3 or + later. + @@ -7502,49 +7508,10 @@ - &os; have a feature to allow the display of - splash screens during the boot messages. The - splash screens currently must be a 256 color bitmap - (*.BMP) or ZSoft PCX - (*.PCX) file. In addition, they must - have a resolution of 320x200 or less to work on standard VGA - adapters. If you compile VESA support into your kernel, - then you can use larger bitmaps up to 1024x768. The actual - VESA support can either be compiled directly into the kernel - with the VESA kernel config option or by - loading the VESA kld module during bootup. - - To use a splash screen, you need to modify the startup - files that control the boot process for &os;. - - You need to create a - /boot/loader.rc file that contains the - following lines: - - include /boot/loader.4th -start - - and a /boot/loader.conf that - contains the following: - - splash_bmp_load="YES" -bitmap_load="YES" - - This assumes you are using - /boot/splash.bmp for your splash - screen. If you would rather use a PCX file, copy it to - /boot/splash.pcx, create a - /boot/loader.rc as instructed above, - and create a /boot/loader.conf that - contains: - - splash_pcx_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.pcx" - - Now all you need is a splash screen. For that you can - surf on over to the gallery at . + The detailed answer for this question can be found in + the Boot Time Splash Screens + section of the &os; Handbook. From owner-p4-projects@FreeBSD.ORG Mon Jan 5 22:49:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B031065670; Mon, 5 Jan 2009 22:49: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 CE5401065676 for ; Mon, 5 Jan 2009 22:49:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB6408FC1B for ; Mon, 5 Jan 2009 22:49:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05Mngss011666 for ; Mon, 5 Jan 2009 22:49:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05MngdU011664 for perforce@freebsd.org; Mon, 5 Jan 2009 22:49:42 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 5 Jan 2009 22:49:42 GMT Message-Id: <200901052249.n05MngdU011664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155687 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, 05 Jan 2009 22:49:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=155687 Change 155687 by rene@rene_self on 2009/01/05 22:49:30 Translate first 18% of solid-state article. Use English copyright notice for now. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/solid-state/article.sgml#3 (text+ko) ==== @@ -36,12 +36,12 @@ %articles.ent; - + ]>
      - FreeBSD and Solid State Devices + &os; en Solid State Devices @@ -53,10 +53,10 @@ - + 2001 - The FreeBSD Documentation Project + The &os; Documentation Project @@ -66,50 +66,58 @@ &legalnotice; - + - This article covers the use of solid state disk devices in FreeBSD - to create embedded systems. - - Embedded systems have the advantage of increased stability due to - the lack of integral moving parts (hard drives). Account must be - taken, however, for the generally low disk space available in the - system and the durability of the storage medium. + Dit artikel behandelt het gebruik van solid state + disk-apparaten in &os; voor het maken van embeddded + systemen. + + Embedded systemen hebben het voordeel van verhoogde + stabiliteit wegens het ontbreken van bewegende delen (harde + schijven). Er moet echter rekening worden gehouden met de over + het algemeen weinig beschikbare schijfruimte in het systeem en + de duurzaamheid van het opslagmedium. - Specific topics to be covered include the types and attributes of - solid state media suitable for disk use in FreeBSD, kernel options - that are of interest in such an environment, the - rc.diskless mechanisms that automate the - initialization of such systems and the need for read-only filesystems, - and building filesystems from scratch. The article will conclude - with some general strategies for small and read-only FreeBSD - environments. + Specifieke onderwerpen die aan bod komen omvatten de typen + en attributen van solid state-media die geschikt zijn om in &os; + als schijf te gebruiken, kernelopties die interessant zijn in + zo'n omgeving, de mechanismen van + rc.diskless die de initialisatie van zulke + systemen automatiseren en de noodzaak voor alleen-lezen + bestandssystemen, en het van voor af aan bouwen van + bestandssystemen. Het artikel zal afsluiten met wat algemene + strategiën voor kleine en alleen-lezen + &os;-omgevingen. Vertaald door René Ladan. - Solid State Disk Devices + Solid State Disk-apparaten - The scope of this article will be limited to solid state disk - devices made from flash memory. Flash memory is a solid state memory - (no moving parts) that is non-volatile (the memory maintains data even - after all power sources have been disconnected). Flash memory can - withstand tremendous physical shock and is reasonably fast (the flash - memory solutions covered in this article are slightly slower than a EIDE - hard disk for write operations, and much faster for read operations). - One very important aspect of flash memory, the ramifications of which - will be discussed later in this article, is that each sector has a - limited rewrite capacity. You can only write, erase, and write again to - a sector of flash memory a certain number of times before the sector - becomes permanently unusable. Although many flash memory products - automatically map bad blocks, and although some even distribute write - operations evenly throughout the unit, the fact remains that there - exists a limit to the amount of writing that can be done to the device. - Competitive units have between 1,000,000 and 10,000,000 writes per - sector in their specification. This figure varies due to the - temperature of the environment. + Het bereik van dit artikel zal beperkt zijn tot solid state + disk-apparaten die gemaakt zijn met flash-geheugen. + Flash-geheugen is een solid state-geheugen (geen bewegende + onderdelen) dat niet-vluchtig is (het geheugen blijft gegevens + behouden zelf nadat alle stroombronnen zijn ontkoppeld). + Flash-geheugen kan enorme fysieke schokken weerstaan en is + redelijk snel (de oplossingen met flash-geheugens die in dit + artikel worden behandeld zijn iets langzamer dan een EIDE-harde + schijf voor schrijfbewerkingen, en veel sneller voor + leesbewerkingen). Een heel belangrijk aspect van flash-geheugen, + waarvan de ramnificaties later in dit artikel besproken zullen + worden, is dat elke sector een beperkte herschijfcapaciteit heeft. + Een sector flash-geheugen kan maar een bepald aantal keren + beschreven, gewist, en herschreven worden voordat de sector + permanent onbruikbaar wordt. Hoewel veel flash-geheugenproducten + automatisch slechte blokken in kaart brengen, en hoewel sommigen + zelfs schrijfoperaties gelijkmatig over de eenheid distribueren, + blijft het een feit dat er een limiet bestaat aan de hoeveelheid + waarmee het apparaat kan worden beschreven. Concurrerende + apparaten hebben tussen de 1.000.000 en 10.000.000 + schrijfbewerkingen per sector in hun specificaties staan. Dit + getal varieert vanwege de omgevingstemperatuur. Specifically, we will be discussing ATA compatible compact-flash units and the M-Systems &diskonchip; flash memory unit. ATA compatible @@ -325,7 +333,7 @@ &prompt.root; mknod /dev/ad0a c 116 0 -&prompt.root; mknod /dev/ad0c c 116 2 +&prompt.root; mknod /dev/ad0c c 116 2 &prompt.root; disklabel -e /dev/ad0c &prompt.root; mknod /dev/fla0a c 102 0 @@ -399,7 +407,7 @@ - + Bring this machine up on the network so we may transfer our tar file and explode it onto our flash media filesystem. One example of how to do this is: @@ -474,7 +482,7 @@ &prompt.root; mount /dev/vn0c /mnt - + Place your kernel file into /mnt, replacing the existing one @@ -580,7 +588,7 @@ /var/db/pkg. An example: &prompt.root; ln -s /etc/pkg /var/db/pkg - + Add another line in /etc/rc.diskless2 that creates and populates /var/db/port.mkversion @@ -618,7 +626,7 @@ First, add the directory log/apache to the list of directories to be created in /etc/rc.diskless2. - + Second, add these commands to /etc/rc.diskless2 after the directory creation section: @@ -635,4 +643,3 @@
      - From owner-p4-projects@FreeBSD.ORG Mon Jan 5 23:47:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E7371065674; Mon, 5 Jan 2009 23:47: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 018581065672 for ; Mon, 5 Jan 2009 23:47:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1C8D8FC14 for ; Mon, 5 Jan 2009 23:47:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n05Nli6S019770 for ; Mon, 5 Jan 2009 23:47:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n05NliTs019768 for perforce@freebsd.org; Mon, 5 Jan 2009 23:47:44 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 5 Jan 2009 23:47:44 GMT Message-Id: <200901052347.n05NliTs019768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155689 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, 05 Jan 2009 23:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=155689 Change 155689 by rene@rene_self on 2009/01/05 23:47:43 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/share/sgml/trademarks.ent#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 integrate .. //depot/projects/docproj_nl/www/en/security/security.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#13 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1104 2008/12/24 10:32:40 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1106 2009/01/05 15:44:57 remko Exp $ 1995 @@ -29,6 +29,7 @@ 2006 2007 2008 + 2009 The &os; Documentation Project ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -21,7 +21,7 @@ - How to set up IEEE 802.11 and &bluetooth; devices. + How to set up &ieee; 802.11 and &bluetooth; devices. @@ -700,7 +700,7 @@ Wireless Networking Basics - Most wireless networks are based on the IEEE 802.11 + Most wireless networks are based on the &ieee; 802.11 standards. A basic wireless network consists of multiple stations communicating with radios that broadcast in either the 2.4GHz or 5GHz band (though this varies according to the @@ -720,7 +720,7 @@ network. 802.11 networks were first deployed in the 2.4GHz band - using protocols defined by the IEEE 802.11 and 802.11b + using protocols defined by the &ieee; 802.11 and 802.11b standard. These specifications include the operating frequencies, MAC layer characteristics including framing and transmission rates (communication can be done at various @@ -740,7 +740,7 @@ to communicate. This scheme was shown to be easily broken and is now rarely used except to discourage transient users from joining networks. Current security practice is given by the - IEEE 802.11i specification that defines new cryptographic + &ieee; 802.11i specification that defines new cryptographic ciphers and an additional protocol to authenticate stations to an access point and exchange keys for doing data communication. Further, cryptographic keys are periodically @@ -1378,7 +1378,7 @@ - Here, we use RSN (IEEE 802.11i) protocol, i.e., + Here, we use RSN (&ieee; 802.11i) protocol, i.e., WPA2. @@ -3216,7 +3216,7 @@ - failover + Failover Sends and receives traffic only through the master port. If the @@ -3226,15 +3226,15 @@ - fec + &cisco; Fast ðerchannel; - Supports Cisco EtherChannel. This is a static setup and does not + &cisco; Fast ðerchannel; (FEC), is a static setup and does not negotiate aggregation with the peer or exchange frames to monitor the - link, if the switch supports LACP then that should be used + link. If the switch supports LACP then that should be used instead. - Balances outgoing traffic across the active ports based on hashed + FEC balances outgoing traffic across the active ports based on hashed protocol header information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address, and, if available, the VLAN tag, and the IPv4/IPv6 source @@ -3242,20 +3242,20 @@ - lacp + LACP - Supports the IEEE 802.3ad Link Aggregation Control Protocol + The &ieee; 802.3ad Link Aggregation Control Protocol (LACP) and the Marker Protocol. LACP will negotiate a set of aggregable links with the peer in to one or more Link Aggregated - Groups. Each LAG is composed of ports of the same speed, set to + Groups (LAG). Each LAG is composed of ports of the same speed, set to full-duplex operation. The traffic will be balanced across the ports in the LAG with the greatest total speed, in most cases there will - only be one LAG which contains all ports. In the event of changes in + only be one LAG which contains all ports. In the event of changes in physical connectivity, Link Aggregation will quickly converge to a new configuration. - Balances outgoing traffic across the active ports based on hashed + LACP balances outgoing traffic across the active ports based on hashed protocol header information and accepts incoming traffic from any active port. The hash includes the Ethernet source and destination address, and, if available, the VLAN tag, and the IPv4/IPv6 source @@ -3263,19 +3263,19 @@ - loadbalance + Loadbalance - This is an alias of fec mode. + This is an alias of FEC mode. - roundrobin + Round-robin Distributes outgoing traffic using a round-robin scheduler through all active ports and accepts incoming traffic from any active - port. This mode will violate Ethernet frame ordering and should be + port. This mode violates Ethernet Frame ordering and should be used with caution. @@ -3286,7 +3286,7 @@ Examples - LACP aggregation with a Cisco switch + LACP aggregation with a &cisco; Switch This example connects two interfaces on a &os; machine to the switch as a single load balanced and fault tolerant link. More interfaces @@ -3297,23 +3297,31 @@ much information as it can to distinguish different traffic flows and balance across the available interfaces. - On the Cisco switch add the interfaces to the channel group. + On the &cisco; switch add the + FastEthernet0/1 and + FastEthernet0/2 interfaces to the + channel-group 1: - interface FastEthernet0/1 - channel-group 1 mode active - channel-protocol lacp + interface FastEthernet0/1 + channel-group 1 mode active + channel-protocol lacp ! -interface FastEthernet0/2 - channel-group 1 mode active - channel-protocol lacp -! +interface FastEthernet0/2 + channel-group 1 mode active + channel-protocol lacp - On the &os; machine create the lagg interface. + On the &os; machine create the &man.lagg.4; interface using + fxp0 and + fxp1: - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 - View the interface status from ifconfig; ports marked as + View the interface status by running: + + &prompt.root; ifconfig lagg0 + + Ports marked as ACTIVE are part of the active aggregation group that has been negotiated with the remote switch and traffic will be transmitted and received. Use the verbose output of &man.ifconfig.8; @@ -3328,8 +3336,8 @@ laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> - The switch will show which ports are active. For more detail use - show lacp neighbor detail. + To see the port status on the switch, use show + lacp neighbor: switch# show lacp neighbor Flags: S - Device is requesting Slow LACPDUs @@ -3345,17 +3353,27 @@ Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D + For more detail use the show lacp neighbor + detail command. Failover mode - Failover mode can be used to switch over to another interface if - the link is lost on the master. + Failover mode can be used to switch over to a secondary interface if + the link is lost on the master interface. Create and configure the + lagg0 interface, with + fxp0 as the master interface and + fxp1 as the secondary interface: + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 + The interface will look something like this, the major + differences will be the MAC address and the + device names: - lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + &prompt.root; ifconfig lagg0 +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 options=8<VLAN_MTU> ether 00:05:5d:71:8d:b8 media: Ethernet autoselect @@ -3365,8 +3383,8 @@ laggport: fxp0 flags=5<MASTER,ACTIVE> Traffic will be transmitted and received on - fxp0. If the link is lost on - fxp0 then fxp1 will + fxp0. If the link is lost on + fxp0 then fxp1 will become the active link. If the link is restored on the master interface then it will once again become the active link. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ 3Com and HomeConnect are registered @@ -86,7 +86,9 @@ Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries."> +Cisco"> Catalyst"> +EtherChannel"> IOS"> Corel and WordPerfect are trademarks @@ -151,6 +153,7 @@ IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States."> +IEEE"> POSIX"> ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#7 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -159,19 +159,22 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 7.0-RELEASE'; +$manPathDefault = 'FreeBSD 7.1-RELEASE'; %manPath = ( - 'FreeBSD 7.0-RELEASE and Ports', + 'FreeBSD 7.1-RELEASE and Ports', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 6.4-RELEASE and Ports', "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man", - 'FreeBSD 7.0-stable', "$manLocalDir/FreeBSD-7.0-stable", - 'FreeBSD 7.0-RELEASE', -"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", + + 'FreeBSD 7.1-stable', "$manLocalDir/FreeBSD-7.1-stable", + 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", + 'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE", + + 'FreeBSD 7.0-RELEASE', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", 'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE", 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable", @@ -461,15 +464,15 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 7.0-RELEASE', - 'freebsd-release', 'FreeBSD 7.0-RELEASE', + 'freebsd', 'FreeBSD 7.1-RELEASE', + 'freebsd-release', 'FreeBSD 7.1-RELEASE', - 'freebsd-stable', 'FreeBSD 7.0-stable', - 'freebsd-stable7', 'FreeBSD 7.0-stable', + 'freebsd-stable', 'FreeBSD 7.1-stable', + 'freebsd-stable7', 'FreeBSD 7.1-stable', 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 8-current', - 'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 7.1-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', @@ -1375,7 +1378,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.226 2008/12/21 23:04:17 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.227 2009/01/05 20:46:44 hrs Exp $'; return qq{\ 
       Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/releases/7.1R/errata.html#3 (text+ko) ====

@@ -19,7 +19,7 @@
 
      Copyright © 2008, 2009 The FreeBSD Documentation Project
      
 
 
      $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
-186764 2009-01-05 08:56:45Z hrs $
      
+186782 2009-01-05 15:38:45Z hrs $
      
 
      
 
 
      
@@ -142,6 +142,15 @@
 
      4 Late-Breaking News and
 Corrections
      
 
+
      [20090105] The Release Notes for 7.1-RELEASE should have mentioned that the 
+procstat(1)
+utility has been added. This is a process inspection utility which provides both some of
+the missing functionality from 
+procfs(5) and
+new functionality for monitoring and debugging specific processes.
      
+
 
      [20090105] The Release Notes for 7.1-RELEASE should have mentioned changes that the ae(4) driver has been

==== //depot/projects/docproj_nl/www/en/security/security.sgml#4 (text+ko) ====

@@ -1,12 +1,12 @@
 
-
+
 
 
  %developers;
 
 ]>
-
+
 
 
   &header;
@@ -208,10 +208,18 @@
     
      Normal
      
     
      Releases which are published from a -STABLE branch will be
       supported by the Security Officer for a minimum of 12 months after the
-      release.
      
+      release, and for sufficient additional time (if needed) to ensure
+      that there is a newer release for at least 3 months before the
+      older Normal relase expires.
+    
     
      Extended
      
-    
      Selected releases will be supported by the Security Officer for a
-      minimum of 24 months after the release.
      
+    
      Selected releases (normally every second release plus the last
+      release from each -STABLE branch) will be supported by the
+      Security Officer for a minimum of 24 months after the release,
+      and for sufficient additional time (if needed) to ensure that
+      there is a newer Extended release for at least 3 months before the
+      older Extended release expires.
+    
      
   
 
   
@@ -269,7 +277,14 @@
       7.0-RELEASE
       Normal
       February 27, 2008
-      February 28, 2009
+      April 30, 2009
+    
+    
+      RELENG_7_1
+      7.1-RELEASE
+      Extended
+      January 4, 2009
+      January 31, 2011
     
   
 

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 08:20:28 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76CB91065674; Tue,  6 Jan 2009 08:20: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 379C21065670
	for ; Tue,  6 Jan 2009 08:20:27 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 26C338FC13
	for ; Tue,  6 Jan 2009 08:20:27 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n068KQHR006062
	for ; Tue, 6 Jan 2009 08:20:26 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n068KQx6006060
	for perforce@freebsd.org; Tue, 6 Jan 2009 08:20:26 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Tue, 6 Jan 2009 08:20:26 GMT
Message-Id: <200901060820.n068KQx6006060@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 155702 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, 06 Jan 2009 08:20:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=155702

Change 155702 by weongyo@weongyo_ws on 2009/01/06 08:19:26

	a trivial ordering of functions.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#7 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#7 (text+ko) ====

@@ -582,33 +582,6 @@
 }
 
 static usbd_status
-urtw_close_pipes(struct urtw_softc *sc)
-{
-	usbd_status error = 0;
-
-	if (sc->sc_rxpipe != NULL) {
-		error = usbd_close_pipe(sc->sc_rxpipe);
-		if (error != 0)
-			goto fail;
-		sc->sc_rxpipe = NULL;
-	}
-	if (sc->sc_txpipe_low != NULL) {
-		error = usbd_close_pipe(sc->sc_txpipe_low);
-		if (error != 0)
-			goto fail;
-		sc->sc_txpipe_low = NULL;
-	}
-	if (sc->sc_txpipe_normal != NULL) {
-		error = usbd_close_pipe(sc->sc_txpipe_normal);
-		if (error != 0)
-			goto fail;
-		sc->sc_txpipe_normal = NULL;
-	}
-fail:
-	return (error);
-}
-
-static usbd_status
 urtw_open_pipes(struct urtw_softc *sc)
 {
 	usbd_status error;
@@ -649,6 +622,33 @@
 	return (error);
 }
 
+static usbd_status
+urtw_close_pipes(struct urtw_softc *sc)
+{
+	usbd_status error = 0;
+
+	if (sc->sc_rxpipe != NULL) {
+		error = usbd_close_pipe(sc->sc_rxpipe);
+		if (error != 0)
+			goto fail;
+		sc->sc_rxpipe = NULL;
+	}
+	if (sc->sc_txpipe_low != NULL) {
+		error = usbd_close_pipe(sc->sc_txpipe_low);
+		if (error != 0)
+			goto fail;
+		sc->sc_txpipe_low = NULL;
+	}
+	if (sc->sc_txpipe_normal != NULL) {
+		error = usbd_close_pipe(sc->sc_txpipe_normal);
+		if (error != 0)
+			goto fail;
+		sc->sc_txpipe_normal = NULL;
+	}
+fail:
+	return (error);
+}
+
 static int
 urtw_alloc_data_list(struct urtw_softc *sc, struct urtw_data data[],
 	int ndata, int maxsz, int fillmbuf)

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 11:01:10 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66B061065673; Tue,  6 Jan 2009 11:01: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 231C0106566B
	for ; Tue,  6 Jan 2009 11:01:10 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 105588FC17
	for ; Tue,  6 Jan 2009 11:01:10 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06B1AqN035263
	for ; Tue, 6 Jan 2009 11:01:10 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06B1AOH035261
	for perforce@freebsd.org; Tue, 6 Jan 2009 11:01:10 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Tue, 6 Jan 2009 11:01:10 GMT
Message-Id: <200901061101.n06B1AOH035261@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 155706 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, 06 Jan 2009 11:01:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=155706

Change 155706 by weongyo@weongyo_ws on 2009/01/06 11:00:49

	define magic macros due to the lack of documents; no functional changes

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#8 edit
.. //depot/projects/vap/sys/dev/usb/if_urtwreg.h#3 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#8 (text+ko) ====

@@ -849,9 +849,9 @@
 	urtw_read16_m(sc, URTW_RF_PINS_OUTPUT, &o1);
 	urtw_read16_m(sc, URTW_RF_PINS_ENABLE, &o2);
 	urtw_read16_m(sc, URTW_RF_PINS_SELECT, &o3);
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2 | 0xf);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3 | 0xf);
-	o1 &= ~0xf;
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2 | URTW_RF_PINS_MAGIC4);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3 | URTW_RF_PINS_MAGIC4);
+	o1 &= ~URTW_RF_PINS_MAGIC4;
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, o1 | URTW_BB_HOST_BANG_EN);
 	DELAY(5);
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, o1);
@@ -917,7 +917,7 @@
 
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, o2);
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, o3);
-	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, 0x3a0);
+	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_OUTPUT_MAGIC1);
 
 	if (data != NULL)
 		*data = value;
@@ -932,12 +932,12 @@
 	usbd_status error;
 
 	urtw_read16_m(sc, URTW_RF_PINS_OUTPUT, &d80);
-	d80 &= 0xfff3;
+	d80 &= URTW_RF_PINS_MAGIC1;
 	urtw_read16_m(sc, URTW_RF_PINS_ENABLE, &d82);
 	urtw_read16_m(sc, URTW_RF_PINS_SELECT, &d84);
-	d84 &= 0xfff0;
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, d82 | 0x0007);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, d84 | 0x0007);
+	d84 &= URTW_RF_PINS_MAGIC2;
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, d82 | URTW_RF_PINS_MAGIC3);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, d84 | URTW_RF_PINS_MAGIC3);
 	DELAY(10);
 
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, d80 | URTW_BB_HOST_BANG_EN);
@@ -966,27 +966,29 @@
 
 	*ret = 1;
 
-	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, 0x0080);
-	urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x0080);
-	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x0080);
+	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5);
+	urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5);
+	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5);
 	usbd_delay_ms(sc->sc_udev, 1100);
 
-	urtw_8225_write(sc, 0x0, 0x1b7);
+	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
+	    URTW_8225_ADDR_0_DATA_MAGIC1);
 
-	error = urtw_8225_read(sc, 0x8, &data);
+	error = urtw_8225_read(sc, URTW_8225_ADDR_8_MAGIC, &data);
 	if (error != 0)
 		goto fail;
-	if (data != 0x588)
+	if (data != URTW_8225_ADDR_8_DATA_MAGIC1)
 		*ret = 0;
 	else {
-		error = urtw_8225_read(sc, 0x9, &data);
+		error = urtw_8225_read(sc, URTW_8225_ADDR_9_MAGIC, &data);
 		if (error != 0)
 			goto fail;
-		if (data != 0x700)
+		if (data != URTW_8225_ADDR_9_DATA_MAGIC1)
 			*ret = 0;
 	}
 
-	urtw_8225_write(sc, 0x0, 0xb7);
+	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
+	    URTW_8225_ADDR_0_DATA_MAGIC2);
 fail:
 	return (error);
 }
@@ -1546,7 +1548,7 @@
 	usbd_delay_ms(sc->sc_udev, 200);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
-	data = (data & 2) | URTW_CMD_RST;
+	data = (data & 0x2) | URTW_CMD_RST;
 	urtw_write8_m(sc, URTW_CMD, data);
 	usbd_delay_ms(sc->sc_udev, 200);
 
@@ -1605,8 +1607,9 @@
 	if (type == URTW_LED_GPIO) {
 		switch (sc->sc_gpio_ledpin) {
 		case URTW_LED_PIN_GPIO0:
-			urtw_write8_m(sc, URTW_GPIO, 0x01);
-			urtw_write8_m(sc, URTW_GP_ENABLE, 0x01);
+			urtw_write8_m(sc, URTW_GPIO, URTW_GPIO_DATA_MAGIC1);
+			urtw_write8_m(sc,
+			    URTW_GP_ENABLE, URTW_GP_ENABLE_DATA_MAGIC1);
 			break;
 		default:
 			panic("unsupported LED PIN type 0x%x",
@@ -1901,11 +1904,11 @@
 	if (error)
 		goto fail;
 
-	urtw_write8_m(sc, 0x85, 0);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 0);
 	urtw_write8_m(sc, URTW_GPIO, 0);
 
 	/* for led  */
-	urtw_write8_m(sc, 0x85, 4);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 4);
 	error = urtw_led_ctl(sc, URTW_LED_CTL_POWER_ON);
 	if (error != 0)
 		goto fail;
@@ -1937,12 +1940,14 @@
 	if (sc->sc_rf_set_sens != NULL)
 		sc->sc_rf_set_sens(sc, sc->sc_sens);
 
-	urtw_write16_m(sc, 0x5e, 1);
-	urtw_write16_m(sc, 0xfe, 0x10);
+	/* XXX correct? to call write16  */
+	urtw_write16_m(sc, URTW_PSR, 1);
+	urtw_write16_m(sc, URTW_ADDR_MAGIC2, 0x10);
 	urtw_write8_m(sc, URTW_TALLY_SEL, 0x80);
-	urtw_write8_m(sc, 0xff, 0x60);
-	urtw_write16_m(sc, 0x5e, 0);
-	urtw_write8_m(sc, 0x85, 4);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC3, 0x60);
+	/* XXX correct? to call write16  */
+	urtw_write16_m(sc, URTW_PSR, 0);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC1, 4);
 
 	error = urtw_intr_enable(sc);
 	if (error != 0)
@@ -2555,10 +2560,10 @@
 	usbd_status error;
 
 	phyw = ((data << 8) | (addr | 0x80));
-	urtw_write8_m(sc, 0x7f, ((phyw & 0xff000000) >> 24));
-	urtw_write8_m(sc, 0x7e, ((phyw & 0x00ff0000) >> 16));
-	urtw_write8_m(sc, 0x7d, ((phyw & 0x0000ff00) >> 8));
-	urtw_write8_m(sc, 0x7c, ((phyw & 0x000000ff)));
+	urtw_write8_m(sc, URTW_PHY_MAGIC4, ((phyw & 0xff000000) >> 24));
+	urtw_write8_m(sc, URTW_PHY_MAGIC3, ((phyw & 0x00ff0000) >> 16));
+	urtw_write8_m(sc, URTW_PHY_MAGIC2, ((phyw & 0x0000ff00) >> 8));
+	urtw_write8_m(sc, URTW_PHY_MAGIC1, ((phyw & 0x000000ff)));
 	usbd_delay_ms(sc->sc_udev, 1);
 fail:
 	return (error);
@@ -2697,19 +2702,24 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 	usbd_delay_ms(sc->sc_udev, 100);
-	urtw_8225_write(sc, 0x2, 0xc4d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x2, 0x44d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x0, 0x127);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC3);
 	
 	for (i = 0; i < 95; i++) {
-		urtw_8225_write(sc, 0x1, (uint8_t)(i + 1));
-		urtw_8225_write(sc, 0x2, urtw_8225_rxgain[i]);
+		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
+		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, urtw_8225_rxgain[i]);
 	}
 
-	urtw_8225_write(sc, 0x0, 0x27);
-	urtw_8225_write(sc, 0x0, 0x22f);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC4);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC5);
 	
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
@@ -2734,7 +2744,7 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_write8_m(sc, 0x5b, 0x0d);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
 
 	error = urtw_8225_set_txpwrlvl(sc, 1);
 	if (error)
@@ -2749,7 +2759,7 @@
 	error = urtw_8185_tx_antenna(sc, 0x3);
 	if (error)
 		goto fail;
-	urtw_write32_m(sc, 0x94, 0x3dc00002);
+	urtw_write32_m(sc, URTW_ADDR_MAGIC5, 0x3dc00002);
 
 	error = urtw_8225_rf_set_chan(sc, 1);
 fail:
@@ -2768,7 +2778,7 @@
 	error = urtw_8225_set_txpwrlvl(sc, chan);
 	if (error)
 		goto fail;
-	urtw_8225_write(sc, 0x7, urtw_8225_channel[chan]);
+	urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]);
 	usbd_delay_ms(sc->sc_udev, 10);
 
 	urtw_write8_m(sc, URTW_SIFS, 0x22);
@@ -2804,9 +2814,11 @@
 		return -1;
 
 	if (sens > 4)
-		urtw_8225_write(sc, 0x0c, 0x850);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC1);
 	else	
-		urtw_8225_write(sc, 0x0c, 0x50);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_C_MAGIC, URTW_8225_ADDR_C_DATA_MAGIC2);
 
 	sens = 6 - sens;
 	error = urtw_8225_setgain(sc, sens);
@@ -3006,9 +3018,9 @@
 	cck_pwrtable = (chan == 14) ? urtw_8225v2_txpwr_cck_ch14 :
 	    urtw_8225v2_txpwr_cck;
 
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < 8; i++)
 		urtw_8187_write_phy_cck(sc, 0x44 + i, cck_pwrtable[i]);
-	}
+
 	urtw_write8_m(sc, URTW_TX_GAIN_CCK,
 	    urtw_8225v2_tx_gain_cck_ofdm[cck_pwrlvl]);
 	usbd_delay_ms(sc->sc_udev, 1);
@@ -3079,45 +3091,55 @@
 	}
 	usbd_delay_ms(sc->sc_udev, 100);
 
-	urtw_8225_write(sc, 0x0, 0x1b7);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1);
 
 	for (i = 0; i < 95; i++) {
-		urtw_8225_write(sc, 0x1, (uint8_t)(i + 1));
+		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
 		usbd_delay_ms(sc->sc_udev, 1);
-		urtw_8225_write(sc, 0x2, urtw_8225v2_rxgain[i]);
+		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC,
+		    urtw_8225v2_rxgain[i]);
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_8225_write(sc, 0x3, 0x2);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_3_MAGIC, URTW_8225_ADDR_3_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x5, 0x4);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_5_MAGIC, URTW_8225_ADDR_5_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x0, 0xb7);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 1);
-	urtw_8225_write(sc, 0x2, 0xc4d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 	usbd_delay_ms(sc->sc_udev, 200);
-	urtw_8225_write(sc, 0x2, 0x44d);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 	usbd_delay_ms(sc->sc_udev, 200);
 
-	error = urtw_8225_read(sc, 0x6, &data32);
+	error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 	if (error != 0)
 		goto fail;
-	if (data32 != 0xe6)
+	if (data32 != URTW_8225_ADDR_6_DATA_MAGIC1)
 		device_printf(sc->sc_dev, "expect 0xe6!! (0x%x)\n", data32);
-	if (!(data32 & 0x80)) {
-		urtw_8225_write(sc, 0x02, 0x0c4d);
+	if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) {
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
 		usbd_delay_ms(sc->sc_udev, 200);
-		urtw_8225_write(sc, 0x02, 0x044d);
+		urtw_8225_write(sc,
+		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
 		usbd_delay_ms(sc->sc_udev, 100);
-		error = urtw_8225_read(sc, 0x6, &data32);
+		error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 		if (error != 0)
 			goto fail;
-		if (!(data32 & 0x80))
+		if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2))
 			device_printf(sc->sc_dev, "RF calibration failed\n");
 	}
 	usbd_delay_ms(sc->sc_udev, 200);
 
-	urtw_8225_write(sc, 0x0, 0x2bf);
+	urtw_8225_write(sc,
+	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6);
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
 		usbd_delay_ms(sc->sc_udev, 1);
@@ -3142,7 +3164,7 @@
 		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
-	urtw_write8_m(sc, 0x5b, 0x0d);
+	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
 
 	error = urtw_8225v2_set_txpwrlvl(sc, 1);
 	if (error)
@@ -3157,7 +3179,7 @@
 	error = urtw_8185_tx_antenna(sc, 0x3);
 	if (error)
 		goto fail;
-	urtw_write32_m(sc, 0x94, 0x3dc00002);
+	urtw_write32_m(sc, URTW_ADDR_MAGIC5, 0x3dc00002);
 
 	error = urtw_8225_rf_set_chan(sc, 1);
 fail:
@@ -3177,7 +3199,7 @@
 	if (error)
 		goto fail;
 
-	urtw_8225_write(sc, 0x7, urtw_8225_channel[chan]);
+	urtw_8225_write(sc, URTW_8225_ADDR_7_MAGIC, urtw_8225_channel[chan]);
 	usbd_delay_ms(sc->sc_udev, 10);
 
 	urtw_write8_m(sc, URTW_SIFS, 0x22);

==== //depot/projects/vap/sys/dev/usb/if_urtwreg.h#3 (text+ko) ====

@@ -120,6 +120,7 @@
 #define URTW_CONFIG3			0x0059		/* 1 byte  */
 #define URTW_CONFIG3_ANAPARAM_WRITE	(0x40)
 #define URTW_CONFIG3_ANAPARAM_W_SHIFT	(6)
+#define	URTW_ADDR_MAGIC4		0x005b		/* 1 byte  */
 #define URTW_PSR			0x005e		/* 1 byte  */
 #define URTW_ANAPARAM2			0x0060		/* 4 byte  */
 #define URTW_8225_ANAPARAM2_ON		(0x860c7312)
@@ -127,17 +128,31 @@
 #define	URTW_ATIM_WND			0x0072		/* 2 byte  */
 #define	URTW_BEACON_INTERVAL_TIME	0x0074		/* 2 byte  */
 #define	URTW_ATIM_TR_ITV		0x0076		/* 2 byte  */
+#define	URTW_PHY_MAGIC1			0x007c		/* 1 byte  */
+#define	URTW_PHY_MAGIC2			0x007d		/* 1 byte  */
+#define	URTW_PHY_MAGIC3			0x007e		/* 1 byte  */
+#define	URTW_PHY_MAGIC4			0x007f		/* 1 byte  */
 #define URTW_RF_PINS_OUTPUT		0x0080		/* 2 byte  */
+#define	URTW_RF_PINS_OUTPUT_MAGIC1	(0x3a0)
 #define URTW_BB_HOST_BANG_CLK		(1 << 1)
 #define URTW_BB_HOST_BANG_EN		(1 << 2)
 #define URTW_BB_HOST_BANG_RW		(1 << 3)
 #define URTW_RF_PINS_ENABLE		0x0082		/* 2 byte  */
 #define URTW_RF_PINS_SELECT		0x0084		/* 2 byte  */
+#define	URTW_ADDR_MAGIC1		0x0085		/* broken?  */
 #define URTW_RF_PINS_INPUT		0x0086		/* 2 byte  */
+#define	URTW_RF_PINS_MAGIC1		(0xfff3)
+#define	URTW_RF_PINS_MAGIC2		(0xfff0)
+#define	URTW_RF_PINS_MAGIC3		(0x0007)
+#define	URTW_RF_PINS_MAGIC4		(0xf)
+#define	URTW_RF_PINS_MAGIC5		(0x0080)
 #define URTW_RF_PARA			0x0088		/* 4 byte  */
 #define URTW_RF_TIMING			0x008c		/* 4 byte  */
 #define URTW_GP_ENABLE			0x0090		/* 1 byte  */
+#define	URTW_GP_ENABLE_DATA_MAGIC1	(0x1)
 #define URTW_GPIO			0x0091		/* 1 byte  */
+#define	URTW_GPIO_DATA_MAGIC1		(0x1)
+#define	URTW_ADDR_MAGIC5		0x0094		/* 4 byte  */
 #define URTW_TX_AGC_CTL			0x009c		/* 1 byte  */
 #define URTW_TX_AGC_CTL_PERPACKET_GAIN	(0x1)
 #define URTW_TX_AGC_CTL_PERPACKET_ANTSEL	(0x2)
@@ -155,6 +170,36 @@
 #define URTW_CW_VAL			0x00bd		/* 1 byte  */
 #define URTW_RATE_FALLBACK		0x00be		/* 1 byte  */
 #define URTW_TALLY_SEL			0x00fc		/* 1 byte  */
+#define	URTW_ADDR_MAGIC2		0x00fe		/* 2 byte  */
+#define	URTW_ADDR_MAGIC3		0x00ff		/* 1 byte  */
+
+/* for 8225  */
+#define	URTW_8225_ADDR_0_MAGIC		0x0
+#define	URTW_8225_ADDR_0_DATA_MAGIC1	(0x1b7)
+#define	URTW_8225_ADDR_0_DATA_MAGIC2	(0x0b7)
+#define	URTW_8225_ADDR_0_DATA_MAGIC3	(0x127)
+#define	URTW_8225_ADDR_0_DATA_MAGIC4	(0x027)
+#define	URTW_8225_ADDR_0_DATA_MAGIC5	(0x22f)
+#define	URTW_8225_ADDR_0_DATA_MAGIC6	(0x2bf)
+#define	URTW_8225_ADDR_1_MAGIC		0x1
+#define	URTW_8225_ADDR_2_MAGIC		0x2
+#define	URTW_8225_ADDR_2_DATA_MAGIC1	(0xc4d)
+#define	URTW_8225_ADDR_2_DATA_MAGIC2	(0x44d)
+#define	URTW_8225_ADDR_3_MAGIC		0x3
+#define	URTW_8225_ADDR_3_DATA_MAGIC1	(0x2)
+#define	URTW_8225_ADDR_5_MAGIC		0x5
+#define	URTW_8225_ADDR_5_DATA_MAGIC1	(0x4)
+#define	URTW_8225_ADDR_6_MAGIC		0x6
+#define	URTW_8225_ADDR_6_DATA_MAGIC1	(0xe6)
+#define	URTW_8225_ADDR_6_DATA_MAGIC2	(0x80)
+#define	URTW_8225_ADDR_7_MAGIC		0x7
+#define	URTW_8225_ADDR_8_MAGIC		0x8
+#define	URTW_8225_ADDR_8_DATA_MAGIC1	(0x588)
+#define	URTW_8225_ADDR_9_MAGIC		0x9
+#define	URTW_8225_ADDR_9_DATA_MAGIC1	(0x700)
+#define	URTW_8225_ADDR_C_MAGIC		0xc
+#define	URTW_8225_ADDR_C_DATA_MAGIC1	(0x850)
+#define	URTW_8225_ADDR_C_DATA_MAGIC2	(0x050)
 
 /* for EEPROM  */
 #define URTW_EPROM_TXPW_BASE		0x05

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 11:17:27 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5003B1065673; Tue,  6 Jan 2009 11:17: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 103B6106566C
	for ; Tue,  6 Jan 2009 11:17:27 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F24F28FC19
	for ; Tue,  6 Jan 2009 11:17:26 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06BHQ9X037704
	for ; Tue, 6 Jan 2009 11:17:26 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06BHQe5037702
	for perforce@freebsd.org; Tue, 6 Jan 2009 11:17:26 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Tue, 6 Jan 2009 11:17:26 GMT
Message-Id: <200901061117.n06BHQe5037702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 155708 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, 06 Jan 2009 11:17:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=155708

Change 155708 by weongyo@weongyo_ws on 2009/01/06 11:16:34

	reduce delays to initialize the device more fast.  This is tested with
	my device.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#9 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#9 (text+ko) ====

@@ -969,7 +969,7 @@
 	urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5);
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5);
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5);
-	usbd_delay_ms(sc->sc_udev, 1100);
+	usbd_delay_ms(sc->sc_udev, 500);
 
 	urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC,
 	    URTW_8225_ADDR_0_DATA_MAGIC1);
@@ -1534,7 +1534,7 @@
 	error = urtw_intr_disable(sc);
 	if (error)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_write8e(sc, 0x18, 0x10);
 	if (error != 0)
@@ -1545,12 +1545,12 @@
 	error = urtw_write8e(sc, 0x18, 0x00);
 	if (error != 0)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
 	data = (data & 0x2) | URTW_CMD_RST;
 	urtw_write8_m(sc, URTW_CMD, data);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_read8_m(sc, URTW_CMD, &data);
 	if (data & URTW_CMD_RST) {
@@ -1561,7 +1561,7 @@
 	error = urtw_set_mode(sc, URTW_EPROM_CMD_LOAD);
 	if (error)
 		goto fail;
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_8180_set_anaparam(sc, URTW_8225_ANAPARAM_ON);
 	if (error)
@@ -2537,8 +2537,7 @@
 	urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x80);
 	urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x80);
 
-	usbd_delay_ms(sc->sc_udev, 100);
-	usbd_delay_ms(sc->sc_udev, 1000);
+	usbd_delay_ms(sc->sc_udev, 500);
 fail:
 	return (error);
 }
@@ -3082,41 +3081,35 @@
 	if (error)
 		goto fail;
 
-	usbd_delay_ms(sc->sc_udev, 1000);
+	usbd_delay_ms(sc->sc_udev, 500);
 
 	for (i = 0; i < N(urtw_8225v2_rf_part1); i++) {
 		urtw_8225_write(sc, urtw_8225v2_rf_part1[i].reg,
 		    urtw_8225v2_rf_part1[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
-	usbd_delay_ms(sc->sc_udev, 100);
+	usbd_delay_ms(sc->sc_udev, 50);
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1);
 
 	for (i = 0; i < 95; i++) {
 		urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1));
-		usbd_delay_ms(sc->sc_udev, 1);
 		urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC,
 		    urtw_8225v2_rxgain[i]);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_3_MAGIC, URTW_8225_ADDR_3_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_5_MAGIC, URTW_8225_ADDR_5_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 	if (error != 0)
@@ -3126,32 +3119,28 @@
 	if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) {
 		urtw_8225_write(sc,
 		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1);
-		usbd_delay_ms(sc->sc_udev, 200);
+		usbd_delay_ms(sc->sc_udev, 100);
 		urtw_8225_write(sc,
 		    URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2);
-		usbd_delay_ms(sc->sc_udev, 100);
+		usbd_delay_ms(sc->sc_udev, 50);
 		error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32);
 		if (error != 0)
 			goto fail;
 		if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2))
 			device_printf(sc->sc_dev, "RF calibration failed\n");
 	}
-	usbd_delay_ms(sc->sc_udev, 200);
+	usbd_delay_ms(sc->sc_udev, 100);
 
 	urtw_8225_write(sc,
 	    URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6);
 	for (i = 0; i < 128; i++) {
 		urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]);
-		usbd_delay_ms(sc->sc_udev, 1);
 		urtw_8187_write_phy_ofdm(sc, 0xa, (uint8_t)i + 0x80);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
-	usbd_delay_ms(sc->sc_udev, 1);
 
 	for (i = 0; i < N(urtw_8225v2_rf_part2); i++) {
 		urtw_8187_write_phy_ofdm(sc, urtw_8225v2_rf_part2[i].reg,
 		    urtw_8225v2_rf_part2[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 	
 	error = urtw_8225v2_setgain(sc, 4);
@@ -3161,7 +3150,6 @@
 	for (i = 0; i < N(urtw_8225v2_rf_part3); i++) {
 		urtw_8187_write_phy_cck(sc, urtw_8225v2_rf_part3[i].reg,
 		    urtw_8225v2_rf_part3[i].val);
-		usbd_delay_ms(sc->sc_udev, 1);
 	}
 
 	urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d);
@@ -3171,9 +3159,7 @@
 		goto fail;
 	
 	urtw_8187_write_phy_cck(sc, 0x10, 0x9b);
-	usbd_delay_ms(sc->sc_udev, 1);
 	urtw_8187_write_phy_ofdm(sc, 0x26, 0x90);
-	usbd_delay_ms(sc->sc_udev, 1);
 
 	/* TX ant A, 0x0 for B */
 	error = urtw_8185_tx_antenna(sc, 0x3);

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 18:27:46 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF9B7106567E; Tue,  6 Jan 2009 18:27: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 6FC421065675
	for ; Tue,  6 Jan 2009 18:27:45 +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 451348FC2C
	for ; Tue,  6 Jan 2009 18:27:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06IRjkr007652
	for ; Tue, 6 Jan 2009 18:27:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06IRj9x007650
	for perforce@freebsd.org; Tue, 6 Jan 2009 18:27:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 6 Jan 2009 18:27:45 GMT
Message-Id: <200901061827.n06IRj9x007650@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 155730 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, 06 Jan 2009 18:27:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=155730

Change 155730 by hselasky@hselasky_laptop001 on 2009/01/06 18:27:26

	
	Config index should be zero. Reported by:
	Stanislav Sedov 

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#18 (text+ko) ====

@@ -92,7 +92,7 @@
 #define	UBSA_N_TRANSFER           6	/* units */
 #define	UBSA_BSIZE             1024	/* bytes */
 
-#define	UBSA_CONFIG_INDEX	1
+#define	UBSA_CONFIG_INDEX	0
 #define	UBSA_IFACE_INDEX	0
 
 #define	UBSA_REG_BAUDRATE	0x00

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 18:29:48 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE4381065672; Tue,  6 Jan 2009 18:29:47 +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 9E53B106566B
	for ; Tue,  6 Jan 2009 18:29:47 +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 738C68FC18
	for ; Tue,  6 Jan 2009 18:29:47 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06ITleZ007777
	for ; Tue, 6 Jan 2009 18:29:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06ITlmu007775
	for perforce@freebsd.org; Tue, 6 Jan 2009 18:29:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 6 Jan 2009 18:29:47 GMT
Message-Id: <200901061829.n06ITlmu007775@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 155731 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, 06 Jan 2009 18:29:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=155731

Change 155731 by hselasky@hselasky_laptop001 on 2009/01/06 18:29:31

	
	Make printout more informative. Reported by:
	Volker

Affected files ...

.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#10 edit

Differences ...

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#10 (text+ko) ====

@@ -562,7 +562,7 @@
 	}
 
 	if (matches == 0) {
-		printf("No device match\n");
+		printf("No device match or lack of permissions.\n");
 	}
 done:
 	reset_options(opt);

From owner-p4-projects@FreeBSD.ORG  Tue Jan  6 22:04:35 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD313106570C; Tue,  6 Jan 2009 22:04: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 5D6311065707
	for ; Tue,  6 Jan 2009 22:04:35 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 49F678FC14
	for ; Tue,  6 Jan 2009 22:04:35 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06M4PUV043835
	for ; Tue, 6 Jan 2009 22:04:25 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06M4PfS043833
	for perforce@freebsd.org; Tue, 6 Jan 2009 22:04:25 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 6 Jan 2009 22:04:25 GMT
Message-Id: <200901062204.n06M4PfS043833@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 155737 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, 06 Jan 2009 22:04:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=155737

Change 155737 by rene@rene_self on 2009/01/06 22:03:56

	MFen handbook/advanced-networking 1.419 -> 1.420

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#25 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#25 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.9 2008/12/23 23:07:32 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
-     %SRCID%   1.419
+     %SRCID%   1.420
 -->
 
 
@@ -34,7 +34,8 @@
       
 
       
-	Hoe IEEE 802.11- en &bluetooth;-apparaten te installeren.
+	Hoe &ieee; 802.11- en &bluetooth;-apparaten te
+	  installeren.
 	
       
 
@@ -786,7 +787,7 @@
     
       De beginselen van draadloos netwerken
 
-      De meeste draadloze netwerken zijn op de IEEE 802.11
+      De meeste draadloze netwerken zijn op de &ieee; 802.11
 	standaarden gebaseerd.  Een eenvoudig draadloos netwerk bestaat
 	uit meerdere stations die met radio's communiceren die in de
 	2,4GHz of de 5GHz band uitzenden (alhoewel dit regionaal
@@ -806,16 +807,16 @@
 	netwerk.
 
       802.11 netwerken begonnen in de 2,4GHz band waarbij gebruik
-	werd gemaakt van protocollen die door de IEEE 802.11 en 802.11b
-	standaarden worden gedefinieerd.  Deze specificaties omvatten de
-	werkfrequenties, karakteristieken van de MAC-lagen waaronder
-	frame- en zendsnelheden (communicatie kan met verschillende
-	snelheden plaatsvinden).  Later definieerde de 802.11a-standaard
-	het werken in de 5GHz band, inclusief andere mechanismen voor
-	signalering en hogere zendsnelheden.  Nog later werd de
-	802.11g-standaard gedefinieerd om gebruik te kunnen maken van de
-	signalerings- en zendmechanismen van 802.11a in de 2,4GHz band
-	zodanig dat het met terugwerkende kracht werkt op
+	werd gemaakt van protocollen die door de &ieee; 802.11 en
+	802.11b standaarden worden gedefinieerd.  Deze specificaties
+	omvatten de werkfrequenties, karakteristieken van de MAC-lagen
+	waaronder frame- en zendsnelheden (communicatie kan met
+	verschillende snelheden plaatsvinden).  Later definieerde de
+	802.11a-standaard het werken in de 5GHz band, inclusief andere
+	mechanismen voor signalering en hogere zendsnelheden.  Nog later
+	werd de 802.11g-standaard gedefinieerd om gebruik te kunnen
+	maken van de signalerings- en zendmechanismen van 802.11a in de
+	2,4GHz band zodanig dat het met terugwerkende kracht werkt op
 	802.11b-netwerken.
 
       Afgezien van de onderliggende zendtechnieken beschikken
@@ -829,7 +830,7 @@
 	Het is bewezen dat dit mechanisme eenvoudig te kraken is en
 	wordt nu, afgezien om voorbijgaande gebruikers te ontmoedigen
 	het netwerk te gebruiken, nog zelden gebruikt.  De huidige
-	beveiligingsmethoden worden gegeven door de IEEE 802.11i
+	beveiligingsmethoden worden gegeven door de &ieee; 802.11i
 	specificatie dat nieuwe cryptografische algoritmen en een
 	aanvullend protocol om stations aan een toegangspunt te
 	authenticeren en om sleutels voor gegevenscommunicatie uit te
@@ -1500,7 +1501,7 @@
 	      
 
 	      
-		Hier wordt het RSN (IEEE 802.11i) protocol
+		Hier wordt het RSN (&ieee; 802.11i) protocol
 		  gebruikt, ofwel WPA2.
 	      
 
@@ -3481,7 +3482,7 @@
 
       
 	
-	  failover
+	  Failover
 
 	  
 	    Zendt en ontvangt verkeer alleen door de meesterpoort.
@@ -3494,61 +3495,61 @@
 	
 
 	
-	  fec
+	  &cisco; Fast ðerchannel;
 
 	  
-	    Ondersteunt Cisco EtherChannel.  Dit is een statische
+	    &cisco; Fast ðerchannel; (FEC), is een statische
 	      installatie en onderhandelt niet over aggregatie met de
 	      peer noch wisselt het frames uit om de verbinding te
-	      monitoren, indien de switch LACP ondersteunt dient dat
+	      monitoren.  Indien de switch LACP ondersteunt dient dat
 	      gebruikt te worden.
 
-	    Balanceert uitgaand verkeer over de actieve poorten
-	      gebaseerd op gehashde informatie over protocolheaders en
-	      accepteert inkomend verkeer van elke actieve poort.  De
-	      hash bevat het Ethernet bron- en doeladres, en indien
-	      beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en
-	      doeladressen.
+	    FEC balanceert uitgaand verkeer
+	      over de actieve poorten gebaseerd op gehashde informatie
+	      over protocolheaders en accepteert inkomend verkeer van
+	      elke actieve poort.  De hash bevat het Ethernet bron- en
+	      doeladres, en indien beschikbaar, de VLAN-tag, en de
+	      IPv4/IPv6 bron- en doeladressen.
 	  
 	
 
 	
-	  lacp
+	  LACP
 
 	  
-	    Ondersteunt het IEEE 802.3ad Link Aggregation Control
-	      Protocol (LACP) en het Marker Protocol.  LACP onderhandelt
-	      met de peer over een verzameling aggregeerbare
-	      verbindingen in een of meerdere Link Aggregated Groups.
-	      Elke LAG is opgebouwd uit poorten die dezelfde snelheid
-	      hebben, ingesteld op full-duplex werking.  Het verkeer zal
-	      over de poorten in de LAG gebalanceerd worden met de
-	      hoogste totaalsnelheid, in de meeste gevallen zal er
-	      slechts één LAG zijn die alle poorten bevat.
-	      Wanneer er fysieke verbindingen veranderen, zal Link
-	      Aggregation snel naar een nieuwe opstelling
+	    Het &ieee; 802.3ad Link Aggregation Control Protocol
+	      (LACP) en het Marker Protocol.  LACP onderhandelt met de
+	      peer over een verzameling aggregeerbare verbindingen in
+	      één of meerdere Link Aggregated Groups
+	      (LAG).  Elke LAG is opgebouwd uit poorten die dezelfde
+	      snelheid hebben, ingesteld op full-duplex werking.  Het
+	      verkeer zal over de poorten in de LAG gebalanceerd worden
+	      met de hoogste totaalsnelheid, in de meeste gevallen zal
+	      er slechts één LAG zijn die alle poorten
+	      bevat.  Wanneer er fysieke verbindingen veranderen, zal
+	      Link Aggregation snel naar een nieuwe opstelling
 	      convergeren.
 
-	    Balanceert uitgaand verkeer over de actieve poorten
-	      gebaseerd op gehashde informatie over protocolheaders en
-	      accepteert inkomend verkeer van elke actieve poort.  De
-	      hash bevat het Ethernet bron- en doeladres, en indien
-	      beschikbaar, de VLAN-tag, en de IPv4/IPv6 bron- en
-	      doeladressen.
+	    LACP balanceert uitgaand verkeer
+	      over de actieve poorten gebaseerd op gehashde informatie
+	      over protocolheaders en accepteert inkomend verkeer van
+	      elke actieve poort.  De hash bevat het Ethernet bron- en
+	      doeladres, en indien beschikbaar, de VLAN-tag, en de
+	      IPv4/IPv6 bron- en doeladressen.
 	  
 	
 
 	
-	  loadbalance
+	  Loadbalance
 
 	  
-	    Dit is een alias van de fec
+	    Dit is een alias van de FEC
 	      modus.
 	  
 	
 
 	
-	  roundrobin
+	  Round-Robin
 
 	  
 	    Distribueert uitgaand verkeer door middel van een
@@ -3565,7 +3566,7 @@
       Voorbeelden
 
       
-	LACP aggregatie met een Cisco switch
+	LACP-aggregatie met een &cisco; switch
 
 	Dit voorbeeld verbindt twee interfaces op een &os;-machine
 	  met de switch als een enkele loadgebalanceerde en
@@ -3580,29 +3581,35 @@
 	  verkeersstromen en deze over de beschikbare interfaces te
 	  balanceren.
 
-	Voeg op de Cisco switch de interfaces aan de kanaalgroep
-	  toe.
+	Voeg op de &cisco; switch de interfaces
+	  FastEthernet0/1 en
+	  FastEthernet0/2 aan de kanaalgroep
+	  1 toe:
 
-	interface FastEthernet0/1
- channel-group 1 mode active
- channel-protocol lacp
+	interface FastEthernet0/1
+ channel-group 1 mode active
+ channel-protocol lacp
 !
-interface FastEthernet0/2
- channel-group 1 mode active
- channel-protocol lacp
-!
+interface FastEthernet0/2
+ channel-group 1 mode active
+ channel-protocol lacp
+
+	Maak op de &os;-machine de &man.lagg.4;-interface aan door
+	  fxp0 en
+	  fxp1 te gebruiken:
+
+	&prompt.root; ifconfig lagg0 create
+&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1
 
-	Maak op de &os;-machine de lagg-interface aan.
+	Bekijk de interfacestatus van ifconfig:
 
-	&prompt.root; ifconfig lagg0 create
-&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1
+	&prompt.root; ifconfig lagg0
 
-	Bekijk de interfacestatus van ifconfig; poorten die als
-	  ACTIVE zijn gemarkeerd zijn lid van de
-	  actieve aggregatiegroep waarover onderhandeld is met de verre
-	  switch en waarover verkeer zal worden verzonden en ontvangen.
-	  Gebruik de uitgebreide uitvoer van &man.ifconfig.8; om de
-	  LAG-identifiers te bekijken.
+	Poorten die als ACTIVE zijn
+	  gemarkeerd zijn lid van de actieve aggregatiegroep waarover
+	  onderhandeld is met de verre switch en waarover verkeer zal
+	  worden verzonden en ontvangen.  Gebruik de uitgebreide uitvoer
+	  van &man.ifconfig.8; om de LAG-identifiers te bekijken.
 
 	lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
         options=8<VLAN_MTU>
@@ -3613,9 +3620,8 @@
         laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING>
         laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING>
 
-	De switch zal laten zien welke poorten actief zijn.
-	  Gebruik voor meer detail
-	  show lacp neighbor detail.
+	Gebruik, om de toestand van de poorten op de switch te
+	  bekijken, show lacp neighbor.
 
 	switch# show lacp neighbor
 Flags:  S - Device is requesting Slow LACPDUs
@@ -3631,19 +3637,30 @@
 Fa0/1     SA      32768     0005.5d71.8db8  29s    0x146   0x3      0x3D
 Fa0/2     SA      32768     0005.5d71.8db8  29s    0x146   0x4      0x3D
 
+	Gebruik voor meer detail het commando show lacp
+	    neighbor detail.
       
 
       
 	Failover-modus
 
-	Failover-modus kan worden gebruikt om op een ander
+	Failover-modus kan worden gebruikt om op een secondaire
 	  interface over te schakelen wanneer de verbinding op de
-	  meester verloren is.
+	  meesterinterface verloren is.  Creëer en configureer de
+	  interface lagg0, met
+	  fxp0 als de meesterinterface en
+	  fxp1 als de secondaire
+	  interface:
+
+	&prompt.root; ifconfig lagg0 create
+&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1
 
-        &prompt.root; ifconfig lagg0 create
-&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1
+	De interface zal er ongeveer als volgt uitzien, de grote
+	  verschillen zullen het MAC-adres en de
+	  apparaatnamen zijn:
 
-	lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
+	&prompt.root; ifconfig lagg0
+lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
         options=8<VLAN_MTU>
         ether 00:05:5d:71:8d:b8
         media: Ethernet autoselect
@@ -3653,9 +3670,9 @@
         laggport: fxp0 flags=5<MASTER,ACTIVE>
 
 	Het verkeer zal worden verzonden en ontvangen op
-	  fxp0.  Indien de verbinding op
-	  fxp0 verloren is, zal
-	  fxp1 de actieve verbinding worden.
+	  fxp0.  Indien de verbinding op
+	  fxp0 verloren is, zal
+	  fxp1 de actieve verbinding worden.
 	  Indien de verbinding op de meesterinterface hersteld is, zal
 	  het weer de actieve verbinding worden.
       

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 10:09:46 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B925E1065673; Wed,  7 Jan 2009 10:09: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 77BA9106564A
	for ; Wed,  7 Jan 2009 10:09:45 +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 6465A8FC0C
	for ; Wed,  7 Jan 2009 10:09:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07A9jrp056955
	for ; Wed, 7 Jan 2009 10:09:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07A9jrs056953
	for perforce@freebsd.org; Wed, 7 Jan 2009 10:09:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Jan 2009 10:09:45 GMT
Message-Id: <200901071009.n07A9jrs056953@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 155748 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, 07 Jan 2009 10:09:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=155748

Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35

	
	Umass module quirk from Alexander Best
	to support Meizu Electronics MiniPlayer.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#35 (text+ko) ====

@@ -151,6 +151,7 @@
 vendor KYOCERA		0x0482	Kyocera Wireless Corp.
 vendor STMICRO		0x0483	STMicroelectronics
 vendor FOXCONN		0x0489	Foxconn
+vendor MEIZU		0x0492	Meizu Electronics
 vendor YAMAHA		0x0499	YAMAHA
 vendor COMPAQ		0x049f	Compaq
 vendor HITACHI		0x04a4	Hitachi
@@ -1657,6 +1658,9 @@
 product MCT USB232		0x0210	USB-232 Interface
 product MCT SITECOM_USB232	0x0230	Sitecom USB-232 Products
 
+/* Meizu Electronics */
+product MEIZU M6_SL		0x0140	MiniPlayer M6 (SL)
+
 /* Melco, Inc products */
 product MELCO LUATX1		0x0001	LUA-TX Ethernet
 product MELCO LUATX5		0x0005	LUA-TX Ethernet

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -158,6 +158,7 @@
 #define	USB_VENDOR_KYOCERA	0x0482		/* Kyocera Wireless Corp. */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
 #define	USB_VENDOR_FOXCONN	0x0489		/* Foxconn */
+#define	USB_VENDOR_MEIZU	0x0492		/* Meizu Electronics */
 #define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
 #define	USB_VENDOR_HITACHI	0x04a4		/* Hitachi */
@@ -1247,12 +1248,18 @@
 #define	USB_PRODUCT_EPSON_CX5400	0x0808		/* CX5400 scanner */
 #define	USB_PRODUCT_EPSON_3500	0x080e		/* CX-3500/3600/3650 MFP */
 #define	USB_PRODUCT_EPSON_RX425	0x080f		/* Stylus Photo RX425 scanner */
-#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4800 MP scanner */
-#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4200 MP scanner */
-#define	USB_PRODUCT_EPSON_5000	0x082b		/* DX-50x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_6000	0x082e		/* DX-60x0 MFP scanner */
-#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* DX7400/CX7300 scanner */
-#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* DX8400 scanner */
+#define	USB_PRODUCT_EPSON_DX3800	0x0818		/* CX3700/CX3800/DX38x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4800	0x0819		/* CX4700/CX4800/DX48x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_4200	0x0820		/* CX4100/CX4200/DX4200 MFP scanner */
+#define	USB_PRODUCT_EPSON_5000	0x082b		/* CX4900/CX5000/DX50x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_6000	0x082e		/* CX5900/CX6000/DX60x0 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX4000	0x082f		/* DX4000 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX7400	0x0838		/* CX7300/CX7400/DX7400 MFP scanner */
+#define	USB_PRODUCT_EPSON_DX8400	0x0839		/* CX8300/CX8400/DX8400 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX100	0x0841		/* SX100/NX100 MFP scanner */
+#define	USB_PRODUCT_EPSON_NX300	0x0848		/* NX300 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX200	0x0849		/* SX200/SX205 MFP scanner */
+#define	USB_PRODUCT_EPSON_SX400	0x084a		/* SX400/NX400/TX400 MFP scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial */
@@ -1658,6 +1665,9 @@
 #define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
 #define	USB_PRODUCT_MCT_SITECOM_USB232	0x0230		/* Sitecom USB-232 Products */
 
+/* Meizu Electronics */
+#define	USB_PRODUCT_MEIZU_M6_SL	0x0140		/* MiniPlayer M6 (SL) */
+
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -2357,40 +2357,76 @@
 	    "Stylus Photo RX425 scanner",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800,
+	    0,
+	    "Seiko Epson",
+	    "CX3700/CX3800/DX38x0 MFP scanner",
+	},
+	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800,
 	    0,
 	    "Seiko Epson",
-	    "CX4800 MP scanner",
+	    "CX4700/CX4800/DX48x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200,
 	    0,
 	    "Seiko Epson",
-	    "CX4200 MP scanner",
+	    "CX4100/CX4200/DX4200 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000,
 	    0,
 	    "Seiko Epson",
-	    "DX-50x0 MFP scanner",
+	    "CX4900/CX5000/DX50x0 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000,
 	    0,
 	    "Seiko Epson",
-	    "DX-60x0 MFP scanner",
+	    "CX5900/CX6000/DX60x0 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000,
+	    0,
+	    "Seiko Epson",
+	    "DX4000 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400,
 	    0,
 	    "Seiko Epson",
-	    "DX7400/CX7300 scanner",
+	    "CX7300/CX7400/DX7400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400,
 	    0,
 	    "Seiko Epson",
-	    "DX8400 scanner",
+	    "CX8300/CX8400/DX8400 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX100,
+	    0,
+	    "Seiko Epson",
+	    "SX100/NX100 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_NX300,
+	    0,
+	    "Seiko Epson",
+	    "NX300 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX200,
+	    0,
+	    "Seiko Epson",
+	    "SX200/SX205 MFP scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX400,
+	    0,
+	    "Seiko Epson",
+	    "SX400/NX400/TX400 MFP scanner",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
@@ -3995,6 +4031,12 @@
 	    "Sitecom USB-232 Products",
 	},
 	{
+	    USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL,
+	    0,
+	    "Meizu Electronics",
+	    "MiniPlayer M6 (SL)",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
 	    0,
 	    "Melco",
@@ -7835,6 +7877,12 @@
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MEIZU, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Meizu Electronics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_YAMAHA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "YAMAHA",

==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 (text+ko) ====

@@ -916,6 +916,10 @@
 		UMASS_PROTO_ATAPI | UMASS_PROTO_CBI,
 		NO_QUIRKS
 	},
+	{USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, RID_WILDCARD,
+		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+		NO_INQUIRY | NO_SYNCHRONIZE_CACHE
+	},
 	{VID_EOT, PID_EOT, RID_EOT, 0, 0}
 };
 

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 10:41:28 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 808F010656C1; Wed,  7 Jan 2009 10:41: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 3396D10656BC
	for ; Wed,  7 Jan 2009 10:41:27 +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 214838FC1E
	for ; Wed,  7 Jan 2009 10:41:27 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07AfQAt061158
	for ; Wed, 7 Jan 2009 10:41:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07AfHG9061148
	for perforce@freebsd.org; Wed, 7 Jan 2009 10:41:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Jan 2009 10:41:17 GMT
Message-Id: <200901071041.n07AfHG9061148@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 155750 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, 07 Jan 2009 10:41:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=155750

Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28

	
	Patch to resolve problems with power mode off.
	Reported by Alexander Best.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 (text+ko) ====

@@ -1699,11 +1699,12 @@
 	}
 	switch (mode) {
 	case USB_POWER_MODE_OFF:
-		/* clear suspend */
-		err = usb2_req_clear_port_feature(udev->parent_hub,
-		    NULL, udev->port_no, UHF_PORT_SUSPEND);
-		if (err)
-			break;
+		/* get the device unconfigured */
+		err = ugen_set_config(f, USB_UNCONFIG_INDEX);
+		if (err) {
+			DPRINTFN(0, "Could not unconfigure "
+			    "device (ignored)\n");
+		}
 
 		/* clear port enable */
 		err = usb2_req_clear_port_feature(udev->parent_hub,

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 (text+ko) ====

@@ -1823,7 +1823,8 @@
 usb2_set_power_mode(struct usb2_device *udev, uint8_t power_mode)
 {
 	/* filter input argument */
-	if (power_mode != USB_POWER_MODE_ON) {
+	if ((power_mode != USB_POWER_MODE_ON) &&
+	    (power_mode != USB_POWER_MODE_OFF)) {
 		power_mode = USB_POWER_MODE_SAVE;
 	}
 	udev->power_mode = power_mode;	/* update copy of power mode */

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 13:23:12 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9296106567E; Wed,  7 Jan 2009 13:23: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 9469A106567A
	for ; Wed,  7 Jan 2009 13:23:11 +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 827148FC14
	for ; Wed,  7 Jan 2009 13:23:11 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07DNBll091555
	for ; Wed, 7 Jan 2009 13:23:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07DNBA1091553
	for perforce@freebsd.org; Wed, 7 Jan 2009 13:23:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Jan 2009 13:23:11 GMT
Message-Id: <200901071323.n07DNBA1091553@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 155754 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, 07 Jan 2009 13:23:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=155754

Change 155754 by hselasky@hselasky_laptop001 on 2009/01/07 13:22:11

	
	Make sure that the cancelled error code
	is always checked and result in a return
	from the USB callback.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#24 (text+ko) ====

@@ -2921,6 +2921,8 @@
 	uint8_t chan;
 	uint8_t buf[2];
 
+	DPRINTF("\n");
+
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 tr_transferred:
@@ -2980,11 +2982,14 @@
 		if (repeat) {
 			goto tr_setup;
 		}
-		return;
+		break;
 
 	default:			/* Error */
 		DPRINTF("error=%s\n", usb2_errstr(xfer->error));
-
+		if (xfer->error == USB_ERR_CANCELLED) {
+			/* do nothing - we are detaching */
+			break;
+		}
 		goto tr_transferred;
 	}
 }

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 13:27:16 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 20713106566C; Wed,  7 Jan 2009 13:27: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 D1AB6106564A
	for ; Wed,  7 Jan 2009 13:27:15 +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 C00BA8FC17
	for ; Wed,  7 Jan 2009 13:27:15 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07DRFr8091938
	for ; Wed, 7 Jan 2009 13:27:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07DRFt5091936
	for perforce@freebsd.org; Wed, 7 Jan 2009 13:27:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Jan 2009 13:27:15 GMT
Message-Id: <200901071327.n07DRFt5091936@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 155755 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, 07 Jan 2009 13:27:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=155755

Change 155755 by hselasky@hselasky_laptop001 on 2009/01/07 13:26:37

	
	Fix a race causing the explore thread to
	hang when tearing down USB transfers at
	detach.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#36 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#36 (text+ko) ====

@@ -1915,8 +1915,7 @@
 
 	/*
 	 * Check if we got started after that we got cancelled, but
-	 * before we managed to do the callback. Check if we are
-	 * draining.
+	 * before we managed to do the callback.
 	 */
 	if ((!xfer->flags_int.open) &&
 	    (xfer->flags_int.started) &&
@@ -1924,13 +1923,19 @@
 		/* try to loop, but not recursivly */
 		usb2_command_wrapper(&info->done_q, xfer);
 		return;
-	} else if (xfer->flags_int.draining &&
+	}
+
+done:
+	/*
+	 * Check if we are draining.
+	 */
+	if (xfer->flags_int.draining &&
 	    (!xfer->flags_int.transferring)) {
 		/* "usb2_transfer_drain()" is waiting for end of transfer */
 		xfer->flags_int.draining = 0;
 		usb2_cv_broadcast(&xfer->usb2_root->cv_drain);
 	}
-done:
+
 	/* do the next callback, if any */
 	usb2_command_wrapper(&info->done_q,
 	    info->done_q.curr);

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 15:13:04 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D87201065672; Wed,  7 Jan 2009 15:13: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 93F08106564A
	for ; Wed,  7 Jan 2009 15:13:03 +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 81F408FC1A
	for ; Wed,  7 Jan 2009 15:13:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07FD3dY019129
	for ; Wed, 7 Jan 2009 15:13:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07FD3Do019127
	for perforce@freebsd.org; Wed, 7 Jan 2009 15:13:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 7 Jan 2009 15:13:03 GMT
Message-Id: <200901071513.n07FD3Do019127@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 155759 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, 07 Jan 2009 15:13:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=155759

Change 155759 by hselasky@hselasky_laptop001 on 2009/01/07 15:12:24

	
	Optimise: Remove extra flush calls.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#22 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#22 (text+ko) ====

@@ -1558,13 +1558,12 @@
 	}
 	ed->ed_flags = htole32(ed_flags);
 
-	usb2_pc_cpu_flush(ed->page_cache);
-
 	td = xfer->td_transfer_first;
 
 	ed->ed_headp = td->td_self;
 
 	if (xfer->udev->pwr_save.suspended == 0) {
+		/* the append function will flush the endpoint descriptor */
 		OHCI_APPEND_QH(ed, *ed_last);
 
 		if (methods == &ohci_device_bulk_methods) {
@@ -2009,13 +2008,12 @@
 	}
 	ed->ed_flags = htole32(ed_flags);
 
-	usb2_pc_cpu_flush(ed->page_cache);
-
 	td = xfer->td_transfer_first;
 
 	ed->ed_headp = td->itd_self;
 
 	/* isochronous transfers are not affected by suspend / resume */
+	/* the append function will flush the endpoint descriptor */
 
 	OHCI_APPEND_QH(ed, sc->sc_isoc_p_last);
 }

From owner-p4-projects@FreeBSD.ORG  Wed Jan  7 19:10:06 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75C051065670; Wed,  7 Jan 2009 19:10: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 3397B1065678
	for ; Wed,  7 Jan 2009 19:10:06 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2ABCC8FC19
	for ; Wed,  7 Jan 2009 19:10:05 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07JA5bk057734
	for ; Wed, 7 Jan 2009 19:10:05 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07JA5bk057731
	for perforce@freebsd.org; Wed, 7 Jan 2009 19:10:05 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 7 Jan 2009 19:10:05 GMT
Message-Id: <200901071910.n07JA5bk057731@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 155769 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, 07 Jan 2009 19:10:07 -0000

http://perforce.freebsd.org/chv.cgi?CH=155769

Change 155769 by rene@rene_self on 2009/01/07 19:09:32

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#14 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#26 integrate
.. //depot/projects/docproj_nl/www/en/developers/cvs.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releases/7.1R/announce.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#12 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#5 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#9 (text+ko) ====

@@ -11,7 +11,7 @@
       The &os; Ports Management Team
     
 
-    $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.35 2008/09/20 18:47:41 linimon Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.36 2009/01/07 09:34:58 pav Exp $
 
     
       2003
@@ -491,7 +491,8 @@
 
 	
 	  build portsupdate arch
-	    branch - Replaces the ports
+	    branch
+	    buildid - Replaces the ports
 	    tree with a new ZFS snapshot.  Don't forget to use
 	    -noports flag to dopackages
 	    later!

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#14 (text+ko) ====

@@ -12,7 +12,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1106 2009/01/05 15:44:57 remko Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1107 2009/01/07 09:49:12 pgj Exp $
 
     
       1995
@@ -4590,6 +4590,46 @@
       
 
       
+	
+	  Do I need to recompile every port each time I perform a
+	    major version update?
+	
+
+	
+	  By all means!  While a recent system will run with
+	    software compiled under an older release, you will end up with
+	    things randomly crashing and failing to work once you start
+	    installing other ports or updating a portion of what you
+	    already have.
+
+	  When the system is upgraded, various shared libraries,
+	    loadable modules, and other parts of the system will be
+	    replaced with newer versions.  Applications linked against
+	    the older versions may fail to start or, in other cases,
+	    fail to function properly.
+
+	  For more information, see the section on upgrades
+	    in the &os; Handbook.
+	
+      
+
+      
+	
+	  Do I need to recompile every port each time I perform a
+	    minor version update?
+	
+
+	
+	  In general, no.  &os; developers do their utmost to
+	    guarantee binary compatibility across all releases with the
+	    same major version number.  Any exceptions will be
+	    documented in the Release Notes, and advice given there
+	    should be followed.
+	
+      
+
+      
 	
 	  Why is /bin/sh so minimal?  Why does
 	    &os; not use bash or another

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -79,6 +79,12 @@
       
 
       
+	How to keep your documentation up to date with
+	  CVSup.
+      
+
+      
 	The difference between the two development
 	  branches: &os.stable; and &os.current;.
       
@@ -698,6 +704,327 @@
     &prompt.root; portsnap fetch update
   
 
+  
+    Updating the Documentation Set
+
+    Updating and Upgrading
+
+    
+      Documentation
+      Updating and Upgrading
+    
+
+    Besides the base system and the Ports Collection,
+      documentation is an integral part of the &os; operating system.
+      While an up-to-date version of the &os; Documentation Set is
+      always available on the &os; web site, some
+      users might have slow or no permanent network connectivity at all.
+      Fortunately, there are several ways to update the documentation
+      shipped with each release by maintaining a local copy of the
+      latest &os; Documentation Set.
+
+    
+      Using CVSup to Update the Documentation
+
+      The sources and the installed copy of the &os; documentation
+        can be updated with CVSup, using a
+        mechanism similar to the one employed for the base system
+        sources (c.f. ).  This section
+        describes:
+
+      
+	
+	  How to install the documentation toolchain, the tools
+	    that are required to rebuild the &os; documentation from its
+	    source.
+	
+
+	
+	  How to download a copy of the documentation source
+	    at /usr/doc,
+	    using CVSup.
+	
+
+	
+	  How to rebuild the &os; documentation from its source,
+	    and install it
+	    under /usr/share/doc.
+	
+
+	
+	  Some of the build options that are supported by the
+	    build system of the documentation, i.e. the options that
+	    build only some of the different language translations of
+	    the documentation or the options that select a specific
+	    output format.
+	
+      
+    
+
+    
+      Installing CVSup and the Documentation Toolchain
+
+      Rebuilding the &os; documentation from source requires a
+	fairly large collection of tools.  These tools are not part of
+	the &os; base system, because they need a large amount of disk
+	space and they are not useful to all &os; users; they are only
+	useful to those users that are actively writing new
+	documentation for &os; or are frequently updating their
+	documentation from source.
+
+      All the required tools are available as part of the Ports
+	Collection.  The textproc/docproj port is a master
+	port that has been developed by the &os; Documentation Project,
+	to ease the initial installation and future updates of these
+	tools.
+
+      
+	When no &postscript; or PDF documentation required, one
+	  might consider installing the textproc/docproj-nojadetex port
+	  instead.  This version of the documentation toolchain includes
+	  everything except the teTeX
+	  typesetting engine.  teTeX is a
+	  very large collection of tools, so it may be quite sensible to
+	  omit its installation if PDF output is not really
+	  necessary.
+      
+
+      For more information on installing and using
+	CVSup, see Using CVSup.
+    
+
+    
+      Updating the Documentation Sources
+
+      The CVSup utility can fetch a
+	clean copy of the documentation sources, using
+	the /usr/share/examples/cvsup/doc-supfile
+	file as a configuration template.  The default update host is
+	set to a placeholder value in doc-supfile,
+	but &man.cvsup.1; accepts a host name through the command line,
+	so the documentation sources can be fetched from one of the
+	CVSup servers by typing:
+
+      &prompt.root; cvsup -h cvsup.FreeBSD.org -g -L 2 /usr/share/examples/cvsup/doc-supfile
+
+      Change cvsup.FreeBSD.org to the
+	nearest CVSup server.  See  for a complete listing of mirror
+	sites.
+
+      The initial download of the documentation sources may take a
+	while.  Let it run until it completes.
+
+      Future updates of the documentation sources may be fetched
+	by running the same command.
+	The CVSup utility downloads and
+	copies only the updates since the last time it ran, so every run
+	of CVSup after the first complete run
+	should be pretty fast.
+
+      After checking out the sources, an alternative way of
+	updating the documentation is supported by the
+	Makefile of the /usr/doc directory.  By setting
+	SUP_UPDATE, SUPHOST and
+	DOCSUPFILE in the
+	/etc/make.conf file, it is possible to
+	run:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make update
+
+      A typical set of these &man.make.1; options
+	for /etc/make.conf is:
+
+      SUP_UPDATE= yes
+SUPHOST?= cvsup.freebsd.org
+DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile
+
+      
+	Setting the SUPHOST
+	  and DOCSUPFILE value
+	  with ?= permits overriding them in the
+	  command-line of make.  This is the recommended way of adding
+	  options to make.conf, to avoid having to
+	  edit the file every time a different option value has to be
+	  tested.
+      
+    
+
+    
+      Tunable Options of the Documentation Sources
+
+      The updating and build system of the &os; documentation
+	supports a few options that ease the process of updating only
+	parts of the documentation, or the build of specific
+	translations.  These options can be set either as system-wide
+	options in the /etc/make.conf file, or as
+	command-line options passed to the &man.make.1; utility.
+
+      The following options are some of these:
+
+      
+	
+	  DOC_LANG
+
+	  
+	    The list of languages and encodings to build and
+	      install, e.g. en_US.ISO8859-1 for the
+	      English documentation only.
+	  
+	
+
+	
+	  FORMATS
+
+	  
+	    A single format or a list of output formats to be
+	      built.  Currently, html,
+	      html-split, txt,
+	      ps, pdf,
+	      and rtf are supported.
+	  
+	
+
+	
+	  SUPHOST
+
+	  
+	    The hostname of the CVSup
+	      server to use when updating.
+	  
+	
+      
+
+      For more make variables supported as system-wide options in
+	&os;, see &man.make.conf.5;.
+
+      For more make variables supported by the build system of the
+	&os; documentation, please refer to
+	the &os;
+	  Documentation Project Primer for New Contributors.
+    
+
+    
+      Installing the &os; Documentation from Source
+
+      When an up-to-date snapshot of the documentation sources has
+	been fetched in /usr/doc,
+	everything is ready for an update of the installed
+	documentation.
+
+      A full update of all the languages defined in
+	the DOC_LANG makefile option may be done by
+	typing:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make install clean
+
+      If make.conf has been set up with the
+	correct DOCSUPFILE, SUPHOST
+	and SUP_UPDATE options, the install step may
+	be combined with an update of the documentation sources by
+	typing:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make update install clean
+
+      If an update of only a specific language is desired,
+	&man.make.1; can be invoked in a language specific subdirectory
+	of /usr/doc, i.e.:
+
+      &prompt.root; cd /usr/doc/en_US.ISO8859-1
+&prompt.root; make update install clean
+
+      The output formats that will be installed may be specified
+	by setting the FORMATS make variable,
+	i.e.:
+
+      &prompt.root; cd /usr/doc
+&prompt.root; make FORMATS='html html-split' install clean
+    
+
+
+
+      
+	
+	  
+	    Pav
+	    Lucistnik
+	    Based on information provided by 
+	  
+	
+      
+
+      Using Docsnap
+
+      Updating and Upgrading
+
+      
+	Docsnap
+	Updating and Upgrading
+      
+
+      Docsnap is an &man.rsync.1;
+	repository for updating installed &os; Documentation in a
+	relatively easy and fast way.  A
+	Docsnap server tracks
+	the documentation sources, and builds them in HTML format every
+	hour.  The textproc/docproj
+	is unneeded with Docsnap as only
+	patches to the built documentation exist.
+
+      The only requirement for using this technique is
+	the net/rsync port or
+	package.  To add it, use the following command:
+
+      &prompt.root; pkg_add -r rsync
+
+      
+	Docsnap has been originally
+	  developed for updating documentation installed
+	  to /usr/share/doc, but
+	  the following examples could be adapted for other directories
+	  as well.  For user directories, it does not require
+	  root privileges.
+      
+
+      To update the documentation set, issue the following
+	command:
+
+      &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap /usr/share/doc
+
+      
+	There is only one Docsnap
+	  server at the moment;
+	  the docsnap.sk.FreeBSD.org shown
+	  above.
+      
+
+      Do not use the  flag here as there
+	are some items installed
+	into /usr/share/doc
+	during make installworld, which would
+	accidentally be removed.  To clean up, use this command
+	instead:
+
+      &prompt.root; rsync -rltvz --delete docsnap.sk.FreeBSD.org::docsnap/??_??\.\* /usr/share/doc
+
+      If a subset of documentation needs to be updated, for
+	example, the English documentation only, the following command
+	should be used:
+
+      &prompt.root; rsync -rltvz docsnap.sk.FreeBSD.org::docsnap/en_US.ISO8859-1 /usr/share/doc
+    
+]]>
+  
+
   
     Tracking a Development Branch
     -CURRENT

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#7 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -714,32 +714,12 @@
 	Portsnap Method
 
 	Portsnap is an alternative system for
-	  distributing the Ports Collection.  It was first included in
-	  &os; 6.0.  On older systems, you can install it from ports-mgmt/portsnap package:
-
-	&prompt.root; pkg_add -r portsnap
-
-	Please refer to Using Portsnap
+	  distributing the Ports Collection.
+	  Please refer to Using Portsnap
 	  for a detailed description of all Portsnap
 	  features.
 
 	
-	  Since &os; 6.1-RELEASE and with recent versions
-	    of the Portsnap port or package, you
-	    can safely skip this step.  The /usr/ports will be created
-	    automatically at first use of the &man.portsnap.8; command.
-	    With previous versions of
-	    Portsnap, you will have to
-	    create an empty directory /usr/ports if it does not
-	    exists:
-
-	  &prompt.root; mkdir /usr/ports
-	
-
-	
 	  Download a compressed snapshot of the Ports Collection into
 	    /var/db/portsnap.  You can
 	    disconnect from the Internet after this step, if you wish.

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#26 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
   &header;
@@ -210,7 +210,7 @@
       supported by the Security Officer for a minimum of 12 months after the
       release, and for sufficient additional time (if needed) to ensure
       that there is a newer release for at least 3 months before the
-      older Normal relase expires.
+      older Normal release expires.
     
     
      Extended
      
     
      Selected releases (normally every second release plus the last

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#12 (text+ko) ====

@@ -10,10 +10,36 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.64 2008/12/29 11:11:56 murray Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.66 2009/01/06 13:45:10 danger Exp $
     
   
 
+  
+    FOSDEM '09
+    http://fosdem.org/2009/
+    
+      2009
+      2
+      7
+    
+    
+      2009
+      2
+      8
+    
+    
+      Belgium
+      Brussels
+      ULB Campus Solbosh
+    
+
+    FOSDEM '09 is a free and non-commercial event organized
+      by the community, for the community.  Its goal is to provide Free
+      and Open Source developers a place to meet.  Several &os;
+      developers will be present, including Kris Kennaway who will be
+      giving a talk about system performance.
+  
+
   
     EuroBSDCon 2009
     http://2009.eurobsdcon.org/
@@ -63,6 +89,40 @@
       from commercial vendors.
   
 
+  
+    FreeBSD Kernel Internals: Intensive Evening Course
+    http://www.mckusick.com/courses/adveveclass.html
+    
+      2009
+      3
+      18
+    
+    
+      2009
+      7
+      2
+    
+    
+      USA
+      California
+      Berkeley
+    
+
+    The 
+      FreeBSD Kernel Internals: An Intensive Code Walkthrough
+      course provides an in depth study of the source code of the
+      FreeBSD 8-current kernel as of early March.  This course is
+      aimed at users with a good understanding of the algorithms used
+      in the FreeBSD kernel that want to learn the details of their
+      implementation.  The class will be held at the historic  Hillside Club at 2286
+      Cedar Street, Berkeley, CA 94709 just three blocks north of the
+      Berkeley campus once per week from 6:30PM to 10:00PM starting
+      Wednesday March 18th and finishing Thursday July 2nd.
+  
+
+
   
     AsiaBSDCon 2009
     http://2009.asiabsdcon.org/

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#3 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 Developers
    • Developer's Handbook
    • Porter's Handbook
      • -
    • CVS Repository
      • +
    • Source code repositories
    • Release Engineering
    • Platforms
    • Project Ideas
      • From owner-p4-projects@FreeBSD.ORG Wed Jan 7 19:19:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA1A71065673; Wed, 7 Jan 2009 19:19: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 9A3D7106564A for ; Wed, 7 Jan 2009 19:19:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 88D648FC1F for ; Wed, 7 Jan 2009 19:19:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07JJEgv058502 for ; Wed, 7 Jan 2009 19:19:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07JJEEL058500 for perforce@freebsd.org; Wed, 7 Jan 2009 19:19:14 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 7 Jan 2009 19:19:14 GMT Message-Id: <200901071919.n07JJEEL058500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155770 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, 07 Jan 2009 19:19:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=155770 Change 155770 by rene@rene_self on 2009/01/07 19:18:59 MFen handbook/ports 1.286 -> 1.287 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#12 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.286 + %SRCID% 1.287 --> @@ -781,32 +781,12 @@ Met Portsnap Portsnap is een alternatief systeem voor het - distribueren van de Portscollectie dat voor het eerst - beschikbaar was in &os; 6.0. Op oudere systemen is het - te installeren uit het pakket sysutils/portsnap: - - &prompt.root; pkg_add -r portsnap - - In Portsnap - gebruiken staat een gedetailleerde beschrijving van + distribueren van de Portscollectie. In Portsnap + gebruiken staat een gedetailleerde beschrijving van alle mogelijkheden van Portsnap. - Sinds &os;- 6.1-RELEASE en met recente versies van - de Portsnap port of pakket kan - de volgende stap veilig worden overgeslagen. De /usr/ports wordt automatisch - gemaakt bij het eerste gebruik van het &man.portsnap.8; - commando. Met eerdere versies van - Portsnap moet de /usr/ports directory eerst - gemaakt worden als deze nog niet bestaat: - - &prompt.root; mkdir /usr/ports - - - Download een gecomprimeerd snapshot van de Portscollectie naar /var/db/portsnap. Na deze From owner-p4-projects@FreeBSD.ORG Wed Jan 7 20:03:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A315D1065676; Wed, 7 Jan 2009 20:02: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 5C7AB1065670 for ; Wed, 7 Jan 2009 20:02:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2B3F8FC1D for ; Wed, 7 Jan 2009 20:02:58 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07K2wPU062265 for ; Wed, 7 Jan 2009 20:02:58 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07K2wYv062263 for perforce@freebsd.org; Wed, 7 Jan 2009 20:02:58 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 7 Jan 2009 20:02:58 GMT Message-Id: <200901072002.n07K2wYv062263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155772 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, 07 Jan 2009 20:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155772 Change 155772 by rene@rene_self on 2009/01/07 20:02:33 Synchronize committers-guide with commit candidate 1. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 (text+ko) ==== @@ -2404,7 +2404,7 @@ maintainer is expected to work with the platform maintainers to refine these changes. Major new toolchain components are allowed to break support for Tier 2 architectures if the - &os;-local changes have not been incorporated upstream. The + FreeBSD-local changes have not been incorporated upstream. The toolchain maintainers are expected to provide prompt review of any proposed changes and cannot block, through their inaction, changes going into the tree. New features added to FreeBSD @@ -3312,7 +3312,7 @@ - Free 4-CD and DVD sets + Free 4-CD and DVD Sets &os; committers can get a free 4-CD or DVD set at From owner-p4-projects@FreeBSD.ORG Wed Jan 7 20:06:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FE6D106567A; Wed, 7 Jan 2009 20:06: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 695AF1065672 for ; Wed, 7 Jan 2009 20:06:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57E6C8FC13 for ; Wed, 7 Jan 2009 20:06:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07K62HI063395 for ; Wed, 7 Jan 2009 20:06:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07K62tg063393 for perforce@freebsd.org; Wed, 7 Jan 2009 20:06:02 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 7 Jan 2009 20:06:02 GMT Message-Id: <200901072006.n07K62tg063393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155774 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, 07 Jan 2009 20:06:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=155774 Change 155774 by rene@rene_self on 2009/01/07 20:05:47 Undo ordering change of i386 and Sparc64 in commiters-guide Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 (text+ko) ==== @@ -2224,7 +2224,7 @@ to the source tree.
    - The Sparc64 and i386 platforms were chosen due to being more + The i386 and Sparc64 platforms were chosen due to being more readily available to developers and as representatives of more diverse processor and system designs - big vs little endian, register file vs register stack, different DMA and cache From owner-p4-projects@FreeBSD.ORG Wed Jan 7 23:32:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 901D710656FC; Wed, 7 Jan 2009 23:32: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 4B62A10656DB for ; Wed, 7 Jan 2009 23:32:50 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 390B78FC20 for ; Wed, 7 Jan 2009 23:32:50 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n07NWoIa092744 for ; Wed, 7 Jan 2009 23:32:50 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n07NWkhX092742 for perforce@freebsd.org; Wed, 7 Jan 2009 23:32:46 GMT (envelope-from peter@wemm.org) Date: Wed, 7 Jan 2009 23:32:46 GMT Message-Id: <200901072332.n07NWkhX092742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 155790 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, 07 Jan 2009 23:32:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155790 Change 155790 by peter@peter_daintree on 2009/01/07 23:32:45 IFC @155788 Affected files ... .. //depot/projects/hammer/COPYRIGHT#8 integrate .. //depot/projects/hammer/Makefile#54 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#63 integrate .. //depot/projects/hammer/UPDATING#128 integrate .. //depot/projects/hammer/bin/test/test.1#7 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#12 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#7 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#8 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#6 integrate .. //depot/projects/hammer/contrib/bind9/README#9 integrate .. //depot/projects/hammer/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#10 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/main.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#10 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.8#6 delete .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#6 integrate .. //depot/projects/hammer/contrib/bind9/config.h.in#1 branch .. //depot/projects/hammer/contrib/bind9/configure.in#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#10 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/options#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/index#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/aclocal.m4#4 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strerror.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strtoul.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/config.h.in#7 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/support.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/assertions.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/eventlib.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/misc.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netdb.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/resolv.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_network.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_ho.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent_r.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_clnt.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_after.h.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_query.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_send.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#10 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#11 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/api#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/mutex.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/net.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/net.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/time.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/api#7 integrate .. //depot/projects/hammer/contrib/bind9/make/rules.in#6 integrate .. //depot/projects/hammer/contrib/bind9/version#12 integrate .. //depot/projects/hammer/contrib/csup/GNUmakefile#3 integrate .. //depot/projects/hammer/contrib/csup/Makefile#3 integrate .. //depot/projects/hammer/contrib/csup/TODO#3 integrate .. //depot/projects/hammer/contrib/csup/config.c#3 integrate .. //depot/projects/hammer/contrib/csup/csup.1#3 integrate .. //depot/projects/hammer/contrib/csup/detailer.c#2 integrate .. //depot/projects/hammer/contrib/csup/diff.c#2 integrate .. //depot/projects/hammer/contrib/csup/diff.h#2 integrate .. //depot/projects/hammer/contrib/csup/fattr.c#3 integrate .. //depot/projects/hammer/contrib/csup/fattr.h#2 integrate .. //depot/projects/hammer/contrib/csup/keyword.c#2 integrate .. //depot/projects/hammer/contrib/csup/keyword.h#2 integrate .. //depot/projects/hammer/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/hammer/contrib/csup/lister.c#3 integrate .. //depot/projects/hammer/contrib/csup/misc.c#3 integrate .. //depot/projects/hammer/contrib/csup/misc.h#3 integrate .. //depot/projects/hammer/contrib/csup/mux.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.c#3 integrate .. //depot/projects/hammer/contrib/csup/proto.h#2 integrate .. //depot/projects/hammer/contrib/csup/rcsfile.c#1 branch .. //depot/projects/hammer/contrib/csup/rcsfile.h#1 branch .. //depot/projects/hammer/contrib/csup/rcsparse.c#1 branch .. //depot/projects/hammer/contrib/csup/rcsparse.h#1 branch .. //depot/projects/hammer/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/hammer/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/hammer/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/hammer/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/hammer/contrib/csup/status.c#2 integrate .. //depot/projects/hammer/contrib/csup/stream.c#2 integrate .. //depot/projects/hammer/contrib/csup/stream.h#2 integrate .. //depot/projects/hammer/contrib/csup/updater.c#3 integrate .. //depot/projects/hammer/contrib/file/AUTHORS#1 branch .. //depot/projects/hammer/contrib/file/COPYING#1 branch .. //depot/projects/hammer/contrib/file/ChangeLog#6 integrate .. //depot/projects/hammer/contrib/file/FREEBSD-upgrade#6 delete .. //depot/projects/hammer/contrib/file/INSTALL#1 branch .. //depot/projects/hammer/contrib/file/LEGAL.NOTICE#5 delete .. //depot/projects/hammer/contrib/file/MAINT#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/adventure#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/animation#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/apple#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/archive#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/audio#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/c-lang#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/c64#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/clarion#1 branch .. //depot/projects/hammer/contrib/file/Magdir/commands#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/compress#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/console#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ctags#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/database#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/diff#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/dump#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/elf#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/erlang#1 branch .. //depot/projects/hammer/contrib/file/Magdir/filesystems#9 integrate .. //depot/projects/hammer/contrib/file/Magdir/flash#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/fonts#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/frame#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/fsav#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/games#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/hammer/contrib/file/Magdir/gnu#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/hammer/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/hammer/contrib/file/Magdir/hp#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/iff#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/images#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/inform#1 branch .. //depot/projects/hammer/contrib/file/Magdir/java#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/jpeg#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/kde#1 branch .. //depot/projects/hammer/contrib/file/Magdir/lex#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/linux#7 integrate .. //depot/projects/hammer/contrib/file/Magdir/lisp#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/llvm#1 branch .. //depot/projects/hammer/contrib/file/Magdir/lua#1 branch .. //depot/projects/hammer/contrib/file/Magdir/luks#1 branch .. //depot/projects/hammer/contrib/file/Magdir/macintosh#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/mail.news#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/hammer/contrib/file/Magdir/mathematica#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/hammer/contrib/file/Magdir/misctools#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/hammer/contrib/file/Magdir/msdos#8 integrate .. //depot/projects/hammer/contrib/file/Magdir/mup#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/netware#1 branch .. //depot/projects/hammer/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/hammer/contrib/file/Magdir/os2#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/palm#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/pdf#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/perl#6 integrate .. //depot/projects/hammer/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/printer#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/psion#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/revision#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/riff#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/rpm#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/ruby#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sc#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sgi#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/sgml#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/sharc#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/spectrum#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/tex#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/troff#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/varied.script#3 integrate .. //depot/projects/hammer/contrib/file/Magdir/vorbis#5 integrate .. //depot/projects/hammer/contrib/file/Magdir/warc#1 branch .. //depot/projects/hammer/contrib/file/Magdir/weak#1 branch .. //depot/projects/hammer/contrib/file/Magdir/windows#1 branch .. //depot/projects/hammer/contrib/file/Magdir/wordprocessors#4 integrate .. //depot/projects/hammer/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/hammer/contrib/file/Makefile.am#9 integrate .. //depot/projects/hammer/contrib/file/Makefile.in#9 integrate .. //depot/projects/hammer/contrib/file/Makefile.std#4 delete .. //depot/projects/hammer/contrib/file/NEWS#1 branch .. //depot/projects/hammer/contrib/file/PORTING#2 delete .. //depot/projects/hammer/contrib/file/README#6 integrate .. //depot/projects/hammer/contrib/file/TODO#1 branch .. //depot/projects/hammer/contrib/file/acinclude.m4#5 integrate .. //depot/projects/hammer/contrib/file/aclocal.m4#8 integrate .. //depot/projects/hammer/contrib/file/apprentice.c#9 integrate .. //depot/projects/hammer/contrib/file/ascmagic.c#9 integrate .. //depot/projects/hammer/contrib/file/asprintf.c#1 branch .. //depot/projects/hammer/contrib/file/compile#1 branch .. //depot/projects/hammer/contrib/file/compress.c#8 integrate .. //depot/projects/hammer/contrib/file/config.guess#1 branch .. //depot/projects/hammer/contrib/file/config.h.in#9 integrate .. //depot/projects/hammer/contrib/file/config.sub#1 branch .. //depot/projects/hammer/contrib/file/configure#9 integrate .. //depot/projects/hammer/contrib/file/configure.ac#1 branch .. //depot/projects/hammer/contrib/file/configure.in#9 delete .. //depot/projects/hammer/contrib/file/elfclass.h#1 branch .. //depot/projects/hammer/contrib/file/file.c#9 integrate .. //depot/projects/hammer/contrib/file/file.h#9 integrate .. //depot/projects/hammer/contrib/file/file.man#7 integrate .. //depot/projects/hammer/contrib/file/fsmagic.c#8 integrate .. //depot/projects/hammer/contrib/file/funcs.c#6 integrate .. //depot/projects/hammer/contrib/file/getopt_long.c#1 branch .. //depot/projects/hammer/contrib/file/is_tar.c#7 integrate .. //depot/projects/hammer/contrib/file/libmagic.man#4 integrate .. //depot/projects/hammer/contrib/file/magic.c#7 integrate .. //depot/projects/hammer/contrib/file/magic.h#5 integrate .. //depot/projects/hammer/contrib/file/magic.man#7 integrate .. //depot/projects/hammer/contrib/file/magic.mime#9 delete .. //depot/projects/hammer/contrib/file/magic2mime#5 delete .. //depot/projects/hammer/contrib/file/mkinstalldirs#5 delete .. //depot/projects/hammer/contrib/file/mygetopt.h#1 branch .. //depot/projects/hammer/contrib/file/names.h#7 integrate .. //depot/projects/hammer/contrib/file/patchlevel.h#9 integrate .. //depot/projects/hammer/contrib/file/print.c#9 integrate .. //depot/projects/hammer/contrib/file/readelf.c#10 integrate .. //depot/projects/hammer/contrib/file/readelf.h#7 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#9 integrate .. //depot/projects/hammer/contrib/file/tar.h#5 integrate .. //depot/projects/hammer/contrib/file/test.c#4 delete .. //depot/projects/hammer/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/hammer/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/hammer/contrib/file/tests/README#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/hammer/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/hammer/contrib/file/tests/test.c#1 branch .. //depot/projects/hammer/contrib/file/vasprintf.c#1 branch .. //depot/projects/hammer/contrib/lukemftpd/src/extern.h#5 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpcmd.y#5 integrate .. //depot/projects/hammer/contrib/lukemftpd/src/ftpd.c#5 integrate .. //depot/projects/hammer/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#9 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/NEWS#2 integrate .. //depot/projects/hammer/contrib/openbsm/README#7 integrate .. //depot/projects/hammer/contrib/openbsm/TODO#6 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#8 integrate .. //depot/projects/hammer/contrib/openbsm/bin/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_darwin.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_fbsd.c#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/auditd_lib.h#1 branch .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#6 integrate .. //depot/projects/hammer/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h#8 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h.in#6 integrate .. //depot/projects/hammer/contrib/openbsm/configure#8 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#8 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#9 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/libauditd/auditd_lib.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_errno.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/audit_submit.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_errno.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#8 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_user.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/libbsm.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/man/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit.log.5#6 integrate .. //depot/projects/hammer/contrib/openbsm/modules/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_errno.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/E2BIG_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EACCES_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EBADF_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EBUSY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ECHILD_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EDEADLK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EEXIST_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EFAULT_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EFBIG_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EINTR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EINVAL_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EIO_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EISDIR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EMFILE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EMLINK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENFILE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENODEV_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOENT_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOEXEC_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOMEM_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOSPC_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTBLK_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTDIR_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTTY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ENXIO_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EPERM_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EPIPE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EROFS_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ESPIPE_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ESRCH_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/ETXTBSY_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/EXDEV_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/arg32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/data_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/file_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/header32_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/in_addr_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ip_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ipc_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/iport_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/opaque_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/path_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv4#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv6#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv4#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv6#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/seq_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_record#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_token#1 branch .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/text_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/zonename_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/openssl/apps/speed.c#6 integrate .. //depot/projects/hammer/crypto/openssl/apps/spkac.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/verify.c#4 integrate .. //depot/projects/hammer/crypto/openssl/apps/x509.c#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_clnt.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s2_srvr.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_clnt.c#8 integrate .. //depot/projects/hammer/crypto/openssl/ssl/s3_srvr.c#9 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssltest.c#7 integrate .. //depot/projects/hammer/etc/Makefile#67 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#92 integrate .. //depot/projects/hammer/etc/devd.conf#36 integrate .. //depot/projects/hammer/etc/devd/Makefile#1 branch .. //depot/projects/hammer/etc/devd/asus.conf#1 branch .. //depot/projects/hammer/etc/mtree/BSD.root.dist#20 integrate .. //depot/projects/hammer/etc/rc.d/defaultroute#2 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#31 integrate .. //depot/projects/hammer/gnu/usr.bin/man/manpath/manpath.config#7 integrate .. //depot/projects/hammer/lib/Makefile#75 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#7 integrate .. //depot/projects/hammer/lib/bind/bind/port_after.h#5 integrate .. //depot/projects/hammer/lib/bind/bind/port_before.h#6 integrate .. //depot/projects/hammer/lib/bind/config.h#10 integrate .. //depot/projects/hammer/lib/bind/dns/code.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumclass.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumtype.h#6 integrate .. //depot/projects/hammer/lib/bind/dns/dns/rdatastruct.h#6 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#8 integrate .. //depot/projects/hammer/lib/bind/isc/isc/platform.h#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#37 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#15 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libauditd/Makefile#1 branch .. //depot/projects/hammer/lib/libbsm/Makefile#7 integrate .. //depot/projects/hammer/lib/libc/arm/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/arm/arith.h#3 integrate .. //depot/projects/hammer/lib/libc/include/fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#15 integrate .. //depot/projects/hammer/lib/libc/sys/jail.2#10 integrate .. //depot/projects/hammer/lib/libc/sys/kldunload.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/socket.2#9 integrate .. //depot/projects/hammer/lib/libelf/README#1 branch .. //depot/projects/hammer/lib/libfetch/fetch.c#6 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#11 integrate .. //depot/projects/hammer/lib/libstand/bootp.c#4 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/hammer/lib/libutil/kinfo_getfile.c#2 integrate .. //depot/projects/hammer/lib/libutil/kinfo_getvmmap.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#11 integrate .. //depot/projects/hammer/libexec/ftpd/extern.h#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpcmd.y#12 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#32 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#16 integrate .. //depot/projects/hammer/sbin/ddb/ddb.8#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#18 integrate .. //depot/projects/hammer/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#10 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#69 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#68 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#10 integrate .. //depot/projects/hammer/sbin/md5/md5.1#9 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#8 integrate .. //depot/projects/hammer/sbin/mount/mount.c#33 integrate .. //depot/projects/hammer/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.8#9 integrate .. //depot/projects/hammer/sbin/ping/ping.8#11 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#10 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.8#7 integrate .. //depot/projects/hammer/share/doc/bind9/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#115 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/hammer/share/man/man4/ae.4#2 integrate .. //depot/projects/hammer/share/man/man4/cpuctl.4#2 integrate .. //depot/projects/hammer/share/man/man4/ndis.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_tty.4#6 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#14 integrate .. //depot/projects/hammer/share/man/man4/snd_ich.4#9 integrate .. //depot/projects/hammer/share/man/man4/textdump.4#5 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#21 integrate .. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#11 integrate .. //depot/projects/hammer/share/man/man7/build.7#19 integrate .. //depot/projects/hammer/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/hammer/share/man/man9/domain.9#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#31 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#47 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#66 integrate .. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#11 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#118 integrate .. //depot/projects/hammer/sys/amd64/conf/USB2#1 branch .. //depot/projects/hammer/sys/amd64/include/cputypes.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#34 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#26 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#19 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#13 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#15 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/hammer/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/hammer/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#8 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#7 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#18 integrate .. //depot/projects/hammer/sys/arm/conf/NSLU#5 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#8 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#6 integrate .. //depot/projects/hammer/sys/arm/include/ieee.h#3 integrate .. //depot/projects/hammer/sys/arm/include/intr.h#12 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_ata.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#9 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#8 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npe.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_npevar.h#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/hammer/sys/boot/forth/loader.4th#3 integrate .. //depot/projects/hammer/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/hammer/sys/boot/forth/support.4th#5 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#13 integrate .. //depot/projects/hammer/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/hammer/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/hammer/sys/bsm/audit.h#12 integrate .. //depot/projects/hammer/sys/bsm/audit_errno.h#1 branch .. //depot/projects/hammer/sys/bsm/audit_internal.h#9 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#13 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#10 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#25 integrate .. //depot/projects/hammer/sys/cam/cam_periph.h#7 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#8 integrate .. //depot/projects/hammer/sys/cam/cam_sim.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#41 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#27 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#49 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#63 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#47 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#57 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#44 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#28 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#28 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#48 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#49 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/hammer/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#23 integrate .. //depot/projects/hammer/sys/conf/NOTES#156 integrate .. //depot/projects/hammer/sys/conf/files#194 integrate .. //depot/projects/hammer/sys/conf/files.amd64#110 integrate .. //depot/projects/hammer/sys/conf/files.i386#101 integrate .. //depot/projects/hammer/sys/conf/files.ia64#43 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#36 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#50 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#10 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#45 integrate .. //depot/projects/hammer/sys/conf/options#138 integrate .. //depot/projects/hammer/sys/conf/options.arm#17 integrate .. //depot/projects/hammer/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#13 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#16 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#4 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/hammer/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#16 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#18 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#16 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#16 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#29 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#31 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#15 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#10 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#18 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#19 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#9 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#17 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#69 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#68 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#27 integrate .. //depot/projects/hammer/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/hammer/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#15 integrate .. //depot/projects/hammer/sys/dev/iicbus/iic.c#13 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicbus.c#10 integrate .. //depot/projects/hammer/sys/dev/iicbus/iicsmb.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#24 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#20 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#13 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/hammer/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/hammer/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/hammer/sys/dev/ofw/openfirm.c#12 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#9 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirmio.c#13 integrate .. //depot/projects/hammer/sys/dev/ofw/openpromio.c#9 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#20 integrate .. //depot/projects/hammer/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#35 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#66 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#13 delete .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.h#3 delete .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#27 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-dumb.c#5 delete .. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#8 delete .. //depot/projects/hammer/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/scterm.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/sctermvar.h#3 delete .. //depot/projects/hammer/sys/dev/syscons/syscons.c#50 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#17 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/hammer/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#38 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#53 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#115 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#17 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#33 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_bus.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#21 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#31 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#18 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#10 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#17 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#3 integrate .. //depot/projects/hammer/sys/i386/conf/DEFAULTS#12 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/i386/conf/USB2#1 branch .. //depot/projects/hammer/sys/i386/conf/XEN#6 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#90 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#65 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#7 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#8 integrate .. //depot/projects/hammer/sys/i386/include/xen/evtchn.h#4 delete .. //depot/projects/hammer/sys/i386/include/xen/hypervisor.h#2 delete .. //depot/projects/hammer/sys/i386/include/xen/xen_intr.h#3 delete .. //depot/projects/hammer/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#33 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#37 integrate .. //depot/projects/hammer/sys/i386/xen/clock.c#3 integrate .. //depot/projects/hammer/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/xen/mptable.c#2 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#7 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#88 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#80 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#20 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#101 integrate .. //depot/projects/hammer/sys/kern/subr_kobj.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#31 integrate .. //depot/projects/hammer/sys/kern/tty.c#67 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#60 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#102 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#139 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#87 integrate .. //depot/projects/hammer/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#3 integrate .. //depot/projects/hammer/sys/mips/mips/elf64_machdep.c#1 branch .. //depot/projects/hammer/sys/modules/ndis/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#24 integrate .. //depot/projects/hammer/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/hammer/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/hammer/sys/net/ieee8023ad_lacp.c#9 integrate .. //depot/projects/hammer/sys/net/if.c#85 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#24 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#78 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#28 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#25 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#27 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#20 integrate .. //depot/projects/hammer/sys/net/if_media.h#24 integrate .. //depot/projects/hammer/sys/net/if_tun.c#39 integrate .. //depot/projects/hammer/sys/net/if_var.h#53 integrate .. //depot/projects/hammer/sys/net/route.c#42 integrate .. //depot/projects/hammer/sys/net/route.h#25 integrate .. //depot/projects/hammer/sys/net/rtsock.c#44 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#46 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#43 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#52 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#42 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_power.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#37 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#33 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/hammer/sys/netinet/if_ether.c#53 integrate .. //depot/projects/hammer/sys/netinet/in.c#35 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#66 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#47 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#75 integrate .. //depot/projects/hammer/sys/netinet/ipprotosw.h#4 delete .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#19 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#93 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#90 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#68 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#63 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#64 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#9 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#41 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#37 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#41 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#55 integrate .. //depot/projects/hammer/sys/netinet6/ip6protosw.h#7 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#41 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#13 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#31 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#44 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#46 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#28 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#19 integrate .. //depot/projects/hammer/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#19 integrate .. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/hammer/sys/pc98/cbus/sctermvar.h#1 branch .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 8 02:40:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83EED106566B; Thu, 8 Jan 2009 02:40:05 +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 42E3F106566C for ; Thu, 8 Jan 2009 02:40:05 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1864C8FC0A for ; Thu, 8 Jan 2009 02:40:05 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n082e4m8020845 for ; Thu, 8 Jan 2009 02:40:04 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n082e4hZ020843 for perforce@freebsd.org; Thu, 8 Jan 2009 02:40:04 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 02:40:04 GMT Message-Id: <200901080240.n082e4hZ020843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155793 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, 08 Jan 2009 02:40:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=155793 Change 155793 by weongyo@weongyo_ws on 2009/01/08 02:39:44 looks the initilizetion of led is done so get rid of a XXX comment. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#10 (text+ko) ==== @@ -501,7 +501,7 @@ error = urtw_get_txpwr(sc); if (error != 0) goto fail; - error = urtw_led_init(sc); /* XXX incompleted */ + error = urtw_led_init(sc); if (error != 0) goto fail; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 02:51:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 104711065672; Thu, 8 Jan 2009 02:51: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 C466F106564A for ; Thu, 8 Jan 2009 02:51:16 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B311F8FC14 for ; Thu, 8 Jan 2009 02:51:16 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n082pGQR021674 for ; Thu, 8 Jan 2009 02:51:16 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n082pG6n021672 for perforce@freebsd.org; Thu, 8 Jan 2009 02:51:16 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 02:51:16 GMT Message-Id: <200901080251.n082pG6n021672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155794 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, 08 Jan 2009 02:51:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=155794 Change 155794 by weongyo@weongyo_ws on 2009/01/08 02:51:09 some comments and remove magic values to handle preamble modes. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#11 edit .. //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#11 (text+ko) ==== @@ -508,8 +508,11 @@ sc->sc_rts_retry = URTW_DEFAULT_RTS_RETRY; sc->sc_tx_retry = URTW_DEFAULT_TX_RETRY; sc->sc_currate = 3; - /* XXX for what? */ - sc->sc_preamble_mode = 2; + /* + * XXX there's no points to set this variable to + * URTW_PREAMBLE_MODE_SHORT so we need to set it properly. + */ + sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { @@ -2381,10 +2384,11 @@ data->buf[1] = (m0->m_pkthdr.len & 0x0f00) >> 8; data->buf[1] |= (1 << 7); - /* XXX sc_preamble_mode is always 2. */ + /* XXX sc_preamble_mode is always URTW_PREAMBLE_MODE_LONG. */ if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && - (sc->sc_preamble_mode == 1) && (sc->sc_currate != 0)) + (sc->sc_preamble_mode == URTW_PREAMBLE_MODE_SHORT) && + (sc->sc_currate != 0)) data->buf[2] |= 1; if ((m0->m_pkthdr.len > vap->iv_rtsthreshold) && prior == URTW_PRIORITY_LOW) ==== //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 (text+ko) ==== @@ -129,6 +129,8 @@ uint8_t sc_rts_retry; uint8_t sc_tx_retry; uint8_t sc_preamble_mode; +#define URTW_PREAMBLE_MODE_SHORT 1 +#define URTW_PREAMBLE_MODE_LONG 2 struct callout sc_watchdog_ch; int sc_txtimer; int sc_currate; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 03:29:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1244106566C; Thu, 8 Jan 2009 03:29: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 8FAFE106564A for ; Thu, 8 Jan 2009 03:29:58 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 650FA8FC19 for ; Thu, 8 Jan 2009 03:29:58 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n083TwhL025488 for ; Thu, 8 Jan 2009 03:29:58 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n083TuFo025480 for perforce@freebsd.org; Thu, 8 Jan 2009 03:29:56 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 03:29:56 GMT Message-Id: <200901080329.n083TuFo025480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155796 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, 08 Jan 2009 03:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=155796 Change 155796 by weongyo@weongyo_ws on 2009/01/08 03:29:22 update a comment. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#12 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#12 (text+ko) ==== @@ -510,7 +510,8 @@ sc->sc_currate = 3; /* * XXX there's no points to set this variable to - * URTW_PREAMBLE_MODE_SHORT so we need to set it properly. + * URTW_PREAMBLE_MODE_SHORT so we need to set it properly to increase + * the throughput perfomance at high data rates. */ sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; From owner-p4-projects@FreeBSD.ORG Thu Jan 8 03:42:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FDDA1065678; Thu, 8 Jan 2009 03:42: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 EFF5B1065676 for ; Thu, 8 Jan 2009 03:42:10 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE6BC8FC19 for ; Thu, 8 Jan 2009 03:42:10 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n083gAKn026435 for ; Thu, 8 Jan 2009 03:42:10 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n083gARw026433 for perforce@freebsd.org; Thu, 8 Jan 2009 03:42:10 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 03:42:10 GMT Message-Id: <200901080342.n083gARw026433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155797 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, 08 Jan 2009 03:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155797 Change 155797 by weongyo@weongyo_ws on 2009/01/08 03:41:18 add a knob to control the preamble mode. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#13 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#13 (text+ko) ==== @@ -63,8 +63,8 @@ #include #include +SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L"); #ifdef URTW_DEBUG -SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L"); int urtw_debug = 0; SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RW, &urtw_debug, 0, "control debugging printfs"); @@ -88,6 +88,10 @@ (void) sc; \ } while (0) #endif +int urtw_preamble_mode = URTW_PREAMBLE_MODE_LONG; +SYSCTL_INT(_hw_usb_urtw, OID_AUTO, preamble_mode, CTLFLAG_RW, + &urtw_preamble_mode, 0, "set the preable mode (long or short)"); +TUNABLE_INT("hw.usb.urtw.preamble_mode", &urtw_preamble_mode); /* recognized device vendors/products */ static const struct usb_devno urtw_devs[] = { @@ -508,12 +512,7 @@ sc->sc_rts_retry = URTW_DEFAULT_RTS_RETRY; sc->sc_tx_retry = URTW_DEFAULT_TX_RETRY; sc->sc_currate = 3; - /* - * XXX there's no points to set this variable to - * URTW_PREAMBLE_MODE_SHORT so we need to set it properly to increase - * the throughput perfomance at high data rates. - */ - sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG; + sc->sc_preamble_mode = urtw_preamble_mode; ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if (ifp == NULL) { @@ -2385,7 +2384,6 @@ data->buf[1] = (m0->m_pkthdr.len & 0x0f00) >> 8; data->buf[1] |= (1 << 7); - /* XXX sc_preamble_mode is always URTW_PREAMBLE_MODE_LONG. */ if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && (sc->sc_preamble_mode == URTW_PREAMBLE_MODE_SHORT) && From owner-p4-projects@FreeBSD.ORG Thu Jan 8 03:56:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA0751065672; Thu, 8 Jan 2009 03:56: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 79944106566C for ; Thu, 8 Jan 2009 03:56:25 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 685658FC0A for ; Thu, 8 Jan 2009 03:56:25 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n083uPgp027522 for ; Thu, 8 Jan 2009 03:56:25 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n083uPY0027520 for perforce@freebsd.org; Thu, 8 Jan 2009 03:56:25 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 03:56:25 GMT Message-Id: <200901080356.n083uPY0027520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155798 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, 08 Jan 2009 03:56:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=155798 Change 155798 by weongyo@weongyo_ws on 2009/01/08 03:55:24 As a looking of the Realtek's linux driver they use RX_MAXSIZE buffers with 0x9c4(2500) but currently urtw(4) would use MCLBYTES. Without datasheets it looks hard to define the value exactly. Just with some testing it looks it's ok to use MCLBYTES but not sure there're some side-effects. So temporary remove a warning message to make users into confusions. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#14 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#14 (text+ko) ==== @@ -669,7 +669,6 @@ goto fail; } if (fillmbuf) { - /* XXX check maxsz */ dp->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (dp->m == NULL) { device_printf(sc->sc_dev, @@ -734,9 +733,6 @@ urtw_alloc_rx_data_list(struct urtw_softc *sc) { - /* XXX todo */ - device_printf(sc->sc_dev, "WARNING: rx buffer is smaller than %d\n", - URTW_RX_MAXSIZE); return urtw_alloc_data_list(sc, sc->sc_rxdata, URTW_RX_DATA_LIST_COUNT, MCLBYTES, 1 /* mbufs */); } From owner-p4-projects@FreeBSD.ORG Thu Jan 8 04:58:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0782A106566C; Thu, 8 Jan 2009 04:58: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 B2276106564A for ; Thu, 8 Jan 2009 04:58:28 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0BE38FC08 for ; Thu, 8 Jan 2009 04:58:28 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n084wSAg042755 for ; Thu, 8 Jan 2009 04:58:28 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n084wS3T042753 for perforce@freebsd.org; Thu, 8 Jan 2009 04:58:28 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 8 Jan 2009 04:58:28 GMT Message-Id: <200901080458.n084wS3T042753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155801 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, 08 Jan 2009 04:58:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=155801 Change 155801 by weongyo@weongyo_ws on 2009/01/08 04:58:16 check the value directly. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#15 (text+ko) ==== @@ -2770,7 +2770,6 @@ { struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211_channel *c = ic->ic_curchan; - short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0; usbd_status error; error = urtw_8225_set_txpwrlvl(sc, chan); @@ -2787,7 +2786,7 @@ else urtw_write8_m(sc, URTW_SLOT, 0x14); - if (gset) { + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14); @@ -3177,7 +3176,6 @@ { struct ieee80211com *ic = sc->sc_ifp->if_l2com; struct ieee80211_channel *c = ic->ic_curchan; - short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0; usbd_status error; error = urtw_8225v2_set_txpwrlvl(sc, chan); @@ -3195,7 +3193,7 @@ else urtw_write8_m(sc, URTW_SLOT, 0x14); - if (gset) { + if (IEEE80211_IS_CHAN_G(c)) { /* for G */ urtw_write8_m(sc, URTW_DIFS, 0x14); urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 05:40:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E2A41065673; Thu, 8 Jan 2009 05:40: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 4E1DD106566C for ; Thu, 8 Jan 2009 05:40:11 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D20E8FC0C for ; Thu, 8 Jan 2009 05:40:11 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n085eBVO047000 for ; Thu, 8 Jan 2009 05:40:11 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n085eB8d046998 for perforce@freebsd.org; Thu, 8 Jan 2009 05:40:11 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 8 Jan 2009 05:40:11 GMT Message-Id: <200901080540.n085eB8d046998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 155804 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, 08 Jan 2009 05:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155804 Change 155804 by gonzo@gonzo_figaro on 2009/01/08 05:39:36 o Clean code while I'm here looking for pcib(4) examples Affected files ... .. //depot/projects/mips2/src/sys/mips/idt/idtpci.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/idt/idtpci.c#4 (text+ko) ==== @@ -125,8 +125,6 @@ struct rman sc_mem_rman[2]; struct rman sc_io_rman[2]; struct rman sc_irq_rman; - uint32_t sc_mem; - uint32_t sc_io; }; static uint32_t @@ -155,9 +153,6 @@ sc->sc_dev = dev; sc->sc_busno = busno; - sc->sc_io = 0; - sc->sc_mem = 0; - /* TODO: Check for host mode */ /* Enabled PCI, IG mode, EAP mode */ @@ -240,7 +235,6 @@ } /* Use KSEG1 to access IO ports for it is uncached */ - sc->sc_io = 0; sc->sc_io_rman[0].rm_type = RMAN_ARRAY; sc->sc_io_rman[0].rm_descr = "IDTPCI I/O Ports window 1"; if (rman_init(&sc->sc_io_rman[0]) != 0 || @@ -258,7 +252,6 @@ } /* Use KSEG1 to access PCI memory for it is uncached */ - sc->sc_mem = 0; sc->sc_mem_rman[0].rm_type = RMAN_ARRAY; sc->sc_mem_rman[0].rm_descr = "IDTPCI PCI Memory window 1"; if (rman_init(&sc->sc_mem_rman[0]) != 0 || From owner-p4-projects@FreeBSD.ORG Thu Jan 8 10:13:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C6D71065675; Thu, 8 Jan 2009 10:13: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 3B315106564A for ; Thu, 8 Jan 2009 10:13:52 +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 299718FC16 for ; Thu, 8 Jan 2009 10:13:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08ADqUA086595 for ; Thu, 8 Jan 2009 10:13:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08ADqxX086593 for perforce@freebsd.org; Thu, 8 Jan 2009 10:13:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 10:13:52 GMT Message-Id: <200901081013.n08ADqxX086593@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 155807 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, 08 Jan 2009 10:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=155807 Change 155807 by hselasky@hselasky_laptop001 on 2009/01/08 10:13:07 Fix a typo. Reported by Alexander Best. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#11 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#11 (text+ko) ==== @@ -327,7 +327,7 @@ opt->got_power_save + opt->got_power_on + opt->got_power_off) > 1) { - err(1, "cannot only specify one of 'set_config', " + err(1, "can only specify one of 'set_config', " "'set_alt', 'reset', 'suspend', 'resume', " "'power_save', 'power_on' and 'power_off' " "at the same time!"); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 10:28:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 548C81065687; Thu, 8 Jan 2009 10:28: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 0F2291065680 for ; Thu, 8 Jan 2009 10:28:07 +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 F15308FC08 for ; Thu, 8 Jan 2009 10:28:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08AS6QZ088409 for ; Thu, 8 Jan 2009 10:28:06 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08AS6eS088407 for perforce@freebsd.org; Thu, 8 Jan 2009 10:28:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 10:28:06 GMT Message-Id: <200901081028.n08AS6eS088407@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 155810 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, 08 Jan 2009 10:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=155810 Change 155810 by hselasky@hselasky_laptop001 on 2009/01/08 10:27:16 Usability improvement. Make sure that setting power mode ON resurrects the device if powered OFF. Reported by: Alexander Best. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#40 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#40 (text+ko) ==== @@ -1688,15 +1688,23 @@ { struct usb2_device *udev = f->udev; int err; + uint8_t old_mode; if ((udev == NULL) || (udev->parent_hub == NULL)) { return (EINVAL); } err = priv_check(curthread, PRIV_ROOT); - if (err) { + if (err) return (err); - } + + /* get old power mode */ + old_mode = udev->power_mode; + + /* if no change, then just return */ + if (old_mode == mode) + return (0); + switch (mode) { case USB_POWER_MODE_OFF: /* get the device unconfigured */ @@ -1734,6 +1742,13 @@ if (err) return (ENXIO); /* I/O failure */ + /* if we are powered off we need to re-enumerate first */ + if (old_mode == USB_POWER_MODE_OFF) { + err = ugen_re_enumerate(f); + if (err) + return (err); + } + /* set new power mode */ usb2_set_power_mode(udev, mode); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 12:23:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FAC7106567D; Thu, 8 Jan 2009 12:23: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 2E3741065674 for ; Thu, 8 Jan 2009 12:23:11 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A1FA8FC23 for ; Thu, 8 Jan 2009 12:23:11 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08CNAhN000151 for ; Thu, 8 Jan 2009 12:23:10 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08CNAqk000149 for perforce@freebsd.org; Thu, 8 Jan 2009 12:23:10 GMT (envelope-from remko@freebsd.org) Date: Thu, 8 Jan 2009 12:23:10 GMT Message-Id: <200901081223.n08CNAqk000149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 155813 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, 08 Jan 2009 12:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=155813 Change 155813 by remko@remko_nakur on 2009/01/08 12:22:56 More WIP. Facilitated by: Snow B.V. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#15 (text+ko) ==== @@ -1904,134 +1904,144 @@ om de top-level structuur te dupliceren van de broncode boom). - Having the sources on-line and knowing how to build a - system with them will make it much easier for you to upgrade - to future releases of &os;. + Door de broncode direct te kunnen benaderen, en weten + hoe een systeem opgebouwd kan worden ermee, maakt het een + stuk makkelijker om te upgraden naar toekomstige versies + van &os;. - To actually select a subset of the sources, use the - Custom menu item when you are in - the Distributions menu of the - system installation tool. + Om een subset van de broncode te kunnen zien, maak + gebruik van het Custom menu + item wanneer u in het + Distributions menu zit van de + systeem installatie applicatie. - Do I need to build a kernel? + Moet ik een kernel bouwen? - Building a new kernel was originally pretty much a - required step in a &os; installation, but more recent releases - have benefited from the introduction of much friendlier - kernel configuration methods. It is very easy to configure - the kernel's configuration by much more flexible - hints which can be set at the loader - prompt. + Het bouwen van een nieuwe kernel was voorheen een + benodigde stap bij een &os; installatie, maar meer recente + versies hebben voordeel gehad van de introductie van veel + vriendelijkere kernel configuratie methodes. Het is heel + makkelijk om de kernel configuratie aan te passen door een + veel flexibelere hints welke ingesteld kunnen + worden op de loader prompt. - It may still be worthwhile building a new kernel - containing just the drivers that you need, just to save a - bit of RAM, but it is no longer necessary for most - systems. + Het kan nog steeds de moeite waard zijn om een nieuwe + kernel te maken, welke alleen de drivers bevat die je + nodig hebt, enkel om een beetje RAM te sparen, maar dat is + veelal niet meer nodig voor de meeste systemen. - Should I use DES, Blowfish, or MD5 passwords and how do - I specify which form my users receive? + Moet ik gebruik maken van DES, Blowfish of MD5 + wachtwoorden en hoe specificeer ik welke vorm gebruikt + wordt voor mijn gebruikers? - The default password format on &os; is to use - MD5-based passwords. These are - believed to be more secure than the traditional &unix; - password format, which used a scheme based on the - DES algorithm. DES passwords are still - available if you need to share your password file with - legacy operating systems which still use the less secure - password format. &os; also allows you to use the Blowfish - password format, which is more secure. Which password - format to use for new passwords is controlled by the - passwd_format login capability in - /etc/login.conf, which takes values of - des, blf (if these are - available) or md5. See the - &man.login.conf.5; manual page for more information about - login capabilities. + Het standaard wachtwoord formaat op &os; is door + gebruik te maken van MD5 + gebaseerde wachtwoorden. Deze worden geacht veiliger te + zijn dan het traditionele &unix; wachtwoord formaat welke + gebruik maakt van een schema gebaseerd op het + DES algorithme. DES wachtwoorden zijn + nog steeds beschikbaar als u uw wachtwoord bestand moet + delen met oudere besturingssystemen, welke nog gebruik maken + van het minder veilige wachtwoord formaat. &os; stelt u ook + in staat om gebruik te maken van het Blowfish wachtwoord + formaat, welke veiliger is. Welk wachtwoord formaat er + gebruikt wordt voor nieuwe wachtwoorden, wordt ingesteld + door de passwd_format login mogelijkheden + in /etc/login.conf, welke de waardes + des, blf (als deze + beschikbaar is) of md5 accepteert. Zie + de &man.login.conf.5; handleiding voor meer informatie over + login mogelijkheden. - Why does the boot floppy start, but hang at the - Probing Devices... screen? + Waarom start de floppy op, maar hangt deze op het + Probing Devices... scherm? - If you have a IDE &iomegazip; or &jaz; drive installed, - remove it and try again. The boot floppy can get confused by - the drives. After the system is installed you can reconnect - the drive. Hopefully this will be fixed in a later - release. + Als u een IDE &iomegezip; of &jaz; heeft + geïnstalleerd, verwijder deze en probeer het opnieuw. + De opstart floppy kan in de war raken door de schijven. + Nadat het systeem geïnstalleerd is kunnen ze opnieuw + verbonden worden met het systeem. Hopelijk wordt dit in + een latere versie opgelost. - Why do I get a panic: can't mount - root error when rebooting the system after - installation? + Waarom krijg ik een panic: can't mount + root error als ik het systeem herstart + na de installatie? - This error comes from confusion between the boot block's - and the kernel's understanding of the disk devices. The - error usually manifests on two-disk IDE systems, with the - hard disks arranged as the master or single device on - separate IDE controllers, with &os; installed on the - secondary IDE controller. The boot blocks think the system - is installed on ad0 (the second - BIOS disk) while the kernel assigns the first disk on the - secondary controller device, ad2. - After the device probing, the kernel tries to mount what the - boot blocks think is the boot disk, - ad0, while it is really - ad2, and fails. + Deze error komt uit de verwarring tussen de boot blokken + en het begrip van de kernel over de schijf apparaten. De + error komt meestal voor op twee-schijf IDE systemen, met de + schijven ingedeeld als de master of als enkel apparaat op + verschillende IDE controllers, waarbij &os; geïnstalleerd + is op de tweede IDE controller. De bootblokken denken dat het + systeem geïnstalleerd is op ad0 + (de eerste BIOS schijf), terwijl de kernel de eerste schijf op + de tweede controller toewijst, ad2. + Na het proben van de apparaten, probeert de kernel de opstart + schijf te koppelen, naar wat de bootblokken denken dat de + opstart schijf is, ad0, terwijl dit + eigenlijk ad2 is waarna de opstart + poging mislukt. - To fix the problem, do one of the following: + Om dit probleem op te lossen, voer één + van de volgende dingen uit: - Reboot the system and hit Enter at - the Booting kernel in 10 seconds; hit [Enter] - to interrupt prompt. This will drop you into - the boot loader. + Herstart het systeem en druk op de + Enter tijdens de + Booting kernel in 10 seconds; hit [Enter] + to interrupt prompt. Dit verwijst u naar de + boot loader. - Then type + Type hierna set root_disk_unit="disk_number". - disk_number will be - 0 if &os; is installed on the master - drive on the first IDE controller, 1 - if it is installed on the slave on the first IDE - controller, 2 if it is installed on - the master of the second IDE controller, and - 3 if it is installed on the slave of - the second IDE controller. + disk_number wordt + 0 als &os; is geïnstalleerd op + de master schijf van de eerste IDE controller, + 1 als deze geïnstallerd op de + slaaf van de eerste IDE controller, + 2 als deze geïnstalleerd is op + de master van de tweede IDE controller, en + 3 als deze geïnstalleerd is op + de slaaf van de tweede IDE controller. - Then type boot, and your - system should boot correctly. + Type hierna boot en uw + systeem zou correct moeten opstarten. - To make this change permanent (i.e, so you do not - have to do this every time you reboot or turn on your - &os; machine), put the line - root_disk_unit="disk_number" - in /boot/loader.conf.local. + Om deze wijziging permanent te maken (dusdanig zodat + u dit niet elke keer hoeft te doen als u uw machine + herstart, of hem opnieuw aanzet), zet de volgende regel + in /boot/loader.conf.local: + root_disk_unit="disk_number". - Move the &os; disk onto the primary IDE - controller, so the hard disks are consecutive. + Verplaats de &os; schijf naar de primaire IDE + controller, zodat de disken goed herkend worden. From owner-p4-projects@FreeBSD.ORG Thu Jan 8 15:32:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63A0C1065675; Thu, 8 Jan 2009 15:32: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 059A61065670 for ; Thu, 8 Jan 2009 15:32:26 +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 E6E818FC16 for ; Thu, 8 Jan 2009 15:32:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08FWPPT031984 for ; Thu, 8 Jan 2009 15:32:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08FWPDx031982 for perforce@freebsd.org; Thu, 8 Jan 2009 15:32:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 15:32:25 GMT Message-Id: <200901081532.n08FWPDx031982@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 155820 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, 08 Jan 2009 15:32:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=155820 Change 155820 by hselasky@hselasky_laptop001 on 2009/01/08 15:32:01 USB memory usage reduction patch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#6 (text+ko) ==== @@ -34,6 +34,8 @@ #ifndef _AT9100_DCI_H_ #define _AT9100_DCI_H_ +#define AT91_MAX_DEVICES (USB_MIN_DEVICES + 1) + #define AT91_UDP_FRM 0x00 /* Frame number register */ #define AT91_UDP_FRM_MASK (0x7FF << 0) /* Frame Number as Defined in * the Packet Field Formats */ @@ -206,6 +208,7 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; + struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#15 (text+ko) ==== @@ -145,9 +145,12 @@ sc->sc_dci.sc_pull_down = &at91_udp_pull_down; sc->sc_dci.sc_pull_arg = sc; + /* initialise some bus fields */ + sc->sc_dci.sc_bus.parent = dev; + sc->sc_dci.sc_bus.devices = sc->sc_dci.sc_devices; + sc->sc_dci.sc_bus.devices_max = AT91_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_dci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_dci.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#11 (text+ko) ==== @@ -38,6 +38,8 @@ #ifndef _EHCI_H_ #define _EHCI_H_ +#define EHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base MEM */ #define PCI_INTERFACE_EHCI 0x20 @@ -459,6 +461,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[EHCI_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; struct ehci_qh *sc_async_p_last; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#18 (text+ko) ==== @@ -232,12 +232,15 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = EHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#10 (text+ko) ==== @@ -32,6 +32,8 @@ #ifndef _MUSB2_OTG_H_ #define _MUSB2_OTG_H_ +#define MUSB2_MAX_DEVICES (USB_MIN_DEVICES + 1) + /* Common registers */ #define MUSB2_REG_FADDR 0x0000 /* function address register */ @@ -365,6 +367,8 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; + + struct usb2_device *sc_devices[MUSB2_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#12 (text+ko) ==== @@ -102,9 +102,12 @@ sc->sc_otg.sc_clocks_off = &musbotg_clocks_off; sc->sc_otg.sc_clocks_arg = sc; + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = MUSB2_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_otg.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#7 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _OHCI_H_ #define _OHCI_H_ +#define OHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base memory */ #define PCI_INTERFACE_OHCI 0x10 @@ -324,6 +326,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[OHCI_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; struct ohci_hcca *sc_hcca_p; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#14 (text) ==== @@ -73,12 +73,15 @@ if (sc == NULL) { return (ENXIO); } + /* initialise some bus fields */ + sc->sc_ohci.sc_bus.parent = dev; + sc->sc_ohci.sc_bus.devices = sc->sc_ohci.sc_devices; + sc->sc_ohci.sc_bus.devices_max = OHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_ohci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->iclk = at91_pmc_clock_ref("ohci_clk"); sc->fclk = at91_pmc_clock_ref("uhpck"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#15 (text+ko) ==== @@ -200,12 +200,15 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = OHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ohci_iterate_hw_softc)) { - return ENOMEM; + return (ENOMEM); } sc->sc_dev = self; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#9 (text+ko) ==== @@ -39,6 +39,8 @@ #ifndef _UHCI_H_ #define _UHCI_H_ +#define UHCI_MAX_DEVICES USB_MAX_DEVICES + /* PCI config registers */ #define PCI_USBREV 0x60 /* USB protocol revision */ #define PCI_USB_REV_MASK 0xff @@ -273,6 +275,7 @@ struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; + struct usb2_device *sc_devices[UHCI_MAX_DEVICES]; struct uhci_td *sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]; /* pointer to last TD * for isochronous */ struct uhci_qh *sc_intr_p_last[UHCI_IFRAMELIST_COUNT]; /* pointer to last QH ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#16 (text+ko) ==== @@ -251,9 +251,12 @@ device_printf(self, "Could not allocate sc\n"); return (ENXIO); } + /* initialise some bus fields */ + sc->sc_bus.parent = self; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = UHCI_MAX_DEVICES; + /* get all DMA memory */ - - sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &uhci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#10 (text+ko) ==== @@ -70,7 +70,7 @@ struct usb2_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; struct usb2_bus_methods *methods; /* filled by HC driver */ - struct usb2_device *devices[USB_MAX_DEVICES]; + struct usb2_device **devices; uint32_t hw_power_state; /* see USB_HW_POWER_XXX */ uint32_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#21 (text+ko) ==== @@ -493,8 +493,6 @@ { bus->alloc_failed = 0; - bus->devices_max = USB_MAX_DEVICES; - mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), NULL, MTX_DEF | MTX_RECURSE); @@ -506,6 +504,13 @@ usb2_dma_tag_setup(bus->dma_parent_tag, bus->dma_tags, dmat, &bus->bus_mtx, NULL, NULL, 32, USB_BUS_DMA_TAG_MAX); + if ((bus->devices_max > USB_MAX_DEVICES) || + (bus->devices_max < USB_MIN_DEVICES) || + (bus->devices == NULL)) { + DPRINTFN(0, "Devices field has not been " + "initialised properly!\n"); + bus->alloc_failed = 1; /* failure */ + } if (cb) { cb(bus, &usb2_bus_mem_alloc_all_cb); } ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#6 (text+ko) ==== @@ -28,6 +28,8 @@ #ifndef _USS820_DCI_H_ #define _USS820_DCI_H_ +#define USS820_MAX_DEVICES (USB_MIN_DEVICES + 1) + #define USS820_EP_MAX 8 /* maximum number of endpoints */ #define USS820_TXDAT 0x00 /* Transmit FIFO data */ @@ -347,6 +349,7 @@ struct usb2_sw_transfer sc_root_intr; struct usb2_config_td sc_config_td; + struct usb2_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; struct resource *sc_irq_res; void *sc_intr_hdl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#7 (text+ko) ==== @@ -138,9 +138,13 @@ if (sc == NULL) { return (ENXIO); } - /* get all DMA memory */ + /* initialise some bus fields */ sc->sc_bus.parent = dev; + sc->sc_bus.devices = sc->sc_devices; + sc->sc_bus.devices_max = USS820_MAX_DEVICES; + + /* get all DMA memory */ if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 (text+ko) ==== @@ -1290,19 +1290,23 @@ * Find an unused device index. In USB Host mode this is the * same as the device address. * - * NOTE: Index 1 is reserved for the Root HUB. + * Device index zero is not used and device index 1 should + * always be the root hub. */ - for (device_index = USB_ROOT_HUB_ADDR; device_index != - USB_MAX_DEVICES; device_index++) { + for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { +#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (device_index == bus->devices_max) { + device_printf(bus->bdev, + "No free USB device " + "index for new device!\n"); + return (NULL); + } if (bus->devices[device_index] == NULL) break; } - if (device_index == USB_MAX_DEVICES) { - device_printf(bus->bdev, - "No free USB device index for new device!\n"); - return (NULL); - } if (depth > 0x10) { device_printf(bus->bdev, "Invalid device depth!\n"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 (text+ko) ==== @@ -1520,8 +1520,12 @@ * The root HUB device is never suspended * and we simply skip it. */ - for (x = USB_ROOT_HUB_ADDR + 1; - x != USB_MAX_DEVICES; x++) { + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (x == bus->devices_max) + break; udev = bus->devices[x]; if (udev == NULL) @@ -1564,8 +1568,12 @@ /* Re-loop all the devices to get the actual state */ - for (x = USB_ROOT_HUB_ADDR + 1; - x != USB_MAX_DEVICES; x++) { + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) +#error "Incorrect device limit." +#endif + if (x == bus->devices_max) + break; udev = bus->devices[x]; if (udev == NULL) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 (text+ko) ==== @@ -35,6 +35,8 @@ #define USB_EP_MAX (2*16) /* hardcoded */ #define USB_FIFO_MAX (4 * USB_EP_MAX) +#define USB_MIN_DEVICES 2 /* unused + root HUB */ + #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and * address zero */ #define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ @@ -64,5 +66,7 @@ #if (USB_EP_MAX < (2*16)) #error "Misconfigured limits #3" #endif - +#if (USB_MAX_DEVICES < USB_MIN_DEVICES) +#error "Misconfigured limits #4" +#endif #endif /* _USB2_DEFS_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 8 16:29:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37E88106567E; Thu, 8 Jan 2009 16:29: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 CE00A106567B for ; Thu, 8 Jan 2009 16:29:28 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB3768FC1D for ; Thu, 8 Jan 2009 16:29:28 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08GTSsi038353 for ; Thu, 8 Jan 2009 16:29:28 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08GTSHU038351 for perforce@freebsd.org; Thu, 8 Jan 2009 16:29:28 GMT (envelope-from remko@freebsd.org) Date: Thu, 8 Jan 2009 16:29:28 GMT Message-Id: <200901081629.n08GTSHU038351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 155822 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, 08 Jan 2009 16:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=155822 Change 155822 by remko@remko_nakur on 2009/01/08 16:29:26 Correct typo. Submitted by: rene Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#16 (text+ko) ==== @@ -1974,7 +1974,7 @@ - Als u een IDE &iomegezip; of &jaz; heeft + Als u een IDE &iomegazip; of &jaz; heeft geïnstalleerd, verwijder deze en probeer het opnieuw. De opstart floppy kan in de war raken door de schijven. Nadat het systeem geïnstalleerd is kunnen ze opnieuw From owner-p4-projects@FreeBSD.ORG Thu Jan 8 16:30:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BC221065672; Thu, 8 Jan 2009 16:30: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 0B127106566B for ; Thu, 8 Jan 2009 16:30:30 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EDB1C8FC19 for ; Thu, 8 Jan 2009 16:30:29 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08GUTXY038485 for ; Thu, 8 Jan 2009 16:30:29 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08GUTeT038483 for perforce@freebsd.org; Thu, 8 Jan 2009 16:30:29 GMT (envelope-from nwhitehorn@freebsd.org) Date: Thu, 8 Jan 2009 16:30:29 GMT Message-Id: <200901081630.n08GUTeT038483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 155823 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, 08 Jan 2009 16:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=155823 Change 155823 by nwhitehorn@nwhitehorn_trantor on 2009/01/08 16:30:00 970 CPUs don't implement the L2 and L3 cache configuration registers, so we should not try to program them. We should have a better scheme (a CPU features mask) for controlling this -- right now we just check if the stored values for the L2CR and L3CR are zero. This commit makes SMP work in the simulator, modulo platform-specific issues starting the CPU. It may work on real (Apple) hardware. The CPU start/stop bits of this file should be abstracted into a platform module. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#3 (text+ko) ==== @@ -250,8 +250,10 @@ mtmsr(msr); isync(); - reg = l3_enable(); - reg = l2_enable(); + if (l3cr_config != 0) + reg = l3_enable(); + if (l2cr_config != 0) + reg = l2_enable(); reg = l1d_enable(); reg = l1i_enable(); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 17:24:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D43381065745; Thu, 8 Jan 2009 17: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 46B0F1065722; Thu, 8 Jan 2009 17:24:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 05DD98FC13; Thu, 8 Jan 2009 17:24:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n08HMuL0079968; Thu, 8 Jan 2009 10:22:56 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 10:23:11 -0700 (MST) Message-Id: <20090108.102311.1541746851.imp@bsdimp.com> To: hselasky@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200901071009.n07A9jrs056953@repoman.freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 17:24:25 -0000 In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=155748 : : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 : : : Umass module quirk from Alexander Best : to support Meizu Electronics MiniPlayer. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 (text+ko) ==== : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 (text+ko) ==== Why are these generated files committed to the tree? We did a lot of work to make usbdevs generated files not need to be committed to the tree and this breaks that... Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 8 17:27:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2152E106570F; Thu, 8 Jan 2009 17:27: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 B62271065701; Thu, 8 Jan 2009 17:27:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6B78FC1B; Thu, 8 Jan 2009 17:27:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n08HOce6080012; Thu, 8 Jan 2009 10:24:38 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 10:24:53 -0700 (MST) Message-Id: <20090108.102453.-1749728154.imp@bsdimp.com> To: hselasky@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200901071327.n07DRFt5091936@repoman.freebsd.org> References: <200901071327.n07DRFt5091936@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 155755 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, 08 Jan 2009 17:27:23 -0000 In message: <200901071327.n07DRFt5091936@repoman.freebsd.org> Hans Petter Selasky writes: : Fix a race causing the explore thread to : hang when tearing down USB transfers at : detach. Would this explain a hang with a wait channel of DMSG on kldunload of the drivers? Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 8 17:27:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F5EC10657E0; Thu, 8 Jan 2009 17:27: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 5F431106586E; Thu, 8 Jan 2009 17:27:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id EF0E08FC20; Thu, 8 Jan 2009 17:27:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n08HNjrW079989; Thu, 8 Jan 2009 10:23:45 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 10:24:00 -0700 (MST) Message-Id: <20090108.102400.-1877578186.imp@bsdimp.com> To: hselasky@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200901071041.n07AfHG9061148@repoman.freebsd.org> References: <200901071041.n07AfHG9061148@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 155750 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, 08 Jan 2009 17:27:26 -0000 In message: <200901071041.n07AfHG9061148@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=155750 : : Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28 : : : Patch to resolve problems with power mode off. Can you please use more descriptive commits? This doesn't tell us much about what the problems were, or how this fixes them. Warner : Reported by Alexander Best. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 edit : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#39 (text+ko) ==== : : @@ -1699,11 +1699,12 @@ : } : switch (mode) { : case USB_POWER_MODE_OFF: : - /* clear suspend */ : - err = usb2_req_clear_port_feature(udev->parent_hub, : - NULL, udev->port_no, UHF_PORT_SUSPEND); : - if (err) : - break; : + /* get the device unconfigured */ : + err = ugen_set_config(f, USB_UNCONFIG_INDEX); : + if (err) { : + DPRINTFN(0, "Could not unconfigure " : + "device (ignored)\n"); : + } : : /* clear port enable */ : err = usb2_req_clear_port_feature(udev->parent_hub, : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#27 (text+ko) ==== : : @@ -1823,7 +1823,8 @@ : usb2_set_power_mode(struct usb2_device *udev, uint8_t power_mode) : { : /* filter input argument */ : - if (power_mode != USB_POWER_MODE_ON) { : + if ((power_mode != USB_POWER_MODE_ON) && : + (power_mode != USB_POWER_MODE_OFF)) { : power_mode = USB_POWER_MODE_SAVE; : } : udev->power_mode = power_mode; /* update copy of power mode */ : From owner-p4-projects@FreeBSD.ORG Thu Jan 8 17:35:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07EF61065859; Thu, 8 Jan 2009 17:35: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 B409B1065856; Thu, 8 Jan 2009 17:35:47 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 6447D8FC17; Thu, 8 Jan 2009 17:35:47 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n08HWpjq080136; Thu, 8 Jan 2009 10:32:51 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 10:33:06 -0700 (MST) Message-Id: <20090108.103306.1683974155.imp@bsdimp.com> To: hselasky@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200901081532.n08FWPDx031982@repoman.freebsd.org> References: <200901081532.n08FWPDx031982@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 155820 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, 08 Jan 2009 17:35:49 -0000 In message: <200901081532.n08FWPDx031982@repoman.freebsd.org> Hans Petter Selasky writes: : USB memory usage reduction patch. This likely needs to be more descriptive. : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#45 (text+ko) ==== : : @@ -1290,19 +1290,23 @@ : * Find an unused device index. In USB Host mode this is the : * same as the device address. : * : - * NOTE: Index 1 is reserved for the Root HUB. : + * Device index zero is not used and device index 1 should : + * always be the root hub. : */ : - for (device_index = USB_ROOT_HUB_ADDR; device_index != : - USB_MAX_DEVICES; device_index++) { : + for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { This looks wrong. ';;' seems wrong to me. While it is acceptable 'C' code, the fact that you have an if statement at the end means that you should write this like: for (device_index = USB_ROOT_HUB_ADDR; bus->devices[device_index] != NULL; device_index++) { : +#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif This likely is the wrong place for this #ifdef. : + if (device_index == bus->devices_max) { : + device_printf(bus->bdev, : + "No free USB device " : + "index for new device!\n"); : + return (NULL); : + } : if (bus->devices[device_index] == NULL) : break; See above: likely want to merge this statement into the for loop. : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#28 (text+ko) ==== : : @@ -1520,8 +1520,12 @@ : * The root HUB device is never suspended : * and we simply skip it. : */ : - for (x = USB_ROOT_HUB_ADDR + 1; : - x != USB_MAX_DEVICES; x++) { : + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { : +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif : + if (x == bus->devices_max) : + break; Same comments as above. This #if is in the wrong place for a compile time assert. The for loop is weirdly constructed. : : udev = bus->devices[x]; : if (udev == NULL) : @@ -1564,8 +1568,12 @@ : : /* Re-loop all the devices to get the actual state */ : : - for (x = USB_ROOT_HUB_ADDR + 1; : - x != USB_MAX_DEVICES; x++) { : + for (x = USB_ROOT_HUB_ADDR + 1;; x++) { : +#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) : +#error "Incorrect device limit." : +#endif : + if (x == bus->devices_max) : + break; Same comments as above. This #if is in the wrong place for a compile time assert. The for loop is weirdly constructed. : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#7 (text+ko) ==== : : @@ -35,6 +35,8 @@ : #define USB_EP_MAX (2*16) /* hardcoded */ : #define USB_FIFO_MAX (4 * USB_EP_MAX) : : +#define USB_MIN_DEVICES 2 /* unused + root HUB */ : + : #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and : * address zero */ : #define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ : @@ -64,5 +66,7 @@ : #if (USB_EP_MAX < (2*16)) : #error "Misconfigured limits #3" : #endif : - : +#if (USB_MAX_DEVICES < USB_MIN_DEVICES) : +#error "Misconfigured limits #4" : +#endif : #endif /* _USB2_DEFS_H_ */ These #error messages are lame. Please make them less lame and more descriptive. Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 8 18:01:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE44E10658B6; Thu, 8 Jan 2009 18:01:02 +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 4B87A10658B3 for ; Thu, 8 Jan 2009 18:01:02 +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 391AF8FC0A for ; Thu, 8 Jan 2009 18:01:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08I12rG058938 for ; Thu, 8 Jan 2009 18:01:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08I1222058936 for perforce@freebsd.org; Thu, 8 Jan 2009 18:01:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 18:01:02 GMT Message-Id: <200901081801.n08I1222058936@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 155829 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, 08 Jan 2009 18:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=155829 Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 Cody style changes requested by: M. Warner Losh Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#31 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#46 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#29 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#31 (text+ko) ==== @@ -101,8 +101,6 @@ #define USB_HOST_ALIGN 8 /* bytes, must be power of two */ -#define USB_ROOT_HUB_ADDR 1 /* value */ - #define USB_ISOC_TIME_MAX 128 /* ms */ #define USB_FS_ISOC_UFRAME_MAX 4 /* exclusive unit */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#46 (text+ko) ==== @@ -1293,18 +1293,15 @@ * Device index zero is not used and device index 1 should * always be the root hub. */ - for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { -#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (device_index == bus->devices_max) { - device_printf(bus->bdev, - "No free USB device " - "index for new device!\n"); - return (NULL); - } - if (bus->devices[device_index] == NULL) - break; + for (device_index = USB_ROOT_HUB_ADDR; + (device_index != bus->devices_max) && + (bus->devices[device_index] != NULL); + device_index++) /* nop */; + + if (device_index == bus->devices_max) { + device_printf(bus->bdev, + "No free USB device index for new device!\n"); + return (NULL); } if (depth > 0x10) { ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#29 (text+ko) ==== @@ -1520,12 +1520,8 @@ * The root HUB device is never suspended * and we simply skip it. */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) @@ -1568,12 +1564,8 @@ /* Re-loop all the devices to get the actual state */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#8 (text+ko) ==== @@ -35,6 +35,8 @@ #define USB_EP_MAX (2*16) /* hardcoded */ #define USB_FIFO_MAX (4 * USB_EP_MAX) +#define USB_ROOT_HUB_ADDR 1 /* index */ + #define USB_MIN_DEVICES 2 /* unused + root HUB */ #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and @@ -58,15 +60,18 @@ /* sanity checks */ #if (USB_FIFO_MAX < USB_EP_MAX) -#error "Misconfigured limits #1" +#error "There cannot be less FIFOs than USB endpoints." #endif #if (USB_FIFO_MAX & 1) -#error "Misconfigured limits #2" +#error "Number of FIFOs must be odd." #endif #if (USB_EP_MAX < (2*16)) -#error "Misconfigured limits #3" +#error "Number of hardware USB endpoints cannot be less than 32." #endif #if (USB_MAX_DEVICES < USB_MIN_DEVICES) -#error "Misconfigured limits #4" +#error "Minimum number of devices is greater than maximum number of devices." +#endif +#if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) +#error "The root hub address must be less than USB_MIN_DEVICES." #endif #endif /* _USB2_DEFS_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 8 18:08:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E0791065695; Thu, 8 Jan 2009 18:08: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 BEB681065694 for ; Thu, 8 Jan 2009 18:08:11 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe10.swipnet.se [212.247.155.33]) by mx1.freebsd.org (Postfix) with ESMTP id 552EB8FC08 for ; Thu, 8 Jan 2009 18:08:10 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=ApZxvnb4XcoA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=Z0ZRIhtBvgWrONN_4HUA:9 a=kaBOKLV9JN2HiYn8tlYOnXqjsIgA:4 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe10.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1007833543; Thu, 08 Jan 2009 19:08:09 +0100 From: Hans Petter Selasky To: Perforce Change Reviews Date: Thu, 8 Jan 2009 19:10:33 +0100 User-Agent: KMail/1.9.7 References: <200901081801.n08I1222058936@repoman.freebsd.org> In-Reply-To: <200901081801.n08I1222058936@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901081910.33615.hselasky@c2i.net> Cc: "M. Warner Losh" Subject: Re: PERFORCE change 155829 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, 08 Jan 2009 18:08:13 -0000 On Thursday 08 January 2009, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=155829 > > Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 > > > Cody style changes requested by: > M. Warner Losh > > Affected files ... > I think I need to buy a new USB keyboard soon :-) s/Cody/Code Are these changes Ok Warner? --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 18:36:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 981C01065678; Thu, 8 Jan 2009 18:36: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 1DE1C1065670 for ; Thu, 8 Jan 2009 18:36:35 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe15.swip.net [212.247.155.193]) by mx1.freebsd.org (Postfix) with ESMTP id A93908FC40 for ; Thu, 8 Jan 2009 18:36:34 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=5gbsbjUaDroA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=kFgAgTWzN3JMOqxAgmkA:9 a=0SXsZ3hB2N0iNRT-Rj8e3a6FLMkA:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe15.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 431408952; Thu, 08 Jan 2009 18:36:31 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Thu, 8 Jan 2009 18:38:54 +0100 User-Agent: KMail/1.9.7 References: <200901071327.n07DRFt5091936@repoman.freebsd.org> <20090108.102453.-1749728154.imp@bsdimp.com> In-Reply-To: <20090108.102453.-1749728154.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901081838.55030.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155755 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, 08 Jan 2009 18:36:44 -0000 On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071327.n07DRFt5091936@repoman.freebsd.org> > > Hans Petter Selasky writes: > : Fix a race causing the explore thread to > : hang when tearing down USB transfers at > : detach. > > Would this explain a hang with a wait channel of DMSG on kldunload of > the drivers? > > Warner Yes, If "ps auxw| grep DRAIN" shows you something. Try out -current next week if you don't have access to P4. --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 18:37:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 124DA1065672; Thu, 8 Jan 2009 18:37: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 C341F1065675 for ; Thu, 8 Jan 2009 18:37:05 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe10.swipnet.se [212.247.155.33]) by mx1.freebsd.org (Postfix) with ESMTP id 57B2A8FC29 for ; Thu, 8 Jan 2009 18:37:04 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=VWUNZqetDUwA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=NRndgTSu2fKRHqlDc90A:9 a=frCSg3ebFJs_KDlmO1MA:7 a=Np7r8Lt3bHFbCJM57H2FQxfbf7IA:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe10.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1007819804; Thu, 08 Jan 2009 18:37:03 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Thu, 8 Jan 2009 18:39:26 +0100 User-Agent: KMail/1.9.7 References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <20090108.102311.1541746851.imp@bsdimp.com> In-Reply-To: <20090108.102311.1541746851.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901081839.27124.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 18:37:07 -0000 On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> > > Hans Petter Selasky writes: > : http://perforce.freebsd.org/chv.cgi?CH=155748 > : > : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 > : > : > : Umass module quirk from Alexander Best > : to support Meizu Electronics MiniPlayer. > : > : Affected files ... > : > : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit > : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit > : > : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > : (text+ko) ==== ==== > : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 > : (text+ko) ==== > > Why are these generated files committed to the tree? We did a lot of > work to make usbdevs generated files not need to be committed to the > tree and this breaks that... > > Warner Because they are not automatically generated any more. --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 18:38:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C3A51065672; Thu, 8 Jan 2009 18:38: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 E8322106566B for ; Thu, 8 Jan 2009 18:38:03 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe06.swip.net [212.247.154.161]) by mx1.freebsd.org (Postfix) with ESMTP id 808BB8FC1A for ; Thu, 8 Jan 2009 18:38:03 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=8djo1e_CNWEA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=XP4I_PTaGBR-jxfDvPMA:9 a=TmjpKS3p-Bi9jgRxH_o6xNQkD-UA:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe06.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1177730833; Thu, 08 Jan 2009 18:38:00 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Thu, 8 Jan 2009 18:40:23 +0100 User-Agent: KMail/1.9.7 References: <200901071041.n07AfHG9061148@repoman.freebsd.org> <20090108.102400.-1877578186.imp@bsdimp.com> In-Reply-To: <20090108.102400.-1877578186.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901081840.24219.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155750 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, 08 Jan 2009 18:38:05 -0000 On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901071041.n07AfHG9061148@repoman.freebsd.org> > > Hans Petter Selasky writes: > : http://perforce.freebsd.org/chv.cgi?CH=155750 > : > : Change 155750 by hselasky@hselasky_laptop001 on 2009/01/07 10:40:28 > : > : > : Patch to resolve problems with power mode off. > > Can you please use more descriptive commits? This doesn't tell us > much about what the problems were, or how this fixes them. > I will try to think about people looking for patches reading the commit logs. --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:00:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 778A0106566B; Thu, 8 Jan 2009 19:00: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 3193F1065672; Thu, 8 Jan 2009 19:00:03 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from websrv01.jr-hosting.nl (websrv01.jr-hosting.nl [78.47.69.233]) by mx1.freebsd.org (Postfix) with ESMTP id E135A8FC14; Thu, 8 Jan 2009 19:00:02 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from [195.64.94.120] (helo=[10.0.2.153]) by websrv01.jr-hosting.nl with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69 (FreeBSD)) (envelope-from ) id 1LKzqm-000328-NL; Thu, 08 Jan 2009 19:43:24 +0100 Message-Id: <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> From: Remko Lodder To: Hans Petter Selasky In-Reply-To: <200901081839.27124.hselasky@freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Thu, 8 Jan 2009 19:43:19 +0100 References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <20090108.102311.1541746851.imp@bsdimp.com> <200901081839.27124.hselasky@freebsd.org> X-Mailer: Apple Mail (2.930.3) Cc: perforce@freebsd.org, "M. Warner Losh" Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 19:00:04 -0000 On Jan 8, 2009, at 6:39 PM, Hans Petter Selasky wrote: > On Thursday 08 January 2009, M. Warner Losh wrote: >> In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> >> >> Hans Petter Selasky writes: >> : http://perforce.freebsd.org/chv.cgi?CH=155748 >> : >> : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 >> : >> : >> : Umass module quirk from Alexander Best >> : to support Meizu Electronics MiniPlayer. >> : >> : Affected files ... >> : >> : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit >> : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 >> edit >> : .. //depot/projects/usb/src/sys/dev/usb2/include/ >> usb2_devtable.h#21 edit >> : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit >> : >> : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 >> : (text+ko) ==== ==== >> : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 >> : (text+ko) ==== >> >> Why are these generated files committed to the tree? We did a lot of >> work to make usbdevs generated files not need to be committed to the >> tree and this breaks that... >> >> Warner > > Because they are not automatically generated any more. > > --HPS Hmm, I liked the idea of only needing to do something marginally to add something. If files are no longer generated automatically and I need to do more, I'll look for other low hanging fruit. In short: can you restore automatic regenerating behaviour? -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:06:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0A41106568A; Thu, 8 Jan 2009 19:06:38 +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 AF1571065686 for ; Thu, 8 Jan 2009 19:06:38 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe13.swip.net [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id 46C698FC16 for ; Thu, 8 Jan 2009 19:06:37 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=3ApKP_J8uJAA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=SxfMj7E5-iMXY01LRUIA:9 a=ZAdFDTX8w897M7GmbC9q2-H9_rIA:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe13.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 787367602; Thu, 08 Jan 2009 19:06:35 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Thu, 8 Jan 2009 19:08:57 +0100 User-Agent: KMail/1.9.7 References: <200901081532.n08FWPDx031982@repoman.freebsd.org> <20090108.103306.1683974155.imp@bsdimp.com> In-Reply-To: <20090108.103306.1683974155.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901081908.57867.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155820 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, 08 Jan 2009 19:06:41 -0000 On Thursday 08 January 2009, M. Warner Losh wrote: > In message: <200901081532.n08FWPDx031982@repoman.freebsd.org> > > Hans Petter Selasky writes: > : USB memory usage reduction patch. > > This likely needs to be more descriptive. Hi, The change is about making the bus->devices array size dynamic. For embedded purpuse you can reduce the array size to save memory. Also in some cases like USB Device Mode you don't use more than 3 entries. Even though the wasted size is not much, 4*124 bytes, it needs to go away. --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:08:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 633141065670; Thu, 8 Jan 2009 19:08: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 1C8D5106566B for ; Thu, 8 Jan 2009 19:08:13 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe08.swip.net [212.247.154.225]) by mx1.freebsd.org (Postfix) with ESMTP id 7806C8FC1A for ; Thu, 8 Jan 2009 19:08:12 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=VWUNZqetDUwA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=W44AnPxHioOjG8uGrB4A:9 a=uy7H4yfaUnKQhRuZQMgA:7 a=rGCls88uczg7S4NM4JRed8Nvr48A:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1175517752; Thu, 08 Jan 2009 20:08:10 +0100 From: Hans Petter Selasky To: Remko Lodder Date: Thu, 8 Jan 2009 20:10:32 +0100 User-Agent: KMail/1.9.7 References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901081839.27124.hselasky@freebsd.org> <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> In-Reply-To: <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901082010.33577.hselasky@freebsd.org> Cc: perforce@freebsd.org, "M. Warner Losh" Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 19:08:14 -0000 On Thursday 08 January 2009, Remko Lodder wrote: > On Jan 8, 2009, at 6:39 PM, Hans Petter Selasky wrote: > > On Thursday 08 January 2009, M. Warner Losh wrote: > >> In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> > >> > >> Hans Petter Selasky writes: > >> : http://perforce.freebsd.org/chv.cgi?CH=155748 > >> : > >> : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 > >> : > >> : > >> : Umass module quirk from Alexander Best > >> : to support Meizu Electronics MiniPlayer. > >> : > >> : Affected files ... > >> : > >> : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit > >> : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > >> > >> edit > >> > >> : .. //depot/projects/usb/src/sys/dev/usb2/include/ > >> > >> usb2_devtable.h#21 edit > >> > >> : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit > >> : > >> : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 > >> : (text+ko) ==== ==== > >> : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 > >> : (text+ko) ==== > >> > >> Why are these generated files committed to the tree? We did a lot of > >> work to make usbdevs generated files not need to be committed to the > >> tree and this breaks that... > >> > >> Warner > > > > Because they are not automatically generated any more. > > > > --HPS > > Hmm, I liked the idea of only needing to do something marginally to > add something. If files are no longer generated automatically and I > need to do more, I'll look for other low hanging fruit. > > In short: can you restore automatic regenerating behaviour? Hi Remko, Everything is possible. How would you explain the benefit of the +19Mbyte of data resulting from this autogeneration when building the modules ? 126035 Jan 7 11:12 usb2_devid.h 197224 Jan 7 11:12 usb2_devtable.h 197+126 ans = 323 ans * 60 ans = 19380 --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:10:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30A961065717; Thu, 8 Jan 2009 19:10:01 +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 D5FF61065710 for ; Thu, 8 Jan 2009 19:10:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from agogare.doit.wisc.edu (agogare.doit.wisc.edu [144.92.197.211]) by mx1.freebsd.org (Postfix) with ESMTP id A7ED88FC1D for ; Thu, 8 Jan 2009 19:10:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=ISO-8859-1; format=flowed Received: from avs-daemon.smtpauth2.wiscmail.wisc.edu by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) id <0KD500504ZSNC800@smtpauth2.wiscmail.wisc.edu> for perforce@freebsd.org; Thu, 08 Jan 2009 12:09:59 -0600 (CST) Received: from trantor.tachypleus.net ([76.204.99.187]) by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPSA id <0KD5004RBZS7EB00@smtpauth2.wiscmail.wisc.edu>; Thu, 08 Jan 2009 12:09:44 -0600 (CST) Date: Thu, 08 Jan 2009 12:12:22 -0600 From: Nathan Whitehorn In-reply-to: <200901081910.33615.hselasky@c2i.net> To: Hans Petter Selasky Message-id: <49664206.9090908@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.204.99.187 X-Spam-PmxInfo: Server=avs-9, Version=5.5.0.359631, Antispam-Engine: 2.6.1.350677, Antispam-Data: 2009.1.8.175808, SenderIP=76.204.99.187 References: <200901081801.n08I1222058936@repoman.freebsd.org> <200901081910.33615.hselasky@c2i.net> User-Agent: Thunderbird 2.0.0.19 (X11/20090103) Cc: Perforce Change Reviews , "M. Warner Losh" Subject: Re: PERFORCE change 155829 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, 08 Jan 2009 19:10:03 -0000 Hans Petter Selasky wrote: > On Thursday 08 January 2009, Hans Petter Selasky wrote: >> http://perforce.freebsd.org/chv.cgi?CH=155829 >> >> Change 155829 by hselasky@hselasky_laptop001 on 2009/01/08 18:00:49 >> >> >> Cody style changes requested by: >> M. Warner Losh >> >> Affected files ... >> > > I think I need to buy a new USB keyboard soon :-) > > s/Cody/Code > > Are these changes Ok Warner? May I suggest a Sun Type 7? It would be nice if they worked reliably with the new stack :) -Nathan From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:13:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F12EB1065672; Thu, 8 Jan 2009 19:13: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 9C522106566B; Thu, 8 Jan 2009 19:13:36 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 3587F8FC0A; Thu, 8 Jan 2009 19:13:36 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 27BC91CC5C; Thu, 8 Jan 2009 20:13:35 +0100 (CET) Date: Thu, 8 Jan 2009 20:13:35 +0100 From: Ed Schouten To: Hans Petter Selasky Message-ID: <20090108191335.GT45775@hoeg.nl> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901081839.27124.hselasky@freebsd.org> <61E32407-BF64-47D0-89E9-EB0B9EB22B91@elvandar.org> <200901082010.33577.hselasky@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gn1ylXQ+YRNuZICZ" Content-Disposition: inline In-Reply-To: <200901082010.33577.hselasky@freebsd.org> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: Remko Lodder , perforce@freebsd.org, "M. Warner Losh" Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 19:13:39 -0000 --gn1ylXQ+YRNuZICZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Hans Petter Selasky wrote: > Everything is possible. >=20 > How would you explain the benefit of the +19Mbyte of data resulting from = this=20 > autogeneration when building the modules ? I think we always had a preference to generate stuff on demand. It's a lot easier to maintain. --=20 Ed Schouten WWW: http://80386.nl/ --gn1ylXQ+YRNuZICZ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAklmUF8ACgkQ52SDGA2eCwXPvwCeILiNfdPe9nk2m+CUuB1y9diS plgAniTOcipRz1Z3EeVLCSih0TrcH57e =vKpf -----END PGP SIGNATURE----- --gn1ylXQ+YRNuZICZ-- From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:22:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CB41065673; Thu, 8 Jan 2009 19:22: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 587AA1065670 for ; Thu, 8 Jan 2009 19:22:59 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe13.swip.net [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id E2BC48FC18 for ; Thu, 8 Jan 2009 19:22:58 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=VWUNZqetDUwA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=xvzNxC0hOXTdhLn-BQsA:9 a=qlKYuZpUoz9lQtNOct_9aqe-Hp8A:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe13.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 787402726; Thu, 08 Jan 2009 20:22:57 +0100 From: Hans Petter Selasky To: Ed Schouten Date: Thu, 8 Jan 2009 20:25:19 +0100 User-Agent: KMail/1.9.7 References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901082010.33577.hselasky@freebsd.org> <20090108191335.GT45775@hoeg.nl> In-Reply-To: <20090108191335.GT45775@hoeg.nl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901082025.20711.hselasky@freebsd.org> Cc: Remko Lodder , perforce@freebsd.org, "M. Warner Losh" Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 19:23:00 -0000 On Thursday 08 January 2009, Ed Schouten wrote: > * Hans Petter Selasky wrote: > > Everything is possible. > > > > How would you explain the benefit of the +19Mbyte of data resulting from > > this autogeneration when building the modules ? > > I think we always had a preference to generate stuff on demand. It's a > lot easier to maintain. Hi, I can understand that, but how about only generating the file once when you know it will be needed 60 times in a row? This also applies to other autogenerated files. It would speed up the module build alot I think. cd src/sys/modules/usb2/serial_3g make all clean time make all 0:01.58 rm u3g2.o time make all 0:00.96 You see it is around 50% slower to build a module which needs to generate N header files first, than if those header files were cached somewhere! Multiply the time you save by 60, and we are talking about a significant amount of time! --HPS From owner-p4-projects@FreeBSD.ORG Thu Jan 8 19:27:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B7571065673; Thu, 8 Jan 2009 19:27: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 DB9A7106566C; Thu, 8 Jan 2009 19:27:52 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 9DB898FC12; Thu, 8 Jan 2009 19:27:52 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id F1DFA1CC5C; Thu, 8 Jan 2009 20:27:51 +0100 (CET) Date: Thu, 8 Jan 2009 20:27:51 +0100 From: Ed Schouten To: Hans Petter Selasky Message-ID: <20090108192751.GU45775@hoeg.nl> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <200901082010.33577.hselasky@freebsd.org> <20090108191335.GT45775@hoeg.nl> <200901082025.20711.hselasky@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MLcyhLwX/7AHNQNx" Content-Disposition: inline In-Reply-To: <200901082025.20711.hselasky@freebsd.org> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: Remko Lodder , perforce@freebsd.org, "M. Warner Losh" Subject: Re: PERFORCE change 155748 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, 08 Jan 2009 19:27:54 -0000 --MLcyhLwX/7AHNQNx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Hans Petter Selasky wrote: > I can understand that, but how about only generating the file once when y= ou=20 > know it will be needed 60 times in a row? This also applies to other=20 > autogenerated files. It would speed up the module build alot I think. We're doing this with vnode_if.src as well and nobody has ever complained about this. I think moving to a faster C compiler (LLVM, anyone?) would cut down compile times even more than eliminating some calls to awk. --=20 Ed Schouten WWW: http://80386.nl/ --MLcyhLwX/7AHNQNx Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAklmU7cACgkQ52SDGA2eCwVx/gCfeIV5XAKLpt4qNnMPkNvbezjv JakAnj48tQS0QWQCZtPNJoV6TRAEY90q =Q5bt -----END PGP SIGNATURE----- --MLcyhLwX/7AHNQNx-- From owner-p4-projects@FreeBSD.ORG Thu Jan 8 21:06:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B0EB1065672; Thu, 8 Jan 2009 21: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 54EFF106564A for ; Thu, 8 Jan 2009 21:06:10 +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 415D48FC0A for ; Thu, 8 Jan 2009 21:06:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08L6AhF093924 for ; Thu, 8 Jan 2009 21:06:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08L6ANa093922 for perforce@freebsd.org; Thu, 8 Jan 2009 21:06:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 21:06:10 GMT Message-Id: <200901082106.n08L6ANa093922@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 155834 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, 08 Jan 2009 21:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=155834 Change 155834 by hselasky@hselasky_laptop001 on 2009/01/08 21:05:55 Factor out roothub process into the USB bus structure for all USB controller drivers. Essentially I am trying to save some processes on the root HUB and get away from the config thread pradigm. There will be a follow up commit where the root HUB control and interrupt callback will be moved over to run from the roothub process. Total win: 3 processes become 1 for every USB controller. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#26 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#20 (text+ko) ==== @@ -50,14 +50,11 @@ #include #define USB_DEBUG_VAR at91dcidebug -#define usb2_config_td_cc at91dci_config_copy -#define usb2_config_td_softc at91dci_softc #include #include #include #include -#include #include #include #include @@ -106,7 +103,6 @@ static usb2_sw_transfer_func_t at91dci_root_intr_done; static usb2_sw_transfer_func_t at91dci_root_ctrl_done; -static usb2_config_td_command_t at91dci_root_ctrl_task; /* * NOTE: Some of the bits in the CSR register have inverse meaning so @@ -1817,15 +1813,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &at91dci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -at91dci_root_ctrl_task(struct at91dci_softc *sc, - struct at91dci_config_copy *cc, uint16_t refcount) +at91dci_root_ctrl_task(struct usb2_bus *bus) { - at91dci_root_ctrl_poll(sc); + at91dci_root_ctrl_poll(AT9100_DCI_BUS2SC(bus)); } static void @@ -2478,4 +2472,5 @@ .set_stall = &at91dci_set_stall, .clear_stall = &at91dci_clear_stall, .vbus_interrupt = &at91dci_vbus_interrupt, + .roothub_exec = &at91dci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#7 (text+ko) ==== @@ -206,7 +206,6 @@ LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_device *sc_devices[AT91_MAX_DEVICES]; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#16 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -208,12 +207,6 @@ } device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus); - err = usb2_config_td_setup(&sc->sc_dci.sc_config_td, sc, - &sc->sc_dci.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); @@ -308,8 +301,6 @@ sc->sc_dci.sc_io_res); sc->sc_dci.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_dci.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_dci.sc_bus, NULL); /* disable clocks */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#26 (text+ko) ==== @@ -52,14 +52,11 @@ #include #define USB_DEBUG_VAR ehcidebug -#define usb2_config_td_cc ehci_config_copy -#define usb2_config_td_softc ehci_softc #include #include #include #include -#include #include #include #include @@ -99,7 +96,6 @@ extern struct usb2_pipe_methods ehci_root_ctrl_methods; extern struct usb2_pipe_methods ehci_root_intr_methods; -static usb2_config_td_command_t ehci_root_ctrl_task; static void ehci_do_poll(struct usb2_bus *bus); static void ehci_root_ctrl_poll(ehci_softc_t *sc); static void ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error); @@ -3031,15 +3027,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &ehci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -ehci_root_ctrl_task(ehci_softc_t *sc, - struct usb2_config_td_cc *cc, uint16_t refcount) +ehci_root_ctrl_task(struct usb2_bus *bus) { - ehci_root_ctrl_poll(sc); + ehci_root_ctrl_poll(EHCI_BUS2SC(bus)); } static void @@ -3969,4 +3963,5 @@ .device_resume = ehci_device_resume, .device_suspend = ehci_device_suspend, .set_hw_power = ehci_set_hw_power, + .roothub_exec = ehci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#12 (text+ko) ==== @@ -455,7 +455,6 @@ typedef struct ehci_softc { struct ehci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; struct usb2_callout sc_tmo_pcd; union ehci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#19 (text+ko) ==== @@ -59,7 +59,6 @@ #include #include #include -#include #include #include @@ -341,12 +340,6 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); @@ -381,8 +374,6 @@ ehci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -422,8 +413,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &ehci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#21 (text+ko) ==== @@ -42,14 +42,11 @@ #include #define USB_DEBUG_VAR musbotgdebug -#define usb2_config_td_cc musbotg_config_copy -#define usb2_config_td_softc musbotg_softc #include #include #include #include -#include #include #include #include @@ -101,7 +98,6 @@ static usb2_sw_transfer_func_t musbotg_root_intr_done; static usb2_sw_transfer_func_t musbotg_root_ctrl_done; -static usb2_config_td_command_t musbotg_root_ctrl_task; /* * Here is a configuration that the chip supports. @@ -2222,15 +2218,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &musbotg_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -musbotg_root_ctrl_task(struct musbotg_softc *sc, - struct musbotg_config_copy *cc, uint16_t refcount) +musbotg_root_ctrl_task(struct usb2_bus *bus) { - musbotg_root_ctrl_poll(sc); + musbotg_root_ctrl_poll(MUSBOTG_BUS2SC(bus)); } static void @@ -2885,4 +2879,5 @@ .set_stall = &musbotg_set_stall, .clear_stall = &musbotg_clear_stall, .vbus_interrupt = &musbotg_vbus_interrupt, + .roothub_exec = &musbotg_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#11 (text+ko) ==== @@ -365,7 +365,6 @@ union musbotg_hub_temp sc_hub_temp; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_hw_ep_profile sc_hw_ep_profile[16]; struct usb2_device *sc_devices[MUSB2_MAX_DEVICES]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#13 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -136,12 +135,6 @@ } device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); - err = usb2_config_td_setup(&sc->sc_otg.sc_config_td, sc, - &sc->sc_otg.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); @@ -207,8 +200,6 @@ sc->sc_otg.sc_io_res); sc->sc_otg.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_otg.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#23 (text+ko) ==== @@ -41,14 +41,11 @@ #include #define USB_DEBUG_VAR ohcidebug -#define usb2_config_td_cc ohci_config_copy -#define usb2_config_td_softc ohci_softc #include #include #include #include -#include #include #include #include @@ -99,7 +96,6 @@ extern struct usb2_pipe_methods ohci_root_ctrl_methods; extern struct usb2_pipe_methods ohci_root_intr_methods; -static usb2_config_td_command_t ohci_root_ctrl_task; static void ohci_root_ctrl_poll(struct ohci_softc *sc); static void ohci_do_poll(struct usb2_bus *bus); static void ohci_device_done(struct usb2_xfer *xfer, usb2_error_t error); @@ -2135,15 +2131,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &ohci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -ohci_root_ctrl_task(struct ohci_softc *sc, - struct ohci_config_copy *cc, uint16_t refcount) +ohci_root_ctrl_task(struct usb2_bus *bus) { - ohci_root_ctrl_poll(sc); + ohci_root_ctrl_poll(OHCI_BUS2SC(bus)); } static void @@ -2864,4 +2858,5 @@ .device_resume = ohci_device_resume, .device_suspend = ohci_device_suspend, .set_hw_power = ohci_set_hw_power, + .roothub_exec = ohci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#8 (text+ko) ==== @@ -320,7 +320,6 @@ typedef struct ohci_softc { struct ohci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; struct usb2_callout sc_tmo_rhsc; union ohci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#15 (text) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -114,12 +113,6 @@ strlcpy(sc->sc_ohci.sc_vendor, "Atmel", sizeof(sc->sc_ohci.sc_vendor)); - err = usb2_config_td_setup(&sc->sc_ohci.sc_config_td, sc, - &sc->sc_ohci.sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); @@ -203,8 +196,6 @@ sc->sc_ohci.sc_io_res); sc->sc_ohci.sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_ohci.sc_config_td); - usb2_bus_mem_free_all(&sc->sc_ohci.sc_bus, &ohci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#16 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include @@ -291,12 +290,6 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } /* sc->sc_bus.usbrev; set by ohci_init() */ #if (__FreeBSD_version >= 700031) @@ -332,8 +325,6 @@ ohci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -368,8 +359,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &ohci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#20 (text+ko) ==== @@ -44,14 +44,11 @@ #include #define USB_DEBUG_VAR uhcidebug -#define usb2_config_td_cc uhci_config_copy -#define usb2_config_td_softc uhci_softc #include #include #include #include -#include #include #include #include @@ -138,7 +135,6 @@ extern struct usb2_pipe_methods uhci_root_ctrl_methods; extern struct usb2_pipe_methods uhci_root_intr_methods; -static usb2_config_td_command_t uhci_root_ctrl_task; static void uhci_root_ctrl_poll(struct uhci_softc *); static void uhci_do_poll(struct usb2_bus *); static void uhci_device_done(struct usb2_xfer *, usb2_error_t); @@ -2502,15 +2498,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command - (&sc->sc_config_td, NULL, &uhci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -uhci_root_ctrl_task(struct uhci_softc *sc, - struct uhci_config_copy *cc, uint16_t refcount) +uhci_root_ctrl_task(struct usb2_bus *bus) { - uhci_root_ctrl_poll(sc); + uhci_root_ctrl_poll(UHCI_BUS2SC(bus)); } static void @@ -3361,4 +3355,5 @@ .device_resume = uhci_device_resume, .device_suspend = uhci_device_suspend, .set_hw_power = uhci_set_hw_power, + .roothub_exec = uhci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#10 (text+ko) ==== @@ -270,7 +270,6 @@ typedef struct uhci_softc { struct uhci_hw_softc sc_hw; struct usb2_bus sc_bus; /* base device */ - struct usb2_config_td sc_config_td; union uhci_hub_desc sc_hub_desc; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#17 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -325,12 +324,6 @@ break; } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, - NULL, 0, 4); - if (err) { - device_printf(self, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl); @@ -379,8 +372,6 @@ uhci_softc_t *sc = device_get_softc(self); device_t bdev; - usb2_config_td_drain(&sc->sc_config_td); - if (sc->sc_bus.bdev) { bdev = sc->sc_bus.bdev; device_detach(bdev); @@ -422,8 +413,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, &uhci_iterate_hw_softc); return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#11 (text+ko) ==== @@ -52,9 +52,11 @@ struct usb2_bus_stat stats_err; struct usb2_bus_stat stats_ok; struct usb2_process explore_proc; + struct usb2_process roothub_proc; struct usb2_bus_msg explore_msg[2]; struct usb2_bus_msg detach_msg[2]; struct usb2_bus_msg attach_msg[2]; + struct usb2_bus_msg roothub_msg[2]; /* * This mutex protects the USB hardware: */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#22 (text+ko) ==== @@ -59,6 +59,7 @@ static void usb2_bus_mem_free_all_cb(struct usb2_bus *, struct usb2_page_cache *, struct usb2_page *, uint32_t, uint32_t); +static void usb2_bus_roothub(struct usb2_proc_msg *pm); /* static variables */ @@ -165,6 +166,10 @@ USB_BUS_UNLOCK(bus); + /* Get rid of USB roothub process */ + + usb2_proc_unsetup(&bus->roothub_proc); + /* Get rid of USB explore process */ usb2_proc_unsetup(&bus->explore_proc); @@ -381,10 +386,20 @@ bus->attach_msg[1].hdr.pm_callback = &usb2_bus_attach; bus->attach_msg[1].bus = bus; - /* Create a new USB process */ - if (usb2_proc_setup(&bus->explore_proc, + bus->roothub_msg[0].hdr.pm_callback = &usb2_bus_roothub; + bus->roothub_msg[0].bus = bus; + bus->roothub_msg[1].hdr.pm_callback = &usb2_bus_roothub; + bus->roothub_msg[1].bus = bus; + + /* Create USB explore and roothub processes */ + if (usb2_proc_setup(&bus->roothub_proc, + &bus->bus_mtx, USB_PRI_HIGH)) { + printf("WARNING: Creation of USB roothub " + "process failed.\n"); + } else if (usb2_proc_setup(&bus->explore_proc, &bus->bus_mtx, USB_PRI_MED)) { - printf("WARNING: Creation of USB explore process failed.\n"); + printf("WARNING: Creation of USB explore " + "process failed.\n"); } else { /* Get final attach going */ USB_BUS_LOCK(bus); @@ -543,3 +558,38 @@ mtx_destroy(&bus->bus_mtx); } + +/*------------------------------------------------------------------------* + * usb2_bus_roothub + * + * This function is used to execute roothub control requests on the + * roothub and is called from the roothub process. + *------------------------------------------------------------------------*/ +static void +usb2_bus_roothub(struct usb2_proc_msg *pm) +{ + struct usb2_bus *bus; + + bus = ((struct usb2_bus_msg *)pm)->bus; + + USB_BUS_LOCK_ASSERT(bus, MA_OWNED); + + (bus->methods->roothub_exec) (bus); +} + +/*------------------------------------------------------------------------* + * usb2_bus_roothub_exec + * + * This function is used to schedule the "roothub_done" bus callback + * method. The bus lock must be locked when calling this function. + *------------------------------------------------------------------------*/ +void +usb2_bus_roothub_exec(struct usb2_bus *bus) +{ + USB_BUS_LOCK_ASSERT(bus, MA_OWNED); + + if (usb2_proc_msignal(&bus->roothub_proc, + &bus->roothub_msg[0], &bus->roothub_msg[1])) { + /* ignore */ + } +} ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#8 (text+ko) ==== @@ -94,6 +94,10 @@ /* USB Device mode only - Optional */ void (*vbus_interrupt) (struct usb2_bus *, uint8_t is_on); + + /* USB Device and Host mode - Optional */ + + void (*roothub_exec) (struct usb2_bus *); }; /* @@ -186,6 +190,7 @@ void usb2_bus_mem_flush_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb); uint8_t usb2_bus_mem_alloc_all(struct usb2_bus *bus, bus_dma_tag_t dmat, usb2_bus_mem_cb_t *cb); void usb2_bus_mem_free_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb); +void usb2_bus_roothub_exec(struct usb2_bus *bus); uint16_t usb2_isoc_time_expand(struct usb2_bus *bus, uint16_t isoc_time_curr); uint16_t usb2_fs_isoc_schedule_isoc_time_expand(struct usb2_device *udev, struct usb2_fs_isoc_schedule **pp_start, struct usb2_fs_isoc_schedule **pp_end, uint16_t isoc_time); uint8_t usb2_fs_isoc_schedule_alloc(struct usb2_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#18 (text+ko) ==== @@ -39,14 +39,11 @@ #include #define USB_DEBUG_VAR uss820dcidebug -#define usb2_config_td_cc uss820dci_config_copy -#define usb2_config_td_softc uss820dci_softc #include #include #include #include -#include #include #include #include @@ -98,7 +95,6 @@ static usb2_sw_transfer_func_t uss820dci_root_intr_done; static usb2_sw_transfer_func_t uss820dci_root_ctrl_done; -static usb2_config_td_command_t uss820dci_root_ctrl_task; /* * Here is a list of what the USS820D chip can support. The main @@ -1832,15 +1828,13 @@ sc->sc_root_ctrl.xfer = xfer; - usb2_config_td_queue_command( - &sc->sc_config_td, NULL, &uss820dci_root_ctrl_task, 0, 0); + usb2_bus_roothub_exec(xfer->udev->bus); } static void -uss820dci_root_ctrl_task(struct uss820dci_softc *sc, - struct uss820dci_config_copy *cc, uint16_t refcount) +uss820dci_root_ctrl_task(struct usb2_bus *bus) { - uss820dci_root_ctrl_poll(sc); + uss820dci_root_ctrl_poll(USS820_DCI_BUS2SC(bus)); } static void @@ -2496,4 +2490,5 @@ .get_hw_ep_profile = &uss820dci_get_hw_ep_profile, .set_stall = &uss820dci_set_stall, .clear_stall = &uss820dci_clear_stall, + .roothub_exec = &uss820dci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#7 (text+ko) ==== @@ -347,7 +347,6 @@ LIST_HEAD(, usb2_xfer) sc_interrupt_list_head; struct usb2_sw_transfer sc_root_ctrl; struct usb2_sw_transfer sc_root_intr; - struct usb2_config_td sc_config_td; struct usb2_device *sc_devices[USS820_MAX_DEVICES]; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#8 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -175,12 +174,6 @@ } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - err = usb2_config_td_setup(&sc->sc_config_td, sc, - &sc->sc_bus.bus_mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, NULL, (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); @@ -244,8 +237,6 @@ sc->sc_io_res); sc->sc_io_res = NULL; } - usb2_config_td_unsetup(&sc->sc_config_td); - usb2_bus_mem_free_all(&sc->sc_bus, NULL); return (0); From owner-p4-projects@FreeBSD.ORG Thu Jan 8 21:55:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A6F41065672; Thu, 8 Jan 2009 21:55:01 +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 DB2B7106566C for ; Thu, 8 Jan 2009 21:55:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C131F8FC26 for ; Thu, 8 Jan 2009 21:55:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08Lt0Ss097804 for ; Thu, 8 Jan 2009 21:55:00 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08Lsxb9097788 for perforce@freebsd.org; Thu, 8 Jan 2009 21:54:59 GMT (envelope-from trasz@freebsd.org) Date: Thu, 8 Jan 2009 21:54:59 GMT Message-Id: <200901082154.n08Lsxb9097788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 155836 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, 08 Jan 2009 21:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155836 Change 155836 by trasz@trasz_victim7 on 2009/01/08 21:54:31 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lister.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/mux.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/status.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/AUTHORS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/COPYING#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ChangeLog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/INSTALL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/MAINT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/animation#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/apple#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/archive#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/audio#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/clarion#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/commands#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/console#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/database#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/diff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/dump#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/elf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/erlang#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/flash#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/frame#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/games#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/hp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/iff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/images#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/inform#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/java#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/kde#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/linux#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/llvm#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lua#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/luks#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mup#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/netware#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/os2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/palm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/perl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/printer#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/psion#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/revision#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/riff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ruby#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/tex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/warc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/weak#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/windows#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.std#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/NEWS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/PORTING#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/TODO#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/apprentice.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ascmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/asprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.guess#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.sub#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.ac#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/elfclass.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/fsmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/funcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/getopt_long.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/is_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/libmagic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic2mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mygetopt.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/names.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/patchlevel.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/print.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/softmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/vasprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/socket.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/bootp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/md5.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping/ping.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ae.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cd.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/build.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/domain.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/insmntque.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/obio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/support.4th#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/exca/exca.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/protosw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/soundcard.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/globals.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/var.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/fileformat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mld6query/mld6query.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rrenumd/rrenumd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/wlandebug.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.27 2009/01/07 01:03:23 danger Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -310,7 +310,7 @@ standards document. All other cases are subject to the ambiguity in the command semantics. -.Sh RETURN VALUES +.Sh EXIT STATUS The .Nm utility exits with one of the following values: ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 (text) ==== @@ -2,7 +2,7 @@ # be used elsewhere because it assumes that the target system doesn't # support BSD extended file flags. # -# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ # PREFIX?=/usr/local @@ -12,8 +12,9 @@ UNAME= $(shell uname -s) SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ - globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c pathcomp.c \ - parse.c proto.c status.c stream.c threads.c token.c updater.c + globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \ + pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \ + stream.c threads.c token.c updater.c OBJS= $(SRCS:.c=.o) WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -9,10 +9,11 @@ PROG= csup SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ - pathcomp.c proto.c status.c stream.c threads.c token.l updater.c + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ + rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG -WARNS?= 6 +WARNS?= 1 # A bit of tweaking is needed to get this Makefile working # with the bsd.prog.mk of all the *BSD OSes... ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ BUGS: @@ -28,4 +28,3 @@ checkout files (files in CVS/ subdirectores), a command line override to only update a specific collection and a third verbosity level to display commit log messages. -- Add support for CVS mode (maybe?). ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/config.c,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ + * $FreeBSD: src/contrib/csup/config.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include @@ -133,7 +133,6 @@ coll->co_options &= ~CO_CHECKRCS; /* In recent versions, we always try to set the file modes. */ coll->co_options |= CO_SETMODE; - /* XXX We don't support the rsync updating algorithm yet. */ coll->co_options |= CO_NORSYNC; error = config_parse_refusefiles(coll); if (error) @@ -444,10 +443,6 @@ "\"%s\"\n", cur_coll->co_name); exit(1); } - if (!(cur_coll->co_options & CO_CHECKOUTMODE)) { - lprintf(-1, "Client only supports checkout mode\n"); - exit(1); - } if (!STAILQ_EMPTY(&colls)) { coll = STAILQ_LAST(&colls, coll, co_next); if (strcmp(coll->co_host, cur_coll->co_host) != 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 (text) ==== @@ -22,7 +22,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $ -.\" $FreeBSD: src/contrib/csup/csup.1,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -442,8 +442,6 @@ mode and .Em checkout mode. -.Nm -only supports the checkout mode for now. .Pp In CVS mode, the client receives copies of the actual RCS files making up the master CVS repository. CVS mode is the default mode of operation. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 (text) ==== @@ -23,20 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/detailer.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/detailer.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include #include #include #include +#include +#include +#include +#include + #include "config.h" #include "detailer.h" #include "fixups.h" +#include "globtree.h" #include "misc.h" #include "mux.h" #include "proto.h" +#include "rcsfile.h" +#include "rsyncfile.h" #include "status.h" #include "stream.h" @@ -56,8 +64,16 @@ static int detailer_batch(struct detailer *); static int detailer_coll(struct detailer *, struct coll *, struct status *); -static int detailer_dofile(struct detailer *, struct coll *, +static int detailer_dofile_co(struct detailer *, struct coll *, struct status *, char *); +static int detailer_dofile_rcs(struct detailer *, struct coll *, + char *, char *); +static int detailer_dofile_regular(struct detailer *, char *, char *); +static int detailer_dofile_rsync(struct detailer *, char *, char *); +static int detailer_checkrcsattr(struct detailer *, struct coll *, char *, + struct fattr *, int); +int detailer_send_details(struct detailer *, struct coll *, char *, + char *, struct fattr *); void * detailer(void *arg) @@ -186,8 +202,13 @@ } if (fixup->f_coll != coll) break; - error = proto_printf(wr, "Y %s %s %s\n", fixup->f_name, - coll->co_tag, coll->co_date); + if (coll->co_options & CO_CHECKOUTMODE) + error = proto_printf(wr, "Y %s %s %s\n", + fixup->f_name, coll->co_tag, coll->co_date); + else { + error = proto_printf(wr, "A %s\n", + fixup->f_name); + } if (error) return (DETAILER_ERR_WRITE); fixup = NULL; @@ -208,12 +229,14 @@ static int detailer_coll(struct detailer *d, struct coll *coll, struct status *st) { + struct fattr *rcsattr; struct stream *rd, *wr; - char *cmd, *file, *line, *msg; - int error; + char *attr, *cmd, *file, *line, *msg, *path, *target; + int error, attic; rd = d->rd; wr = d->wr; + attic = 0; line = stream_getln(rd, NULL); if (line == NULL) return (DETAILER_ERR_READ); @@ -226,17 +249,84 @@ /* Delete file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "D %s\n", file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'I': + case 'i': + case 'j': + /* Directory operations. */ + file = proto_get_ascii(&line); + if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = proto_printf(wr, "D %s\n", file); + error = proto_printf(wr, "%s %s\n", cmd, file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'J': + /* Set directory attributes. */ + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || line != NULL || attr == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, attr); if (error) return (DETAILER_ERR_WRITE); break; + case 'H': + case 'h': + /* Create a hard link. */ + file = proto_get_ascii(&line); + target = proto_get_ascii(&line); + if (file == NULL || target == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, + target); + break; + case 't': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) { + return (DETAILER_ERR_PROTO); + } + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) { + return (DETAILER_ERR_PROTO); + } + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 1); + break; + + case 'T': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) + return (DETAILER_ERR_PROTO); + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 0); + break; + case 'U': /* Add or update file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = detailer_dofile(d, coll, st, file); + if (coll->co_options & CO_CHECKOUTMODE) { + error = detailer_dofile_co(d, coll, st, file); + } else { + path = cvspath(coll->co_prefix, file, 0); + rcsattr = fattr_frompath(path, FATTR_NOFOLLOW); + error = detailer_send_details(d, coll, file, + path, rcsattr); + if (rcsattr != NULL) + fattr_free(rcsattr); + free(path); + } if (error) return (error); break; @@ -261,14 +351,110 @@ return (0); } +/* + * Tell the server to update a regular file. + */ +static int +detailer_dofile_regular(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct stat st; + char md5[MD5_DIGEST_SIZE]; + int error; + + wr = d->wr; + error = stat(path, &st); + /* If we don't have it or it's unaccessible, we want it again. */ + if (error) { + proto_printf(wr, "A %s\n", name); + return (0); + } + + /* If not, we want the file to be updated. */ + error = MD5_File(path, md5); + if (error) { + lprintf(-1, "Error reading \"%s\"\n", name); + return (error); + } + error = proto_printf(wr, "R %s %O %s\n", name, st.st_size, md5); + if (error) + return (DETAILER_ERR_WRITE); + return (0); +} + +/* + * Tell the server to update a file with the rsync algorithm. + */ +static int +detailer_dofile_rsync(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct rsyncfile *rf; + + wr = d->wr; + rf = rsync_open(path, 0, 1); + if (rf == NULL) { + /* Fallback if we fail in opening it. */ + proto_printf(wr, "A %s\n", name); + return (0); + } + proto_printf(wr, "r %s %z %z\n", name, rsync_filesize(rf), + rsync_blocksize(rf)); + /* Detail the blocks. */ + while (rsync_nextblock(rf) != 0) + proto_printf(wr, "%s %s\n", rsync_rsum(rf), rsync_blockmd5(rf)); + proto_printf(wr, ".\n"); + rsync_close(rf); + return (0); +} + +/* + * Tell the server to update an RCS file that we have, or send it if we don't. + */ static int -detailer_dofile(struct detailer *d, struct coll *coll, struct status *st, +detailer_dofile_rcs(struct detailer *d, struct coll *coll, char *name, + char *path) +{ + struct stream *wr; + struct fattr *fa; + struct rcsfile *rf; + int error; + + wr = d->wr; + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + if (fa == NULL) { + /* We don't have it, so send request to get it. */ + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + free(path); + return (0); + } + + rf = rcsfile_frompath(path, name, coll->co_cvsroot, coll->co_tag, 1); + free(path); + if (rf == NULL) { + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* Tell to update the RCS file. The client version details follow. */ + rcsfile_send_details(rf, wr); + rcsfile_free(rf); + fattr_free(fa); + return (0); +} + +static int +detailer_dofile_co(struct detailer *d, struct coll *coll, struct status *st, char *file) { - char md5[MD5_DIGEST_SIZE]; struct stream *wr; struct fattr *fa; struct statusrec *sr; + char md5[MD5_DIGEST_SIZE]; char *path; int error, ret; @@ -337,3 +523,81 @@ return (DETAILER_ERR_WRITE); return (0); } + +int +detailer_checkrcsattr(struct detailer *d, struct coll *coll, char *name, + struct fattr *server_attr, int attic) +{ + struct fattr *client_attr; + char *attr, *path; + int error; + + /* + * I don't think we can use the status file, since it only records file + * attributes in cvsmode. + */ + client_attr = NULL; + path = cvspath(coll->co_prefix, name, attic); + if (path == NULL) { + return (DETAILER_ERR_PROTO); + } + + if (access(path, F_OK) == 0 && + ((client_attr = fattr_frompath(path, FATTR_NOFOLLOW)) != NULL) && + fattr_equal(client_attr, server_attr)) { + attr = fattr_encode(client_attr, NULL, 0); + if (attic) { + error = proto_printf(d->wr, "l %s %s\n", name, attr); + } else { + error = proto_printf(d->wr, "L %s %s\n", name, attr); + } + free(attr); + free(path); + fattr_free(client_attr); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* We don't have it, so tell the server to send it. */ + error = detailer_send_details(d, coll, name, path, client_attr); + fattr_free(client_attr); + free(path); + return (error); +} + +int +detailer_send_details(struct detailer *d, struct coll *coll, char *name, + char *path, struct fattr *fa) +{ + int error; + size_t len; + + /* + * Try to check if the file exists either live or dead to see if we can + * edit it and put it live or dead, rather than receiving the entire + * file. + */ + if (fa == NULL) { + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + } + if (fa == NULL) { + error = proto_printf(d->wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } else if (fattr_type(fa) == FT_FILE) { + if (isrcs(name, &len) && !(coll->co_options & CO_NORCS)) { + detailer_dofile_rcs(d, coll, name, path); + } else if (!(coll->co_options & CO_NORSYNC) && + !globtree_test(coll->co_norsync, name)) { + detailer_dofile_rsync(d, name, path); + } else { + detailer_dofile_regular(d, name, path); + } + } else { + error = proto_printf(d->wr, "N %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } + return (0); +} ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 (text) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/diff.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/diff.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ +#include + #include #include #include +#include #include #include @@ -36,15 +39,20 @@ #include "keyword.h" #include "misc.h" #include "stream.h" +#include "queue.h" typedef long lineno_t; #define EC_ADD 0 #define EC_DEL 1 +#define MAXKEY LONG_MAX /* Editing command and state. */ struct editcmd { int cmd; + long key; + int havetext; + int offset; lineno_t where; lineno_t count; lineno_t lasta; @@ -55,20 +63,28 @@ struct diffinfo *di; struct stream *orig; struct stream *dest; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 8 23:31:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 830B21065723; Thu, 8 Jan 2009 23:31: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 371281065711 for ; Thu, 8 Jan 2009 23:31:40 +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 23B9E8FC21 for ; Thu, 8 Jan 2009 23:31:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08NVend009557 for ; Thu, 8 Jan 2009 23:31:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08NVdVZ009555 for perforce@freebsd.org; Thu, 8 Jan 2009 23:31:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 8 Jan 2009 23:31:39 GMT Message-Id: <200901082331.n08NVdVZ009555@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 155839 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, 08 Jan 2009 23:31:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=155839 Change 155839 by hselasky@hselasky_laptop001 on 2009/01/08 23:31:16 This change is about removing three fields from "struct usb2_xfer" which can be reached from "struct usb2_xfer_root" instead and cleaning up the code after this change. The fields are "xfer->udev", "xfer->xfer_mtx" and "xfer->usb2_sc". In this process the following changes were also made: Rename "usb2_root" to "xroot" which is short for "xfer root". Rename "priv_mtx" to "xfer_mtx" in USB core. The USB_XFER_LOCK and USB_XFER_UNLOCK macros should only be used in the USB core due to dependency towards "xroot". Substitute macros for the real lock in two USB device drivers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#27 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#24 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#32 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#30 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#29 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#37 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#21 (text+ko) ==== @@ -259,13 +259,13 @@ static void at91dci_wakeup_peer(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t use_polling; if (!(sc->sc_flags.status_suspend)) { return; } - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, AT91_UDP_GSTATE_ESR); @@ -698,7 +698,7 @@ return (1); /* not complete */ done: - sc = xfer->usb2_sc; + sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); temp = (xfer->endpoint & UE_ADDR); /* update FIFO bank flag and multi buffer */ @@ -886,7 +886,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -901,7 +901,7 @@ temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; - sc = xfer->usb2_sc; + sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); /* check if we should prepend a setup message */ @@ -1042,7 +1042,7 @@ /* poll one time */ if (at91dci_xfer_do_fifo(xfer)) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no = xfer->endpoint & UE_ADDR; /* @@ -1055,7 +1055,7 @@ DPRINTFN(15, "enable interrupts on endpoint %d\n", ep_no); /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1069,7 +1069,7 @@ at91dci_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); DPRINTFN(9, "\n"); @@ -1209,7 +1209,7 @@ static void at91dci_device_done(struct usb2_xfer *xfer, usb2_error_t error) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint8_t ep_no; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -1623,7 +1623,7 @@ static void at91dci_device_isoc_fs_enter(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint32_t temp; uint32_t nframes; @@ -1705,7 +1705,7 @@ static void at91dci_root_ctrl_close(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; @@ -1809,11 +1809,11 @@ static void at91dci_root_ctrl_start(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); sc->sc_root_ctrl.xfer = xfer; - usb2_bus_roothub_exec(xfer->udev->bus); + usb2_bus_roothub_exec(xfer->xroot->bus); } static void @@ -1826,7 +1826,7 @@ at91dci_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); uint16_t value; uint16_t index; uint8_t use_polling; @@ -1847,7 +1847,7 @@ value = UGETW(std->req.wValue); index = UGETW(std->req.wIndex); - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; /* demultiplex the control request */ @@ -2252,7 +2252,7 @@ static void at91dci_root_intr_close(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; @@ -2269,7 +2269,7 @@ static void at91dci_root_intr_start(struct usb2_xfer *xfer) { - struct at91dci_softc *sc = xfer->usb2_sc; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); sc->sc_root_intr.xfer = xfer; } @@ -2299,11 +2299,6 @@ xfer = parm->curr_xfer; /* - * setup xfer - */ - xfer->usb2_sc = sc; - - /* * NOTE: This driver does not use any of the parameters that * are computed from the following values. Just set some * reasonable dummies: ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#27 (text+ko) ==== @@ -971,7 +971,7 @@ return; } /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1135,7 +1135,7 @@ static usb2_error_t ehci_non_isoc_done_sub(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_qtd_t *td; ehci_qtd_t *td_alt_next; uint32_t status; @@ -1239,7 +1239,7 @@ #if USB_DEBUG if (ehcidebug > 10) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_dump_sqtds(sc, xfer->td_transfer_first); } @@ -1291,7 +1291,7 @@ ehci_check_transfer(struct usb2_xfer *xfer) { struct usb2_pipe_methods *methods = xfer->pipe->methods; - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint32_t status; @@ -1521,7 +1521,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ ehci_device_done(xfer, USB_ERR_TIMEOUT); @@ -1731,11 +1731,11 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.average = xfer->max_usb2_frame_size; temp.max_frame_size = xfer->max_frame_size; - temp.sc = xfer->usb2_sc; + temp.sc = EHCI_BUS2SC(xfer->xroot->bus); /* toggle the DMA set we are using */ xfer->flags_int.curr_dma_set ^= 1; @@ -1763,7 +1763,7 @@ temp.auto_data_toggle = 1; } - if (usb2_get_speed(xfer->udev) != USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) { /* max 3 retries */ temp.qtd_status |= htoehci32(temp.sc, EHCI_QTD_SET_CERR(3)); @@ -1894,12 +1894,12 @@ EHCI_QH_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)) | EHCI_QH_SET_MPL(xfer->max_packet_size)); - if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_DTC | EHCI_QH_SET_NRL(8)); } else { - if (usb2_get_speed(xfer->udev) == USB_SPEED_FULL) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL) | EHCI_QH_DTC); } else { @@ -1922,8 +1922,8 @@ (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) | EHCI_QH_SET_CMASK(xfer->usb2_cmask) | EHCI_QH_SET_SMASK(xfer->usb2_smask) | - EHCI_QH_SET_HUBA(xfer->udev->hs_hub_addr) | - EHCI_QH_SET_PORT(xfer->udev->hs_port_no)); + EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | + EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no)); qh->qh_endphub = htoehci32(temp.sc, qh_endphub); qh->qh_curqtd = htoehci32(temp.sc, 0); @@ -1951,7 +1951,7 @@ usb2_pc_cpu_flush(qh->page_cache); - if (xfer->udev->pwr_save.suspended == 0) { + if (xfer->xroot->udev->pwr_save.suspended == 0) { EHCI_APPEND_QH(qh, *qh_last); } } @@ -1960,7 +1960,7 @@ ehci_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint16_t i; uint16_t m; @@ -2117,7 +2117,7 @@ ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error) { struct usb2_pipe_methods *methods = xfer->pipe->methods; - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -2130,7 +2130,7 @@ if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", xfer->pipe->toggle_next); - ehci_dump_sqtds(xfer->usb2_sc, + ehci_dump_sqtds(sc, xfer->td_transfer_first); } #endif @@ -2185,7 +2185,7 @@ static void ehci_device_bulk_start(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); @@ -2228,7 +2228,7 @@ static void ehci_device_ctrl_start(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); @@ -2253,7 +2253,7 @@ static void ehci_device_intr_open(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint16_t best; uint16_t bit; uint16_t x; @@ -2262,9 +2262,9 @@ /* Allocate a microframe slot first: */ slot = usb2_intr_schedule_adjust - (xfer->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX); + (xfer->xroot->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX); - if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { xfer->usb2_uframe = slot; xfer->usb2_smask = (1 << slot) & 0xFF; xfer->usb2_cmask = 0; @@ -2306,11 +2306,11 @@ static void ehci_device_intr_close(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint8_t slot; slot = usb2_intr_schedule_adjust - (xfer->udev, -(xfer->max_frame_size), xfer->usb2_uframe); + (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb2_uframe); sc->sc_intr_stat[xfer->qh_pos]--; @@ -2326,7 +2326,7 @@ static void ehci_device_intr_start(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ehci_setup_standard_chain(xfer, &sc->sc_intr_p_last[xfer->qh_pos]); @@ -2351,7 +2351,7 @@ static void ehci_device_isoc_fs_open(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_sitd_t *td; uint32_t sitd_portaddr; uint8_t ds; @@ -2359,8 +2359,8 @@ sitd_portaddr = EHCI_SITD_SET_ADDR(xfer->address) | EHCI_SITD_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)) | - EHCI_SITD_SET_HUBA(xfer->udev->hs_hub_addr) | - EHCI_SITD_SET_PORT(xfer->udev->hs_port_no); + EHCI_SITD_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | + EHCI_SITD_SET_PORT(xfer->xroot->udev->hs_port_no); if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) { sitd_portaddr |= EHCI_SITD_SET_DIR_IN; @@ -2399,7 +2399,7 @@ ehci_device_isoc_fs_enter(struct usb2_xfer *xfer) { struct usb2_page_search buf_res; - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); struct usb2_fs_isoc_schedule *fss_start; struct usb2_fs_isoc_schedule *fss_end; struct usb2_fs_isoc_schedule *fss; @@ -2460,7 +2460,7 @@ */ xfer->isoc_time_complete = usb2_fs_isoc_schedule_isoc_time_expand - (xfer->udev, &fss_start, &fss_end, nframes) + buf_offset + + (xfer->xroot->udev, &fss_start, &fss_end, nframes) + buf_offset + xfer->nframes; /* get the real number of frames */ @@ -2636,7 +2636,7 @@ static void ehci_device_isoc_hs_open(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_itd_t *td; uint32_t temp; uint8_t ds; @@ -2690,7 +2690,7 @@ ehci_device_isoc_hs_enter(struct usb2_xfer *xfer) { struct usb2_page_search buf_res; - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); ehci_itd_t *td; ehci_itd_t *td_last = NULL; ehci_itd_t **pp_last; @@ -2914,7 +2914,7 @@ static void ehci_root_ctrl_close(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; @@ -3021,13 +3021,13 @@ static void ehci_root_ctrl_start(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); DPRINTF("\n"); sc->sc_root_ctrl.xfer = xfer; - usb2_bus_roothub_exec(xfer->udev->bus); + usb2_bus_roothub_exec(xfer->xroot->bus); } static void @@ -3040,7 +3040,7 @@ ehci_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); char *ptr; uint32_t port; uint32_t v; @@ -3066,7 +3066,7 @@ value = UGETW(std->req.wValue); index = UGETW(std->req.wIndex); - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; DPRINTFN(3, "type=0x%02x request=0x%02x wLen=0x%04x " "wValue=0x%04x wIndex=0x%04x\n", @@ -3483,7 +3483,7 @@ static void ehci_root_intr_close(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; @@ -3500,7 +3500,7 @@ static void ehci_root_intr_start(struct usb2_xfer *xfer) { - ehci_softc_t *sc = xfer->usb2_sc; + ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); sc->sc_root_intr.xfer = xfer; } @@ -3538,11 +3538,6 @@ nitd = 0; /* - * setup xfer - */ - xfer->usb2_sc = sc; - - /* * compute maximum number of some structures */ if (parm->methods == &ehci_device_ctrl_methods) { @@ -3864,7 +3859,7 @@ TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->udev == udev) { + if (xfer->xroot->udev == udev) { methods = xfer->pipe->methods; @@ -3898,7 +3893,7 @@ TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->udev == udev) { + if (xfer->xroot->udev == udev) { methods = xfer->pipe->methods; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#22 (text+ko) ==== @@ -204,14 +204,14 @@ static void musbotg_wakeup_peer(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); uint8_t temp; uint8_t use_polling; if (!(sc->sc_flags.status_suspend)) { return; } - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; temp = MUSB2_READ_1(sc, MUSB2_REG_POWER); temp |= MUSB2_MASK_RESUME; @@ -931,7 +931,7 @@ return (1); /* not complete */ done: - sc = xfer->usb2_sc; + sc = MUSBOTG_BUS2SC(xfer->xroot->bus); /* compute all actual lengths */ @@ -1130,7 +1130,7 @@ DPRINTFN(8, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1145,7 +1145,7 @@ temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; - sc = xfer->usb2_sc; + sc = MUSBOTG_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); /* check if we should prepend a setup message */ @@ -1245,7 +1245,7 @@ DPRINTFN(1, "xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ musbotg_device_done(xfer, USB_ERR_TIMEOUT); @@ -1254,7 +1254,7 @@ static void musbotg_ep_int_set(struct usb2_xfer *xfer, uint8_t on) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); uint16_t temp; uint8_t ep_no = xfer->endpoint & UE_ADDR; @@ -1304,7 +1304,7 @@ DPRINTFN(14, "enabled interrupts on endpoint\n"); /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1318,7 +1318,7 @@ musbotg_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); DPRINTFN(8, "\n"); @@ -1458,7 +1458,7 @@ static void musbotg_device_done(struct usb2_xfer *xfer, usb2_error_t error) { - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); @@ -2021,7 +2021,7 @@ static void musbotg_device_isoc_enter(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); uint32_t temp; uint32_t nframes; uint32_t fs_frames; @@ -2039,7 +2039,7 @@ */ temp = (nframes - xfer->pipe->isoc_next) & MUSB2_MASK_FRAME; - if (usb2_get_speed(xfer->udev) == USB_SPEED_HIGH) { + if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { fs_frames = (xfer->nframes + 7) / 8; } else { fs_frames = xfer->nframes; @@ -2109,7 +2109,7 @@ static void musbotg_root_ctrl_close(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; @@ -2214,11 +2214,11 @@ static void musbotg_root_ctrl_start(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); sc->sc_root_ctrl.xfer = xfer; - usb2_bus_roothub_exec(xfer->udev->bus); + usb2_bus_roothub_exec(xfer->xroot->bus); } static void @@ -2231,7 +2231,7 @@ musbotg_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); uint16_t value; uint16_t index; uint8_t use_polling; @@ -2252,7 +2252,7 @@ value = UGETW(std->req.wValue); index = UGETW(std->req.wIndex); - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; /* demultiplex the control request */ @@ -2660,7 +2660,7 @@ static void musbotg_root_intr_close(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; @@ -2677,7 +2677,7 @@ static void musbotg_root_intr_start(struct usb2_xfer *xfer) { - struct musbotg_softc *sc = xfer->usb2_sc; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); sc->sc_root_intr.xfer = xfer; } @@ -2707,11 +2707,6 @@ xfer = parm->curr_xfer; /* - * setup xfer - */ - xfer->usb2_sc = sc; - - /* * NOTE: This driver does not use any of the parameters that * are computed from the following values. Just set some * reasonable dummies: ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#24 (text+ko) ==== @@ -669,7 +669,7 @@ return; } /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1233,7 +1233,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ ohci_device_done(xfer, USB_ERR_TIMEOUT); @@ -1404,7 +1404,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.average = xfer->max_usb2_frame_size; temp.max_frame_size = xfer->max_frame_size; @@ -1549,7 +1549,7 @@ ed_flags |= (OHCI_ED_FORMAT_GEN | OHCI_ED_DIR_TD); - if (xfer->udev->speed == USB_SPEED_LOW) { + if (xfer->xroot->udev->speed == USB_SPEED_LOW) { ed_flags |= OHCI_ED_SPEED; } ed->ed_flags = htole32(ed_flags); @@ -1558,17 +1558,17 @@ ed->ed_headp = td->td_self; - if (xfer->udev->pwr_save.suspended == 0) { + if (xfer->xroot->udev->pwr_save.suspended == 0) { /* the append function will flush the endpoint descriptor */ OHCI_APPEND_QH(ed, *ed_last); if (methods == &ohci_device_bulk_methods) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF); } if (methods == &ohci_device_ctrl_methods) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF); } @@ -1581,7 +1581,7 @@ ohci_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); uint32_t hstatus; uint16_t i; uint16_t m; @@ -1629,7 +1629,7 @@ ohci_device_done(struct usb2_xfer *xfer, usb2_error_t error) { struct usb2_pipe_methods *methods = xfer->pipe->methods; - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); ohci_ed_t *ed; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -1685,7 +1685,7 @@ static void ohci_device_bulk_start(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ohci_setup_standard_chain(xfer, &sc->sc_bulk_p_last); @@ -1728,7 +1728,7 @@ static void ohci_device_ctrl_start(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ohci_setup_standard_chain(xfer, &sc->sc_ctrl_p_last); @@ -1753,7 +1753,7 @@ static void ohci_device_intr_open(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); uint16_t best; uint16_t bit; uint16_t x; @@ -1786,7 +1786,7 @@ static void ohci_device_intr_close(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); sc->sc_intr_stat[xfer->qh_pos]--; @@ -1802,7 +1802,7 @@ static void ohci_device_intr_start(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); /* setup TD's and QH */ ohci_setup_standard_chain(xfer, &sc->sc_intr_p_last[xfer->qh_pos]); @@ -1841,7 +1841,7 @@ ohci_device_isoc_enter(struct usb2_xfer *xfer) { struct usb2_page_search buf_res; - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); struct ohci_hcca *hcca; uint32_t buf_offset; uint32_t nframes; @@ -1999,7 +1999,7 @@ OHCI_ED_SET_EN(UE_GET_ADDR(xfer->endpoint)) | OHCI_ED_SET_MAXP(xfer->max_frame_size)); - if (xfer->udev->speed == USB_SPEED_LOW) { + if (xfer->xroot->udev->speed == USB_SPEED_LOW) { ed_flags |= OHCI_ED_SPEED; } ed->ed_flags = htole32(ed_flags); @@ -2047,7 +2047,7 @@ static void ohci_root_ctrl_close(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_ctrl.xfer == xfer) { sc->sc_root_ctrl.xfer = NULL; @@ -2127,11 +2127,11 @@ static void ohci_root_ctrl_start(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); sc->sc_root_ctrl.xfer = xfer; - usb2_bus_roothub_exec(xfer->udev->bus); + usb2_bus_roothub_exec(xfer->xroot->bus); } static void @@ -2144,7 +2144,7 @@ ohci_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); char *ptr; uint32_t port; uint32_t v; @@ -2169,7 +2169,7 @@ value = UGETW(std->req.wValue); index = UGETW(std->req.wIndex); - use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0; + use_polling = mtx_owned(xfer->xroot->xfer_mtx) ? 1 : 0; DPRINTFN(3, "type=0x%02x request=0x%02x wLen=0x%04x " "wValue=0x%04x wIndex=0x%04x\n", @@ -2470,7 +2470,7 @@ static void ohci_root_intr_close(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); if (sc->sc_root_intr.xfer == xfer) { sc->sc_root_intr.xfer = NULL; @@ -2487,7 +2487,7 @@ static void ohci_root_intr_start(struct usb2_xfer *xfer) { - ohci_softc_t *sc = xfer->usb2_sc; + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); sc->sc_root_intr.xfer = xfer; } @@ -2518,11 +2518,6 @@ sc = OHCI_BUS2SC(parm->udev->bus); xfer = parm->curr_xfer; - /* - * setup xfer - */ - xfer->usb2_sc = sc; - parm->hc_max_packet_size = 0x500; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = OHCI_PAGE_SIZE; @@ -2753,7 +2748,7 @@ TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->udev == udev) { + if (xfer->xroot->udev == udev) { methods = xfer->pipe->methods; ed = xfer->qh_start[xfer->flags_int.curr_dma_set]; @@ -2791,7 +2786,7 @@ TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->udev == udev) { + if (xfer->xroot->udev == udev) { methods = xfer->pipe->methods; ed = xfer->qh_start[xfer->flags_int.curr_dma_set]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#21 (text+ko) ==== @@ -878,7 +878,7 @@ return; } /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->udev->bus->intr_q, xfer); + usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); /* start timeout, if any */ if (xfer->timeout != 0) { @@ -1490,7 +1490,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ uhci_device_done(xfer, USB_ERR_TIMEOUT); @@ -1659,7 +1659,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->udev)); + xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.average = xfer->max_frame_size; temp.max_frame_size = xfer->max_frame_size; @@ -1683,7 +1683,7 @@ htole32(UHCI_TD_ZERO_ACTLEN(UHCI_TD_SET_ERRCNT(3) | UHCI_TD_ACTIVE)); - if (xfer->udev->speed == USB_SPEED_LOW) { + if (xfer->xroot->udev->speed == USB_SPEED_LOW) { temp.td_status |= htole32(UHCI_TD_LS); } temp.td_token = @@ -1816,7 +1816,7 @@ uhci_device_done(struct usb2_xfer *xfer, usb2_error_t error) { struct usb2_pipe_methods *methods = xfer->pipe->methods; - uhci_softc_t *sc = xfer->usb2_sc; + uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus); uhci_qh_t *qh; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 9 00:18:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7C481065672; Fri, 9 Jan 2009 00:18: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 87FCD106564A for ; Fri, 9 Jan 2009 00:18:28 +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 75DB88FC16 for ; Fri, 9 Jan 2009 00:18:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n090ISII014133 for ; Fri, 9 Jan 2009 00:18:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n090ISsS014131 for perforce@freebsd.org; Fri, 9 Jan 2009 00:18:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 9 Jan 2009 00:18:28 GMT Message-Id: <200901090018.n090ISsS014131@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 155842 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, 09 Jan 2009 00:18:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=155842 Change 155842 by hselasky@hselasky_laptop001 on 2009/01/09 00:18:19 Reduce the number of callback processes to 4 per USB controller. There are two rough categories: 1) Giant locked USB transfers. 2) Non-Giant locked USB transfers. On a real system with many USB devices plugged in the number of processes reported by "ps auxw | grep USBPROC" was reduced from 40 to 18. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#47 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#38 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#12 (text+ko) ==== @@ -53,6 +53,13 @@ struct usb2_bus_stat stats_ok; struct usb2_process explore_proc; struct usb2_process roothub_proc; + /* + * There are two callback processes. One for Giant locked + * callbacks. One for non-Giant locked callbacks. This should + * avoid congestion and reduce response time in most cases. + */ + struct usb2_process giant_callback_proc; + struct usb2_process non_giant_callback_proc; struct usb2_bus_msg explore_msg[2]; struct usb2_bus_msg detach_msg[2]; struct usb2_bus_msg attach_msg[2]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#23 (text+ko) ==== @@ -166,6 +166,11 @@ USB_BUS_UNLOCK(bus); + /* Get rid of USB callback processes */ + + usb2_proc_unsetup(&bus->giant_callback_proc); + usb2_proc_unsetup(&bus->non_giant_callback_proc); + /* Get rid of USB roothub process */ usb2_proc_unsetup(&bus->roothub_proc); @@ -391,8 +396,17 @@ bus->roothub_msg[1].hdr.pm_callback = &usb2_bus_roothub; bus->roothub_msg[1].bus = bus; - /* Create USB explore and roothub processes */ - if (usb2_proc_setup(&bus->roothub_proc, + /* Create USB explore, roothub and callback processes */ + + if (usb2_proc_setup(&bus->giant_callback_proc, + &bus->bus_mtx, USB_PRI_MED)) { + printf("WARNING: Creation of USB Giant " + "callback process failed.\n"); + } else if (usb2_proc_setup(&bus->non_giant_callback_proc, + &bus->bus_mtx, USB_PRI_HIGH)) { + printf("WARNING: Creation of USB non-Giant " + "callback process failed.\n"); + } else if (usb2_proc_setup(&bus->roothub_proc, &bus->bus_mtx, USB_PRI_HIGH)) { printf("WARNING: Creation of USB roothub " "process failed.\n"); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#47 (text+ko) ==== @@ -1742,8 +1742,18 @@ /* unsetup any leftover default USB transfers */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); + /* template unsetup, if any */ (usb2_temp_unsetup_p) (udev); + /* + * Make sure that our clear-stall messages are not queued + * anywhere: + */ + USB_BUS_LOCK(udev->bus); + usb2_proc_mwait(&udev->bus->non_giant_callback_proc, + &udev->cs_msg[0], &udev->cs_msg[1]); + USB_BUS_UNLOCK(udev->bus); + sx_destroy(udev->default_sx); sx_destroy(udev->default_sx + 1); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#38 (text+ko) ==== @@ -819,13 +819,12 @@ info->done_m[1].hdr.pm_callback = &usb2_callback_proc; info->done_m[1].xroot = info; - /* create a callback thread */ - - if (usb2_proc_setup(&info->done_p, - &udev->bus->bus_mtx, USB_PRI_HIGH)) { - parm.err = USB_ERR_NO_INTR_THREAD; - goto done; - } + if (xfer_mtx == &Giant) + info->done_p = + &udev->bus->giant_callback_proc; + else + info->done_p = + &udev->bus->non_giant_callback_proc; } /* reset sizes */ @@ -1045,11 +1044,12 @@ temp = usb2_get_dma_delay(info->bus); usb2_pause_mtx(&info->bus->bus_mtx, temp); } + + /* make sure that our done messages are not queued anywhere */ + usb2_proc_mwait(info->done_p, &info->done_m[0], &info->done_m[1]); + USB_BUS_UNLOCK(info->bus); - /* wait for interrupt thread to exit */ - usb2_proc_unsetup(&info->done_p); - /* free DMA'able memory, if any */ pc = info->dma_page_cache_start; while (pc != info->dma_page_cache_end) { @@ -1811,7 +1811,7 @@ * will have a Lock Order Reversal, LOR, if we try to * proceed ! */ - if (usb2_proc_msignal(&info->done_p, + if (usb2_proc_msignal(info->done_p, &info->done_m[0], &info->done_m[1])) { /* ignore */ } @@ -1851,7 +1851,7 @@ * will have a Lock Order Reversal, LOR, if we try to * proceed ! */ - if (usb2_proc_msignal(&info->done_p, + if (usb2_proc_msignal(info->done_p, &info->done_m[0], &info->done_m[1])) { /* ignore */ } @@ -2195,7 +2195,8 @@ udev, NULL, pipe); } else if (udev->default_xfer[1]) { info = udev->default_xfer[1]->xroot; - if (usb2_proc_msignal(&info->done_p, + if (usb2_proc_msignal( + &info->bus->non_giant_callback_proc, &udev->cs_msg[0], &udev->cs_msg[1])) { /* ignore */ } ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#14 (text+ko) ==== @@ -47,8 +47,8 @@ struct usb2_done_msg done_m[2]; struct cv cv_drain; struct usb2_dma_parent_tag dma_parent_tag; - struct usb2_process done_p; + struct usb2_process *done_p; /* pointer to callback process */ void *memory_base; struct mtx *xfer_mtx; /* cannot be changed during operation */ struct usb2_page_cache *dma_page_cache_start; From owner-p4-projects@FreeBSD.ORG Fri Jan 9 03:18:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09E271065674; Fri, 9 Jan 2009 03:18: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 B0D06106566C; Fri, 9 Jan 2009 03:18:06 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 732C98FC14; Fri, 9 Jan 2009 03:18:06 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n093GeWG086196; Thu, 8 Jan 2009 20:16:40 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 20:16:56 -0700 (MST) Message-Id: <20090108.201656.-65464992.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200901081838.55030.hselasky@freebsd.org> References: <200901071327.n07DRFt5091936@repoman.freebsd.org> <20090108.102453.-1749728154.imp@bsdimp.com> <200901081838.55030.hselasky@freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155755 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, 09 Jan 2009 03:18:08 -0000 In message: <200901081838.55030.hselasky@freebsd.org> Hans Petter Selasky writes: : On Thursday 08 January 2009, M. Warner Losh wrote: : > In message: <200901071327.n07DRFt5091936@repoman.freebsd.org> : > : > Hans Petter Selasky writes: : > : Fix a race causing the explore thread to : > : hang when tearing down USB transfers at : > : detach. : > : > Would this explain a hang with a wait channel of DMSG on kldunload of : > the drivers? : > : > Warner : : Yes, : : If "ps auxw| grep DRAIN" shows you something. : : Try out -current next week if you don't have access to P4. I'll give it a spin when I finish rescuing a failing hard drive... Warner From owner-p4-projects@FreeBSD.ORG Fri Jan 9 03:20:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE6031065673; Fri, 9 Jan 2009 03:20: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 AC824106566B; Fri, 9 Jan 2009 03:20:30 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 6B7378FC12; Fri, 9 Jan 2009 03:20:30 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n093HldR086215; Thu, 8 Jan 2009 20:17:47 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 08 Jan 2009 20:18:02 -0700 (MST) Message-Id: <20090108.201802.-1782466862.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200901081839.27124.hselasky@freebsd.org> References: <200901071009.n07A9jrs056953@repoman.freebsd.org> <20090108.102311.1541746851.imp@bsdimp.com> <200901081839.27124.hselasky@freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 155748 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, 09 Jan 2009 03:20:32 -0000 In message: <200901081839.27124.hselasky@freebsd.org> Hans Petter Selasky writes: : On Thursday 08 January 2009, M. Warner Losh wrote: : > In message: <200901071009.n07A9jrs056953@repoman.freebsd.org> : > : > Hans Petter Selasky writes: : > : http://perforce.freebsd.org/chv.cgi?CH=155748 : > : : > : Change 155748 by hselasky@hselasky_laptop001 on 2009/01/07 10:09:35 : > : : > : : > : Umass module quirk from Alexander Best : > : to support Meizu Electronics MiniPlayer. : > : : > : Affected files ... : > : : > : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit : > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit : > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit : > : .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit : > : : > : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 : > : (text+ko) ==== ==== : > : //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 : > : (text+ko) ==== : > : > Why are these generated files committed to the tree? We did a lot of : > work to make usbdevs generated files not need to be committed to the : > tree and this breaks that... : > : > Warner : : Because they are not automatically generated any more. They are automatically generated. You mean that they are no longer automatically generated as part of the build? I'm wondering why not? We went to a lot of trouble to dig out of the problems that causes, and I'd hate to see us go back to the bad old days... Warner From owner-p4-projects@FreeBSD.ORG Fri Jan 9 05:22:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ACEE1065674; Fri, 9 Jan 2009 05:22: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 278F4106564A; Fri, 9 Jan 2009 05:22:24 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 0117E8FC08; Fri, 9 Jan 2009 05:22:23 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from [10.123.2.23] (p53.kientzle.com [66.166.149.53]) by kientzle.com (8.12.9/8.12.9) with ESMTP id n095MNtv055068; Thu, 8 Jan 2009 21:22:23 -0800 (PST) (envelope-from kientzle@freebsd.org) Message-ID: <4966DF0D.9020302@freebsd.org> Date: Thu, 08 Jan 2009 21:22:21 -0800 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Edward Tomasz Napierala References: <200901082154.n08Lsxb9097788@repoman.freebsd.org> In-Reply-To: <200901082154.n08Lsxb9097788@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155836 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, 09 Jan 2009 05:22:25 -0000 Any estimate when the nfs4acl patches will be merged into -CURRENT? I'm hoping to start soon on nfs4acl support for libarchive and it would be a lot simpler post-merge. I have a couple of other things to finish up first, so probably won't get started until mid-February. Cheers, Tim Edward Tomasz Napierala wrote: > http://perforce.freebsd.org/chv.cgi?CH=155836 > > Change 155836 by trasz@trasz_victim7 on 2009/01/08 21:54:31 > > IFC. > > Affected files ... > > .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 integrate > .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 integrate > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 integrate > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 integrate > .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 integrate From owner-p4-projects@FreeBSD.ORG Fri Jan 9 18:36:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9446A1065673; Fri, 9 Jan 2009 18:36:38 +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 524C0106566B for ; Fri, 9 Jan 2009 18:36:38 +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 4080D8FC18 for ; Fri, 9 Jan 2009 18:36:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n09Iac9P083003 for ; Fri, 9 Jan 2009 18:36:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n09IacJP083001 for perforce@freebsd.org; Fri, 9 Jan 2009 18:36:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 9 Jan 2009 18:36:38 GMT Message-Id: <200901091836.n09IacJP083001@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 155869 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, 09 Jan 2009 18:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=155869 Change 155869 by hselasky@hselasky_laptop001 on 2009/01/09 18:36:19 Initial version of ATMEGA USB device controller driver. Has not been tested on real hardware yet. The driver is based upon the AT91DCI driver. Time spent on development: Approx 20 mhrs. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#1 add .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.h#1 add .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_atmegadci/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 9 21:55:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAE641065670; Fri, 9 Jan 2009 21:55: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 86F46106566B for ; Fri, 9 Jan 2009 21:55:21 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 755468FC16 for ; Fri, 9 Jan 2009 21:55:21 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n09LtLCS025342 for ; Fri, 9 Jan 2009 21:55:21 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n09LtL0G025340 for perforce@freebsd.org; Fri, 9 Jan 2009 21:55:21 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 9 Jan 2009 21:55:21 GMT Message-Id: <200901092155.n09LtL0G025340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 155879 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, 09 Jan 2009 21:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=155879 Change 155879 by sson@sson_amd64 on 2009/01/09 21:54:25 Fixes for launchd: -Change launchd label to com.apple.auditd. -Check for the correct audit condition in audit_quick_stop(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 edit .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $ */ #include @@ -83,7 +83,7 @@ #endif /* __BSM_INTERNAL_NOTIFY_KEY */ #ifndef __AUDIT_LAUNCHD_LABEL -#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd" +#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd" #endif /* __AUDIT_LAUNCHD_LABEL */ #define MAX_MSG_SIZE 4096 @@ -100,7 +100,7 @@ if (debug) opt = ASL_OPT_STDERR; - au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); + au_aslclient = asl_open("auditd", "com.apple.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); #ifdef ASL_KEY_READ_UID ==== //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -57,7 +57,7 @@ * Path of auditd plist file for launchd. */ #define AUDITD_PLIST_FILE \ - "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist" + "/System/Library/LaunchDaemons/com.apple.auditd.plist" /* * Error return codes for auditd_lib functions. ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ */ #include @@ -823,7 +823,7 @@ */ if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) return (-1); - if (cond == AUC_DISABLED) + if (cond == AUC_NOAUDIT) return (0); /* From owner-p4-projects@FreeBSD.ORG Fri Jan 9 22:19:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5472E106567B; Fri, 9 Jan 2009 22:19:47 +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 0C1321065674 for ; Fri, 9 Jan 2009 22:19:47 +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 ECEA68FC12 for ; Fri, 9 Jan 2009 22:19:46 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n09MJk1n028086 for ; Fri, 9 Jan 2009 22:19:46 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n09MJkVO028084 for perforce@freebsd.org; Fri, 9 Jan 2009 22:19:46 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 9 Jan 2009 22:19:46 GMT Message-Id: <200901092219.n09MJkVO028084@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 155883 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, 09 Jan 2009 22:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=155883 Change 155883 by pgj@kolbasz on 2009/01/09 22:18:53 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#14 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#15 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#15 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#20 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/catalog#6 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#7 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#14 integrate .. //depot/projects/docproj_hu/doc/share/sgml/trademarks.ent#2 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/docproj_hu/src_7/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/docproj_hu/src_7/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/docproj_hu/src_7/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#10 integrate .. //depot/projects/docproj_hu/www/en/community.xsl#5 integrate .. //depot/projects/docproj_hu/www/en/community/social.xsl#3 integrate .. //depot/projects/docproj_hu/www/en/developers/cvs.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/index.xsl#4 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#6 integrate .. //depot/projects/docproj_hu/www/en/news/status/status.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/announce.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/errata.html#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/hardware.html#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/readme.html#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/relnotes.html#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/releases/index.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#12 integrate .. //depot/projects/docproj_hu/www/en/security/security.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/send-pr.sgml#2 integrate .. //depot/projects/docproj_hu/www/hu/community.xsl#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#11 integrate .. //depot/projects/docproj_hu/www/share/sgml/header.ent#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#33 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#9 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#14 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.476 2008/12/24 13:42:37 blackend Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.479 2009/01/05 08:20:23 hrs Exp $ --> @@ -156,6 +156,7 @@ + @@ -563,6 +564,7 @@ + @@ -1674,6 +1676,7 @@ + @@ -1707,6 +1710,8 @@ + + @@ -2097,6 +2102,7 @@ + @@ -2255,6 +2261,7 @@ + @@ -3040,6 +3047,10 @@ + + + + @@ -3377,6 +3388,7 @@ + @@ -3712,6 +3724,7 @@ + @@ -4223,6 +4236,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/trademarks.ent#2 (text+ko) ==== @@ -8,7 +8,7 @@ Please keep this file sorted. - $FreeBSD: doc/share/sgml/trademarks.ent,v 1.43 2007/08/11 20:05:53 bmah Exp $ + $FreeBSD: doc/share/sgml/trademarks.ent,v 1.44 2009/01/05 21:30:43 brd Exp $ --> 3Com and HomeConnect are registered @@ -86,7 +86,9 @@ Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries."> +Cisco"> Catalyst"> +EtherChannel"> IOS"> Corel and WordPerfect are trademarks @@ -151,6 +153,7 @@ IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States."> +IEEE"> POSIX"> ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1098 2008/11/24 01:26:22 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1099 2009/01/09 03:52:12 murray Exp $ 2000 @@ -29,6 +29,7 @@ 2006 2007 2008 + 2009 The &os; Documentation Project @@ -347,6 +348,12 @@ The &man.fdopendir.3; library function has been added. + The &man.fetch.3; library now support HTTP 1.1 + If-Modified-Since behavior. The &man.fetch.1; program now + supports + which will only download the specified HTTP URL if the content + is newer than filename. + &man.find.1; has been enhanced by the addition of a number of primaries that were present in GNU find but not &os; &man.find.1;. ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#4 (text+ko) ==== @@ -16,7 +16,7 @@ %release; - + ]>
    @@ -37,10 +37,11 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.6 2008/12/23 17:55:07 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.10 2009/01/05 15:38:45 hrs Exp $ 2008 + 2009 The &os; Documentation Project @@ -125,11 +126,9 @@ Security Advisories -No advisories. -]]> -The following security advisories pertain to &os; &release.bugfix;. For more information, consult the individual advisories available from . @@ -154,128 +153,201 @@ 17 April 2008 OpenSSH X11-forwarding privilege escalation - - SA-08:06.bind - 13 July 2008 - DNS cache poisoning - - - SA-08:07.amd64 - 3 September 2008 - amd64 swapgs local privilege escalation - - - SA-08:08.nmount - 3 September 2008 - &man.nmount.2; local arbitrary code execution - - - SA-08:09.icmp6 - 3 September 2008 - Remote kernel panics on IPv6 connections - - - SA-08:10.nd6 - 1 October 2008 - IPv6 Neighbor Discovery Protocol routing vulnerability - - - SA-08:11.arc4random - 24 November 2008 - &man.arc4random.9; predictable sequence vulnerability - - - SA-08:12.ftpd - 23 December 2008 - Cross-site request forgery in &man.ftpd.8; - - - SA-08:13.protosw - 23 December 2008 - netgraph / bluetooth privilege escalation - -]]> +--> Open Issues -No open issues. -]]> + [20090105] As in the Announcement of 7.1-RELEASE, certain Intel NICs + will come up as &man.igb.4; instead of &man.em.4; in this + release. There are only 3 PCI ID's that should have + their name changed from &man.em.4; to &man.igb.4;: + + + + 0x10A78086 + + + + 0x10A98086 + + + + 0x10D68086 + + + + You should be able to determine if your card will + change names by running the following command: + + &prompt.user; pciconf -l +. . . +em0@pci0:0:25:0: class=0x020000 card=0x02381028 chip=0x10c08086 rev=0x02 hdr=0x00 + + and for the line representing your NIC (should be named + em on older systems, + e.g. em0 or em1, etc) + check the fourth column. If that says + chip=0x10a78086 (or one of the other two IDs + given above) you will have the adapter's name change. + + + + Late-Breaking News and Corrections + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned that the &man.procstat.1; utility has been added. + This is a process inspection utility which provides both some of + the missing functionality from &man.procfs.5; and new + functionality for monitoring and debugging specific + processes. + + [20090105] The Release Notes for 7.1-RELEASE should have mentioned + changes that the &man.ae.4; driver has been added to provide support + for the Attansic/Atheros L2 FastEthernet controllers. + This driver is not enabled in GENERIC + kernels for this release. + + [20090105] The Release Notes for 7.1-RELEASE included the + following misdescriptions: + + + + In the entry of &man.linux.4; ABI support, + get_setaffinity() should have been + sched_setaffinity(). + + + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the &man.jme.4; driver has been added to + provide support for PCIe adapters based on JMicron JMC250 + gigabit Ethernet and JMC260 fast Ethernet controllers. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the &man.age.4; driver has been added to + provide support for Attansic/Atheros L1 gigabit Ethernet + controller. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the &man.malo.4; driver has been added to + provide support for Marvell Libertas 88W8335 based PCI network + adapters. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the bm(4) driver has been added to + provide support for Apple Big Mac (BMAC) Ethernet controller, + found on various Apple G3 models. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the et(4) driver has been added to + provide support for Agere ET1310 10/100/Gigabit Ethernet + controller. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned changes that the &man.glxsb.4; driver has been added + to provide support for the Security Block in AMD Geode LX + processors. + + [20090105] The Release Notes for 7.1-RELEASE should have + mentioned that &os; now supports multiple routing tables. To + enable this, the following steps are needed: + + + + Add the following kernel configuration option and + rebuild the kernel. The 2 is the number + of FIB (Forward Information Base, synonym for a routing + table here). The maximum value is 16. + + options ROUTETABLES=2 + + The procedure for rebuilding the &os; kernel is + described in the &os; + Handbook. + + This number can be modified on boot time. To do so, add + the following to /boot/loader.conf and + reboot the system: + + net.fibs=6 + + + + Set a loader tunable net.my_fibnum if + needed. This means the default number of routing tables. + If not specified, 0 will be used. + -[20080229] &man.tcpdump.1; does not correctly print the - TX/RX rates for 802.11 frames. This issue has been fixed on the - HEAD and RELENG_7 branches. + + Set a loader tunable + net.add_addr_allfibs if needed. This + enables to add routes to all FIBs for new interfaces by + default. When this is set to 0, it will + only allocate routes on interface changes for the FIB of the + caller when adding a new set of addresses to an interface. + Note that this tunable is set to 1 by + default. + + - [20080229] A bug in Linux emulation may cause segmentation - faults for some Linux programs using &man.mmap.2;. This issue - has been fixed on the HEAD and RELENG_7 branches. + To select one of the FIBs, the new &man.setfib.1; utility + can be used. This set an associated FIB with the process. For + example: - [20080229] Instances of packet corruption and instability - have been observed with the &man.re.4; network driver. Some - users have reported that using a newer version of this driver - (on HEAD) has solved their problems, or at least mitigated - them. + &prompt.root; setfib -3 ping target.example.com - [20080229, updated 20080817] A change in the way that &os; sends TCP options - has been reported to cause connectivity issues. - This problem has been corrected on - HEAD and the RELENG_7 and RELENG_7_0 branches.. Further - details are contained in errta notice - FreeBSD-EN-08:02.tcp. + The FIB #3 will be used for the &man.ping.8; command. - [20080307] The &os; implementation of SCTP currently depends - on having INET6 support compiled into the - kernel. This requirement is planned to be removed in future - releases. + The FIB which the packet will be associated with will be + determined in the following rules: - [20080307] Source upgrades from &os; - 6.X to &os; &release.bugfix; will - generate warnings from &man.kldxref.8; during - the installkernel step. These warnings are - harmless and can be ignored. + + + All packets which have a FIB associated with them will + use the FIB. If not, FIB #0 will be used. + - [20080307] The &man.crypto.4; driver, which is required for - IPsec functionality, has severe problems on &os;/&arch.powerpc; - (a kernel with device crypto included in its - configuration will be non-functional). + + A packet received on an interface for forwarding uses + FIB #0. + -]]> + + A TCP listen socket associated with an FIB will generate + accept sockets which are associated with the same FIB. + - + + A packet generated in response to other packet uses the + FIB associated with the packet being responded to. + - - Late-Breaking News and Corrections + + A packet generated on tunnel interfaces such as + &man.gif.4; and &man.tun.4; will be encapsulated using the + FIB of the process which set up the tunnel. + -No news. -]]> + + Routing messages will be associated with the process's + FIB. + + -[20080229] The &os; &release.bugfix; release documentation - (release notes, hardware notes, and so forth) all contained a - note that users of &os; 7-STABLE should be subscribed to - the freebsd-current mailing list. This note - should not have appeared. + Also, the &man.ipfw.8; now supports an action rule + setfib. The following action: - [20080229] The release notes gave an incorrect version - number for KDE. The correct version number is 3.5.8. + setfib fibnum -]]> + will make the matched packet use the FIB specified in + fibnum. The rule processing + continues at the next rule. -
    ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 (text+ko) ==== @@ -12,342 +12,238 @@ ]>
    - - &os; &release.current; Release Notes + + &os; &release.current; Release Notes - The &os; Project + The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.30 2008/11/24 20:05:14 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.31 2009/01/05 05:53:14 hrs Exp $ - - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - 2007 - 2008 - The &os; Documentation Project - + + 2000 + 2001 + 2002 + 2003 + 2004 + 2005 + 2006 + 2007 + 2008 + 2009 + The &os; Documentation Project + - - &tm-attrib.freebsd; - &tm-attrib.ibm; - &tm-attrib.ieee; - &tm-attrib.intel; - &tm-attrib.sparc; - &tm-attrib.general; - + + &tm-attrib.freebsd; + &tm-attrib.ibm; + &tm-attrib.ieee; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + - - The release notes for &os; &release.current; contain a summary - of the changes made to the &os; base system on the - &release.branch; development line. - This document lists applicable security advisories that were issued since - the last release, as well as significant changes to the &os; - kernel and userland. - Some brief remarks on upgrading are also presented. - - + + The release notes for &os; &release.current; contain a summary + of the changes made to the &os; base system on the + &release.branch; development line. + This document lists applicable security advisories that were issued since + the last release, as well as significant changes to the &os; + kernel and userland. + Some brief remarks on upgrading are also presented. + + - - Introduction + + Introduction - This document contains the release notes for &os; - &release.current;. It - describes recently added, changed, or deleted features of &os;. - It also provides some notes on upgrading - from previous versions of &os;. + This document contains the release notes for &os; + &release.current;. It + describes recently added, changed, or deleted features of &os;. + It also provides some notes on upgrading + from previous versions of &os;. The &release.type; distribution to which these release notes - apply represents the latest point along the &release.branch; development - branch since &release.branch; was created. Information regarding pre-built, binary - &release.type; distributions along this branch - can be found at . + The &release.type; distribution to which these release notes + apply represents the latest point along the &release.branch; development + branch since &release.branch; was created. Information regarding pre-built, binary + &release.type; distributions along this branch + can be found at . ]]> The &release.type; distribution to which these release notes - apply represents a point along the &release.branch; development - branch between &release.prev; and the future &release.next;. - Information regarding - pre-built, binary &release.type; distributions along this branch - can be found at . + The &release.type; distribution to which these release notes + apply represents a point along the &release.branch; development + branch between &release.prev; and the future &release.next;. + Information regarding + pre-built, binary &release.type; distributions along this branch + can be found at . ]]> This distribution of &os; &release.current; is a - &release.type; distribution. It can be found at or any of its mirrors. More - information on obtaining this (or other) &release.type; - distributions of &os; can be found in the Obtaining - &os; appendix to the &os; - Handbook. + This distribution of &os; &release.current; is a + &release.type; distribution. It can be found at or any of its mirrors. More + information on obtaining this (or other) &release.type; + distributions of &os; can be found in the Obtaining + &os; appendix to the &os; Handbook. ]]> - All users are encouraged to consult the release errata before - installing &os;. The errata document is updated with - late-breaking information discovered late in the - release cycle or after the release. Typically, it contains - information on known bugs, security advisories, and corrections to - documentation. An up-to-date copy of the errata for &os; - &release.current; can be found on the &os; Web site. + All users are encouraged to consult the release errata before + installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections to + documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + - + + What's New - - What's New + This section describes the most user-visible new or changed + features in &os; since &release.prev;. - This section describes - the most user-visible new or changed features in &os; - since &release.prev;. - + Typical release note items document recent security + advisories issued after &release.prev;, new drivers or hardware + support, new commands or options, major bug fixes, or + contributed software upgrades. They may also list changes to + major ports/packages or release engineering practices. Clearly + the release notes cannot list every single change made to &os; + between releases; this document focuses primarily on security + advisories, user-visible changes, and major architectural + improvements. - Typical release note items - document recent security advisories issued after - &release.prev;, - new drivers or hardware support, new commands or options, - major bug fixes, or contributed software upgrades. They may also - list changes to major ports/packages or release engineering - practices. Clearly the release notes cannot list every single - change made to &os; between releases; this document focuses - primarily on security advisories, user-visible changes, and major - architectural improvements. + + Security Advisories - - Security Advisories + + - - + + Kernel Changes - - Kernel Changes + - The &man.ddb.4; kernel debugger now has an output capture - facility. Input and output from &man.ddb.4; can now be captured - to a memory buffer for later inspection using &man.sysctl.8; or - a textdump. The new capture command controls - this feature. + + Boot Loader Changes - The &man.ddb.4; debugger now supports a simple scripting - facility, which supports a set of named scripts consisting of a - set of &man.ddb.4; commands. These commands can be managed from - within &man.ddb.4; or with the use of the new &man.ddb.8; - utility. More details can be found in the &man.ddb.4; manual - page. + + - The kernel now supports a new textdump format of kernel - dumps. A textdump provides higher-level information via - mechanically generated/extracted debugging output, rather than a - simple memory dump. This facility can be used to generate brief - kernel bug reports that are rich in debugging information, but - are not dependent on kernel symbol tables or precisely - synchronized source code. More information can be found in the - &man.textdump.4; manual page. + + Hardware Support - [&arch.amd64;, &arch.i386;] The ULE - scheduler is now the default process scheduler - in GENERIC kernels. + - - Boot Loader Changes + + Multimedia Support - + + - [&arch.amd64;, &arch.i386;] 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. + + Network Interface Support - [&arch.amd64;, &arch.i386;] A new gptboot boot loader has - been added to support booting from a GPT labeled disk. A - new boot command has been added to - &man.gpt.8;, which makes a GPT disk bootable by writing the - required bits of the boot loader, creating a new boot - partition if required. + - + + - - Hardware Support + + Network Protocols - The &man.cmx.4; driver, a driver for Omnikey CardMan 4040 - PCMCIA smartcard readers, has been added. + - The &man.uslcom.4; driver, a driver for Silicon - Laboratories CP2101/CP2102-based USB serial adapters, has been - imported from OpenBSD. + - - Multimedia Support + + Disks and Storage - - - Network Interface Support + - The &man.ale.4; driver has been added to provide support - for Atheros AR8121/AR8113/AR8114 Gigabit/Fast Ethernet controllers. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 10 06:46:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACC02106566C; Sat, 10 Jan 2009 06:46: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 69D151065675 for ; Sat, 10 Jan 2009 06:46:25 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 58A968FC1E for ; Sat, 10 Jan 2009 06:46:25 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A6kOuv003937 for ; Sat, 10 Jan 2009 06:46:24 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0A6kOPk003935 for perforce@freebsd.org; Sat, 10 Jan 2009 06:46:24 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 10 Jan 2009 06:46:24 GMT Message-Id: <200901100646.n0A6kOPk003935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155895 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, 10 Jan 2009 06:46:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=155895 Change 155895 by weongyo@weongyo_ws on 2009/01/10 06:45:39 Add support for Atheros USB wireless adapters based on AR5523 processor and AR2112 or AR5112 Radio-on-a-Chip. This is a WIP version and the man page should be updated. Moreover, the firmware and a tool to load the firmware for the device are missed. I'll try to commit it in the further commits. Affected files ... .. //depot/projects/vap/share/man/man4/uath.4#1 add .. //depot/projects/vap/sys/dev/usb/if_uath.c#1 add .. //depot/projects/vap/sys/dev/usb/if_uathreg.h#1 add .. //depot/projects/vap/sys/dev/usb/if_uathvar.h#1 add .. //depot/projects/vap/sys/modules/uath/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 10 08:59:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B3A1065670; Sat, 10 Jan 2009 08: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 10029106566B for ; Sat, 10 Jan 2009 08:59:40 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2DC18FC0C for ; Sat, 10 Jan 2009 08:59:39 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A8xd4T025071 for ; Sat, 10 Jan 2009 08:59:39 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0A8xdmW025069 for perforce@freebsd.org; Sat, 10 Jan 2009 08:59:39 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 10 Jan 2009 08:59:39 GMT Message-Id: <200901100859.n0A8xdmW025069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155896 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, 10 Jan 2009 08:59:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=155896 Change 155896 by weongyo@weongyo_ws on 2009/01/10 08:59:26 In USB 2.0 specification The USB System Software should guarantees a minumum of 10ms for reset recovery but it looks the USB1 framework doesn't follow it. So it looks sometimes it failed to re-attach or reenumerate devices after the device reset. With this patch, the fw loading operation of uath(4) works. Affected files ... .. //depot/projects/vap/sys/dev/usb/usb.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/usb.c#8 (text+ko) ==== @@ -725,6 +725,7 @@ while (sc->sc_bus->needs_explore && !sc->sc_dying) { sc->sc_bus->needs_explore = 0; splx(s); + usbd_delay_ms(sc->sc_bus->root_hub, 10); sc->sc_bus->root_hub->hub->explore(sc->sc_bus->root_hub); s = splusb(); } From owner-p4-projects@FreeBSD.ORG Sat Jan 10 11:30:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E17B1065670; Sat, 10 Jan 2009 11:30: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 CFB59106566B for ; Sat, 10 Jan 2009 11:30:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BEA158FC12 for ; Sat, 10 Jan 2009 11:30:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ABUCqj041808 for ; Sat, 10 Jan 2009 11:30:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ABUCOk041806 for perforce@freebsd.org; Sat, 10 Jan 2009 11:30:12 GMT (envelope-from gabor@freebsd.org) Date: Sat, 10 Jan 2009 11:30:12 GMT Message-Id: <200901101130.n0ABUCOk041806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155900 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, 10 Jan 2009 11:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=155900 Change 155900 by gabor@gabor_server on 2009/01/10 11:29:14 - Use the GNU regex library for further testing and development Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#16 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#76 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#16 (text+ko) ==== @@ -17,8 +17,12 @@ CFLAGS+= -std=c99 -Wall -pedantic -LDADD= -lz -lbz2 -DPADD= ${LIBZ} ${LIBBZ2} +LDADD= -lgnuregex -lz -lbz2 +DPADD= ${LIBGNUREGEX} ${LIBZ} ${LIBBZ2} + +.if !defined(WITHOUT_GNU_COMPAT) +CFLAGS+= -I/usr/include/gnu +.endif .if !defined(WITHOUT_NLS) NLS= hu_HU.ISO8859-2 ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#76 (text+ko) ==== @@ -82,7 +82,7 @@ }; /* Flags passed to regcomp() and regexec() */ -int cflags; +int cflags = 0; int eflags = REG_STARTEND; /* Shortcut for matching all cases like empty regex */ @@ -563,10 +563,7 @@ switch (grepbehave) { case GREP_FIXED: - cflags |= REG_NOSPEC; - break; case GREP_BASIC: - cflags |= REG_BASIC; break; case GREP_EXTENDED: cflags |= REG_EXTENDED; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 11:35:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5E91065674; Sat, 10 Jan 2009 11:35: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 0BB311065670; Sat, 10 Jan 2009 11:35:45 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe16.swipnet.se [212.247.155.225]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB348FC12; Sat, 10 Jan 2009 11:35:44 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=Eebajf9wwWgA:10 a=nklthdr5v5AUSfVrlghuJA==:17 a=6I5d2MoRAAAA:8 a=cpEYiYxj_F6_3k5pMIAA:9 a=VIs_eT0QLFGJp1hvZx4A:7 a=M7m15PuNcdR9OAfSffOo6Zmbn6sA:4 a=LY0hPdMaydYA:10 Received: from [62.113.132.62] (account mc467741@c2i.net [62.113.132.62] verified) by mailfe16.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 434932729; Sat, 10 Jan 2009 11:35:41 +0100 From: Hans Petter Selasky To: Weongyo Jeong Date: Sat, 10 Jan 2009 11:38:01 +0100 User-Agent: KMail/1.9.7 References: <200901100859.n0A8xdmW025069@repoman.freebsd.org> In-Reply-To: <200901100859.n0A8xdmW025069@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901101138.02533.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155896 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, 10 Jan 2009 11:35:46 -0000 On Saturday 10 January 2009, Weongyo Jeong wrote: > http://perforce.freebsd.org/chv.cgi?CH=155896 > > Change 155896 by weongyo@weongyo_ws on 2009/01/10 08:59:26 > > In USB 2.0 specification The USB System Software should guarantees > a minumum of 10ms for reset recovery but it looks the USB1 framework > doesn't follow it. So it looks sometimes it failed to re-attach or > reenumerate devices after the device reset. > > With this patch, the fw loading operation of uath(4) works. > > Affected files ... > > .. //depot/projects/vap/sys/dev/usb/usb.c#8 edit > Hi, This is not the right place to patch. I think this delay belongs somewhere in "uhub.c". Please search for the following defines in the code: #define USB_PORT_RESET_DELAY 50 /* ms */ #define USB_PORT_ROOT_RESET_DELAY 250 /* ms */ #define USB_PORT_RESET_RECOVERY 250 /* ms */ There should already be a delay there. Maybe you need to increase one of these macros. --HPS > Differences ... > > ==== //depot/projects/vap/sys/dev/usb/usb.c#8 (text+ko) ==== > > @@ -725,6 +725,7 @@ > while (sc->sc_bus->needs_explore && !sc->sc_dying) { > sc->sc_bus->needs_explore = 0; > splx(s); > + usbd_delay_ms(sc->sc_bus->root_hub, 10); > sc->sc_bus->root_hub->hub->explore(sc->sc_bus->root_hub); > s = splusb(); > } From owner-p4-projects@FreeBSD.ORG Sat Jan 10 11:44:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B899D1065672; Sat, 10 Jan 2009 11:44: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 746AB106564A for ; Sat, 10 Jan 2009 11:44:27 +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 49BA48FC19 for ; Sat, 10 Jan 2009 11:44:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ABiRdO043050 for ; Sat, 10 Jan 2009 11:44:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ABiRad043048 for perforce@freebsd.org; Sat, 10 Jan 2009 11:44:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 11:44:27 GMT Message-Id: <200901101144.n0ABiRad043048@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 155901 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, 10 Jan 2009 11:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=155901 Change 155901 by hselasky@hselasky_laptop001 on 2009/01/10 11:44:16 Integrate "print-usb-if-vids.sh" from head. The file is needed for patching. Affected files ... .. //depot/projects/usb/src/tools/tools/usb/print-usb-if-vids.sh#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 10 11:46:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C55511065692; Sat, 10 Jan 2009 11:46: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 830AC106568A for ; Sat, 10 Jan 2009 11:46:33 +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 715F28FC0A for ; Sat, 10 Jan 2009 11:46:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ABkVgS043263 for ; Sat, 10 Jan 2009 11:46:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ABkTVG043261 for perforce@freebsd.org; Sat, 10 Jan 2009 11:46:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 11:46:29 GMT Message-Id: <200901101146.n0ABkTVG043261@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 155902 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, 10 Jan 2009 11:46:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=155902 Change 155902 by hselasky@hselasky_laptop001 on 2009/01/10 11:46:06 Patch from Alexander Best: Correct USB vendor ID download location. Affected files ... .. //depot/projects/usb/src/tools/tools/usb/print-usb-if-vids.sh#2 edit Differences ... ==== //depot/projects/usb/src/tools/tools/usb/print-usb-if-vids.sh#2 (text+ko) ==== @@ -27,5 +27,5 @@ # $FreeBSD: src/tools/tools/usb/print-usb-if-vids.sh,v 1.1 2004/04/18 05:37:34 obrien Exp $ -fetch -o /tmp/usb.if http://www.usb.org/app/pub/dump/comp_dump/ +fetch -o /tmp/usb.if http://www.usb.org/developers/tools/comp_dump/ awk -F '|' '{ printf "%#06x\t%s\n", $1, $2 }' < /tmp/usb.if | sort From owner-p4-projects@FreeBSD.ORG Sat Jan 10 12:08:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3F7E1065688; Sat, 10 Jan 2009 12:08: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 4DA091065679 for ; Sat, 10 Jan 2009 12:08:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 39B608FC16 for ; Sat, 10 Jan 2009 12:08:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AC8uYh045769 for ; Sat, 10 Jan 2009 12:08:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AC8up2045767 for perforce@freebsd.org; Sat, 10 Jan 2009 12:08:56 GMT (envelope-from gabor@freebsd.org) Date: Sat, 10 Jan 2009 12:08:56 GMT Message-Id: <200901101208.n0AC8up2045767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155903 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, 10 Jan 2009 12:08:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=155903 Change 155903 by gabor@gabor_server on 2009/01/10 12:08:38 - Fix a bug in stdin handling, which was introduced in a change of buffering Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#38 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#44 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#38 (text+ko) ==== @@ -132,8 +132,10 @@ /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { - if (stat(fname, &st) != 0) - errx(2, NULL); + if (f->stdin == 1) + st.st_size = 0; + else if (stat(fname, &st) != 0) + err(2, NULL); bufsiz = (MAXBUFSIZ > (st.st_size * PREREAD_M)) ? (st.st_size / 2) : MAXBUFSIZ; @@ -183,8 +185,10 @@ f = grep_malloc(sizeof *f); - if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) + if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) { + f->stdin = 1; return (f); + } free(f); return (NULL); @@ -202,6 +206,7 @@ f = grep_malloc(sizeof *f); + f->stdin = 0; switch (filebehave) { case FILE_STDIO: if ((f->f = fopen(path, "r")) != NULL) ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#44 (text+ko) ==== @@ -72,6 +72,7 @@ struct file { int binary; + int stdin; FILE *f; struct mmfile *mmf; gzFile *gzf; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 12:11:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E26BD106567A; Sat, 10 Jan 2009 12:10: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 93DB51065677 for ; Sat, 10 Jan 2009 12:10:58 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68C3B8FC1C for ; Sat, 10 Jan 2009 12:10:58 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ACAwLN045986 for ; Sat, 10 Jan 2009 12:10:58 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ACAwo1045984 for perforce@freebsd.org; Sat, 10 Jan 2009 12:10:58 GMT (envelope-from gabor@freebsd.org) Date: Sat, 10 Jan 2009 12:10:58 GMT Message-Id: <200901101210.n0ACAwo1045984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155904 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, 10 Jan 2009 12:11:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155904 Change 155904 by gabor@gabor_server on 2009/01/10 12:10:37 - This should have been the right change Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#39 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#39 (text+ko) ==== @@ -133,7 +133,7 @@ /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { if (f->stdin == 1) - st.st_size = 0; + st.st_size = MAXBUFSIZ; else if (stat(fname, &st) != 0) err(2, NULL); From owner-p4-projects@FreeBSD.ORG Sat Jan 10 12:17:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A8E51065672; Sat, 10 Jan 2009 12:17:05 +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 E8FBC106566B for ; Sat, 10 Jan 2009 12:17:04 +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 D707C8FC13 for ; Sat, 10 Jan 2009 12:17:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ACH4GO046450 for ; Sat, 10 Jan 2009 12:17:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ACH4JL046448 for perforce@freebsd.org; Sat, 10 Jan 2009 12:17:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 12:17:04 GMT Message-Id: <200901101217.n0ACH4JL046448@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 155906 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, 10 Jan 2009 12:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=155906 Change 155906 by hselasky@hselasky_laptop001 on 2009/01/10 12:16:21 Remove "vbus_interrupt" method from bus methods and use a global function instead for the various drivers using it. The reason for the removal is to simplify the code. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#22 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#22 (text+ko) ==== @@ -729,11 +729,9 @@ } } -static void -at91dci_vbus_interrupt(struct usb2_bus *bus, uint8_t is_on) +void +at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); - DPRINTFN(5, "vbus = %u\n", is_on); USB_BUS_LOCK(&sc->sc_bus); @@ -760,7 +758,6 @@ &at91dci_root_intr_done); } } - USB_BUS_UNLOCK(&sc->sc_bus); } @@ -2466,6 +2463,5 @@ .get_hw_ep_profile = &at91dci_get_hw_ep_profile, .set_stall = &at91dci_set_stall, .clear_stall = &at91dci_clear_stall, - .vbus_interrupt = &at91dci_vbus_interrupt, .roothub_exec = &at91dci_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#8 (text+ko) ==== @@ -240,5 +240,6 @@ void at91dci_suspend(struct at91dci_softc *sc); void at91dci_resume(struct at91dci_softc *sc); void at91dci_interrupt(struct at91dci_softc *sc); +void at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on); #endif /* _AT9100_DCI_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#17 (text+ko) ==== @@ -72,7 +72,7 @@ }; static void -at91_vbus_interrupt(struct at91_udp_softc *sc) +at91_vbus_poll(struct at91_udp_softc *sc) { uint32_t temp; uint8_t vbus_val; @@ -84,8 +84,7 @@ /* just forward it */ vbus_val = at91_pio_gpio_get(VBUS_BASE, VBUS_MASK); - (sc->sc_dci.sc_bus.methods->vbus_interrupt) - (&sc->sc_dci.sc_bus, vbus_val); + at91dci_vbus_interrupt(&sc->sc_dci, vbus_val); } static void @@ -220,10 +219,10 @@ } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)at91_vbus_interrupt, sc, &sc->sc_vbus_intr_hdl); + NULL, (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)at91_vbus_interrupt, sc, &sc->sc_vbus_intr_hdl); + (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #endif if (err) { sc->sc_vbus_intr_hdl = NULL; @@ -237,7 +236,7 @@ goto error; } else { /* poll VBUS one time */ - at91_vbus_interrupt(sc); + at91_vbus_poll(sc); } return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#23 (text+ko) ==== @@ -954,11 +954,9 @@ } } -static void -musbotg_vbus_interrupt(struct usb2_bus *bus, uint8_t is_on) +void +musbotg_vbus_interrupt(struct musbotg_softc *sc, uint8_t is_on) { - struct musbotg_softc *sc = MUSBOTG_BUS2SC(bus); - DPRINTFN(4, "vbus = %u\n", is_on); USB_BUS_LOCK(&sc->sc_bus); @@ -2873,6 +2871,5 @@ .get_hw_ep_profile = &musbotg_get_hw_ep_profile, .set_stall = &musbotg_set_stall, .clear_stall = &musbotg_clear_stall, - .vbus_interrupt = &musbotg_vbus_interrupt, .roothub_exec = &musbotg_root_ctrl_task, }; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#12 (text+ko) ==== @@ -402,5 +402,6 @@ void musbotg_suspend(struct musbotg_softc *sc); void musbotg_resume(struct musbotg_softc *sc); void musbotg_interrupt(struct musbotg_softc *sc); +void musbotg_vbus_interrupt(struct musbotg_softc *sc, uint8_t is_on); #endif /* _MUSB2_OTG_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#14 (text+ko) ==== @@ -50,14 +50,12 @@ }; static void -musbotg_vbus_interrupt(struct musbotg_super_softc *sc) +musbotg_vbus_poll(struct musbotg_super_softc *sc) { uint8_t vbus_val = 1; /* fake VBUS on - TODO */ /* just forward it */ - - (sc->sc_otg.sc_bus.methods->vbus_interrupt) - (&sc->sc_otg.sc_bus, vbus_val); + musbotg_vbus_interrupt(&sc->sc_otg, vbus_val); } static void @@ -154,7 +152,7 @@ goto error; } else { /* poll VBUS one time */ - musbotg_vbus_interrupt(sc); + musbotg_vbus_poll(sc); } return (0); ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#9 (text+ko) ==== @@ -91,10 +91,6 @@ void (*set_stall) (struct usb2_device *udev, struct usb2_xfer *xfer, struct usb2_pipe *pipe); void (*clear_stall) (struct usb2_device *udev, struct usb2_pipe *pipe); - /* USB Device mode only - Optional */ - - void (*vbus_interrupt) (struct usb2_bus *, uint8_t is_on); - /* USB Device and Host mode - Optional */ void (*roothub_exec) (struct usb2_bus *); From owner-p4-projects@FreeBSD.ORG Sat Jan 10 13:34:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0B5A1065673; Sat, 10 Jan 2009 13:34:42 +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 AFE82106564A for ; Sat, 10 Jan 2009 13:34:42 +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 9BFCC8FC12 for ; Sat, 10 Jan 2009 13:34:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ADYg2M063981 for ; Sat, 10 Jan 2009 13:34:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ADYfUn063979 for perforce@freebsd.org; Sat, 10 Jan 2009 13:34:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 13:34:41 GMT Message-Id: <200901101334.n0ADYfUn063979@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 155909 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, 10 Jan 2009 13:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=155909 Change 155909 by hselasky@hselasky_laptop001 on 2009/01/10 13:33:47 IFC @ 155905 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#9 integrate .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#7 integrate .. //depot/projects/usb/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/files.mv#3 integrate .. //depot/projects/usb/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/usb/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#4 integrate .. //depot/projects/usb/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/usb/src/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/usb/src/sys/arm/mv/obio.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/usb/src/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/usb/src/sys/boot/forth/support.4th#5 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/usb/src/sys/conf/NOTES#24 integrate .. //depot/projects/usb/src/sys/conf/files#46 integrate .. //depot/projects/usb/src/sys/conf/kern.post.mk#8 integrate .. //depot/projects/usb/src/sys/conf/options#16 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/amrr/amrr.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#11 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/usb/src/sys/dev/exca/exca.c#4 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/usb/src/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#8 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.h#5 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/au88x0.c#4 delete .. //depot/projects/usb/src/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#17 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#41 integrate .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#22 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#22 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#20 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#12 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/usb/src/sys/kern/tty.c#14 integrate .. //depot/projects/usb/src/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/usb/src/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#4 integrate .. //depot/projects/usb/src/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/usb/src/sys/net/route.c#14 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/usb/src/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/usb/src/sys/netinet/in.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in.h#8 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/usb/src/sys/netinet/udp_var.h#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#13 integrate .. //depot/projects/usb/src/sys/netinet6/in6_gif.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/ip6protosw.h#3 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/grackle.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/uninorth.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/usb/src/sys/security/audit/audit.h#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#11 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_ifoff/mac_ifoff.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_partition/mac_partition.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_portacl/mac_portacl.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_stub/mac_stub.c#10 integrate .. //depot/projects/usb/src/sys/security/mac_test/mac_test.c#10 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#9 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/usb/src/sys/sys/protosw.h#5 integrate .. //depot/projects/usb/src/sys/sys/soundcard.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_page.h#10 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.168 2008/12/12 23:17:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.169 2009/01/05 21:51:49 jkim Exp $"); #include "opt_cpu.h" @@ -102,6 +102,7 @@ } cpu_vendors[] = { { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ + { CENTAUR_VENDOR_ID, CPU_VENDOR_CENTAUR }, /* CentaurHauls */ }; int cpu_cores; ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#18 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.511 2008/12/02 19:09:08 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.512 2009/01/05 14:21:49 rwatson Exp $ cpu HAMMER ident GENERIC @@ -65,6 +65,8 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/usb/src/sys/amd64/include/cputypes.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.20 2008/11/26 19:25:13 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.21 2009/01/05 21:51:49 jkim Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ @@ -47,7 +47,9 @@ * Vendors of processor. */ #define CPU_VENDOR_AMD 0x1022 /* AMD */ +#define CPU_VENDOR_IDT 0x111d /* Centaur/IDT/VIA */ #define CPU_VENDOR_INTEL 0x8086 /* Intel */ +#define CPU_VENDOR_CENTAUR CPU_VENDOR_IDT #ifndef LOCORE extern int cpu; ==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.51 2008/12/12 23:17:00 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.52 2009/01/05 21:51:49 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -205,6 +205,7 @@ * CPUID manufacturers identifiers */ #define AMD_VENDOR_ID "AuthenticAMD" +#define CENTAUR_VENDOR_ID "CentaurHauls" #define INTEL_VENDOR_ID "GenuineIntel" /* ==== //depot/projects/usb/src/sys/arm/arm/cpufunc.c#8 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.24 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $"); #include #include @@ -358,7 +358,7 @@ }; -struct cpu_functions feroceon_cpufuncs = { +struct cpu_functions sheeva_cpufuncs = { /* CPU functions */ cpufunc_id, /* id */ @@ -368,7 +368,7 @@ cpufunc_control, /* control */ cpufunc_domains, /* Domain */ - feroceon_setttb, /* Setttb */ + sheeva_setttb, /* Setttb */ cpufunc_faultstatus, /* Faultstatus */ cpufunc_faultaddress, /* Faultaddress */ @@ -387,17 +387,17 @@ armv5_ec_icache_sync_range, /* icache_sync_range */ armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ - feroceon_dcache_wbinv_range, /* dcache_wbinv_range */ - feroceon_dcache_inv_range, /* dcache_inv_range */ - feroceon_dcache_wb_range, /* dcache_wb_range */ + sheeva_dcache_wbinv_range, /* dcache_wbinv_range */ + sheeva_dcache_inv_range, /* dcache_inv_range */ + sheeva_dcache_wb_range, /* dcache_wb_range */ armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ - feroceon_idcache_wbinv_range, /* idcache_wbinv_all */ + sheeva_idcache_wbinv_range, /* idcache_wbinv_all */ - feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */ - feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */ - feroceon_l2cache_inv_range, /* l2cache_inv_range */ - feroceon_l2cache_wb_range, /* l2cache_wb_range */ + sheeva_l2cache_wbinv_all, /* l2cache_wbinv_all */ + sheeva_l2cache_wbinv_range, /* l2cache_wbinv_range */ + sheeva_l2cache_inv_range, /* l2cache_inv_range */ + sheeva_l2cache_wb_range, /* l2cache_wb_range */ /* Other functions */ @@ -1000,7 +1000,7 @@ cputype == CPU_ID_MV88FR571_VD || cputype == CPU_ID_MV88FR571_41) { - cpufuncs = feroceon_cpufuncs; + cpufuncs = sheeva_cpufuncs; /* * Workaround for Marvell MV78100 CPU: Cache prefetch * mechanism may affect the cache coherency validity, @@ -1011,12 +1011,12 @@ */ if (cputype == CPU_ID_MV88FR571_VD || cputype == CPU_ID_MV88FR571_41) { - feroceon_control_ext(0xffffffff, + sheeva_control_ext(0xffffffff, FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN | FC_L2_PREF_DIS); } else { - feroceon_control_ext(0xffffffff, + sheeva_control_ext(0xffffffff, FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN); } ==== //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.23 2009/01/09 10:45:04 raj Exp $"); #include #include #include @@ -74,7 +74,7 @@ #ifdef CPU_XSCALE_81342 #define cpu_l2cache_wbinv_all xscalec3_l2cache_purge #elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) -#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all +#define cpu_l2cache_wbinv_all sheeva_l2cache_wbinv_all #else #define cpu_l2cache_wbinv_all() #endif ==== //depot/projects/usb/src/sys/arm/include/cpufunc.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.14 2008/10/13 18:16:54 raj Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.15 2009/01/09 10:45:04 raj Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -377,17 +377,17 @@ extern unsigned arm10_dcache_index_max; extern unsigned arm10_dcache_index_inc; -u_int feroceon_control_ext (u_int, u_int); -void feroceon_setttb (u_int); -void feroceon_dcache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_dcache_inv_range (vm_offset_t, vm_size_t); -void feroceon_dcache_wb_range (vm_offset_t, vm_size_t); -void feroceon_idcache_wbinv_range (vm_offset_t, vm_size_t); +u_int sheeva_control_ext (u_int, u_int); +void sheeva_setttb (u_int); +void sheeva_dcache_wbinv_range (vm_offset_t, vm_size_t); +void sheeva_dcache_inv_range (vm_offset_t, vm_size_t); +void sheeva_dcache_wb_range (vm_offset_t, vm_size_t); +void sheeva_idcache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wbinv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_inv_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wb_range (vm_offset_t, vm_size_t); -void feroceon_l2cache_wbinv_all (void); +void sheeva_l2cache_wbinv_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_inv_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_wb_range (vm_offset_t, vm_size_t); +void sheeva_l2cache_wbinv_all (void); #endif #ifdef CPU_ARM11 ==== //depot/projects/usb/src/sys/arm/mv/common.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.3 2008/11/19 11:57:16 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/common.c,v 1.5 2009/01/08 18:31:43 raj Exp $"); #include #include @@ -46,13 +46,19 @@ static int decode_win_usb_valid(void); static int decode_win_eth_valid(void); static int decode_win_pcie_valid(void); +static int decode_win_sata_valid(void); +static int decode_win_cesa_valid(void); static void decode_win_cpu_setup(void); -static void decode_win_usb_setup(uint32_t ctrl); +static void decode_win_usb_setup(void); static void decode_win_eth_setup(uint32_t base); static void decode_win_pcie_setup(uint32_t base); +static void decode_win_sata_setup(void); +static void decode_win_cesa_setup(void); + +static void decode_win_cesa_dump(void); +static void decode_win_usb_dump(void); -static uint32_t dev, rev; static uint32_t used_cpu_wins; uint32_t @@ -81,6 +87,7 @@ uint32_t cpu_extra_feat(void) { + uint32_t dev, rev; uint32_t ef = 0; soc_id(&dev, &rev); @@ -104,17 +111,6 @@ return (mask); } -uint32_t -get_tclk(void) -{ - -#if defined(SOC_MV_DISCOVERY) - return (TCLK_200MHZ); -#else - return (TCLK_166MHZ); -#endif -} - void soc_id(uint32_t *dev, uint32_t *rev) { @@ -165,6 +161,10 @@ break; case MV_DEV_88F6281: dev = "Marvell 88F6281"; + if (r == 0) + rev = "Z0"; + else if (r == 2) + rev = "A0"; break; case MV_DEV_MV78100: dev = "Marvell MV78100"; @@ -185,22 +185,27 @@ int soc_decode_win(void) { + uint32_t dev, rev; /* Retrieve our ID: some windows facilities vary between SoC models */ soc_id(&dev, &rev); if (decode_win_cpu_valid() != 1 || decode_win_usb_valid() != 1 || decode_win_eth_valid() != 1 || decode_win_idma_valid() != 1 || - decode_win_pcie_valid() != 1) + decode_win_pcie_valid() != 1 || decode_win_sata_valid() != 1 || + decode_win_cesa_valid() != 1) return(-1); decode_win_cpu_setup(); - decode_win_usb_setup(MV_USB0_BASE); + decode_win_usb_setup(); decode_win_eth_setup(MV_ETH0_BASE); if (dev == MV_DEV_MV78100) decode_win_eth_setup(MV_ETH1_BASE); + if (dev == MV_DEV_88F6281 || dev == MV_DEV_MV78100) + decode_win_cesa_setup(); decode_win_idma_setup(); + decode_win_xor_setup(); if (dev == MV_DEV_MV78100) { decode_win_pcie_setup(MV_PCIE00_BASE); @@ -214,7 +219,8 @@ } else decode_win_pcie_setup(MV_PCIE_BASE); - /* TODO set up decode wins for SATA */ + if (dev != MV_DEV_88F5281) + decode_win_sata_setup(); return (0); } @@ -234,10 +240,15 @@ WIN_REG_IDX_RD(ddr, br, MV_WIN_DDR_BASE, MV_DDR_CADR_BASE) WIN_REG_IDX_RD(ddr, sz, MV_WIN_DDR_SIZE, MV_DDR_CADR_BASE) -WIN_REG_IDX_RD(win_usb, cr, MV_WIN_USB_CTRL, MV_USB_AWR_BASE) -WIN_REG_IDX_RD(win_usb, br, MV_WIN_USB_BASE, MV_USB_AWR_BASE) -WIN_REG_IDX_WR(win_usb, cr, MV_WIN_USB_CTRL, MV_USB_AWR_BASE) -WIN_REG_IDX_WR(win_usb, br, MV_WIN_USB_BASE, MV_USB_AWR_BASE) +WIN_REG_IDX_RD2(win_usb, cr, MV_WIN_USB_CTRL, MV_USB_AWR_BASE) +WIN_REG_IDX_RD2(win_usb, br, MV_WIN_USB_BASE, MV_USB_AWR_BASE) +WIN_REG_IDX_WR2(win_usb, cr, MV_WIN_USB_CTRL, MV_USB_AWR_BASE) +WIN_REG_IDX_WR2(win_usb, br, MV_WIN_USB_BASE, MV_USB_AWR_BASE) + +WIN_REG_IDX_RD(win_cesa, cr, MV_WIN_CESA_CTRL, MV_CESA_BASE) +WIN_REG_IDX_RD(win_cesa, br, MV_WIN_CESA_BASE, MV_CESA_BASE) +WIN_REG_IDX_WR(win_cesa, cr, MV_WIN_CESA_CTRL, MV_CESA_BASE) +WIN_REG_IDX_WR(win_cesa, br, MV_WIN_CESA_BASE, MV_CESA_BASE) WIN_REG_BASE_IDX_RD(win_eth, br, MV_WIN_ETH_BASE) WIN_REG_BASE_IDX_RD(win_eth, sz, MV_WIN_ETH_SIZE) @@ -245,6 +256,16 @@ WIN_REG_BASE_IDX_WR(win_eth, br, MV_WIN_ETH_BASE) WIN_REG_BASE_IDX_WR(win_eth, sz, MV_WIN_ETH_SIZE) WIN_REG_BASE_IDX_WR(win_eth, har, MV_WIN_ETH_REMAP) + +WIN_REG_IDX_RD2(win_xor, br, MV_WIN_XOR_BASE, MV_XOR_BASE) +WIN_REG_IDX_RD2(win_xor, sz, MV_WIN_XOR_SIZE, MV_XOR_BASE) +WIN_REG_IDX_RD2(win_xor, har, MV_WIN_XOR_REMAP, MV_XOR_BASE) +WIN_REG_IDX_RD2(win_xor, ctrl, MV_WIN_XOR_CTRL, MV_XOR_BASE) +WIN_REG_IDX_WR2(win_xor, br, MV_WIN_XOR_BASE, MV_XOR_BASE) +WIN_REG_IDX_WR2(win_xor, sz, MV_WIN_XOR_SIZE, MV_XOR_BASE) +WIN_REG_IDX_WR2(win_xor, har, MV_WIN_XOR_REMAP, MV_XOR_BASE) +WIN_REG_IDX_WR2(win_xor, ctrl, MV_WIN_XOR_CTRL, MV_XOR_BASE) + WIN_REG_BASE_RD(win_eth, bare, 0x290) WIN_REG_BASE_RD(win_eth, epap, 0x294) WIN_REG_BASE_WR(win_eth, bare, 0x290) @@ -269,12 +290,18 @@ WIN_REG_RD(win_idma, bare, 0xa80, MV_IDMA_BASE) WIN_REG_WR(win_idma, bare, 0xa80, MV_IDMA_BASE) +WIN_REG_IDX_RD(win_sata, cr, MV_WIN_SATA_CTRL, MV_SATAHC_BASE); +WIN_REG_IDX_RD(win_sata, br, MV_WIN_SATA_BASE, MV_SATAHC_BASE); +WIN_REG_IDX_WR(win_sata, cr, MV_WIN_SATA_CTRL, MV_SATAHC_BASE); +WIN_REG_IDX_WR(win_sata, br, MV_WIN_SATA_BASE, MV_SATAHC_BASE); + /************************************************************************** * Decode windows helper routines **************************************************************************/ void soc_dump_decode_win(void) { + uint32_t dev, rev; int i; soc_id(&dev, &rev); @@ -297,10 +324,6 @@ for (i = 0; i < MV_WIN_DDR_MAX; i++) printf("DDR CS#%d: b 0x%08x, s 0x%08x\n", i, ddr_br_read(i), ddr_sz_read(i)); - - for (i = 0; i < MV_WIN_USB_MAX; i++) - printf("USB window#%d: c 0x%08x, b 0x%08x\n", i, - win_usb_cr_read(i), win_usb_br_read(i)); for (i = 0; i < MV_WIN_ETH_MAX; i++) { printf("ETH window#%d: b 0x%08x, s 0x%08x", i, @@ -318,6 +341,8 @@ win_eth_epap_read(MV_ETH0_BASE)); decode_win_idma_dump(); + decode_win_cesa_dump(); + decode_win_usb_dump(); printf("\n"); } @@ -327,7 +352,10 @@ int win_cpu_can_remap(int i) { + uint32_t dev, rev; + soc_id(&dev, &rev); + /* Depending on the SoC certain windows have remap capability */ if ((dev == MV_DEV_88F5182 && i < 2) || (dev == MV_DEV_88F5281 && i < 4) || @@ -556,42 +584,69 @@ return (decode_win_can_cover_ddr(MV_WIN_USB_MAX)); } +static __inline int +usb_max_ports(void) +{ + uint32_t dev, rev; + + soc_id(&dev, &rev); + return (dev == MV_DEV_MV78100 ? 3 : 1); +} + +static void +decode_win_usb_dump(void) +{ + int i, p, m; + + m = usb_max_ports(); + for (p = 0; p < m; p++) + for (i = 0; i < MV_WIN_USB_MAX; i++) + printf("USB window#%d: c 0x%08x, b 0x%08x\n", i, + win_usb_cr_read(i, p), win_usb_br_read(i, p)); +} + /* * Set USB decode windows. */ static void -decode_win_usb_setup(uint32_t ctrl) +decode_win_usb_setup(void) { uint32_t br, cr; - int i, j; + int i, j, p, m; + + /* Disable and clear all USB windows for all ports */ + m = usb_max_ports(); + for (p = 0; p < m; p++) { - /* Disable and clear all USB windows */ - for (i = 0; i < MV_WIN_USB_MAX; i++) { - win_usb_cr_write(i, 0); - win_usb_br_write(i, 0); - } + for (i = 0; i < MV_WIN_USB_MAX; i++) { + win_usb_cr_write(i, p, 0); + win_usb_br_write(i, p, 0); + } - /* Only access to active DRAM banks is required */ - for (i = 0; i < MV_WIN_DDR_MAX; i++) - if (ddr_is_active(i)) { - br = ddr_base(i); - /* - * XXX for 6281 we should handle Mbus write burst limit - * field in the ctrl reg - */ - cr = (((ddr_size(i) - 1) & 0xffff0000) | - (ddr_attr(i) << 8) | (ddr_target(i) << 4) | 1); + /* Only access to active DRAM banks is required */ + for (i = 0; i < MV_WIN_DDR_MAX; i++) { + if (ddr_is_active(i)) { + br = ddr_base(i); + /* + * XXX for 6281 we should handle Mbus write + * burst limit field in the ctrl reg + */ + cr = (((ddr_size(i) - 1) & 0xffff0000) | + (ddr_attr(i) << 8) | + (ddr_target(i) << 4) | 1); - /* Set the first free USB window */ - for (j = 0; j < MV_WIN_USB_MAX; j++) { - if (win_usb_cr_read(j) & 0x1) - continue; + /* Set the first free USB window */ + for (j = 0; j < MV_WIN_USB_MAX; j++) { + if (win_usb_cr_read(j, p) & 0x1) + continue; - win_usb_br_write(j, br); - win_usb_cr_write(j, cr); - break; + win_usb_br_write(j, p, br); + win_usb_cr_write(j, p, cr); + break; + } } } + } } /************************************************************************** @@ -941,7 +996,7 @@ j = decode_win_overlap(i, idma_wins_no, &idma_wins[0]); if (j >= 0) { printf("IDMA window#%d: (0x%08x - 0x%08x) overlaps " - "with " "#%d (0x%08x - 0x%08x)\n", i, b, e, j, + "with #%d (0x%08x - 0x%08x)\n", i, b, e, j, idma_wins[j].base, idma_wins[j].base + idma_wins[j].size - 1); rv = 0; @@ -990,3 +1045,413 @@ { } #endif + +/************************************************************************** + * XOR windows routines + **************************************************************************/ +#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +static int +xor_ctrl_read(int i, int c, int e) +{ + uint32_t v; + v = win_xor_ctrl_read(c, e); + v &= (1 << i); + + return (v >> i); +} + +static void +xor_ctrl_write(int i, int c, int e, int val) +{ + uint32_t v; + + v = win_xor_ctrl_read(c, e); + v &= ~(1 << i); + v |= (val << i); + win_xor_ctrl_write(c, e, v); +} + +/* + * Set channel protection 'val' for window 'w' on channel 'c' + */ + +static void +xor_chan_write(int c, int e, int w, int val) +{ + uint32_t v; + + v = win_xor_ctrl_read(c, e); + v &= ~(0x3 << (w * 2 + 16)); + v |= (val << (w * 2 + 16)); + win_xor_ctrl_write(c, e, v); +} + +/* + * Set protection 'val' on all channels for window 'w' on engine 'e' + */ +static void +xor_set_prot(int w, int e, int val) +{ + int c; + + for (c = 0; c < MV_XOR_CHAN_MAX; c++) + xor_chan_write(c, e, w, val); +} + +static int +win_xor_can_remap(int i) +{ + + /* XOR decode windows 0-3 have remap capability */ + if (i < 4) + return (1); + + return (0); +} + +static __inline int +xor_max_eng(void) +{ + uint32_t dev, rev; + + soc_id(&dev, &rev); + return ((dev == MV_DEV_88F6281) ? 2 : + (dev == MV_DEV_MV78100) ? 1 : 0); +} + +static void +xor_active_dram(int c, int e, int *window) +{ + uint32_t br, sz; + int i, m, w; + + /* + * Set up access to all active DRAM banks + */ + m = xor_max_eng(); + for (i = 0; i < m; i++) + if (ddr_is_active(i)) { + br = ddr_base(i) | (ddr_attr(i) << 8) | + ddr_target(i); + sz = ((ddr_size(i) - 1) & 0xffff0000); + + /* Place DDR entries in non-remapped windows */ + for (w = 0; w < MV_WIN_XOR_MAX; w++) + if (win_xor_can_remap(w) != 1 && + (xor_ctrl_read(w, c, e) == 0) && + w > *window) { + /* Configure window */ + win_xor_br_write(w, e, br); + win_xor_sz_write(w, e, sz); + + /* Set protection RW on all channels */ + xor_set_prot(w, e, 0x3); + + /* Enable window */ + xor_ctrl_write(w, c, e, 1); + (*window)++; + break; + } + } +} + +void +decode_win_xor_setup(void) +{ + uint32_t br, sz; + int i, j, z, e = 1, m, window; + + /* + * Disable and clear all XOR windows, revoke protection for all + * channels + */ + m = xor_max_eng(); + for (j = 0; j < m; j++, e--) { + + /* Number of non-remaped windows */ + window = MV_XOR_NON_REMAP - 1; + + for (i = 0; i < MV_WIN_XOR_MAX; i++) { + win_xor_br_write(i, e, 0); + win_xor_sz_write(i, e, 0); + } + + if (win_xor_can_remap(i) == 1) + win_xor_har_write(i, e, 0); + + for (i = 0; i < MV_XOR_CHAN_MAX; i++) { + win_xor_ctrl_write(i, e, 0); + xor_active_dram(i, e, &window); + } + + /* + * Remaining targets -- from a statically defined table + */ + for (i = 0; i < xor_wins_no; i++) + if (xor_wins[i].target > 0) { + br = (xor_wins[i].base & 0xffff0000) | + (xor_wins[i].attr << 8) | + xor_wins[i].target; + sz = ((xor_wins[i].size - 1) & 0xffff0000); + + /* Set the first free XOR window */ + for (z = 0; z < MV_WIN_XOR_MAX; z++) { + if (xor_ctrl_read(z, 0, e) && + xor_ctrl_read(z, 1, e)) + continue; + + /* Configure window */ + win_xor_br_write(z, e, br); + win_xor_sz_write(z, e, sz); + if (win_xor_can_remap(z) && + xor_wins[z].remap >= 0) + win_xor_har_write(z, e, + xor_wins[z].remap); + + /* Set protection RW on all channels */ + xor_set_prot(z, e, 0x3); + + /* Enable window */ + xor_ctrl_write(z, 0, e, 1); + xor_ctrl_write(z, 1, e, 1); + break; + } + } + } +} + +int +decode_win_xor_valid(void) +{ + const struct decode_win *wintab; + int c, i, j, rv; + uint32_t b, e, s; + + if (xor_wins_no > MV_WIN_XOR_MAX) { + printf("XOR windows: too many entries: %d\n", xor_wins_no); + return (-1); + } + for (i = 0, c = 0; i < MV_WIN_DDR_MAX; i++) + if (ddr_is_active(i)) + c++; + + if (xor_wins_no > (MV_WIN_XOR_MAX - c)) { + printf("XOR windows: too many entries: %d, available: %d\n", + xor_wins_no, MV_WIN_IDMA_MAX - c); + return (-1); + } + + wintab = xor_wins; + rv = 1; + for (i = 0; i < xor_wins_no; i++, wintab++) { + + if (wintab->target == 0) { + printf("XOR window#%d: DDR target window is not " + "supposed to be reprogrammed!\n", i); + rv = 0; + } + + if (wintab->remap >= 0 && win_cpu_can_remap(i) != 1) { + printf("XOR window#%d: not capable of remapping, but " + "val 0x%08x defined\n", i, wintab->remap); + rv = 0; + } + + s = wintab->size; + b = wintab->base; + e = b + s - 1; + if (s > (0xFFFFFFFF - b + 1)) { + /* + * XXX this boundary check should account for 64bit + * and remapping.. + */ + printf("XOR window#%d: no space for size 0x%08x at " + "0x%08x\n", i, s, b); + rv = 0; + continue; + } + + j = decode_win_overlap(i, xor_wins_no, &xor_wins[0]); + if (j >= 0) { + printf("XOR window#%d: (0x%08x - 0x%08x) overlaps " + "with #%d (0x%08x - 0x%08x)\n", i, b, e, j, + xor_wins[j].base, + xor_wins[j].base + xor_wins[j].size - 1); + rv = 0; + } + } + + return (rv); +} + +void +decode_win_xor_dump(void) +{ + int i, j; + int e = 1; + + for (j = 0; j < xor_max_eng(); j++, e--) { + for (i = 0; i < MV_WIN_XOR_MAX; i++) { + printf("XOR window#%d: b 0x%08x, s 0x%08x", i, + win_xor_br_read(i, e), win_xor_sz_read(i, e)); + + if (win_xor_can_remap(i)) + printf(", ha 0x%08x", win_xor_har_read(i, e)); + + printf("\n"); + } + for (i = 0; i < MV_XOR_CHAN_MAX; i++) + printf("XOR control#%d: 0x%08x\n", i, + win_xor_ctrl_read(i, e)); + } +} + +#else +/* Provide dummy functions to satisfy the build for SoCs not equipped with XOR */ +int +decode_win_xor_valid(void) +{ + + return (1); +} + +void +decode_win_xor_setup(void) +{ +} + +void +decode_win_xor_dump(void) +{ +} +#endif + +/************************************************************************** + * CESA TDMA windows routines + **************************************************************************/ +#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +/* + * Dump CESA TDMA decode windows. + */ +static void +decode_win_cesa_dump(void) +{ + int i; + + for (i = 0; i < MV_WIN_CESA_MAX; i++) + printf("CESA window#%d: c 0x%08x, b 0x%08x\n", i, + win_cesa_cr_read(i), win_cesa_br_read(i)); +} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 10 16:39:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02570106566C; Sat, 10 Jan 2009 16:39: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 9CF36106564A for ; Sat, 10 Jan 2009 16:39:51 +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 88D118FC16 for ; Sat, 10 Jan 2009 16:39:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AGdpF1090320 for ; Sat, 10 Jan 2009 16:39:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AGdprV090318 for perforce@freebsd.org; Sat, 10 Jan 2009 16:39:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 16:39:51 GMT Message-Id: <200901101639.n0AGdprV090318@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 155917 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, 10 Jan 2009 16:39:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155917 Change 155917 by hselasky@hselasky_laptop001 on 2009/01/10 16:39:25 Remove dependancy towards the USB config thread in the USB serial core. Use USB process msignalling instead. Saves a little memory and hopefully makes the code more understandable. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#19 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#19 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#21 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#5 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#13 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#19 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#13 (text+ko) ==== @@ -87,7 +87,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#16 (text+ko) ==== @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#14 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#17 (text+ko) ==== @@ -94,7 +94,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#15 (text+ko) ==== @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#19 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#15 (text+ko) ==== @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#13 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#13 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#16 (text+ko) ==== @@ -92,7 +92,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#14 (text+ko) ==== @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#16 (text+ko) ==== @@ -95,7 +95,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#21 (text+ko) ==== @@ -78,13 +78,10 @@ #include #define USB_DEBUG_VAR usb2_com_debug -#define usb2_config_td_cc usb2_com_config_copy -#define usb2_config_td_softc usb2_com_softc #include #include #include -#include #include #include #include @@ -99,30 +96,26 @@ &usb2_com_debug, 0, "ucom debug level"); #endif -struct usb2_com_config_copy { - struct usb2_com_softc *cc_softc; - uint8_t cc_flag0; - uint8_t cc_flag1; - uint8_t cc_flag2; - uint8_t cc_flag3; -}; - -static usb2_config_td_command_t usb2_com_config_copy; -static usb2_config_td_command_t usb2_com_cfg_start_transfers; -static usb2_config_td_command_t usb2_com_cfg_open; -static usb2_config_td_command_t usb2_com_cfg_close; -static usb2_config_td_command_t usb2_com_cfg_break; -static usb2_config_td_command_t usb2_com_cfg_dtr; -static usb2_config_td_command_t usb2_com_cfg_rts; -static usb2_config_td_command_t usb2_com_cfg_status_change; -static usb2_config_td_command_t usb2_com_cfg_param; +static usb2_proc_callback_t usb2_com_cfg_start_transfers; +static usb2_proc_callback_t usb2_com_cfg_open; +static usb2_proc_callback_t usb2_com_cfg_close; +static usb2_proc_callback_t usb2_com_cfg_break_on; +static usb2_proc_callback_t usb2_com_cfg_break_off; +static usb2_proc_callback_t usb2_com_cfg_dtr_on; +static usb2_proc_callback_t usb2_com_cfg_dtr_off; +static usb2_proc_callback_t usb2_com_cfg_rts_on; +static usb2_proc_callback_t usb2_com_cfg_rts_off; +static usb2_proc_callback_t usb2_com_cfg_status_change; +static usb2_proc_callback_t usb2_com_cfg_param; static uint8_t usb2_com_units_alloc(uint32_t, uint32_t *); static void usb2_com_units_free(uint32_t, uint32_t); static int usb2_com_attach_sub(struct usb2_com_softc *); static void usb2_com_detach_sub(struct usb2_com_softc *); -static void usb2_com_queue_command(struct usb2_com_softc *, - usb2_config_td_command_t *, int); +static void usb2_com_queue_command(struct usb2_com_softc *sc, + uint8_t cmd); +static void usb2_com_wait_command(struct usb2_com_softc *sc, + uint8_t cmd); static void usb2_com_shutdown(struct usb2_com_softc *); static void usb2_com_start_transfers(struct usb2_com_softc *); static void usb2_com_break(struct usb2_com_softc *, uint8_t); @@ -251,9 +244,7 @@ if (usb2_com_units_alloc(sub_units, &root_unit)) { return (ENOMEM); } - if (usb2_config_td_setup - (&ssc->sc_config_td, sc, p_mtx, NULL, - sizeof(struct usb2_com_config_copy), 24 * sub_units)) { + if (usb2_proc_setup(&ssc->sc_config_td, p_mtx, USB_PRI_MED)) { usb2_com_units_free(root_unit, sub_units); return (ENOMEM); } @@ -285,7 +276,7 @@ { uint32_t n; - usb2_config_td_drain(&ssc->sc_config_td); + usb2_proc_drain(&ssc->sc_config_td); for (n = 0; n < sub_units; n++, sc++) { if (sc->sc_flag & UCOM_FLAG_ATTACHED) { @@ -298,8 +289,7 @@ sc->sc_flag &= ~UCOM_FLAG_ATTACHED; } } - - usb2_config_td_unsetup(&ssc->sc_config_td); + usb2_proc_unsetup(&ssc->sc_config_td); } static int @@ -307,6 +297,7 @@ { struct tty *tp; int error = 0; + uint8_t n; char buf[32]; /* temporary TTY device name buffer */ tp = tty_alloc(&usb2_com_class, sc, sc->sc_parent_mtx); @@ -336,6 +327,39 @@ DPRINTF("ttycreate: %s\n", buf); usb2_cv_init(&sc->sc_cv, "usb2_com"); + /* + * Set all function callback pointers for deferred COM + * operations: + */ + for (n = 0; n != 2; n++) { + sc->sc_cmds[(2*USB_COM_CFG_START_TRANSFERS) + n].hdr.pm_callback = + &usb2_com_cfg_start_transfers; + sc->sc_cmds[(2*USB_COM_CFG_OPEN) + n].hdr.pm_callback = + &usb2_com_cfg_open; + sc->sc_cmds[(2*USB_COM_CFG_CLOSE) + n].hdr.pm_callback = + &usb2_com_cfg_close; + sc->sc_cmds[(2*USB_COM_CFG_BREAK_ON) + n].hdr.pm_callback = + &usb2_com_cfg_break_on; + sc->sc_cmds[(2*USB_COM_CFG_BREAK_OFF) + n].hdr.pm_callback = + &usb2_com_cfg_break_off; + sc->sc_cmds[(2*USB_COM_CFG_DTR_ON) + n].hdr.pm_callback = + &usb2_com_cfg_dtr_on; + sc->sc_cmds[(2*USB_COM_CFG_DTR_OFF) + n].hdr.pm_callback = + &usb2_com_cfg_dtr_off; + sc->sc_cmds[(2*USB_COM_CFG_RTS_ON) + n].hdr.pm_callback = + &usb2_com_cfg_rts_on; + sc->sc_cmds[(2*USB_COM_CFG_RTS_OFF) + n].hdr.pm_callback = + &usb2_com_cfg_rts_off; + sc->sc_cmds[(2*USB_COM_CFG_STATUS_CHANGE) + n].hdr.pm_callback = + &usb2_com_cfg_status_change; + sc->sc_cmds[(2*USB_COM_CFG_PARAM) + n].hdr.pm_callback = + &usb2_com_cfg_param; + } + + /* initialise all callback pointer arguments */ + for (n = 0; n != (2*USB_COM_CFG_MAX); n++) { + sc->sc_cmds[n].cc_softc = sc; + } done: return (error); } @@ -379,27 +403,41 @@ usb2_cv_destroy(&sc->sc_cv); } +/* + * The following function queues a command for deferred execution. + * The following function must be called locked. + */ static void -usb2_com_config_copy(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_queue_command(struct usb2_com_softc *sc, uint8_t cmd) { - cc->cc_softc = sc + (refcount % UCOM_SUB_UNIT_MAX); - cc->cc_flag0 = (refcount / (1 * UCOM_SUB_UNIT_MAX)) % 2; - cc->cc_flag1 = (refcount / (2 * UCOM_SUB_UNIT_MAX)) % 2; - cc->cc_flag2 = (refcount / (4 * UCOM_SUB_UNIT_MAX)) % 2; - cc->cc_flag3 = (refcount / (8 * UCOM_SUB_UNIT_MAX)) % 2; + struct usb2_com_super_softc *ssc = sc->sc_super; + + if (usb2_proc_is_gone(&ssc->sc_config_td)) { + DPRINTF("proc is gone\n"); + return; /* nothing to do */ + } + + if (usb2_proc_msignal(&ssc->sc_config_td, + &sc->sc_cmds[2*cmd], &sc->sc_cmds[(2*cmd)+1])) { + /* ignore */ + } } +/* + * The following function waits until a command has been executed. + * The following function must be called locked. + */ static void -usb2_com_queue_command(struct usb2_com_softc *sc, usb2_config_td_command_t *cmd, int flag) +usb2_com_wait_command(struct usb2_com_softc *sc, uint8_t cmd) { struct usb2_com_super_softc *ssc = sc->sc_super; - usb2_config_td_queue_command - (&ssc->sc_config_td, &usb2_com_config_copy, - cmd, (cmd == &usb2_com_cfg_status_change) ? 1 : 0, - ((sc->sc_local_unit % UCOM_SUB_UNIT_MAX) + - (flag ? UCOM_SUB_UNIT_MAX : 0))); + if (usb2_proc_is_gone(&ssc->sc_config_td)) { + DPRINTF("proc is gone\n"); + return; /* nothing to do */ + } + usb2_proc_mwait(&ssc->sc_config_td, + &sc->sc_cmds[2*cmd], &sc->sc_cmds[(2*cmd)+1]); } static void @@ -420,6 +458,8 @@ } /* + * This function will sleep "timeout" system ticks. + * * Return values: * 0: normal delay * else: config thread is gone @@ -428,8 +468,26 @@ usb2_com_cfg_sleep(struct usb2_com_softc *sc, uint32_t timeout) { struct usb2_com_super_softc *ssc = sc->sc_super; + uint8_t is_gone; + + is_gone = usb2_proc_is_gone(&ssc->sc_config_td); + if (is_gone) + goto done; /* we are detaching */ + if (timeout == 0) + timeout = 1; /* one tick is the least timeout */ - return (usb2_config_td_sleep(&ssc->sc_config_td, timeout)); + mtx_unlock(sc->sc_parent_mtx); + + if (pause("UCOMWAIT", timeout)) { + /* ignore */ + } + + mtx_lock(sc->sc_parent_mtx); + + /* refresh gone status */ + is_gone = usb2_proc_is_gone(&ssc->sc_config_td); +done: + return (is_gone); } /* @@ -442,13 +500,15 @@ { struct usb2_com_super_softc *ssc = sc->sc_super; - return (usb2_config_td_is_gone(&ssc->sc_config_td)); + return (usb2_proc_is_gone(&ssc->sc_config_td)); } static void -usb2_com_cfg_start_transfers(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_start_transfers(struct usb2_proc_msg *_cc) { + struct usb2_com_command_msg *cc = (void *)_cc; + struct usb2_com_softc *sc; + sc = cc->cc_softc; if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) { @@ -485,14 +545,16 @@ (sc->sc_callback->usb2_com_start_write) (sc); } if (!(sc->sc_flag & UCOM_FLAG_GP_DATA)) { - usb2_com_queue_command(sc, &usb2_com_cfg_start_transfers, 0); + usb2_com_queue_command(sc, USB_COM_CFG_START_TRANSFERS); } } static void -usb2_com_cfg_open(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_open(struct usb2_proc_msg *_cc) { + struct usb2_com_command_msg *cc = (void *)_cc; + struct usb2_com_softc *sc; + sc = cc->cc_softc; DPRINTF("\n"); @@ -550,7 +612,7 @@ sc->sc_msr = 0; sc->sc_mcr = 0; - usb2_com_queue_command(sc, &usb2_com_cfg_open, 0); + usb2_com_queue_command(sc, USB_COM_CFG_OPEN); usb2_com_start_transfers(sc); @@ -564,9 +626,11 @@ } static void -usb2_com_cfg_close(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_close(struct usb2_proc_msg *_cc) { + struct usb2_com_command_msg *cc = (void *)_cc; + struct usb2_com_softc *sc; + sc = cc->cc_softc; DPRINTF("\n"); @@ -588,7 +652,6 @@ usb2_com_close(struct tty *tp) { struct usb2_com_softc *sc = tty_softc(tp); - struct usb2_com_super_softc *ssc = sc->sc_super; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -600,8 +663,9 @@ } usb2_com_shutdown(sc); - usb2_com_queue_command(sc, &usb2_com_cfg_close, 0); - usb2_config_td_sync(&ssc->sc_config_td); + /* Queue and wait for close command to complete */ + usb2_com_queue_command(sc, USB_COM_CFG_CLOSE); + usb2_com_wait_command(sc, USB_COM_CFG_CLOSE); sc->sc_flag &= ~(UCOM_FLAG_HL_READY | UCOM_FLAG_WR_START | @@ -704,22 +768,35 @@ } static void -usb2_com_cfg_break(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_break(struct usb2_com_command_msg *cc, uint8_t onoff) { + struct usb2_com_softc *sc; + sc = cc->cc_softc; if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) { return; } - DPRINTF("onoff=%d\n", cc->cc_flag0); + DPRINTF("onoff=%d\n", onoff); if (sc->sc_callback->usb2_com_cfg_set_break) { - (sc->sc_callback->usb2_com_cfg_set_break) (sc, cc->cc_flag0); + (sc->sc_callback->usb2_com_cfg_set_break) (sc, onoff); } } static void +usb2_com_cfg_break_on(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_break((void *)_cc, 1); +} + +static void +usb2_com_cfg_break_off(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_break((void *)_cc, 0); +} + +static void usb2_com_break(struct usb2_com_softc *sc, uint8_t onoff) { mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -729,26 +806,40 @@ } DPRINTF("onoff = %d\n", onoff); - usb2_com_queue_command(sc, &usb2_com_cfg_break, onoff); + usb2_com_queue_command(sc, onoff ? + USB_COM_CFG_BREAK_ON : USB_COM_CFG_BREAK_OFF); } static void -usb2_com_cfg_dtr(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_dtr(struct usb2_com_command_msg *cc, uint8_t onoff) { + struct usb2_com_softc *sc; + sc = cc->cc_softc; if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) { return; } - DPRINTF("onoff=%d\n", cc->cc_flag0); + DPRINTF("onoff=%d\n", onoff); if (sc->sc_callback->usb2_com_cfg_set_dtr) { - (sc->sc_callback->usb2_com_cfg_set_dtr) (sc, cc->cc_flag0); + (sc->sc_callback->usb2_com_cfg_set_dtr) (sc, onoff); } } static void +usb2_com_cfg_dtr_on(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_dtr((void *)_cc, 1); +} + +static void +usb2_com_cfg_dtr_off(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_dtr((void *)_cc, 0); +} + +static void usb2_com_dtr(struct usb2_com_softc *sc, uint8_t onoff) { mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -758,26 +849,40 @@ } DPRINTF("onoff = %d\n", onoff); - usb2_com_queue_command(sc, &usb2_com_cfg_dtr, onoff); + usb2_com_queue_command(sc, onoff ? + USB_COM_CFG_DTR_ON : USB_COM_CFG_DTR_OFF); } static void -usb2_com_cfg_rts(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_rts(struct usb2_com_command_msg *cc, uint8_t onoff) { + struct usb2_com_softc *sc; + sc = cc->cc_softc; - DPRINTF("onoff=%d\n", cc->cc_flag0); + DPRINTF("onoff=%d\n", onoff); if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) { return; } if (sc->sc_callback->usb2_com_cfg_set_rts) { - (sc->sc_callback->usb2_com_cfg_set_rts) (sc, cc->cc_flag0); + (sc->sc_callback->usb2_com_cfg_set_rts) (sc, onoff); } } static void +usb2_com_cfg_rts_on(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_rts((void *)_cc, 1); +} + +static void +usb2_com_cfg_rts_off(struct usb2_proc_msg *_cc) +{ + usb2_com_cfg_rts((void *)_cc, 0); +} + +static void usb2_com_rts(struct usb2_com_softc *sc, uint8_t onoff) { mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -787,13 +892,15 @@ } DPRINTF("onoff = %d\n", onoff); - usb2_com_queue_command(sc, &usb2_com_cfg_rts, onoff); + usb2_com_queue_command(sc, onoff ? + USB_COM_CFG_RTS_ON : USB_COM_CFG_RTS_OFF); } static void -usb2_com_cfg_status_change(struct usb2_com_softc *sc, - struct usb2_com_config_copy *cc, uint16_t refcount) +usb2_com_cfg_status_change(struct usb2_proc_msg *_cc) { + struct usb2_com_command_msg *cc = (void *)_cc; + struct usb2_com_softc *sc; struct tty *tp; uint8_t new_msr; @@ -847,13 +954,14 @@ } DPRINTF("\n"); - usb2_com_queue_command(sc, &usb2_com_cfg_status_change, 0); + usb2_com_queue_command(sc, USB_COM_CFG_STATUS_CHANGE); } static void -usb2_com_cfg_param(struct usb2_com_softc *sc, struct usb2_com_config_copy *cc, - uint16_t refcount) +usb2_com_cfg_param(struct usb2_proc_msg *_cc) { + struct usb2_com_command_msg *cc = (void *)_cc; + struct usb2_com_softc *sc; struct termios t_copy; sc = cc->cc_softc; @@ -924,7 +1032,7 @@ sc->sc_flag &= ~UCOM_FLAG_GP_DATA; /* Queue baud rate programming command first */ - usb2_com_queue_command(sc, &usb2_com_cfg_param, 0); + usb2_com_queue_command(sc, USB_COM_CFG_PARAM); /* Queue transfer enable command last */ usb2_com_start_transfers(sc); ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#10 (text+ko) ==== @@ -119,11 +119,35 @@ #define ULSR_RXRDY 0x01 /* Byte ready in Receive Buffer */ #define ULSR_RCV_MASK 0x1f /* Mask for incoming data or error */ +/* + * List of serial adapter commands or deferred function calls: + */ +enum { + USB_COM_CFG_START_TRANSFERS, + USB_COM_CFG_OPEN, + USB_COM_CFG_CLOSE, + USB_COM_CFG_BREAK_ON, + USB_COM_CFG_BREAK_OFF, + USB_COM_CFG_DTR_ON, + USB_COM_CFG_DTR_OFF, + USB_COM_CFG_RTS_ON, + USB_COM_CFG_RTS_OFF, + USB_COM_CFG_STATUS_CHANGE, + USB_COM_CFG_PARAM, + USB_COM_CFG_MAX, +}; + +struct usb2_com_command_msg { + struct usb2_proc_msg hdr; /* must be first */ + struct usb2_com_softc *cc_softc; +}; + struct usb2_com_super_softc { - struct usb2_config_td sc_config_td; + struct usb2_process sc_config_td; }; struct usb2_com_softc { + struct usb2_com_command_msg sc_cmds[2*USB_COM_CFG_MAX]; struct termios sc_termios_copy; struct cv sc_cv; const struct usb2_com_callback *sc_callback; @@ -146,6 +170,7 @@ uint8_t sc_msr; uint8_t sc_mcr; uint8_t sc_ttyfreed; /* set when TTY has been freed */ + uint8_t sc_last_cmd_flag[USB_COM_CFG_MAX]; }; int usb2_com_attach(struct usb2_com_super_softc *ssc, ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#14 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#16 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jan 10 17:43:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42D21106567B; Sat, 10 Jan 2009 17:43: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 F399F106564A for ; Sat, 10 Jan 2009 17:43:56 +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 E16B58FC21 for ; Sat, 10 Jan 2009 17:43:56 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AHhufV010404 for ; Sat, 10 Jan 2009 17:43:56 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AHhuOD010402 for perforce@freebsd.org; Sat, 10 Jan 2009 17:43:56 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 10 Jan 2009 17:43:56 GMT Message-Id: <200901101743.n0AHhuOD010402@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 155923 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, 10 Jan 2009 17:43:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=155923 Change 155923 by thompsa@thompsa_burger on 2009/01/10 17:43:06 Fix remaining xfer->udev variable changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#23 (text+ko) ==== @@ -1025,7 +1025,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ at91dci_device_done(xfer, USB_ERR_TIMEOUT); ==== //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#2 (text+ko) ==== @@ -918,7 +918,7 @@ DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); /* transfer is transferred */ atmegadci_device_done(xfer, USB_ERR_TIMEOUT); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#10 (text+ko) ==== @@ -72,7 +72,7 @@ DPRINTF("xfer gone\n"); return; } - USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); std->xfer = NULL; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 18:06:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E71D106566B; Sat, 10 Jan 2009 18:06: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 25B3C1065672 for ; Sat, 10 Jan 2009 18:06:20 +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 127828FC19 for ; Sat, 10 Jan 2009 18:06:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AI6JTq012983 for ; Sat, 10 Jan 2009 18:06:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AI6JAZ012981 for perforce@freebsd.org; Sat, 10 Jan 2009 18:06:19 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 10 Jan 2009 18:06:19 GMT Message-Id: <200901101806.n0AI6JAZ012981@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 155924 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, 10 Jan 2009 18:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=155924 Change 155924 by pgj@kolbasz on 2009/01/10 18:05:51 MFen (doc): 1.174 -> 1.175 hu_HU.ISO8859-2/books/handbook/book.sgml 1.419 -> 1.420 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.233 -> 1.236 hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml 1.131 -> 1.132 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.126 -> 1.127 hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml 1.455 -> 1.457 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.113 -> 1.115 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.286 -> 1.287 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.189 -> 1.190 hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml 1.1104 -> 1.1107 hu_HU.ISO8859-2/books/faq/book.sgml 1.107 -> 1.110 hu_HU.ISO8859-2/share/sgml/freebsd.ent 1.43 -> 1.44 hu_HU.ISO8859-2/share/sgml/trademarks.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#36 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#25 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#15 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#16 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#20 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#21 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#16 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#15 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/trademarks.ent#7 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#36 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -37,6 +37,7 @@ 2006 2007 2008 + 2009 A &os; Dokumentációs Projekt @@ -6163,6 +6164,62 @@ + + Minden nagyobb + verziófrissítésnél újra + kell fordítani az összes telepített portot + a rendszeren? + + + + Mindenképpen! Noha látszólag a + frissített rendszeren is remekül futnak a + korábbi verzióra telepített + alkalmazások, könnyen elõfordulhat, hogy az + újabb portok telepítésékor vagy + a meglevõek frissítésekor + véletlenszerû összeomlásokat vagy + egyéb hibákat tapasztalunk. + + Ne felejtsük el, hogy a rendszer + frissítésekor a különféle + osztott könyvtárak, betölthetõ modulok + és a rendszer egyéb komponensei is + lecserélõdnek. Ezért a régebbi + változataikhoz fordított alkalmazások + egyáltalán nem fognak elindulni vagy nem + mûködnek rendesen. + + Ezzel kapcsolatban olvassuk el a &os; + kézikönyvének frissítérõl + szóló szakaszát. + + + + + + Minden kisebb + verziófrissítésnél újra + kell fordítani az összes telepített portot + a rendszeren? + + + + Általánosságban véve nem. A + &os; fejlesztõi ugyanis mindent megtesznek azért, + hogy ugyanazon a fõ fejlesztési ágon + belüli verziók között megmaradjon a + bináris szintû kompatibilitás. Az + esetleges kivételeket pedig dokumentálni + szokták a kiadásokhoz tartozó + jegyzetekben, ahol többnyire megadják az adott + változtatáshoz tartozóan a + követendõ tanácsokat. + + + + A /bin/sh miért ilyen egyszerû? A &os;-ben miért nincs ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#25 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -31,7 +31,7 @@ - hogyan állítsunk be IEEE 802.11 és + hogyan állítsunk be &ieee; 802.11 és &bluetooth; eszközöket; @@ -974,7 +974,7 @@ hálózatok alapjai A legtöbb vezeték nélküli - hálózat az IEEE 802.11 szabványon nyugszik. + hálózat az &ieee; 802.11 szabványon nyugszik. Az alapvetõ vezeték nélküli hálózatokban több olyan állomást találhatunk, amelyek @@ -1012,7 +1012,7 @@ A 802.11 alapú hálózatok elsõként a 2,4 GHz-es sávot - hódították meg, és az IEEE 802.11 + hódították meg, és az &ieee; 802.11 valamint 802.11b szabványokban rögzített protokollokat használták. Ezekben a specifikációkban megtalálhatjuk a @@ -1053,7 +1053,7 @@ nagyon ritkán alkalmazzák, kivéve talán csak a kóbor felhasználók elijesztésére. A jelenleg érvényes - biztonsági elõírásokat az IEEE 802.11i + biztonsági elõírásokat az &ieee; 802.11i specifikáció adja meg, amely új kriptográfiai titkosításokat definiál valamint egy további protokollt az @@ -1945,7 +1945,7 @@ - Itt az RSN (IEEE 802.11i), vagyis a WPA2 + Itt az RSN (&ieee; 802.11i), vagyis a WPA2 protokollt használjuk. @@ -4519,9 +4519,10 @@ - fec + &cisco; Fast ðerchannel; + - A Cisco EtherChannel technológia + A &cisco; Fast ðerchannel; (FEC) technológia támogatása. Ez egy statikus beállítás, és nem egyezteti az összefûzést a többiekkel vagy a linkek @@ -4529,23 +4530,24 @@ switch támogatja az LACP használatát, akkor inkább azt válasszuk. - A kimenõ forgalmat a fejlécekben - szereplõ protokollok alapján számolt - hasítókóddal próbálja - szétosztani az aktív portok között, - és tetszõleges aktív porton fogad - beérkezõ adatokat. Az említett - hasítókódban egy Ethernetes - forrás- és célcím szerepel, - valamint ha elérhetõ, akkor egy VLAN + A FEC a kimenõ forgalmat a + fejlécekben szereplõ protokollok alapján + számolt hasítókóddal + próbálja szétosztani az aktív + portok között, és tetszõleges + aktív porton fogad beérkezõ adatokat. Az + említett hasítókódban egy + Ethernetes forrás- és célcím + szerepel, valamint ha elérhetõ, akkor egy VLAN címke, illetve az IPv4/IPv6 forrás- és célcím. - lacp + LACP + - Az IEEE 802.3ad Link Aggregation Control Protocol (LACP) + Az &ieee; 802.3ad Link Aggregation Control Protocol (LACP) és a Marker Protcol támogatása. Az LACP megpróbálja egyeztetni a többi géppel az összefûzhetõ linkeket egy @@ -4562,10 +4564,10 @@ igen gyorsan alkalmazkodik az új konfigurációhoz. - A kimenõ forgalmat az aktív portok - között osztja szét fejlécekben - szereplõ protokollok alapján számolt - hasítókóddal, és + Az LACP a kimenõ forgalmat az + aktív portok között osztja szét + fejlécekben szereplõ protokollok alapján + számolt hasítókóddal, és bármelyik aktív portról fogad bejövõ forgalmat. A hasítókódban megtalálható @@ -4576,18 +4578,19 @@ - loadbalance + Loadbalance + - Ez a fec mód másik + Ez a FEC mód másik neve. - roundrobin + Round-Robin A kimenõ forgalmat egy körkörös - (Round Robin) elvû ütemezõvel osztja + (Round-Robin) elvû ütemezõvel osztja szét az aktív portok között és tetszõleges aktív portról fogad bejövõ forgalmat. Ez a mûködési @@ -4604,7 +4607,7 @@ Példák - LACP alapú összefûzés egy Cisco + <title>LACP alapú összefûzés egy &cisco; switch-csel Ebben a példában egy &os;-s gép @@ -4624,29 +4627,35 @@ elosztani ezeket a rendelkezésre álló felületek között. - A Cisco switch-en vegyünk fel ezeket a - felületeket egy csoportba (channel group): + A &cisco; switch-en vegyünk fel a + FastEthernet0/1 és + FastEthernet0/2 + interfészeket az 1 csoportba + (channel group): - interface FastEthernet0/1 - channel-group 1 mode active - channel-protocol lacp + interface FastEthernet0/1 + channel-group 1 mode active + channel-protocol lacp ! -interface FastEthernet0/2 - channel-group 1 mode active - channel-protocol lacp -! +interface FastEthernet0/2 + channel-group 1 mode active + channel-protocol lacp - A &os;-s gépen pedig hozzunk létre a - lagg felületet: + A &os;-s gépen pedig a + fxp0 és + fxp1 használatával + hozzunk létre a &man.lagg.4; interfészt: - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 Ellenõrizzük a felület - állapotát az ifconfig parancs - meghívásával. Az - ACTIVE, vagyis aktív - állapotú portok az + állapotát: + + &prompt.root; ifconfig lagg0 + + A ACTIVE jelzésû, vagyis + aktív állapotú portok az összefûzéshez kialakított csoport azon tagjai, amelyeknél felépült a kapcsolat a távoli switch felé és készen @@ -4665,15 +4674,14 @@ laggport: fxp1 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> laggport: fxp0 flags=1c<ACTIVE,COLLECTING,DISTRIBUTING> - A switch-en is látni fogjuk, hogy mely portjai - aktívak. Pontosabb részleteket a - show lacp neighbor detail paranccsal - kapunk. + A show lacp neighbor paranccsal + kérdezhetjük le a portok + állapotát: - switch# show lacp neighbor -Flags: S - Device is requesting Slow LACPDUs + switch# show lacp neighbor +Flags: S - Device is requesting Slow LACPDUs F - Device is requesting Fast LACPDUs - A - Device is in Active mode P - Device is in Passive mode + A - Device is in Active mode P - Device is in Passive mode Channel group 1 neighbors @@ -4681,9 +4689,11 @@ LACP port Oper Port Port Port Flags Priority Dev ID Age Key Number State -Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D +Fa0/1 SA 32768 0005.5d71.8db8 29s 0x146 0x3 0x3D Fa0/2 SA 32768 0005.5d71.8db8 29s 0x146 0x4 0x3D + Részletesebb kijelzést a show + lacp neighbor detail paranccsal kaphatunk. @@ -4692,14 +4702,24 @@ A hibatûrési mód arra alkalmas, hogy amikor az elsõdleges porton elvesztjük a - kapcsolatot, helyette egy másik felület - használatára tudunk - áttérni. + kapcsolatot, helyette egy másodlagos interfész + használatára tudunk áttérni. + Hozzuk létre és állítsuk be a + lagg0 interfészt, ahol az + fxp0 legyen a + fõinterfész, az fxp1 + pedig a tartalék interfész: + + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 + Az így létrejövõ interfész + nagyjából az alábbi lesz, ahol + eltérés a MAC-cím + és az eszköz neve: - lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 + &prompt.root; ifconfig lagg0 +lagg0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 options=8<VLAN_MTU> ether 00:05:5d:71:8d:b8 media: Ethernet autoselect @@ -4708,17 +4728,15 @@ laggport: fxp1 flags=0<> laggport: fxp0 flags=5<MASTER,ACTIVE> - A forgalom kezdetben az fxp0 + A forgalom kezdetben az fxp0 felületen keresztül érkezik és - távozik. Ha az fxp0 + távozik. Ha az fxp0 felületen valamiért megszakadna a kapcsolat, - helyette az fxp1 lesz az aktív - link. Ha késõbb helyreáll a kapcsolat az - elsõdleges felületen, akkor újra az lesz - aktív link. - + helyette az fxp1 lesz az + aktív link. Ha késõbb helyreáll a + kapcsolat az elsõdleges felületen, akkor újra + az lesz aktív link. - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#11 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml - %SRCID% 1.174 + %SRCID% 1.175 --> 2006 2007 2008 + 2009 A &os; Dokumentációs Projekt ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#15 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -93,6 +93,14 @@ + hogyan frissítsük a + dokumentációt a + CVSup + segítségével. + + + a két fejlesztõi ág, a &os.stable; és a &os.current; közti különbséget; @@ -399,22 +407,72 @@ képes betölteni az új binárisokat betölteni a memóriába. + A freebsd-update + önmagától csak a GENERIC + típusú rendszermagokat képes + frissíteni. Ha saját rendszermagot + használunk, akkor azt a rendszer többi + komponensének frissítését + követõen újra kell fordítanunk és + telepítenünk. A freebsd-update + azonban még akkor is érzekelni és + frissíteni fogja a GENERIC + rendszermagot (amennyiben az létezik), ha az éppen + nem az aktuális(an futó) rendszermag. + + + Mindig érdemes tartani egy másolatot a + GENERIC rendszermagról a /boot/GENERIC + könyvtárban. Rengeteg + különbözõ probléma + felderítésében tud segíteni, + illetve ez a szakaszban + leírt freebsd-update programmal + végzett frissítéseknél is hasznos + lehet. + + + Hacsak nem változtatjuk meg az + /etc/freebsd-update.conf + állományt, a freebsd-update a + rendszermag forrásait is frissíti a többivel + együtt. A saját rendszermag + újrafordítása és + telepítése ezután a már a megszokott + módon elvégezhetõ. + - A freebsd-update - kizárólag csak a GENERIC - konfigurációjú rendszermagok - esetén alkalmazható. Amennyiben a - GENERIC típusú - rendszermagot módosítottuk, vagy egy - saját rendszermagot telepítettünk, a - freebsd-update nem fog rendesen - mûködni — az elõbbi esetben - megáll, az utóbbiban pedig hibát fog - jelezni. + A freebsd-update által + terjesztett frissítések nem mindig érintik + a rendszermagot. Ha a rendszermag forrásai nem + változnak egy freebsd-update + install parancs kiadása során, akkor + nem kötelezõ újrafordítani a + saját rendszermagot. A + freebsd-update viszont mindig + módosítani fogja a + /usr/src/sys/conf/newvers.sh + állományt. Itt az aktuális + hibajavítás sorszáma szerepel (amelyet a + -p (mint patch + level elõtaggal kapcsolnak a rendszer + verziójához, és a uname + -r paranccsal lehet lekérdezni). Ennek + megfelelõen tehát a saját rendszermag + újrafordítása után, még ha + semmi más nem is változott, a &man.uname.1; + képes pontosan jelezni a rendszerhez + készült hibajavítás + sorszámát. Ez különösen fontos + több rendszer karbantartása során, mivel + így könnyen és gyorsan + tájékozódhatunk azok + naprakészségérõl. - + Váltás kisebb és nagyobb verziók között @@ -445,13 +503,89 @@ a yes választ adjuk, ezáltal önállósítani tudjuk. + Ha saját rendszermagot használunk, akkor + ennél valamivel azért több feladatunk van. + Szükségünk lesz a GENERIC + rendszermagot egy példányára, amelyet + másoljunk a /boot/GENERIC + könyvtárba. Amennyiben nincs + GENERIC típusú rendszermag a + rendszerünkön, a következõ módok + valamelyikén keresztül tudunk szerezni: + + + + Ha a saját rendszermagot még csak egyszer + fordítottuk, akkor a /boot/kernel.old + könyvtárban még + megtalálható a GENERIC. + Ezt nevezzük át egyszerûen /boot/GENERIC + könyvtárra. + + + + Ha fizikailag hozzá tudunk férni az + érintett géphez, akkor a + GENERIC egy + példányát akár CD-rõl is + átmásolhatjuk. Helyezzük be a + telepítõlemezt és adjuk ki a + következõ parancsokat: + + &prompt.root; mount /cdrom +&prompt.root; cd /cdrom/X.Y-RELEASE/kernels +&prompt.root; ./install.sh GENERIC + + Itt a X.Y-RELEASE + könyvtár nevében + értelemszerûen helyettesítsük be az + általunk használt változatot. A + GENERIC rendszermag ekkor + alapértelmezés szerint a /boot/GENERIC + könyvtárba kerül. + + + + Ha az elõbbiek közül egyik sem + lehetséges, akkor a GENERIC + rendszermagot közvetlenül akár + forrásból is lefordíthatjuk és + telepíthetjük: + + &prompt.root; cd /usr/src +&prompt.root; env DESTDIR=/boot/GENERIC make kernel +&prompt.root; mv /boot/GENERIC/boot/kernel/* /boot/GENERIC +&prompt.root; rm -rf /boot/GENERIC/boot + + A freebsd-update akkor fogja ezt + GENERIC rendszermagként + felismerni, ha a hozzátartozó + konfigurációs állományt nem + módosítjuk. Továbbá javasoljuk, + hogy semmilyen speciális + beállítást ne alkalmazzunk a + fordítás során (érdemes + üresen hagyni ehhez az + /etc/make.conf + állományt). + + + + Nem kötelezõ újraindítani a + rendszert a GENERIC rendszermaggal. + A freebsd-update képes frissíteni rendszerünket egy adott kiadásra. Például a következõ paraméterek - megadásával válthatunk a &os; 6.3 + megadásával válthatunk a &os; 6.4 használatára: - &prompt.root; freebsd-update -r 6.3-RELEASE upgrade + &prompt.root; freebsd-update -r 6.4-RELEASE upgrade A parancs elindulása után nem sokkal, a váltáshoz szükséges @@ -467,7 +601,7 @@ ahogy itt látható: Looking up update.FreeBSD.org mirrors... 1 mirrors found. -Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. +Fetching metadata signature for 6.3-RELEASE from update1.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. @@ -491,6 +625,20 @@ felé arra vonatkozóan, hogy miket telepítsen fel vagy mit csináljon. + A saját rendszermag használatakor az + iménti lépés valamilyen ehhez hasonló + figyelmeztetést fog adni: + + WARNING: This system is running a "SAJÁT RENDSZERMAG" kernel, which is not a +kernel configuration distributed as part of FreeBSD 6.3-RELEASE. +This kernel will not be updated: you MUST update the kernel manually +before running "/usr/sbin/freebsd-update install" + + Ez a figyelmeztetés most nyugodtan figyelmen + kívül hagyható. A folyamat során a + frissített GENERIC rendszermagot + fogjuk használni. + A javítások letöltését követõen megkezdõdik a telepítésük. A váltás ezen @@ -542,11 +690,43 @@ Elõször mindig a rendszermag és a hozzátartozó modulok cserélõdnek le. Ahogy ez végrehajtódott, újra kell - indítanunk a rendszert. Az új rendszermagot - tehát a következõ parancs - futtatásával tudjuk a rendszer - újraindításán keresztül a - memóriába juttatni: + indítanunk a rendszert. Ha saját rendszermagot + használunk, akkor a &man.nextboot.8; parancs + segítségével állítsuk be a + következõ rendszerindítás során + betöltendõ rendszermagot a /boot/GENERIC + könyvtárban levõre (ezt + frissítettük): + + &prompt.root; nextboot -k GENERIC + + + Mielõtt újraindítanánk a + gépünket a GENERIC + rendszermaggal, gyõzõdjünk meg róla, + hogy szerepel benne minden olyan meghajtó, amely + elengedhetetlen a rendszer hiánytalan + indításához (és képes lesz + újra csatlakozni a hálózathoz, ha + éppen távolról adminisztráljuk). + Ez különösen olyan esetben fontos, amikor a + saját rendszermagunkban beépítetten + szerepeltek bizonyos modulok. Ilyenkor a + GENERIC rendszermag használatakor + ezeket a /boot/loader.conf + állományon keresztül töltethetjük + be ideiglenesen. A frissítés + befejezéséig érdemes viszont minden nem + létfontosságú szolgáltatást + leállítani, leválasztani lemezeket + és hálózati megosztásokat + stb. + + + A rendszerünk most már + újraindítható a frissített + rendszermaggal: &prompt.root; shutdown -r now @@ -601,6 +781,12 @@ &prompt.root; freebsd-update install + Ha a GENERIC rendszermagot csak + átmenetileg használtuk, akkor most már a + megszokott módon fordíthatunk és + telepíthetünk magunk egy saját + rendszermagot. + Indítsuk újra a rendszert a &os; frissített változatával. A folyamat ezzel véget ért. @@ -802,6 +988,416 @@ &prompt.root; portsnap fetch update + + A dokumentáció frissítése + + frissítés és frissen + tartás + + + dokumentáció + frissítés és frissen tartás + + + Az alaprendszer és a Portgyûjtemény mellett + a dokumentáció is a &os; operációs + rendszer szerves részét képezi. Noha a &os; + dokumentációjának legfrissebb + változata folyamatosan elérhetõ a &os; + honlapjáról, egyes + felhasználók ezt csak lassan vagy nem képesek + folyamatosan elérni. Szerencsére egy helyi + másolat megfelelõ karbantartásával az + egyes kiadásokhoz tartozó dokumentáció + is frissíthetõ. + + + A dokumentáció frissítése CVSup + használatával + + A &os; telepített + dokumentációjának forrásai az + alaprendszeréhez hasonlóan (lásd ) a CVSup + segítségével frissíthetõek. + Ebben a szakaszban megismerhetjük: + + + + hogyan telepítsük a + dokumentáció + elõállításához + szükséges eszközöket, amelyekkel a + forrásokból újra tudjuk + generálni a &os; + dokumentációját; + + + + hogyan töltsük le a dokumentáció + forrását CVSup + segítségével a /usr/doc + könyvtárba; + + + + a dokumentáció + elõállításához alkalmazott + rendszer milyen beállításokkal + rendelkezik, vagyis hogyan korlátozzuk a + generálást bizonyos nyelvekre vagy + formátumokra. + + + + + + A CVSup és a dokumentációs + eszközök telepítése + + Viszonylag sokféle eszközre lesz + szükségünk, ha a &os; + dokumentációját a forrásokból + akarjuk elõállítani. Ezek az + segédprogramok nem részei a &os; + alaprendszerének, mivel alapvetõen nagyon sok helyet + foglalnak el, és leginkább olyan &os; + felhasználók számára fontosak, akik + folyamatosan a dokumentációval dolgoznak vagy + gyakran frissítik azt forrásból. + + A feladathoz szükséges összes eszköz + elérhetõ a Portgyûjteménybõl. Ebben + a &os; Dokumentációs Projekt + összeállított egy textproc/docproj nevû portot, + amellyel az említett programok + telepítését és + frissítését igyekezték + megkönnyíteni. + + + Ha nem tartunk igényt a dokumentáció + &postscript; vagy PDF változatára, akkor ehelyett + inkább érdemes megfontolnunk a textproc/docproj-nojadetex port + telepítését. Ebben a változatban + a teTeX betûszedõ + rendszer kivételével az összes + segédprogram megtalálható. Mivel a + teTeX önmagában nagyon + sok segédeszköz telepítését + jelenti, ezért amennyiben a PDF változat + ténylegesen nem szükséges, érdemes + eltekinteni a telepítésétõl. + + + A CVSup + telepítésével kapcsolatban pedig + részletesebb információkat a CVSup használatával + foglalkozó szakaszban olvashatunk. + + + + A dokumentáció forrásának + frissítése + + A /usr/share/examples/cvsup/doc-supfile + konfigurációs állomány + segítségével a + CVSup képes letölteni a + dokumentáció + forrásállományainak legfrissebb + példányait. Itt a frissítést + alapértelmezés szerint egy nem létezõ + géptõl fogjuk kérni (mivel ezt + kötelezõ kitölteni), azonban a &man.cvsup.1; + programnak egy parancssori paraméter + segítségével megadhatjuk melyik + CVSup szerverrõl töltse le + a forrásokat: + + &prompt.root; cvsup -h cvsup.FreeBSD.org -g -L 2 /usr/share/examples/cvsup/doc-supfile + + Ne felejtsük el a + cvsup.FreeBSD.org helyére + beírni a hozzánk földrajzilag + legközelebb elhelyezkedõ + CVSup szervert. Ezek teljes + listáját a + tartalmazza. + + Egy ideig eltarthat, amíg elõször + letöltjük a forrásokat. Várjuk meg + türelmesen, amíg befejezõdik a + mûvelet. + + Késõbb a forrásokat ugyanezzel a + paranccsal tudjuk frissíteni. A + CVSup ugyanis mindig csak a + legutóbbi futtatása óta történt + változásokat tölti le, ezért + késõbb már ez a lépés + jelentõsen felgyorsulhat. + + A források letöltése után a + dokumentációt például az ekkor + keletkezett /usr/doc + könyvtárban található + Makefile használatával + állíthatjuk elõ. Tehát miután + az /etc/make.conf állományban + beállítottuk a SUP_UPDATE, + SUPHOST és + DOCSUPFILE változókat, le + tudjuk futtatni a következõ parancsot: + + &prompt.root; cd /usr/doc +&prompt.root; make update + + Az előbb említett &man.make.1; változók jellemző értékei: + + SUP_UPDATE= yes +SUPHOST?= cvsup.freebsd.org +DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile + + + Mivel a SUPHOST és a + DOCSUPFILE változók + értékét a ?= + szimbólummal állítottuk be, + lehetõségünk van a parancssorból + ezeknek más értékeket adni. Az + /etc/make.conf állományba + általában így érdemes felvenni a + változókat, így nem kell minden + alkalommal módosítani, amikor valamilyen + új beállítást akarunk + kipróbálni. + + + + + A dokumentáció különbözõ + beállításai + + A &os; dokumentációjához + tartozó, frissítést és + elõállítást végzõ + rendszernek van néhány olyan + beállítása, amelyekkel + kérhetjük kizárólag csak a + dokumentáció egyes részeinek + frissítését vagy bizonyos kimeneti + formátumok használatát. Ezek vagy + globálisan az /etc/make.conf + állományban, vagy pedig a parancssorból, a + &man.make.1; program paramétereként + adhatóak meg. + + Ízelítõül néhány + közülük: + + + + DOC_LANG + + + Az elõállítandó és + telepítendõ nyelvû + dokumentáció felsorolása, tehát + például csak az angol + dokumentáció esetén ez + en_US.ISO8859-1. + + + + + FORMATS + + + Az elõállítandó + dokumentáció kimeneti formátumainak + felsorolása. Itt pillanatnyilag + értékként a html, + html-split, txt, + ps, pdf és + rtf jelenhet meg. + + + + + SUPHOST + + + A frissítéshez használt + CVSup szerver + hálózati neve. + + + + + A folyamathoz kapcsolódóan további + rendszerszintû &man.make.1; változókról + a &man.make.conf.5; man oldalon olvashatunk. + + A &os; dokumentációjának + elõállításáért + felelõs rendszerben használható &man.make.1; + további változók + bemutatásával kapcsolatban pedig olvassuk el az + A &os; + Dokumentációs Projekt irányelvei + kezdõknek címû könyvet. + + + + A &os; dokumentációjának >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 10 18:35:52 2009 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12A5310656C0; Sat, 10 Jan 2009 18:35: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 BEC2B106567A for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:35:51 +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 ABC0D8FC27 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:35:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AIZpHu015319 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:35:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AIZpiv015317 for perforce@freebsd.org; Sat, 10 Jan 2009 18:35:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 18:35:51 GMT Message-Id: <200901101835.n0AIZpiv015317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 155927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Jan 2009 18:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155927 Change 155927 by hselasky@hselasky_laptop001 on 2009/01/10 18:35:24 Like Marcel Moolenaar has pointed out, we can unconditionally preserve the page offset, hence on platforms without DMA bouncing this is always the case. Repeating the background for this: /* * Background: Some kinds of DMA hardware only store the full * physical address of the first memory page when multiple memory * pages are loaded into DMA. For consecutive memory pages, only the * non-offset part of the physical address is updated. The hardware * computes the amount of data that should be stored in the first * memory page from the minimum of the total transfer length and * PAGE_SIZE, minus the initial page offset. When the initial page * offset is not preserved, the hardware ends up transferring an * invalid number of bytes to or from the initial memory page. */ Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#10 edit .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#12 edit .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#13 edit .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#9 edit .. //depot/projects/usb/src/sys/sys/bus_dma.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -1128,17 +1128,11 @@ bz->active_bpages++; mtx_unlock(&bounce_lock); - /* reset page offset */ + /* page offset needs to be preserved */ bpage->vaddr &= ~PAGE_MASK; bpage->busaddr &= ~PAGE_MASK; - - if (BUS_DMA_NO_REALIGN(dmat->alignment, dmat->boundary, - dmat->maxsegsz)) { - /* preserve page offset */ - bpage->vaddr |= vaddr & PAGE_MASK; - bpage->busaddr |= vaddr & PAGE_MASK; - } - + bpage->vaddr |= vaddr & PAGE_MASK; + bpage->busaddr |= vaddr & PAGE_MASK; bpage->datavaddr = vaddr; bpage->datacount = size; STAILQ_INSERT_TAIL(&(map->bpages), bpage, links); ==== //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#12 (text+ko) ==== @@ -1415,17 +1415,11 @@ bz->active_bpages++; mtx_unlock(&bounce_lock); - /* reset page offset */ + /* page offset needs to be preserved */ bpage->vaddr &= ~PAGE_MASK; bpage->busaddr &= ~PAGE_MASK; - - if (BUS_DMA_NO_REALIGN(dmat->alignment, dmat->boundary, - dmat->maxsegsz)) { - /* preserve page offset */ - bpage->vaddr |= vaddr & PAGE_MASK; - bpage->busaddr |= vaddr & PAGE_MASK; - } - + bpage->vaddr |= vaddr & PAGE_MASK; + bpage->busaddr |= vaddr & PAGE_MASK; bpage->datavaddr = vaddr; bpage->datacount = size; STAILQ_INSERT_TAIL(&(map->bpages), bpage, links); ==== //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#13 (text+ko) ==== @@ -1146,17 +1146,11 @@ bz->active_bpages++; mtx_unlock(&bounce_lock); - /* reset page offset */ + /* page offset needs to be preserved */ bpage->vaddr &= ~PAGE_MASK; bpage->busaddr &= ~PAGE_MASK; - - if (BUS_DMA_NO_REALIGN(dmat->alignment, dmat->boundary, - dmat->maxsegsz)) { - /* preserve page offset */ - bpage->vaddr |= vaddr & PAGE_MASK; - bpage->busaddr |= vaddr & PAGE_MASK; - } - + bpage->vaddr |= vaddr & PAGE_MASK; + bpage->busaddr |= vaddr & PAGE_MASK; bpage->datavaddr = vaddr; bpage->datacount = size; STAILQ_INSERT_TAIL(&(map->bpages), bpage, links); ==== //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#9 (text+ko) ==== @@ -936,16 +936,11 @@ active_bpages++; mtx_unlock(&bounce_lock); - /* reset page offset */ + /* page offset needs to be preserved */ bpage->vaddr &= ~PAGE_MASK; bpage->busaddr &= ~PAGE_MASK; - - if (BUS_DMA_NO_REALIGN(dmat->alignment, dmat->boundary, - dmat->maxsegsz)) { - /* preserve page offset */ - bpage->vaddr |= vaddr & PAGE_MASK; - bpage->busaddr |= vaddr & PAGE_MASK; - } + bpage->vaddr |= vaddr & PAGE_MASK; + bpage->busaddr |= vaddr & PAGE_MASK; bpage->datavaddr = vaddr; bpage->datacount = size; ==== //depot/projects/usb/src/sys/sys/bus_dma.h#7 (text+ko) ==== @@ -102,24 +102,6 @@ #define BUS_DMA_NOWRITE 0x100 #define BUS_DMA_NOCACHE 0x200 -/* - * The following flag specifies that no re-alignment of individual - * memory pages is allowed when loaded into DMA. It can only be used - * when "maxsegsz" is equal to "PAGE_SIZE" and "alignment" is less - * than or equal to 1. - * - * Background: Some kinds of DMA hardware only stores the full - * physical address of the first memory page when multiple memory - * pages are loaded into DMA. Consequtive memory pages only gets the - * non-offset part of the physical address updated. The hardware - * computes the amount of data that should be stored in the first - * memory page from the minimum of the total transfer length and - * PAGE_SIZE minus the initial page offset. When the initial page - * offset is not preserved the hardware ends up transferring an - * invalid number of bytes to or from the initial memory page. - */ -#define BUS_DMA_NOREAL 0x400 /* no page re-alignment allowed */ - /* Forwards needed by prototypes below. */ struct mbuf; struct uio; @@ -133,23 +115,6 @@ #define BUS_DMASYNC_POSTWRITE 8 /* - * Background: Some kinds of DMA hardware only store the full - * physical address of the first memory page when multiple memory - * pages are loaded into DMA. For consecutive memory pages, only the - * non-offset part of the physical address is updated. The hardware - * computes the amount of data that should be stored in the first - * memory page from the minimum of the total transfer length and - * PAGE_SIZE, minus the initial page offset. When the initial page - * offset is not preserved, the hardware ends up transferring an - * invalid number of bytes to or from the initial memory page. - * - * The following macro returns true when the initial page offset must - * be preserved: - */ -#define BUS_DMA_NO_REALIGN(align,boundary,maxsegsz) \ - (((align) == 1) && ((boundary) == PAGE_SIZE) && ((maxsegsz) == PAGE_SIZE)) - -/* * bus_dma_segment_t * * Describes a single contiguous DMA transaction. Values From owner-p4-projects@FreeBSD.ORG Sat Jan 10 18:38:55 2009 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62575106566C; Sat, 10 Jan 2009 18:38: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 09CD21065676 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:38:55 +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 EB6738FC16 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:38:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AIcs92015519 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 18:38:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AIcsWA015517 for perforce@freebsd.org; Sat, 10 Jan 2009 18:38:54 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 10 Jan 2009 18:38:54 GMT Message-Id: <200901101838.n0AIcsWA015517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 155928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Jan 2009 18:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=155928 Change 155928 by pgj@kolbasz on 2009/01/10 18:38:39 MFen (www): 1.165 -> 1.167 hu/index.xsl 1.60 -> 1.61 hu/send-pr.sgml 1.9 -> 1.10 hu/developers/cvs.sgml 1.9 -> 1.10 hu/share/sgml/header.l10n.ent 1.23 -> 1.24 hu/share/sgml/navibar.l10n.ent Affected files ... .. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#11 edit .. //depot/projects/docproj_hu/www/hu/index.xsl#15 edit .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#10 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#9 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#18 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#11 (text+ko) ==== @@ -9,12 +9,14 @@ <!-- FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan <gabor@FreeBSD.org> %SOURCE% en/developers/cvs.sgml - %SRCID% 1.9 + %SRCID% 1.10 --> <html> &header; + <h2>CVS</h2> + <p>A <a href="http://www.FreeBSD.org/cgi/man.cgi?cvs">CVS</a> (Concurrent Version System) az az eszköz, amelyet a forrás kezeléséhez használunk. Minden @@ -77,6 +79,19 @@ href="http://www.FreeBSD.org.ua/cgi/cvsweb.cgi?cvsroot=freebsd">Ukrajna</a>. </p> + <h2>Subversion</h2> + + <p>2008 júniusában az alaprendszer fejlesztése + áttért egy másik verziókezelõ + rendszer, a <a + href="http://subversion.tigris.org/">Subversion</a> + (röviden SVN) használatára. A + hozzátartozó repository egy <a + href="http://svn.freebsd.org/viewvc/base/">webes interfészen</a> + keresztül szabadon böngészhetõ. Az + összes ide befutó változtatás + visszakerül a CVS repositoryba.</p> + &footer; </html> ==== //depot/projects/docproj_hu/www/hu/index.xsl#15 (text+ko) ==== @@ -9,7 +9,7 @@ <!-- FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan <gabor@FreeBSD.org> %SOURCE% en/index.xsl - %SRCID% 1.165 + %SRCID% 1.167 --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> @@ -70,30 +70,35 @@ <div id="FRONTFEATURECONTENT"> <h1>A BSD &unix; alapjain</h1> - <p>A &os;® egy x86 kompatibilis - (Pentium® és - Athlon™), amd64 kompatibilis - (Opteron™, Athlon™64, - és EM64T), UltraSPARC®, - IA-64, PC-98 és ARM - számítógép-architektúrákra - készült fejlett - operációs rendszer. A - BSD rendszer egyik - leszármazottja, amely a &unix; - egy olyan verziója, amelyet a - kaliforniai Berkeley Egyetemen - fejlesztettek ki. A &os;-t <a - href="&base;/doc/en/articles/contributors/staff-committers.html">önkéntesek egy nagyobb csoportja</a> - fejleszti és tartja karban. A - fejlesztés - különbözõ - fázisaiban további <a - href="&base;/platforms/">platformok</a> - is elérhetõek.</p> + <p>A &os;® napjaink szerver, asztali + és beágyazott <a + href="&base;/platforms/">számítógépeinek</a> + operációs rendszere. A + &os; kódbázisa több + mint harminc év folyamatos + fejlesztésének, + munkájának és + optimalizálásának + eredménye. Jelenleg <a + href="&base;/doc/en/articles/contributors/staff-committers.html">egyéni + fejlesztõk egy nagyobb csoportja</a> + tartja karban. A &os; legfontosabb + jellemzõi többek közt a + fejlett + hálózatkezelés, a + kifinomult biztonsági + lehetõségek és a + világszínvonalú + teljesítmény, amelyet a + világban <a + href="&base;/doc/en/books/handbook/nutshell.html/#INTRODUCTION-NUTSHELL-USERS">számos forgalmasabb kiszolgáló</a>, + hatékony beágyazott + rendszer és + tárolóeszköz + használ.</p> - <div id="TXTFRONTFEATURELINK"> - »<a href="&base;/about.html" title="Bõvebben">Bõvebben</a> + <div id="TXTFRONTFEATURELINK"> » + <a href="&base;/about.html" title="Bõvebben">Bõvebben</a> </div> <!-- TXTFRONTFEATURELINK --> </div> <!-- FRONTFEATURECONTENT --> </div> <!-- FRONTFEATURELEFT --> @@ -318,7 +323,7 @@ <ul class="newseventslist"> <li class="first-child"> <a - href="&enbase;/security/" title="További biztonsági figyelmeztetések">Tovább</a> + href="&enbase;/security/advisories.html" title="További biztonsági figyelmeztetések">Tovább</a> </li> <li class="last-child"> <a ==== //depot/projects/docproj_hu/www/hu/send-pr.sgml#10 (text+ko) ==== @@ -10,7 +10,7 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: Peter Terbe <sncdev@gmail.com> %SOURCE% en/send-pr.sgml - %SRCID% 1.60 + %SRCID% 1.61 --> <html> @@ -190,7 +190,7 @@ <textarea name="fix" id="fix" rows="20" cols="80"></textarea><br><br> <label for="patch">És/vagy patch (max. 100 KB, .txt - kiterjesztés ajánlott)</label>: + vagy .shar kiterjesztés ajánlott)</label>: <input type="file" name="patch" id="patch" maxlength="102400" accept="text/*" ><br> ==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#9 (text+ko) ==== @@ -4,14 +4,14 @@ <!-- The FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan <gabor@FreeBSD.org> %SOURCE% share/sgml/header.ent - %SRCID% 1.9 + %SRCID% 1.10 --> <!-- Components making up the standard headers and footers. --> <!-- Override in the prolog <em>before</em> including this --> <!-- file if necessary. --> <!ENTITY copyright '<a href="&base;/search/index-site.html">Oldaltérkép</a> | - <a href="&enbase;/copyright/">Jogi Megjegyzések</a> | © 1995-2008 A &os; Projekt. + <a href="&enbase;/copyright/">Jogi Megjegyzések</a> | © 1995-2009 A &os; Projekt. Minden jog fenntartva.'> <!ENTITY author '<a href="&base;/index.html">Kezdõlap</a>   |   <a href="&base;/mailto.html">Kapcsolat</a>   |   ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#18 (text+ko) ==== @@ -4,7 +4,7 @@ <!-- FreeBSD Hungarian Documentation Project Translated by: Gabor Kovesdan <gabor@FreeBSD.org> %SOURCE% share/sgml/navibar.ent - %SRCID% 1.23 + %SRCID% 1.24 --> <!ENTITY % navinclude.about "IGNORE"> @@ -63,7 +63,7 @@ <li><a href="&enbase;/projects/index.html">Fejlesztõk</a></li> <li><a href="&enbase;/doc/en/books/developers-handbook">A fejlesztõk kézikönyve</a></li> <li><a href="&enbase;/doc/en/books/porters-handbook">A porterek kézikönyve</a></li> - <li><a href="&base;/developers/cvs.html">CVS repository</a></li> + <li><a href="&base;/developers/cvs.html">Forráskód repositoryk</a></li> <li><a href="&enbase;/releng/index.html">A kiadások ütemezése</a></li> <li><a href="&base;/platforms/">Platformok</a></li> <li><a href="&enbase;/projects/ideas/">Projektötletek</a></li> From owner-p4-projects@FreeBSD.ORG Sat Jan 10 19:44:02 2009 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A98511065672; Sat, 10 Jan 2009 19:44:01 +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 68D99106564A for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 19:44:01 +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 56EAC8FC13 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 19:44:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AJi1fe025400 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 19:44:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AJi1Tc025398 for perforce@freebsd.org; Sat, 10 Jan 2009 19:44:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 19:44:01 GMT Message-Id: <200901101944.n0AJi1Tc025398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 155932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Jan 2009 19:44:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=155932 Change 155932 by hselasky@hselasky_laptop001 on 2009/01/10 19:43:54 Refactor "usb2_desc_foreach()" to not use "USB_ADD_BYTES" macro. Requested by Dag-Erling Smřrgrav. More functions will be refactored to not use the "USB_ADD_BYTES" macro when I find time. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#6 (text+ko) ==== @@ -43,25 +43,44 @@ * Else: Next descriptor after "desc" *------------------------------------------------------------------------*/ struct usb2_descriptor * -usb2_desc_foreach(struct usb2_config_descriptor *cd, struct usb2_descriptor *desc) +usb2_desc_foreach(struct usb2_config_descriptor *cd, + struct usb2_descriptor *_desc) { - void *end; + uint8_t *desc_next; + uint8_t *start; + uint8_t *end; + uint8_t *desc; - if (cd == NULL) { + /* be NULL safe */ + if (cd == NULL) return (NULL); - } - end = USB_ADD_BYTES(cd, UGETW(cd->wTotalLength)); + + /* We assume that the "wTotalLength" has been checked. */ + start = (uint8_t *)cd; + end = start + UGETW(cd->wTotalLength); + desc = (uint8_t *)_desc; + + /* Get start of next USB descriptor. */ + if (desc == NULL) + desc = start; + else + desc = desc + desc[0]; + + /* Check that the next USB descriptor is within the range. */ + if ((desc < start) || (desc >= end)) + return (NULL); /* out of range, or EOD */ + + /* Check that the second next USB descriptor is within range. */ + desc_next = desc + desc[0]; + if ((desc_next < start) || (desc_next > end)) + return (NULL); /* out of range */ + + /* Check minimum descriptor length. */ + if (desc[0] < 3) + return (NULL); /* too short descriptor */ - if (desc == NULL) { - desc = USB_ADD_BYTES(cd, 0); - } else { - desc = USB_ADD_BYTES(desc, desc->bLength); - } - return (((((void *)desc) >= ((void *)cd)) && - (((void *)desc) < end) && - (USB_ADD_BYTES(desc, desc->bLength) >= ((void *)cd)) && - (USB_ADD_BYTES(desc, desc->bLength) <= end) && - (desc->bLength >= sizeof(*desc))) ? desc : NULL); + /* Return start of next descriptor. */ + return ((struct usb2_descriptor *)desc); } /*------------------------------------------------------------------------* @@ -140,7 +159,6 @@ desc = ((void *)d); while ((desc = usb2_desc_foreach(cd, desc))) { - if (desc->bDescriptorType == UDESC_INTERFACE) { break; } @@ -195,7 +213,6 @@ uint16_t n = 0; while ((desc = usb2_desc_foreach(cd, desc))) { - if ((desc->bDescriptorType == UDESC_INTERFACE) && (desc->bLength >= sizeof(*id))) { id = (void *)desc; From owner-p4-projects@FreeBSD.ORG Sat Jan 10 20:50:09 2009 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F6B6106568A; Sat, 10 Jan 2009 20:50: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 1F67F1065688 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 20:50:09 +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 0E0048FC1A for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 20:50:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AKo8f8041143 for <perforce@FreeBSD.org>; Sat, 10 Jan 2009 20:50:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0AKo8Gl041141 for perforce@freebsd.org; Sat, 10 Jan 2009 20:50:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 10 Jan 2009 20:50:08 GMT Message-Id: <200901102050.n0AKo8Gl041141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 155936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Jan 2009 20:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=155936 Change 155936 by hselasky@hselasky_laptop001 on 2009/01/10 20:49:20 Save an USB transfer in UHUB driver by using the builtin clear-stall mechanism. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#31 (text+ko) ==== @@ -53,6 +53,7 @@ #include <dev/usb2/controller/usb2_bus.h> #define UHUB_INTR_INTERVAL 250 /* ms */ +#define UHUB_N_TRANSFER 1 #if USB_DEBUG static int uhub_debug = 0; @@ -76,10 +77,9 @@ struct uhub_current_state sc_st;/* current state */ device_t sc_dev; /* base device */ struct usb2_device *sc_udev; /* USB device */ - struct usb2_xfer *sc_xfer[2]; /* interrupt xfer */ + struct usb2_xfer *sc_xfer[UHUB_N_TRANSFER]; /* interrupt xfer */ uint8_t sc_flags; #define UHUB_FLAG_DID_EXPLORE 0x01 -#define UHUB_FLAG_INTR_STALL 0x02 char sc_name[32]; }; @@ -100,12 +100,11 @@ static bus_child_pnpinfo_str_t uhub_child_pnpinfo_string; static usb2_callback_t uhub_intr_callback; -static usb2_callback_t uhub_intr_clear_stall_callback; static void usb2_dev_resume_peer(struct usb2_device *udev); static void usb2_dev_suspend_peer(struct usb2_device *udev); -static const struct usb2_config uhub_config[2] = { +static const struct usb2_config uhub_config[UHUB_N_TRANSFER] = { [0] = { .type = UE_INTERRUPT, @@ -117,17 +116,6 @@ .mh.callback = &uhub_intr_callback, .mh.interval = UHUB_INTR_INTERVAL, }, - - [1] = { - .type = UE_CONTROL, - .endpoint = 0, - .direction = UE_DIR_ANY, - .mh.timeout = 1000, /* 1 second */ - .mh.interval = 50, /* 50ms */ - .mh.flags = {}, - .mh.bufsize = sizeof(struct usb2_device_request), - .mh.callback = &uhub_intr_clear_stall_callback, - }, }; /* @@ -160,19 +148,6 @@ DRIVER_MODULE(ushub, ushub, uhub_driver, uhub_devclass, NULL, 0); static void -uhub_intr_clear_stall_callback(struct usb2_xfer *xfer) -{ - struct uhub_softc *sc = xfer->priv_sc; - struct usb2_xfer *xfer_other = sc->sc_xfer[0]; - - if (usb2_clear_stall_callback(xfer, xfer_other)) { - DPRINTF("stall cleared\n"); - sc->sc_flags &= ~UHUB_FLAG_INTR_STALL; - usb2_transfer_start(xfer_other); - } -} - -static void uhub_intr_callback(struct usb2_xfer *xfer) { struct uhub_softc *sc = xfer->priv_sc; @@ -189,21 +164,22 @@ usb2_needs_explore(sc->sc_udev->bus, 0); case USB_ST_SETUP: - if (sc->sc_flags & UHUB_FLAG_INTR_STALL) { - usb2_transfer_start(sc->sc_xfer[1]); - } else { - xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); - } - return; + xfer->frlengths[0] = xfer->max_data_length; + usb2_start_hardware(xfer); + break; default: /* Error */ if (xfer->error != USB_ERR_CANCELLED) { - /* start clear stall */ - sc->sc_flags |= UHUB_FLAG_INTR_STALL; - usb2_transfer_start(sc->sc_xfer[1]); + /* + * Do a clear-stall. The "stall_pipe" flag + * will get cleared before next callback by + * the USB stack. + */ + xfer->flags.stall_pipe = 1; + xfer->frlengths[0] = xfer->max_data_length; + usb2_start_hardware(xfer); } - return; + break; } } @@ -736,7 +712,7 @@ /* set up interrupt pipe */ iface_index = 0; err = usb2_transfer_setup(udev, &iface_index, sc->sc_xfer, - uhub_config, 2, sc, &Giant); + uhub_config, UHUB_N_TRANSFER, sc, &Giant); if (err) { DPRINTFN(0, "cannot setup interrupt transfer, " "errstr=%s!\n", usb2_errstr(err)); @@ -821,7 +797,7 @@ return (0); error: - usb2_transfer_unsetup(sc->sc_xfer, 2); + usb2_transfer_unsetup(sc->sc_xfer, UHUB_N_TRANSFER); if (udev->hub) { free(udev->hub, M_USBDEV); @@ -864,7 +840,7 @@ child = NULL; } - usb2_transfer_unsetup(sc->sc_xfer, 2); + usb2_transfer_unsetup(sc->sc_xfer, UHUB_N_TRANSFER); free(hub, M_USBDEV); sc->sc_udev->hub = NULL;