From owner-p4-projects@FreeBSD.ORG Sun Nov 15 09:58:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BE411065676; Sun, 15 Nov 2009 09:58: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 B3EE8106566C; Sun, 15 Nov 2009 09:58:20 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailgate.jr-hosting.nl (mailgate.jr-hosting.nl [78.46.126.30]) by mx1.freebsd.org (Postfix) with ESMTP id 5B3528FC08; Sun, 15 Nov 2009 09:58:20 +0000 (UTC) Received: from websrv01.jr-hosting.nl (websrv01 [78.47.69.233]) by mailgate.jr-hosting.nl (Postfix) with ESMTP id 5F6E31CC39; Sun, 15 Nov 2009 10:58:18 +0100 (CET) Received: from a83-163-38-147.adsl.xs4all.nl ([83.163.38.147] helo=axantucar.elvandar.int) by websrv01.jr-hosting.nl with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69 (FreeBSD)) (envelope-from ) id 1N9bsA-000Dh9-7t; Sun, 15 Nov 2009 10:58:18 +0100 Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: text/plain; charset=us-ascii From: Remko Lodder In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org> Date: Sun, 15 Nov 2009 10:58:17 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: <1D8EE757-D3A6-43D1-B8CF-40BBE46A8796@elvandar.org> References: <200911142333.nAENXWrT017367@repoman.freebsd.org> To: Rene Ladan X-Mailer: Apple Mail (2.1077) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170633 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, 15 Nov 2009 09:58:21 -0000 On Nov 15, 2009, at 12:33 AM, Rene Ladan wrote: > http://p4web.freebsd.org/chv.cgi?CH=3D170633 >=20 > Change 170633 by rene@rene_self on 2009/11/14 23:32:57 >=20 > [porters handbook] > Add a section about Clang to the "Dos and Don'ts" chapter. > To be reviewed by the clang team and the doc review team. >=20 > Affected files ... >=20 > .. = //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sg= ml#50 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D = //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sg= ml#50 (text+ko) =3D=3D=3D=3D >=20 > @@ -13602,6 +13602,92 @@ > shorthand solution. > >=20 > + > + Clang: new C/C++ compiler > + > + A future version of &os; will likely have the Clang C/C++ > + compiler as its base compiler. Some modifications to the = Ports > + Collection are necessary. In general, these are write = proper > + ports and write proper source code. = More > + specifically: > + > + > + > + Respect CC and = CXX. Do ^^^ You should probably add something like 'variables' on = the end of the line. > + not any of cc, = c99, > + gcc, c++, or > + g++ directly. What shouldn't we do with 'cc' 'c99' etc? I think we should be more = specific here in terms of 'do not use cc[..] directly. > + > + > + > + Respect LD, do not use > + ld directly. > + > + > + > + Do not use cpp for reformatting = manual > + pages or shell scripts. Try to use something more = suitable > + instead, possibly falling back to = CPP. > + > + > + > + > + If there are link errors related to missing or already > + defined functions, try to add = CSTD=3Dgnu89 to > + Makefile. The function vsnprintf() = is > + already built in. > + > + > + > + The -traditional option is not = supported, > + so existing occurences have to be removed. No concensus = has yet > + been reached on ports abusing this option to preserve = white space > + in text formatting. Note that the Clang preprocessor does = not > + preserve white space. > + > + > + > + Explicit type indication of variables must be used in > + built-in assembler code. > + > + > + > + The main function must be properly declared as ^^^ add : > + > + int main(int argc, char = **argv) > + > + > + > + The maximum useable optimization level is 3. Level 4 = is > + reserved for link-time optimization for the Clang = backend. > + > + > + > + > + > + Some temporary hacks that might be used if all else = fails: > + > + > + > + Adding -fheinous-gnu-extensions. = Note > + that this option is already deprecated. > + > + > + > + Reducing the warning level by adding > + --diasable-werror or > + --disable-strict, or by disabling > + --warn-common or > + -Werror. > + > + > + > + > + > + > > Respect both <makevar>CC</makevar> and > <makevar>CXX</makevar> Thanks for making this! --=20 /"\ 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 Sun Nov 15 13:03:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C78106568B; Sun, 15 Nov 2009 13:03:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97A951065672; Sun, 15 Nov 2009 13:03:39 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (haluter.fromme.com [212.17.241.231]) by mx1.freebsd.org (Postfix) with ESMTP id 20F718FC16; Sun, 15 Nov 2009 13:03:38 +0000 (UTC) Received: from haluter.fromme.com (irc_sucks@localhost [127.0.0.1]) by haluter.fromme.com (8.14.3/8.14.3) with ESMTP id nAFCQEmh005361; Sun, 15 Nov 2009 13:26:21 +0100 (CET) (envelope-from olli@fromme.com) Received: (from olli@localhost) by haluter.fromme.com (8.14.3/8.14.3/Submit) id nAFCQD6g005359; Sun, 15 Nov 2009 13:26:13 +0100 (CET) (envelope-from olli) From: Oliver Fromme Message-Id: <200911151226.nAFCQD6g005359@haluter.fromme.com> To: rene@freebsd.org (Rene Ladan) Date: Sun, 15 Nov 2009 13:26:13 +0100 (CET) In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org> X-Mailer: ELM [version 2.5 PL8] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (haluter.fromme.com [127.0.0.1]); Sun, 15 Nov 2009 13:26:21 +0100 (CET) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170633 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, 15 Nov 2009 13:03:40 -0000 Rene Ladan wrote: > http://p4web.freebsd.org/chv.cgi?CH=170633 > > Change 170633 by rene@rene_self on 2009/11/14 23:32:57 > > [porters handbook] > Add a section about Clang to the "Dos and Don'ts" chapter. > To be reviewed by the clang team and the doc review team. > > Affected files ... > > .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit > > Differences ... > > ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ==== > [...] > + > + Respect CC and CXX. Do > + not any of cc, c99, > + gcc, c++, or > + g++ directly. > + The last sentence is incomplete. I think it's missing a verb like "do not _use_ any of ... directly". > + > + The main function must be properly declared as > + > + int main(int argc, char **argv) > + I think "int main(void)" is also valid if the program doesn't use any command line arguments, in conformance with the C standard. See src/usr/bin/true/true.c for example. Best regards Oliver -- Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany ``We are all but compressed light'' (Albert Einstein) From owner-p4-projects@FreeBSD.ORG Sun Nov 15 14:53:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 219A0106568F; Sun, 15 Nov 2009 14:53: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 CE362106568B for ; Sun, 15 Nov 2009 14:53:52 +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 A2C088FC15 for ; Sun, 15 Nov 2009 14:53:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAFErqFA041566 for ; Sun, 15 Nov 2009 14:53:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAFErq9X041564 for perforce@freebsd.org; Sun, 15 Nov 2009 14:53:52 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 15 Nov 2009 14:53:52 GMT Message-Id: <200911151453.nAFErq9X041564@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 Precedence: bulk Cc: Subject: PERFORCE change 170641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2009 14:53:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=170641 Change 170641 by rene@rene_self on 2009/11/15 14:53:01 [porters handbook/clang]: * Add missing text [1] [2] * Elaborate a bit on CC and CXX variables [1] * Mention that "int main(void)" is also valid for Clang [2] * Mention the default C standards used Submitted by: remko [1], Oliver Fromme [2] Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#51 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#51 (text+ko) ==== @@ -13613,15 +13613,16 @@ - Respect CC and CXX. Do - not any of cc, c99, - gcc, c++, or - g++ directly. + Respect the CC and CXX + variables. Do not use any of the programs cc, + c99, gcc, + c++, or g++ in a port + directly. Respect LD, do not use - ld directly. + ld in a port directly. @@ -13632,10 +13633,11 @@ - If there are link errors related to missing or already - defined functions, try to add CSTD=gnu89 to - Makefile. The function vsnprintf() is - already built in. + Clang uses the C99 standard by default, while GCC uses the C89 + standard by default. Therefore, if there are any errors related + to missing or already defined functions, try to add + CSTD=gnu89 to + Makefile. @@ -13652,9 +13654,13 @@ - The main function must be properly declared as + The main function must be properly declared as: int main(int argc, char **argv) + + or, if there are no parameters, as: + + int main(void) From owner-p4-projects@FreeBSD.ORG Sun Nov 15 16:03:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 223BC106568D; Sun, 15 Nov 2009 16:03:34 +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 DA32A1065672; Sun, 15 Nov 2009 16:03:33 +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 7DCC28FC13; Sun, 15 Nov 2009 16:03:33 +0000 (UTC) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 56A171CDE9; Sun, 15 Nov 2009 17:03:32 +0100 (CET) Date: Sun, 15 Nov 2009 17:03:32 +0100 From: Ed Schouten To: Rene Ladan Message-ID: <20091115160332.GI64905@hoeg.nl> References: <200911142333.nAENXWrT017367@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="+bs7B30DeWCM5QK8" Content-Disposition: inline In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170633 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, 15 Nov 2009 16:03:34 -0000 --+bs7B30DeWCM5QK8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Rene Ladan wrote: > + > + If there are link errors related to missing or already > + defined functions, try to add CSTD=3Dgnu89 to > + Makefile. The function vsnprintf() is > + already built in. > + Port Makefiles should use USE_CSTD. Maybe we should also mention that? --=20 Ed Schouten WWW: http://80386.nl/ --+bs7B30DeWCM5QK8 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAksAJlQACgkQ52SDGA2eCwXGeACfe7+N/8HGV3TMENmb0FU4jvOm e5wAn1XAPzqKsWa2hoO0Ws9ZmQrYuO3T =Rm4w -----END PGP SIGNATURE----- --+bs7B30DeWCM5QK8-- From owner-p4-projects@FreeBSD.ORG Sun Nov 15 16:06:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C9E7106566C; Sun, 15 Nov 2009 16:06: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 20EA71065670 for ; Sun, 15 Nov 2009 16:06:45 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.26]) by mx1.freebsd.org (Postfix) with ESMTP id A3BC08FC17 for ; Sun, 15 Nov 2009 16:06:44 +0000 (UTC) Received: by ey-out-2122.google.com with SMTP id 9so1525982eyd.9 for ; Sun, 15 Nov 2009 08:06:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:references :in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=yvhIzamTOXeH4XuT1P5vG6k1O7HzlmdKfnveE+Vs1H4=; b=l2umBp8ZsokxjBXiSQtpF9NoYP79GKBdzHqRZSHKMg6E47SXuEYA82/zqXl/AnLf4W WP/tgGv36H1VOBrOW5I2nA+cbePRT34XAcfkIVYI28dA9Fy2dd0G8dFDuXvK0Pe/J3BX mhB8Va41dmJV3CusTKoltzVhqfqVk/9tExC+Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=geAMhm0ioFSl7TvuQt7KpvjTKANwdAFoOPtT6eAl2J19h4UlpFNqhiLhAROjr9Ab9c GabxY5+JP+2KL4T/es2edlkG4JpKOvQ2WomWrj49yiMKXRJkeTqpoNhJhK7DYsmtsJN4 k1zwZo2PSItWXw5Erprkbr5gR93jIwjTmt/9w= Received: by 10.213.0.216 with SMTP id 24mr4127072ebc.55.1258301203105; Sun, 15 Nov 2009 08:06:43 -0800 (PST) Received: from self.rene-ladan.nl (ip4da3ae31.direct-adsl.nl [77.163.174.49]) by mx.google.com with ESMTPS id 5sm3955543eyh.18.2009.11.15.08.06.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 15 Nov 2009 08:06:42 -0800 (PST) Sender: Rene Ladan Message-ID: <4B002710.6000103@freebsd.org> Date: Sun, 15 Nov 2009 17:06:40 +0100 From: Rene Ladan Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.23 (X11/20090826) MIME-Version: 1.0 To: Ed Schouten References: <200911142333.nAENXWrT017367@repoman.freebsd.org> <20091115160332.GI64905@hoeg.nl> In-Reply-To: <20091115160332.GI64905@hoeg.nl> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170633 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, 15 Nov 2009 16:06:45 -0000 Ed Schouten schreef: > * Rene Ladan wrote: >> + >> + If there are link errors related to missing or already >> + defined functions, try to add CSTD=gnu89 to >> + Makefile. The function vsnprintf() is >> + already built in. >> + > > Port Makefiles should use USE_CSTD. Maybe we should also mention that? > That's what I intended to write, I'll fix this. Rene -- http://www.rene-ladan.nl/ GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC (subkeys.pgp.net) From owner-p4-projects@FreeBSD.ORG Sun Nov 15 16:13:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 480A3106568B; Sun, 15 Nov 2009 16:13: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 0CDE2106566B for ; Sun, 15 Nov 2009 16:13:12 +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 EF66F8FC13 for ; Sun, 15 Nov 2009 16:13:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAFGDBMV049139 for ; Sun, 15 Nov 2009 16:13:11 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAFGDBqX049137 for perforce@freebsd.org; Sun, 15 Nov 2009 16:13:11 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 15 Nov 2009 16:13:11 GMT Message-Id: <200911151613.nAFGDBqX049137@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 Precedence: bulk Cc: Subject: PERFORCE change 170642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2009 16:13:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=170642 Change 170642 by rene@rene_self on 2009/11/15 16:12:53 [porters handbook/clang] * use correct variable name for port Makefile: USE_CSTD [1] * don't mention the "patch server" Submitted by: ed [1] Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 (text+ko) ==== @@ -13636,7 +13636,7 @@ Clang uses the C99 standard by default, while GCC uses the C89 standard by default. Therefore, if there are any errors related to missing or already defined functions, try to add - CSTD=gnu89 to + USE_CSTD=gnu89 to the port Makefile. @@ -13687,11 +13687,6 @@ -Werror. - - From owner-p4-projects@FreeBSD.ORG Sun Nov 15 20:09:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02D1B1065692; Sun, 15 Nov 2009 20:09: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 A30BC106568D for ; Sun, 15 Nov 2009 20:09:09 +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 5B2498FC12 for ; Sun, 15 Nov 2009 20:09:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAFK99J5080466 for ; Sun, 15 Nov 2009 20:09:09 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAFK99Gr080464 for perforce@freebsd.org; Sun, 15 Nov 2009 20:09:09 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 15 Nov 2009 20:09:09 GMT Message-Id: <200911152009.nAFK99Gr080464@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 Precedence: bulk Cc: Subject: PERFORCE change 170649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2009 20:09:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=170649 Change 170649 by pgj@beehive on 2009/11/15 20:08:21 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#4 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#74 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#23 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#18 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.1 2003/04/11 08:59:19 blackend Exp $ +.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.2 2009/11/13 08:51:10 roam Exp $ .\" .PS @@ -24,7 +24,7 @@ "\fC\s-2199.208.192.0/24\s+2\fP" "FW-1 protected nets" \ with .nw at G.w; box wid 1.2 invis \ - "\fC\s-2199.208.192.0/24\s+2\fP" "internal nets" \ + "\fC\s-2192.168.10.0/24\s+2\fP" "internal nets" \ with .ne at I.e; .PE ==== //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#4 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $ +# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.69 2009/11/15 18:40:26 remko Exp $ # # @@ -474,6 +474,7 @@ my $url = "${self_url_base}${PR}"; my $outp = ""; + my $qpcont = ""; my %mime_headers; my $mime_boundary; my $mime_endheader; @@ -596,6 +597,21 @@ if ($inresponse) { my $txt = $1; + # Detect Q-P line continuations, + # join them with the next line + # and process when the full line + # will be assembled. + if ($encoding == ENCODING_QP) { + if ($txt =~ /=$/) { + $txt =~ s/=$//; + $qpcont .= $txt; + next; + } else { + $txt = $qpcont . $txt; + $qpcont = ""; + } + } + if ($txt !~ /^-+$/ && $txt !~ /(?:cut|snip)/i && $txt =~ /^--(\S+)$/) { $mime_boundary = $1 if (!defined $mime_boundary && !$inpatch); @@ -657,11 +673,10 @@ } if ($encoding == ENCODING_BASE64) { + next if $txt =~ /:/; $outp .= $txt; next; } elsif ($encoding == ENCODING_QP) { - # XXX: lines ending in = should be joined - $txt =~ s/=$//; $txt = decode_qp($txt); } @@ -1013,7 +1028,7 @@ } if (($inpatch & PATCH_BASE64) && $getpatch) { - $outp .= $_; + $outp .= $_ unless /:/; return 1; } @@ -1107,8 +1122,8 @@ unless (!$getpatch and $inpatch & PATCH_UUENC_BIN); $outp = htmlclean($outp) unless ($getpatch); print $outp; - $inpatch ^= PATCH_UUENC; $outp = ""; - $inpatch ^= PATCH_UUENC_BIN; + $outp = ""; + $inpatch &= ~(PATCH_UUENC | PATCH_UUENC_BIN); # No outer container? sprint('patchblock_tfoot') if (!$inpatch and !$getpatch); ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: www/hu/share/sgml/events.xml,v 1.9 2009/10/22 23:02:11 pgj Exp $ + $FreeBSD: www/hu/share/sgml/events.xml,v 1.10 2009/11/11 16:45:32 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.25 2009/10/30 20:54:26 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.26 2009/11/11 16:45:32 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#74 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.276 2009/11/09 05:24:00 linimon Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $ @@ -33,6 +33,27 @@ 2009 + 11 + + + 12 + + + &os; 8.0-RC3 Available + +

The third of the Release Candidates for the &os;-8.0 + release cycle is now available. ISO images for Tier-1 + architectures and a memory stick image for + amd64/i386 are now available + on most of the &os; + mirror sites.

+ + + + + 10 ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#23 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.88 2009/09/03 16:58:37 jkoshy Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.90 2009/11/12 14:02:25 jkoshy Exp $ @@ -17,6 +17,30 @@ 2009 + 11 + + + FreeNAS 0.7 adds ZFS support + http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html + The H + http://www.h-online.com/ + 09 November 2009 + crve +

A description of the new features in version 0.7 of the FreeBSD-based FreeNAS project.

+ + + + Update your FreeBSD software with care + http://blogs.techrepublic.com.com/security/?p=2615 + Tech Republic + http://www.techrepublic.com/ + 09 November 2009 + Chad Perrin +

Chad Perrin describes how he keeps his FreeBSD system up to date.

+ + + + 8 ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#18 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -19,6 +19,28 @@ 2009 + 11 + + + 12 + + + Megjelent a &os; 8.0-RC3! + +

A &os; 8.0 kiadási ciklusának harmadik + kiadásra jelölt változata végre + megérkezett. ISO formátumban az összes + Tier 1, valamint pendrive formátumban + pedig amd64 és i386 architektúrákra érhetõek el + lemezképek, melyek a legtöbb &os; tükrözésen + már megtalálhatóak.

+ + + + + 10 ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#25 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,34 @@ 2009 + 11 + + + A FreeNAS 0.7 ZFS támogatással érkezik + http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html + The H + http://www.h-online.com/ + 2009. november 9. + crve +

A &os; alapú FreeNAS projekt 0.7-es + kiadásának újdonságainak + bemutatása.

+ + + + Hogyan frissítsük szoftvereinket egy &os; + rendszeren + http://vlogs.techrepublic.com.com/security/?p=2615 + Tech Republic + http://www.techrepublic.com/ + 2009. november 9. + Chad Perrin +

Chad Perrin bemutatja miként szokta frissíteni + &os; rendszerét.

+ + + + 8 From owner-p4-projects@FreeBSD.ORG Sun Nov 15 21:05:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE6881065767; Sun, 15 Nov 2009 21:05: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 A1A9D1065757 for ; Sun, 15 Nov 2009 21:05:05 +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 758C38FC0C for ; Sun, 15 Nov 2009 21:05:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAFL558m095954 for ; Sun, 15 Nov 2009 21:05:05 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAFL55e7095952 for perforce@freebsd.org; Sun, 15 Nov 2009 21:05:05 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 15 Nov 2009 21:05:05 GMT Message-Id: <200911152105.nAFL55e7095952@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 Precedence: bulk Cc: Subject: PERFORCE change 170651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2009 21:05:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=170651 Change 170651 by pgj@beehive on 2009/11/15 21:04:16 MFen (doc): 1.18 -> 1.19 hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml 1.20 -> 1.21 hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#13 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml - %SRCID% 1.18 + %SRCID% 1.19 --> @@ -101,13 +101,14 @@ - &man.chroot.2; (parancs) + &man.chroot.8; (parancs) - A &os; azon rendszerhívása, amely egy - program és annak leszármazottjai - futtatása során megváltoztatja a - gyökérkönyvtárat. (change - root) + Egy segédprogram, amely a &os; &man.chroot.2; + rendszerhívásán keresztül egy + program és annak leszármazottjainak + futtatásához megváltoztatja a rendszer + gyökérkönyvtárát (change + root). ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#13 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml - %SRCID% 1.20 + %SRCID% 1.21 --> @@ -953,7 +953,7 @@ - VMware-rel MacOS-en + VMWare-rel MacOS-en A &mac;-ek számára fejlesztett VMWare Fusion egy olyan kereskedelmi @@ -1218,7 +1218,7 @@ évekig nem kapott hivatalosan támogatást egyetlen elterjedtebb virtualizációs megoldás részérõl sem. Sokan erre a célra eddig - a VMware korábbi és + a VMWare korábbi és inkább már elavult, a &linux; kompatibilitási rétegre épülõ változatait (mint például Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D0351065679; Sun, 15 Nov 2009 21:51: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 0F328106566B; Sun, 15 Nov 2009 21:51:59 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-px0-f182.google.com (mail-px0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id D21088FC08; Sun, 15 Nov 2009 21:51:58 +0000 (UTC) Received: by pxi12 with SMTP id 12so3500364pxi.3 for ; Sun, 15 Nov 2009 13:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=4BJNElDj3MSHhYVK/aYZy8KAPwukldbkyF3TIzR14/g=; b=ihCdoaJm/93BXVx4LZzjQmuduBWgLg4nLL8DMokvfCTsn8JOHkMbFE81af0wDpaegS /Zl+zlY1a5ISpVEvLC7jYjpDhd6ItiaC/nVzAtd5ve8dupEUdln9SM/7j0PLMo1ltxIf AswS2znDqBzvEwudb4AP3wN84W/n1vF2135uE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=lZtu1YeB7YxlNQfU2bm206q9Gbu4FzpTS6O1RaO84v0RF8JXWGREOGUi3wJoeg/+S2 ETBiV4rR8eIMGfEFwEKjbQloFny4PH6z4A8wLBYBGvzCFMgCExYi5YaMrjd9HD8pvXjs KzQjoEOuoTCB4tI3M4a0tWEinlrhLrRL4kvP4= MIME-Version: 1.0 Sender: yanegomi@gmail.com Received: by 10.143.25.38 with SMTP id c38mr715865wfj.253.1258320259394; Sun, 15 Nov 2009 13:24:19 -0800 (PST) In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org> References: <200911142333.nAENXWrT017367@repoman.freebsd.org> Date: Sun, 15 Nov 2009 13:24:19 -0800 X-Google-Sender-Auth: 6ddae1dcde973a5b Message-ID: <364299f40911151324k6006e335ga40f6c4ea5c8331c@mail.gmail.com> From: Garrett Cooper To: Rene Ladan Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170633 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, 15 Nov 2009 21:51:59 -0000 On Sat, Nov 14, 2009 at 3:33 PM, Rene Ladan wrote: > http://p4web.freebsd.org/chv.cgi?CH=3D170633 > > Change 170633 by rene@rene_self on 2009/11/14 23:32:57 > > =A0 =A0 =A0 =A0[porters handbook] > =A0 =A0 =A0 =A0Add a section about Clang to the "Dos and Don'ts" chapter. > =A0 =A0 =A0 =A0To be reviewed by the clang team and the doc review team. > > Affected files ... > > .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/boo= k.sgml#50 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-ha= ndbook/book.sgml#50 (text+ko) =3D=3D=3D=3D > > @@ -13602,6 +13602,92 @@ > =A0 =A0 =A0 =A0 =A0shorthand solution. > =A0 =A0 =A0 > > + =A0 =A0 =A0 > + =A0 =A0 =A0 Clang: new C/C++ compiler > + > + =A0 =A0 =A0 A future version of &os; will likely have the Clang C= /C++ > + =A0 =A0 =A0 =A0 compiler as its base compiler. =A0Some modifications to= the Ports > + =A0 =A0 =A0 =A0 Collection are necessary. =A0In general, these are write proper > + =A0 =A0 =A0 =A0 =A0 ports and write proper source code. =A0More > + =A0 =A0 =A0 =A0 specifically: > + > + =A0 =A0 =A0 > + =A0 =A0 =A0 =A0 > + =A0 =A0 =A0 =A0 =A0 Respect CC and CX= X. Do > + =A0 =A0 =A0 =A0 =A0 =A0 not any of cc, c= 99, > + =A0 =A0 =A0 =A0 =A0 =A0 gcc, c++, or > + =A0 =A0 =A0 =A0 =A0 =A0 g++ directly. > + =A0 =A0 =A0 =A0 This is good practice for writing portable Makefile's, anyhow. Cheers! -Garrett From owner-p4-projects@FreeBSD.ORG Mon Nov 16 13:51:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 164EB1065679; Mon, 16 Nov 2009 13:51: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 B639E1065676 for ; Mon, 16 Nov 2009 13:51:52 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A43A28FC1E for ; Mon, 16 Nov 2009 13:51:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAGDpqPQ025772 for ; Mon, 16 Nov 2009 13:51:52 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAGDpqgw025770 for perforce@freebsd.org; Mon, 16 Nov 2009 13:51:52 GMT (envelope-from mav@freebsd.org) Date: Mon, 16 Nov 2009 13:51:52 GMT Message-Id: <200911161351.nAGDpqgw025770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2009 13:51:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=170666 Change 170666 by mav@mav_mavtest on 2009/11/16 13:51:06 Disable PortMultiplier Async Notifications for time of ports reset. They are useless at that time, but confuse Marvell AHCI. Add quirk for SiI57XX Port Multipliers, to hide extra port. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#18 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#18 (text+ko) ==== @@ -63,11 +63,12 @@ typedef enum { PMP_STATE_NORMAL, PMP_STATE_PORTS, - PMP_STATE_CONFIG, + PMP_STATE_PRECONFIG, PMP_STATE_RESET, PMP_STATE_CONNECT, PMP_STATE_CHECK, PMP_STATE_CLEAR, + PMP_STATE_CONFIG, PMP_STATE_SCAN } pmp_state; @@ -436,7 +437,7 @@ pmp_default_timeout * 1000); ata_pm_read_cmd(ataio, 2, 15); break; - case PMP_STATE_CONFIG: + case PMP_STATE_PRECONFIG: cam_fill_ataio(ataio, pmp_retry_count, pmpdone, @@ -445,7 +446,7 @@ /*data_ptr*/NULL, /*dxfer_len*/0, pmp_default_timeout * 1000); - ata_pm_write_cmd(ataio, 0x60, 15, 0xf); + ata_pm_write_cmd(ataio, 0x60, 15, 0x0); break; case PMP_STATE_RESET: cam_fill_ataio(ataio, @@ -495,6 +496,17 @@ pmp_default_timeout * 1000); ata_pm_write_cmd(ataio, 1, softc->pm_step, 0xFFFFFFFF); break; + case PMP_STATE_CONFIG: + cam_fill_ataio(ataio, + pmp_retry_count, + pmpdone, + /*flags*/CAM_DIR_NONE, + 0, + /*data_ptr*/NULL, + /*dxfer_len*/0, + pmp_default_timeout * 1000); + ata_pm_write_cmd(ataio, 0x60, 15, 0xf); + break; default: break; } @@ -554,24 +566,29 @@ (done_ccb->ataio.res.lba_mid << 16) + (done_ccb->ataio.res.lba_low << 8) + done_ccb->ataio.res.sector_count; - /* This PM declares 6 ports, while only 5 of them are real. + /* This PMP declares 6 ports, while only 5 of them are real. * Port 5 is enclosure management bridge port, which has implementation * problems, causing probe faults. Hide it for now. */ if (softc->pm_pid == 0x37261095 && softc->pm_ports == 6) softc->pm_ports = 5; - /* This PM declares 7 ports, while only 5 of them are real. + /* This PMP declares 7 ports, while only 5 of them are real. * Port 5 is some fake "Config Disk" with 640 sectors size, * port 6 is enclosure management bridge port. * Both fake ports has implementation problems, causing * probe faults. Hide them for now. */ if (softc->pm_pid == 0x47261095 && softc->pm_ports == 7) softc->pm_ports = 5; + /* These PMPs declare one more port then actually have, + * for configuration purposes. Hide it for now. */ + if (softc->pm_pid == 0x57231095 || softc->pm_pid == 0x57331095 || + softc->pm_pid == 0x57341095 || softc->pm_pid == 0x57441095) + softc->pm_ports--; printf("PM ports: %d\n", softc->pm_ports); - softc->state = PMP_STATE_CONFIG; + softc->state = PMP_STATE_PRECONFIG; xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; - case PMP_STATE_CONFIG: + case PMP_STATE_PRECONFIG: softc->pm_step = 0; softc->state = PMP_STATE_RESET; softc->reset |= ~softc->found; @@ -658,11 +675,15 @@ return; case PMP_STATE_CLEAR: softc->pm_step++; - if (softc->pm_step < softc->pm_ports) { - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; - } else if (softc->found) { + if (softc->pm_step >= softc->pm_ports) { + softc->state = PMP_STATE_CONFIG; + softc->pm_step = 0; + } + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + case PMP_STATE_CONFIG: + if (softc->found) { softc->pm_step = 0; softc->state = PMP_STATE_SCAN; work_ccb = xpt_alloc_ccb_nowait(); From owner-p4-projects@FreeBSD.ORG Mon Nov 16 19:42:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA0811065698; Mon, 16 Nov 2009 19:42:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEB8A1065696 for ; Mon, 16 Nov 2009 19:42:44 +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 9BBA78FC19 for ; Mon, 16 Nov 2009 19:42:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAGJgiYm067200 for ; Mon, 16 Nov 2009 19:42:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAGJgiTX067198 for perforce@freebsd.org; Mon, 16 Nov 2009 19:42:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 16 Nov 2009 19:42:44 GMT Message-Id: <200911161942.nAGJgiTX067198@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 Precedence: bulk Cc: Subject: PERFORCE change 170673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2009 19:42:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=170673 Change 170673 by hselasky@hselasky_laptop001 on 2009/11/16 19:42:38 LibUSB: - Fix minor memory leak: Make sure leftover USB transfers get closed at device close. - Reported by: Rob Jenssen Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.c#10 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.c#10 (text+ko) ==== @@ -263,6 +263,10 @@ void libusb20_tr_stop(struct libusb20_transfer *xfer) { + if (!xfer->is_opened) { + /* transfer is not opened */ + return; + } if (!xfer->is_pending) { /* transfer not pending */ return; @@ -280,6 +284,10 @@ void libusb20_tr_drain(struct libusb20_transfer *xfer) { + if (!xfer->is_opened) { + /* transfer is not opened */ + return; + } /* make sure that we are cancelling */ libusb20_tr_stop(xfer); @@ -418,6 +426,10 @@ void libusb20_tr_submit(struct libusb20_transfer *xfer) { + if (!xfer->is_opened) { + /* transfer is not opened */ + return; + } if (xfer->is_pending) { /* should not happen */ return; @@ -433,6 +445,10 @@ void libusb20_tr_start(struct libusb20_transfer *xfer) { + if (!xfer->is_opened) { + /* transfer is not opened */ + return; + } if (xfer->is_pending) { if (xfer->is_cancel) { /* cancelling - restart */ @@ -461,7 +477,14 @@ for (x = 0; x != pdev->nTransfer; x++) { xfer = pdev->pTransfer + x; + if (!xfer->is_opened) { + /* transfer is not opened */ + continue; + } + libusb20_tr_drain(xfer); + + libusb20_tr_close(xfer); } if (pdev->pTransfer != NULL) { From owner-p4-projects@FreeBSD.ORG Mon Nov 16 20:05:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAA8A106568D; Mon, 16 Nov 2009 20:05: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 9E9301065670; Mon, 16 Nov 2009 20:05:57 +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 40FB58FC12; Mon, 16 Nov 2009 20:05:57 +0000 (UTC) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 311251CE40; Mon, 16 Nov 2009 21:05:56 +0100 (CET) Date: Mon, 16 Nov 2009 21:05:56 +0100 From: Ed Schouten To: Rene Ladan Message-ID: <20091116200556.GR64905@hoeg.nl> References: <200911151613.nAFGDBqX049137@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ulKx6OyYBbhdAroi" Content-Disposition: inline In-Reply-To: <200911151613.nAFGDBqX049137@repoman.freebsd.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170642 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, 16 Nov 2009 20:05:58 -0000 --ulKx6OyYBbhdAroi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello Rene! * Rene Ladan wrote: > @@ -13636,7 +13636,7 @@ > Clang uses the C99 standard by default, while GCC uses the C89 > standard by default. Therefore, if there are any errors related > to missing or already defined functions, try to add > - CSTD=3Dgnu89 to > + USE_CSTD=3Dgnu89 to the port > Makefile. > Maybe the sentence should be rephrased as: "Therefore, if there are any linker errors caused by the different semantics of inline, compiler errors caused by the use of reserved C99 keywords (i.e. restrict) or calls to unimplemented ISO C99 math routines, try to add..." --=20 Ed Schouten WWW: http://80386.nl/ --ulKx6OyYBbhdAroi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAksBsKQACgkQ52SDGA2eCwUAsACdHJ8F/lTDZILnBZ6ENWmJ3vPt H1YAn2LsCzda6YOI3cc8z4pvn1SrELEk =L7Z3 -----END PGP SIGNATURE----- --ulKx6OyYBbhdAroi-- From owner-p4-projects@FreeBSD.ORG Mon Nov 16 20:09:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794901065676; Mon, 16 Nov 2009 20:09: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 3DB26106566B for ; Mon, 16 Nov 2009 20:09:12 +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 10C958FC21 for ; Mon, 16 Nov 2009 20:09:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAGK9BVe069997 for ; Mon, 16 Nov 2009 20:09:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAGK9Bi4069995 for perforce@freebsd.org; Mon, 16 Nov 2009 20:09:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 16 Nov 2009 20:09:11 GMT Message-Id: <200911162009.nAGK9Bi4069995@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 Precedence: bulk Cc: Subject: PERFORCE change 170675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2009 20:09:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=170675 Change 170675 by hselasky@hselasky_laptop001 on 2009/11/16 20:08:37 USB controller: - temporary fix for dynamic fifo sizing. - correct a register definition Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#28 (text+ko) ==== @@ -1688,12 +1688,14 @@ musbotg_init(struct musbotg_softc *sc) { struct usb_hw_ep_profile *pf; + uint16_t offset; uint8_t nrx; uint8_t ntx; uint8_t temp; uint8_t fsize; uint8_t frx; uint8_t ftx; + uint8_t dynfifo; DPRINTFN(1, "start\n"); @@ -1776,11 +1778,20 @@ DPRINTFN(2, "Config Data: 0x%02x\n", sc->sc_conf_data); + dynfifo = (sc->sc_conf_data & MUSB2_MASK_CD_DYNFIFOSZ) ? 1 : 0; + + if (dynfifo) { + DPRINTFN(0, "Dynamic FIFO sizing detected! " + "Assuming 16Kbytes of FIFO RAM\n"); + } + DPRINTFN(2, "HW version: 0x%04x\n", MUSB2_READ_1(sc, MUSB2_REG_HWVERS)); /* initialise endpoint profiles */ + offset = 0; + for (temp = 1; temp <= sc->sc_ep_max; temp++) { pf = sc->sc_hw_ep_profile + temp; @@ -1791,9 +1802,33 @@ frx = (fsize & MUSB2_MASK_RX_FSIZE) / 16;; ftx = (fsize & MUSB2_MASK_TX_FSIZE); - DPRINTF("Endpoint %u FIFO size: IN=%u, OUT=%u\n", - temp, pf->max_in_frame_size, - pf->max_out_frame_size); + DPRINTF("Endpoint %u FIFO size: IN=%u, OUT=%u, DYN=%d\n", + temp, ftx, frx, dynfifo); + + if (dynfifo) { + if (frx && (temp <= nrx)) { + frx = 10; /* 1K */ + MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, + MUSB2_VAL_FIFOSZ_512 | + MUSB2_MASK_FIFODB); + + MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOADD, + offset >> 3); + + offset += (1 << frx); + } + if (ftx && (temp <= ntx)) { + ftx = 10; /* 1K */ + MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, + MUSB2_VAL_FIFOSZ_512 | + MUSB2_MASK_FIFODB); + + MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOADD, + offset >> 3); + + offset += (1 << ftx); + } + } if (frx && ftx && (temp <= nrx) && (temp <= ntx)) { pf->max_in_frame_size = 1 << ftx; @@ -1824,6 +1859,8 @@ } } + DPRINTFN(2, "Dynamic FIFO size = %d bytes\n", offset); + /* turn on default interrupts */ MUSB2_WRITE_1(sc, MUSB2_REG_INTUSBE, ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#8 (text+ko) ==== @@ -191,7 +191,7 @@ #define MUSB2_REG_EPFIFO(n) (0x0020 + (4*(n))) -#define MUSB2_REG_CONFDATA 0x000F /* EPN=0 */ +#define MUSB2_REG_CONFDATA (0x000F + MUSB2_REG_INDEXED_CSR) /* EPN=0 */ #define MUSB2_MASK_CD_UTMI_DW 0x01 #define MUSB2_MASK_CD_SOFTCONE 0x02 #define MUSB2_MASK_CD_DYNFIFOSZ 0x04 From owner-p4-projects@FreeBSD.ORG Mon Nov 16 20:35:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AED2D106566C; Mon, 16 Nov 2009 20:35: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 72ECE106568B for ; Mon, 16 Nov 2009 20:35:38 +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 602DA8FC20 for ; Mon, 16 Nov 2009 20:35:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAGKZcIM071953 for ; Mon, 16 Nov 2009 20:35:38 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAGKZcRQ071950 for perforce@freebsd.org; Mon, 16 Nov 2009 20:35:38 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 16 Nov 2009 20:35:38 GMT Message-Id: <200911162035.nAGKZcRQ071950@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 Precedence: bulk Cc: Subject: PERFORCE change 170676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2009 20:35:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=170676 Change 170676 by rene@rene_self on 2009/11/16 20:34:47 [porters-handbook/clang]: * Clang/GCC use the gnu99/gnu89 standard, not c99/c89 [1] * Improve text when to try USE_CSTD=gnu89 Submitted by: rdivacky [1], ed [2] Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#53 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#53 (text+ko) ==== @@ -13633,11 +13633,13 @@ - Clang uses the C99 standard by default, while GCC uses the C89 - standard by default. Therefore, if there are any errors related - to missing or already defined functions, try to add - USE_CSTD=gnu89 to the port - Makefile. + Clang uses the gnu99 standard by default, while GCC uses the + gnu89 standard by default. Therefore, if there are any linker + errors caused by the different semantics of + inline, compiler errors caused by the use of + reserved C99 keywords (i.e. restrict) or calls to unimplemented + ISO C99 math routines try to add USE_CSTD=gnu89 + to the port Makefile. From owner-p4-projects@FreeBSD.ORG Mon Nov 16 22:18:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D2021065698; Mon, 16 Nov 2009 22:18: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 60AFD106568F for ; Mon, 16 Nov 2009 22:18:22 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D40E8FC12 for ; Mon, 16 Nov 2009 22:18:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAGMIMZZ091885 for ; Mon, 16 Nov 2009 22:18:22 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAGMIM9l091881 for perforce@freebsd.org; Mon, 16 Nov 2009 22:18:22 GMT (envelope-from mav@freebsd.org) Date: Mon, 16 Nov 2009 22:18:22 GMT Message-Id: <200911162218.nAGMIM9l091881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2009 22:18:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=170686 Change 170686 by mav@mav_mavbook on 2009/11/16 22:17:56 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_from_text.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#14 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/atp.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#81 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#4 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/for1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/devinfo/devinfo.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.66 2009/11/14 22:08:32 jilles Exp $"); #include #include @@ -364,7 +364,9 @@ n1 = (union node *)stalloc(sizeof (struct nfor)); n1->type = NFOR; n1->nfor.var = wordtext; - if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) { + while (readtoken() == TNL) + ; + if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) { app = ≈ while (readtoken() == TWORD) { n2 = (union node *)stalloc(sizeof (struct narg)); ==== //depot/projects/scottl-camlock/src/lib/libc/locale/nl_langinfo.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.6 2005/01/20 09:17:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.7 2009/11/16 14:33:31 brueffer Exp $ .\" .Dd May 3, 2001 .Dt NL_LANGINFO 3 @@ -53,7 +53,7 @@ or to the category .Dv LC_ALL , -may overwrite buffer pointed by the return value. +may overwrite the buffer pointed to by the return value. .Sh RETURN VALUES In a locale where langinfo data is not defined, .Fn nl_langinfo ==== //depot/projects/scottl-camlock/src/lib/libc/nls/ko_KR.UTF-8.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $ +$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $ $ $ Message catalog for ko_KR.UTF-8 locale $ @@ -181,6 +181,16 @@ 87 ì†ì„±ì„ ì°¾ì„ ìˆ˜ 없습니다 $ EDOOFUS 88 í”„ë¡œê·¸ëž¨ìƒ ì˜¤ë¥˜ìž…ë‹ˆë‹¤ +$ EBADMSG +89 ìž˜ëª»ëœ ë©”ì‹œì§€ìž…ë‹ˆë‹¤ +$ EMULTIHOP +90 ë©€í‹°í™‰ì´ ì‹œë„ë˜ì—ˆìŠµë‹ˆë‹¤ +$ ENOLINK +91 ì—°ê²°ì´ ëŠê²¼ìŠµë‹ˆë‹¤ +$ EPROTO +92 í”„ë¡œí† ì½œì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ +$ ENOTCAPABLE +93 ì ‘ê·¼ ëŠ¥ë ¥ì´ ì¶©ë¶„ì¹˜ 않습니다 $ $ strsignal() support catalog $ @@ -230,7 +240,7 @@ $ SIGTTOU 22 정지 (í„°ë¯¸ë„ ì¶œë ¥) $ SIGIO -23 I/O possible +23 I/O 가능 $ SIGXCPU 24 CPU 사용 시간 초과 $ SIGXFSZ @@ -247,3 +257,39 @@ 30 ì‚¬ìš©ìž ì •ì˜ ì‹œê·¸ë„ 1 $ SIGUSR2 31 ì‚¬ìš©ìž ì •ì˜ ì‹œê·¸ë„ 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 호스트 ì´ë¦„ì´ ì§€ì›í•˜ì§€ 않는 주소군입니다 +$ EAI_AGAIN +2 주소 ë³€í™˜ì— ì¼ì‹œì ìœ¼ë¡œ 실패했습니다 +$ EAI_BADFLAGS +3 ìž˜ëª»ëœ ai_flags입니다 +$ EAI_FAIL +4 주소 ë³€í™˜ì— ì™„ì „ížˆ 실패했습니다 +$ EAI_FAMILY +5 지ì›ë˜ì§€ 않는 ai_family입니다 +$ EAI_MEMORY +6 메모리 í• ë‹¹ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ +$ 7 (obsolete) +7 호스트 ì´ë¦„ê³¼ ì¼ì¹˜í•˜ëŠ” 주소가 없습니다 +$ EAI_NONAME +8 호스트 ì´ë¦„ ë˜ëŠ” 서비스 ì´ë¦„ì´ ì§€ì •ë˜ì§€ 않았거나 ì•Œ 수 없습니다 +$ EAI_SERVICE +9 서비스 ì´ë¦„ì€ ai_socktypeì—ì„œ 지ì›ë˜ì§€ 않습니다 +$ EAI_SOCKTYPE +10 지ì›ë˜ì§€ 않는 ai_socktype입니다 +$ EAI_SYSTEM +11 시스템 오류가 errnoì— ë°˜í™˜ë˜ì—ˆìŠµë‹ˆë‹¤ +$ EAI_BADHINTS +12 ìž˜ëª»ëœ hints입니다 +$ EAI_PROTOCOL +13 ì•Œ 수 없는 í”„ë¡œí† ì½œì´ ë³€í™˜ë˜ì—ˆìŠµë‹ˆë‹¤ +$ EAI_OVERFLOW +14 ì¸ìž ë²„í¼ ê³µê°„ì´ ëª¨ìžëžë‹ˆë‹¤ +$ 0 +32766 성공 +$ NL_MSGMAX +32767 ì•Œ 수 없는 오류 ==== //depot/projects/scottl-camlock/src/lib/libc/nls/ko_KR.eucKR.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $ +$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $ $ $ Message catalog for ko_KR.eucKR locale $ @@ -181,6 +181,16 @@ 87 ¼Ó¼ºÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù $ EDOOFUS 88 ÇÁ·Î±×·¥»ó ¿À·ùÀÔ´Ï´Ù +$ EBADMSG +89 À߸øµÈ ¸Þ½ÃÁöÀÔ´Ï´Ù +$ EMULTIHOP +90 ¸ÖƼȩÀÌ ½ÃµµµÇ¾ú½À´Ï´Ù +$ ENOLINK +91 ¿¬°áÀÌ ²÷°å½À´Ï´Ù +$ EPROTO +92 ÇÁ·ÎÅäÄÝÀÌ À߸øµÇ¾ú½À´Ï´Ù +$ ENOTCAPABLE +93 Á¢±Ù ´É·ÂÀÌ ÃæºÐÄ¡ ¾Ê½À´Ï´Ù $ $ strsignal() support catalog $ @@ -230,7 +240,7 @@ $ SIGTTOU 22 Á¤Áö (Å͹̳ΠÃâ·Â) $ SIGIO -23 I/O possible +23 I/O °¡´É $ SIGXCPU 24 CPU »ç¿ë ½Ã°£ ÃÊ°ú $ SIGXFSZ @@ -247,3 +257,39 @@ 30 »ç¿ëÀÚ Á¤ÀÇ ½Ã±×³Î 1 $ SIGUSR2 31 »ç¿ëÀÚ Á¤ÀÇ ½Ã±×³Î 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 È£½ºÆ® À̸§ÀÌ Áö¿øÇÏÁö ¾Ê´Â ÁÖ¼Ò±ºÀÔ´Ï´Ù +$ EAI_AGAIN +2 ÁÖ¼Ò º¯È¯¿¡ ÀϽÃÀûÀ¸·Î ½ÇÆÐÇß½À´Ï´Ù +$ EAI_BADFLAGS +3 À߸øµÈ ai_flagsÀÔ´Ï´Ù +$ EAI_FAIL +4 ÁÖ¼Ò º¯È¯¿¡ ¿ÏÀüÈ÷ ½ÇÆÐÇß½À´Ï´Ù +$ EAI_FAMILY +5 Áö¿øµÇÁö ¾Ê´Â ai_familyÀÔ´Ï´Ù +$ EAI_MEMORY +6 ¸Þ¸ð¸® ÇÒ´ç¿¡ ½ÇÆÐÇß½À´Ï´Ù +$ 7 (obsolete) +7 È£½ºÆ® À̸§°ú ÀÏÄ¡ÇÏ´Â ÁÖ¼Ò°¡ ¾ø½À´Ï´Ù +$ EAI_NONAME +8 È£½ºÆ® À̸§ ¶Ç´Â ¼­ºñ½º À̸§ÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò°Å³ª ¾Ë ¼ö ¾ø½À´Ï´Ù +$ EAI_SERVICE +9 ¼­ºñ½º À̸§Àº ai_socktype¿¡¼­ Áö¿øµÇÁö ¾Ê½À´Ï´Ù +$ EAI_SOCKTYPE +10 Áö¿øµÇÁö ¾Ê´Â ai_socktypeÀÔ´Ï´Ù +$ EAI_SYSTEM +11 ½Ã½ºÅÛ ¿À·ù°¡ errno¿¡ ¹ÝȯµÇ¾ú½À´Ï´Ù +$ EAI_BADHINTS +12 À߸øµÈ hintsÀÔ´Ï´Ù +$ EAI_PROTOCOL +13 ¾Ë ¼ö ¾ø´Â ÇÁ·ÎÅäÄÝÀÌ º¯È¯µÇ¾ú½À´Ï´Ù +$ EAI_OVERFLOW +14 ÀÎÀÚ ¹öÆÛ °ø°£ÀÌ ¸ðÀÚ¶ø´Ï´Ù +$ 0 +32766 ¼º°ø +$ NL_MSGMAX +32767 ¾Ë ¼ö ¾ø´Â ¿À·ù ==== //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_from_text.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.12 2009/06/25 12:46:59 trasz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_from_text.c,v 1.13 2009/11/16 09:28:22 brueffer Exp $"); #include #include "namespace.h" @@ -257,6 +257,7 @@ } #endif + free(mybuf_p); return(acl); error_label: ==== //depot/projects/scottl-camlock/src/lib/libdevinfo/devinfo.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.6 2009/09/15 16:59:52 attilio Exp $ + * $FreeBSD: src/lib/libdevinfo/devinfo.h,v 1.7 2009/11/15 16:44:43 attilio Exp $ */ #ifndef _DEVINFO_H_INCLUDED @@ -32,20 +32,12 @@ #include #include +#include typedef __uintptr_t devinfo_handle_t; #define DEVINFO_ROOT_DEVICE ((devinfo_handle_t)0) -/* - * State of the device. - */ -/* XXX not sure if I want a copy here, or expose sys/bus.h */ -typedef enum devinfo_state { - DIS_NOTPRESENT = 10, /* not probed or probe failed */ - DIS_ALIVE = 20, /* probe succeeded */ - DIS_ATTACHED = 30, /* attach method called */ - DIS_BUSY = 40 /* device is open */ -} devinfo_state_t; +typedef enum device_state devinfo_state_t; struct devinfo_dev { devinfo_handle_t dd_handle; /* device handle */ ==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.463 2009/10/20 13:22:54 avg Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.464 2009/11/15 18:31:57 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -44,6 +44,7 @@ ath_hal.4 \ atkbd.4 \ atkbdc.4 \ + ${_atp.4} \ audit.4 \ auditpipe.4 \ aue.4 \ @@ -611,6 +612,7 @@ _amdsmb.4= amdsmb.4 _amdtemp.4= amdtemp.4 _asmc.4= asmc.4 +_atp.4= atp.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 _dpms.4= dpms.4 @@ -642,6 +644,10 @@ MLINKS+=lindev.4 full.4 .endif +.if ${MACHINE_ARCH} == "powerpc" +_atp.4= atp.4 +.endif + .if exists(${.CURDIR}/man4.${MACHINE_ARCH}) SUBDIR= man4.${MACHINE_ARCH} .endif ==== //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#11 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.367 2009/11/10 19:50:28 dougb Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.368 2009/11/15 23:31:07 dougb Exp $ .\" -.Dd September 23, 2009 +.Dd November 11, 2009 .Dt RC.CONF 5 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.33 2009/09/18 17:04:57 alc Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.34 2009/11/16 10:53:04 phk Exp $ */ @@ -105,7 +105,7 @@ #define NPML4EPG (PAGE_SIZE/(sizeof (pml4_entry_t))) #define NPML4EPGSHIFT 9 /* LOG2(NPML4EPG) */ #define PML4SHIFT 39 /* LOG2(NBPML4) */ -#define NBPML4 (1ul< -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.2 2009/10/31 10:43:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.3 2009/11/16 15:18:02 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#81 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.14 2009/11/14 20:06:04 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.15 2009/11/16 15:38:27 mav Exp $"); #include #include @@ -99,7 +99,14 @@ static struct { uint32_t id; const char *name; - int flags; + int quirks; +#define AHCI_Q_NOFORCE 1 +#define AHCI_Q_NOPMP 2 +#define AHCI_Q_NONCQ 4 +#define AHCI_Q_1CH 8 +#define AHCI_Q_2CH 16 +#define AHCI_Q_4CH 32 +#define AHCI_Q_EDGEIS 64 } ahci_ids[] = { {0x43801002, "ATI IXP600", 0}, {0x43901002, "ATI IXP700", 0}, @@ -145,6 +152,15 @@ {0x3b2b8086, "Intel PCH", 0}, {0x3b2c8086, "Intel PCH", 0}, {0x3b2f8086, "Intel PCH", 0}, + {0x2361197b, "JMicron JMB361", AHCI_Q_NOFORCE}, + {0x2363197b, "JMicron JMB363", AHCI_Q_NOFORCE}, + {0x2365197b, "JMicron JMB365", AHCI_Q_NOFORCE}, + {0x2366197b, "JMicron JMB366", AHCI_Q_NOFORCE}, + {0x2368197b, "JMicron JMB368", AHCI_Q_NOFORCE}, + {0x611111ab, "Marvell 88SX6111", AHCI_Q_NOFORCE|AHCI_Q_1CH|AHCI_Q_EDGEIS}, + {0x612111ab, "Marvell 88SX6121", AHCI_Q_NOFORCE|AHCI_Q_2CH|AHCI_Q_EDGEIS}, + {0x614111ab, "Marvell 88SX6141", AHCI_Q_NOFORCE|AHCI_Q_4CH|AHCI_Q_EDGEIS}, + {0x614511ab, "Marvell 88SX6145", AHCI_Q_NOFORCE|AHCI_Q_4CH|AHCI_Q_EDGEIS}, {0x044c10de, "NVIDIA MCP65", 0}, {0x044d10de, "NVIDIA MCP65", 0}, {0x044e10de, "NVIDIA MCP65", 0}, @@ -226,9 +242,39 @@ ahci_probe(device_t dev) { char buf[64]; + int i, valid = 0; + uint32_t devid = pci_get_devid(dev); + + /* Is this a possible AHCI candidate? */ + if (pci_get_class(dev) == PCIC_STORAGE && + pci_get_subclass(dev) == PCIS_STORAGE_SATA && + pci_get_progif(dev) == PCIP_STORAGE_SATA_AHCI_1_0) + valid = 1; + /* Is this a known AHCI chip? */ + for (i = 0; ahci_ids[i].id != 0; i++) { + if (ahci_ids[i].id == devid && + (valid || !(ahci_ids[i].quirks & AHCI_Q_NOFORCE))) { + snprintf(buf, sizeof(buf), "%s AHCI SATA controller", + ahci_ids[i].name); + device_set_desc_copy(dev, buf); + return (BUS_PROBE_VENDOR); + } + } + if (!valid) + return (ENXIO); + device_set_desc_copy(dev, "AHCI SATA controller"); + return (BUS_PROBE_VENDOR); +} + +static int +ahci_ata_probe(device_t dev) +{ + char buf[64]; int i; uint32_t devid = pci_get_devid(dev); + if ((intptr_t)device_get_ivars(dev) >= 0) + return (ENXIO); /* Is this a known AHCI chip? */ for (i = 0; ahci_ids[i].id != 0; i++) { if (ahci_ids[i].id == devid) { @@ -238,11 +284,6 @@ return (BUS_PROBE_VENDOR); } } - /* Is this a possible AHCI candidate? */ - if (pci_get_class(dev) != PCIC_STORAGE || - pci_get_subclass(dev) != PCIS_STORAGE_SATA || - pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0) - return (ENXIO); device_set_desc_copy(dev, "AHCI SATA controller"); return (BUS_PROBE_VENDOR); } @@ -252,10 +293,15 @@ { struct ahci_controller *ctlr = device_get_softc(dev); device_t child; - int error, unit, speed; + int error, unit, speed, i; + uint32_t devid = pci_get_devid(dev); u_int32_t version; ctlr->dev = dev; + i = 0; + while (ahci_ids[i].id != 0 && ahci_ids[i].id != devid) + i++; + ctlr->quirks = ahci_ids[i].quirks; resource_int_value(device_get_name(dev), device_get_unit(dev), "ccc", &ctlr->ccc); /* if we have a memory BAR(5) we are likely on an AHCI part */ @@ -282,10 +328,32 @@ rman_fini(&ctlr->sc_iomem); return (error); }; - /* Get the number of HW channels */ + /* Get the HW capabilities */ + version = ATA_INL(ctlr->r_mem, AHCI_VS); + ctlr->caps = ATA_INL(ctlr->r_mem, AHCI_CAP); + if (version >= 0x00010020) + ctlr->caps2 = ATA_INL(ctlr->r_mem, AHCI_CAP2); ctlr->ichannels = ATA_INL(ctlr->r_mem, AHCI_PI); + if (ctlr->quirks & AHCI_Q_1CH) { + ctlr->caps &= ~AHCI_CAP_NPMASK; + ctlr->ichannels &= 0x01; + } + if (ctlr->quirks & AHCI_Q_2CH) { + ctlr->caps &= ~AHCI_CAP_NPMASK; + ctlr->caps |= 1; + ctlr->ichannels &= 0x03; + } + if (ctlr->quirks & AHCI_Q_4CH) { + ctlr->caps &= ~AHCI_CAP_NPMASK; + ctlr->caps |= 3; + ctlr->ichannels &= 0x0f; + } ctlr->channels = MAX(flsl(ctlr->ichannels), - (ATA_INL(ctlr->r_mem, AHCI_CAP) & AHCI_CAP_NPMASK) + 1); + (ctlr->caps & AHCI_CAP_NPMASK) + 1); + if (ctlr->quirks & AHCI_Q_NOPMP) + ctlr->caps &= ~AHCI_CAP_SPM; + if (ctlr->quirks & AHCI_Q_NONCQ) + ctlr->caps &= ~AHCI_CAP_SNCQ; /* Setup interrupts. */ if (ahci_setup_interrupt(dev)) { bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); @@ -293,10 +361,6 @@ return ENXIO; } /* Announce HW capabilities. */ - version = ATA_INL(ctlr->r_mem, AHCI_VS); - ctlr->caps = ATA_INL(ctlr->r_mem, AHCI_CAP); - if (version >= 0x00010020) - ctlr->caps2 = ATA_INL(ctlr->r_mem, AHCI_CAP2); speed = (ctlr->caps & AHCI_CAP_ISS) >> AHCI_CAP_ISS_SHIFT; device_printf(dev, "AHCI v%x.%02x with %d %sGbps ports, Port Multiplier %s\n", @@ -531,8 +595,15 @@ for (; unit < ctlr->channels; unit++) { if ((is & (1 << unit)) != 0 && (arg = ctlr->interrupt[unit].argument)) { - ctlr->interrupt[unit].function(arg); - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); + if (ctlr->quirks & AHCI_Q_EDGEIS) { + /* Some controller have edge triggered IS. */ + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); + ctlr->interrupt[unit].function(arg); + } else { + /* but AHCI declares level triggered IS. */ + ctlr->interrupt[unit].function(arg); + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); + } } } } @@ -665,6 +736,25 @@ sizeof(struct ahci_controller) }; DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, 0, 0); +static device_method_t ahci_ata_methods[] = { + DEVMETHOD(device_probe, ahci_ata_probe), + DEVMETHOD(device_attach, ahci_attach), + DEVMETHOD(device_detach, ahci_detach), + DEVMETHOD(device_suspend, ahci_suspend), + DEVMETHOD(device_resume, ahci_resume), + DEVMETHOD(bus_print_child, ahci_print_child), + DEVMETHOD(bus_alloc_resource, ahci_alloc_resource), + DEVMETHOD(bus_release_resource, ahci_release_resource), + DEVMETHOD(bus_setup_intr, ahci_setup_intr), + DEVMETHOD(bus_teardown_intr,ahci_teardown_intr), + { 0, 0 } +}; +static driver_t ahci_ata_driver = { + "ahci", + ahci_ata_methods, + sizeof(struct ahci_controller) +}; +DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, 0, 0); MODULE_VERSION(ahci, 1); MODULE_DEPEND(ahci, cam, 1, 1, 1); @@ -688,6 +778,7 @@ ch->unit = (intptr_t)device_get_ivars(dev); ch->caps = ctlr->caps; ch->caps2 = ctlr->caps2; + ch->quirks = ctlr->quirks; ch->numslots = ((ch->caps & AHCI_CAP_NCS) >> AHCI_CAP_NCS_SHIFT) + 1, mtx_init(&ch->mtx, "AHCI channel lock", NULL, MTX_DEF); resource_int_value(device_get_name(dev), @@ -858,7 +949,7 @@ ahcich_methods, sizeof(struct ahci_channel) }; -DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahci_devclass, 0, 0); +DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, 0, 0); struct ahci_dc_cb_args { bus_addr_t maddr; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#27 (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/dev/ahci/ahci.h,v 1.4 2009/11/03 11:47:07 mav Exp $ + * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.5 2009/11/16 15:38:27 mav Exp $ */ /* ATA register defines */ @@ -352,6 +352,7 @@ struct cam_path *path; uint32_t caps; /* Controller capabilities */ uint32_t caps2; /* Controller capabilities */ + int quirks; int numslots; /* Number of present slots */ int pm_level; /* power management level */ int sata_rev; /* Maximum allowed SATA generation */ @@ -391,6 +392,7 @@ } irqs[16]; uint32_t caps; /* Controller capabilities */ uint32_t caps2; /* Controller capabilities */ + int quirks; int numirqs; int channels; int ichannels; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.145 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.146 2009/11/16 15:38:27 mav Exp $"); #include "opt_ata.h" #include @@ -189,91 +189,138 @@ return error; } +int +ata_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +{ + + return (BUS_READ_IVAR(device_get_parent(dev), dev, which, result)); +} + +int +ata_pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value) +{ + + return (BUS_WRITE_IVAR(device_get_parent(dev), dev, which, value)); +} + +uint32_t +ata_pci_read_config(device_t dev, device_t child, int reg, int width) +{ + + return (pci_read_config(dev, reg, width)); +} + +void +ata_pci_write_config(device_t dev, device_t child, int reg, + uint32_t val, int width) +{ + + pci_write_config(dev, reg, val, width); +} + struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - struct ata_pci_controller *controller = device_get_softc(dev); - int unit = ((struct ata_channel *)device_get_softc(child))->unit; - struct resource *res = NULL; - int myrid; + struct ata_pci_controller *controller = device_get_softc(dev); + struct resource *res = NULL; - if (type == SYS_RES_IOPORT) { - switch (*rid) { - case ATA_IOADDR_RID: - if (controller->legacy) { - start = (unit ? ATA_SECONDARY : ATA_PRIMARY); - count = ATA_IOSIZE; - end = start + count - 1; - } - myrid = PCIR_BAR(0) + (unit << 3); - res = BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, - SYS_RES_IOPORT, &myrid, - start, end, count, flags); - break; + if (device_get_devclass(child) == ata_devclass) { + int unit = ((struct ata_channel *)device_get_softc(child))->unit; + int myrid; - case ATA_CTLADDR_RID: - if (controller->legacy) { - start = (unit ? ATA_SECONDARY : ATA_PRIMARY) + ATA_CTLOFFSET; - count = ATA_CTLIOSIZE; - end = start + count - 1; - } - myrid = PCIR_BAR(1) + (unit << 3); - res = BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, - SYS_RES_IOPORT, &myrid, - start, end, count, flags); - break; - } - } - if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { - if (controller->legacy) { - int irq = (unit == 0 ? 14 : 15); + if (type == SYS_RES_IOPORT) { + switch (*rid) { + case ATA_IOADDR_RID: + if (controller->legacy) { + start = (unit ? ATA_SECONDARY : ATA_PRIMARY); + count = ATA_IOSIZE; + end = start + count - 1; + } + myrid = PCIR_BAR(0) + (unit << 3); + res = BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, + SYS_RES_IOPORT, &myrid, + start, end, count, flags); + break; + case ATA_CTLADDR_RID: + if (controller->legacy) { + start = (unit ? ATA_SECONDARY : ATA_PRIMARY) + + ATA_CTLOFFSET; + count = ATA_CTLIOSIZE; + end = start + count - 1; + } + myrid = PCIR_BAR(1) + (unit << 3); + res = BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, + SYS_RES_IOPORT, &myrid, + start, end, count, flags); + break; + } + } + if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) { + if (controller->legacy) { + int irq = (unit == 0 ? 14 : 15); - res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, - SYS_RES_IRQ, rid, irq, irq, 1, flags); + res = BUS_ALLOC_RESOURCE(device_get_parent(dev), child, + SYS_RES_IRQ, rid, irq, irq, 1, flags); + } else + res = controller->r_irq; + } + } else { + if (type == SYS_RES_IRQ) { + if (*rid != ATA_IRQ_RID) + return (NULL); + res = controller->r_irq; + } else { + res = BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, + type, rid, start, end, count, flags); + } } - else - res = controller->r_irq; - } - return res; + return (res); } int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { - struct ata_pci_controller *controller = device_get_softc(dev); - int unit = ((struct ata_channel *)device_get_softc(child))->unit; - if (type == SYS_RES_IOPORT) { - switch (rid) { - case ATA_IOADDR_RID: - return BUS_RELEASE_RESOURCE(device_get_parent(dev), dev, - SYS_RES_IOPORT, - PCIR_BAR(0) + (unit << 3), r); - break; + if (device_get_devclass(child) == ata_devclass) { + struct ata_pci_controller *controller = device_get_softc(dev); + int unit = ((struct ata_channel *)device_get_softc(child))->unit; - case ATA_CTLADDR_RID: - return BUS_RELEASE_RESOURCE(device_get_parent(dev), dev, - SYS_RES_IOPORT, - PCIR_BAR(1) + (unit << 3), r); - break; - default: - return ENOENT; + if (type == SYS_RES_IOPORT) { + switch (rid) { + case ATA_IOADDR_RID: + return BUS_RELEASE_RESOURCE(device_get_parent(dev), dev, + SYS_RES_IOPORT, + PCIR_BAR(0) + (unit << 3), r); + case ATA_CTLADDR_RID: + return BUS_RELEASE_RESOURCE(device_get_parent(dev), dev, + SYS_RES_IOPORT, + PCIR_BAR(1) + (unit << 3), r); + default: + return ENOENT; + } + } + if (type == SYS_RES_IRQ) { + if (rid != ATA_IRQ_RID) + return ENOENT; + if (controller->legacy) { + return BUS_RELEASE_RESOURCE(device_get_parent(dev), child, + SYS_RES_IRQ, rid, r); + } else + return 0; + } + } else { + if (type == SYS_RES_IRQ) { + if (rid != ATA_IRQ_RID) + return (ENOENT); + return (0); + } else { + return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child, + type, rid, r)); + } } - } - if (type == SYS_RES_IRQ) { - if (rid != ATA_IRQ_RID) - return ENOENT; - - if (controller->legacy) { - return BUS_RELEASE_RESOURCE(device_get_parent(dev), child, - SYS_RES_IRQ, rid, r); - } - else - return 0; - } - return EINVAL; + return (EINVAL); } int @@ -281,44 +328,50 @@ int flags, driver_filter_t *filter, driver_intr_t *function, void *argument, void **cookiep) { - struct ata_pci_controller *controller = device_get_softc(dev); + struct ata_pci_controller *controller = device_get_softc(dev); - if (controller->legacy) { - return BUS_SETUP_INTR(device_get_parent(dev), child, irq, + if (controller->legacy) { + return BUS_SETUP_INTR(device_get_parent(dev), child, irq, flags, filter, function, argument, cookiep); - } - else { - struct ata_pci_controller *controller = device_get_softc(dev); - int unit = ((struct ata_channel *)device_get_softc(child))->unit; + } else { + struct ata_pci_controller *controller = device_get_softc(dev); + int unit; - if (filter != NULL) { - printf("ata-pci.c: we cannot use a filter here\n"); - return (EINVAL); + if (filter != NULL) { + printf("ata-pci.c: we cannot use a filter here\n"); + return (EINVAL); + } + if (device_get_devclass(child) == ata_devclass) + unit = ((struct ata_channel *)device_get_softc(child))->unit; + else + unit = ATA_PCI_MAX_CH - 1; + controller->interrupt[unit].function = function; + controller->interrupt[unit].argument = argument; + *cookiep = controller; + return 0; } - controller->interrupt[unit].function = function; - controller->interrupt[unit].argument = argument; - *cookiep = controller; - return 0; - } } int ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie) { - struct ata_pci_controller *controller = device_get_softc(dev); + struct ata_pci_controller *controller = device_get_softc(dev); - if (controller->legacy) { - return BUS_TEARDOWN_INTR(device_get_parent(dev), child, irq, cookie); - } - else { - struct ata_pci_controller *controller = device_get_softc(dev); - int unit = ((struct ata_channel *)device_get_softc(child))->unit; + if (controller->legacy) { + return BUS_TEARDOWN_INTR(device_get_parent(dev), child, irq, cookie); + } else { + struct ata_pci_controller *controller = device_get_softc(dev); + int unit; - controller->interrupt[unit].function = NULL; - controller->interrupt[unit].argument = NULL; - return 0; - } + if (device_get_devclass(child) == ata_devclass) + unit = ((struct ata_channel *)device_get_softc(child))->unit; + else + unit = ATA_PCI_MAX_CH - 1; + controller->interrupt[unit].function = NULL; + controller->interrupt[unit].argument = NULL; + return 0; + } } static void @@ -510,12 +563,16 @@ DEVMETHOD(device_shutdown, bus_generic_shutdown), /* bus methods */ + DEVMETHOD(bus_read_ivar, ata_pci_read_ivar), + DEVMETHOD(bus_write_ivar, ata_pci_write_ivar), DEVMETHOD(bus_alloc_resource, ata_pci_alloc_resource), DEVMETHOD(bus_release_resource, ata_pci_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, ata_pci_setup_intr), DEVMETHOD(bus_teardown_intr, ata_pci_teardown_intr), + DEVMETHOD(pci_read_config, ata_pci_read_config), + DEVMETHOD(pci_write_config, ata_pci_write_config), { 0, 0 } }; @@ -537,6 +594,8 @@ { char buffer[32]; + if ((intptr_t)device_get_ivars(dev) < 0) + return (ENXIO); sprintf(buffer, "ATA channel %d", (int)(intptr_t)device_get_ivars(dev)); device_set_desc_copy(dev, buffer); @@ -711,7 +770,7 @@ struct ata_channel *ch; int unit; - for (unit = 0; unit < ctlr->channels; unit++) { + for (unit = 0; unit < ATA_PCI_MAX_CH; unit++) { if ((ch = ctlr->interrupt[unit].argument)) ctlr->interrupt[unit].function(ch); } ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#24 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.114 2009/11/13 22:53:49 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.115 2009/11/16 15:38:27 mav Exp $ */ /* structure holding chipset config info */ @@ -36,6 +36,8 @@ char *text; }; +#define ATA_PCI_MAX_CH 8 + /* structure describing a PCI ATA controller */ struct ata_pci_controller { device_t dev; @@ -65,7 +67,7 @@ struct { void (*function)(void *); void *argument; - } interrupt[8]; /* XXX SOS max ch# for now */ + } interrupt[ATA_PCI_MAX_CH]; void *chipset_data; }; @@ -486,6 +488,11 @@ int ata_pci_detach(device_t dev); int ata_pci_suspend(device_t dev); int ata_pci_resume(device_t dev); +int ata_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); +int ata_pci_write_ivar(device_t dev, device_t child, int which, uintptr_t value); +uint32_t ata_pci_read_config(device_t dev, device_t child, int reg, int width); +void ata_pci_write_config(device_t dev, device_t child, int reg, + uint32_t val, int width); struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r); int ata_pci_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, driver_intr_t *function, void *argument, void **cookiep); @@ -509,12 +516,6 @@ /* global prototypes from chipsets/ata-*.c */ int ata_ahci_chipinit(device_t); -int ata_ahci_ch_attach(device_t dev); -int ata_ahci_ch_detach(device_t dev); -int ata_ahci_ch_suspend(device_t dev); -int ata_ahci_ch_resume(device_t dev); -int ata_ahci_ctlr_reset(device_t dev); -void ata_ahci_reset(device_t dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 17 11:25:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5A11065676; Tue, 17 Nov 2009 11:25: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 405E1106566C for ; Tue, 17 Nov 2009 11:25:29 +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 2CEB88FC18 for ; Tue, 17 Nov 2009 11:25:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHBPTlF094372 for ; Tue, 17 Nov 2009 11:25:29 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHBPTwi094370 for perforce@freebsd.org; Tue, 17 Nov 2009 11:25:29 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Nov 2009 11:25:29 GMT Message-Id: <200911171125.nAHBPTwi094370@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 Precedence: bulk Cc: Subject: PERFORCE change 170696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 11:25:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=170696 Change 170696 by rene@rene_self on 2009/11/17 11:24:47 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/share/images/articles/checkpoint/networks.pic#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#23 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#56 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#18 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + - $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.7 2005/10/26 12:14:47 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.8 2009/11/14 22:20:12 manolis Exp $ 2004 @@ -283,7 +283,7 @@ Please use an appropriate human language for a particular mailing list. Many non-English mailing lists are - + available. For the ones that are not, we do appreciate that many ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.44 2009/08/05 01:48:18 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.47 2009/11/13 03:24:31 linimon Exp $ 2003 @@ -47,14 +47,14 @@ otherwise specified, all paths will be relative to this location. ${arch} will be used to specify one of the package architectures - (amd64, &i386;, and &sparc64;), and + (amd64, &i386;, ia64, powerpc, and &sparc64;), and ${branch} will be used - to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp). + to specify the build branch (6, 7, 7-exp, 8, 8-exp, 9, 9-exp). Packages are no longer built for Release 4 or 5, nor - for the alpha nor ia64 architectures. + for the alpha architecture. The scripts that control all of this live in @@ -141,7 +141,6 @@ /var/portbuild&prompt.root; scripts/mkbindist ${arch} ${branch} ${buildid} - The per-machine tarballs are located in ${arch}/clients. @@ -180,13 +179,6 @@ - dopackages.6-exp - Perform - a 6.X build with experimental patches - (6-exp branch) - - - - dopackages.7 - Perform a 7.X build @@ -476,6 +468,15 @@ + build create arch + branch + [newid] - Creates + newid (or a datestamp if not specified). + Only needed when bringing up a new branch or a new architecture. + + + + build clone arch branch oldid [newid] - Clones @@ -633,7 +634,7 @@ To free up resources, you will need to clean up client machines by running build cleanup command. For example: - &prompt.user; /var/portbuild/scripts/build cleanup i386 6-exp 20080714120411 -full + &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full If you forget to do this, then the old build chroots will not be cleaned up for 24 hours, and no @@ -656,8 +657,8 @@ will get you a df, and -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports" -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/src" +allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" +allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src" are supposed to get rid of the hanging mounts. You will have to keep doing them since there can be multiple mounts. @@ -665,10 +666,10 @@ Ignore the following: -umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: statfs: No such file or directory -umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: unknown file system -umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed! -/x/tmp/6-exp/chroot/53837/compat/linux/proc: not a file system root directory +umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: statfs: No such file or directory +umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: unknown file system +umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed! +/x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory The former 2 mean that that client did not have those mounted; the latter 2 are a bug. @@ -925,7 +926,11 @@ - packages-8-current + packages-8-stable + + + + packages-9-current @@ -1000,7 +1005,7 @@ new features or bugfixes to the ports infrastructure (i.e. bsd.port.mk), or to test large sweeping upgrades. The current experimental patches branch is - 7-exp on the amd64 + 8-exp on the amd64 architecture. In general, an experimental patches build is run the same @@ -1048,21 +1053,21 @@ Once the build finishes, compare the control build failures to those of the experimental patches build. Use the following - commands to facilitate this (this assumes the 7 - branch is the control branch, and the 7-exp + commands to facilitate this (this assumes the 8 + branch is the control branch, and the 8-exp branch is the experimental patches branch): - &prompt.user; cd /var/portbuild/i386/7-exp/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/7-exp-errs -&prompt.user; cd /var/portbuild/i386/7/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/7-errs + &prompt.user; cd /var/portbuild/i386/8-exp/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/8-exp-errs +&prompt.user; cd /var/portbuild/i386/8/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/8-errs If it has been a long time since one of the builds finished, the logs may have been automatically compressed with bzip2. In that case, you must use sort | sed 's,\.bz2,,g' instead. - &prompt.user; comm -3 /tmp/7-errs /tmp/7-exp-errs | less + &prompt.user; comm -3 /tmp/8-errs /tmp/8-exp-errs | less This last command will produce a two-column report. The first column is ports that failed on the control build but not in @@ -1117,7 +1122,7 @@ To differentiate between [1] and [2] above, you can do a rebuild of the affected packages under the control branch: - &prompt.user; cd /var/portbuild/i386/7/ports + &prompt.user; cd /var/portbuild/i386/8/ports Be sure to cvs update this tree to the same date as the experimental patches tree. @@ -1125,14 +1130,14 @@ The following command will set up the control branch for the partial build: - &prompt.user; /var/portbuild/scripts/dopackages.7 -noportscvs -nobuild -nocvs -nofinish + &prompt.user; /var/portbuild/scripts/dopackages.8 -noportscvs -nobuild -nocvs -nofinish The builds must be performed from the packages/All directory. This directory should initially be empty except for the Makefile symlink. If this symlink does not exist, it must be created: - &prompt.user; cd /var/portbuild/i386/7/packages/All + &prompt.user; cd /var/portbuild/i386/8/packages/All &prompt.user; ln -sf ../../Makefile . &prompt.user; make -k -j<#> <list of packages to build> @@ -1298,11 +1303,16 @@ Generate a kernel config file. Include GENERIC (or, if you are using more than 3.5G on &i386;, PAE). + + + Required options: +options NULLFS +options TMPFS + + Suggested options: options GEOM_CONCAT options GEOM_STRIPE -options NULLFS -options TMPFS options SHMMAXPGS=65536 options SEMMNI=40 options SEMMNS=240 @@ -1314,7 +1324,8 @@ For PAE, it is not currently possible - to load modules. Therefore, you will need to add: + to load modules. Therefore, if you are running an architecture + that supports Linux emulation, you will need to add: options COMPAT_LINUX options LINPROCFS @@ -1532,12 +1543,16 @@ Create - usr/local/etc/rc.d/portbuild.sh: + usr/local/etc/rc.d/portbuild.sh, + using the appropriate value for + scratchdir: #!/bin/sh # -# Configure the system post-boot +# Configure a package build system post-boot + +scratchdir=/usr2 -ln -sf /usr2/portbuild /var/portbuild +ln -sf ${scratchdir}/portbuild /var/portbuild # Identify builds ready for use cd /var/portbuild/${arch} @@ -1550,11 +1565,20 @@ # Flag that we are ready to accept jobs touch /tmp/.boot_finished + - - If there are machines from more than one cluster in the - same multicast domain (basically = LAN) then change the - multicast groups to different values (.71, .72, etc). + + Modify + usr/local/etc/rc.d/squid: +40c40 +< squid_chdir=${squid_chdir:-"/usr/local/squid/logs"} +--- +> squid_chdir=${squid_chdir:-"/usr2/squid/logs"} +43c43 +< squid_pidfile=${squid_pidfile:-"/usr/local/squid/logs/squid.pid"} +--- +> squid_pidfile=${squid_pidfile:-"/usr2/squid/logs/squid.pid"} + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.83 2009/06/24 22:25:26 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.84 2009/11/13 10:21:30 remko Exp $ &tm-attrib.freebsd; @@ -798,6 +798,17 @@ should be made bootable so that users of modern PCs do not need to create installation floppy disks. + If a custom kernel of &os; is to be included, then + &man.sysinstall.8; and &man.release.7; must be updated to + include installation instructions. The relevant code is contained + in src/release and src/usr.sbin/sysinstall. + Specifically, the file src/release/Makefile, and + dist.c, dist.h, + menus.c, install.c, and + Makefile will need to be updated under + src/usr.sbin/sysinstall. Optionally, you may choose + to update sysinstall.8. + If an alternate version of &xfree86; is to be provided, then &man.sysinstall.8; must be updated to reflect the new location and installation instructions. The relevant code is contained ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -477,16 +477,28 @@ &prompt.root; Xorg -config xorg.conf.new -retro If a black and grey grid and an X mouse cursor appear, - the configuration was successful. To exit the test, just press + the configuration was successful. To exit the test, switch to the + virtual console used to start it by pressing Ctrl Alt - Backspace - simultaneously. + Fn + (F1 for the first virtual console) + and press + + Ctrl + C + . - This key combination was enabled by default up to - &xorg; version 7.3. To enable it in + In &xorg; versions up to 7.3, + the + + Ctrl + Alt + Backspace + key combination could be used to break out of + &xorg;. To enable it in version 7.4 and later, you can either type the following command from any X terminal emulator: @@ -511,6 +523,13 @@ You will have to reboot your machine to force hald to read this file. + + The following line will also have to be added to + xorg.conf.new, in the + ServerLayout or ServerFlags + section: + + Option "DontZap" "off" If the mouse does not work, you will need to first ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -515,16 +515,21 @@ Als er een zwart/grijs rooster en een X muis cursor verschijnen was de instelling succesvol. Om de test te - stoppen dient gelijktijdig op + stoppen dient naar de virtuele console waarmee de test werd gestart + overgeschakeld te worden door op CtrlAlt - Backspace gedrukt te - worden. + Fn ( + F1 voor de eerste virtuele console) en CtrlC te + drukken. - Deze toetsencombinatie stond standaard aan tot en met - versie 7.3 van &xorg;. Om het in versie - 7.4 en hoger aan te zetten, kunt u òfwel het volgende commando - uitvoeren vanaf elke X-terminal-emulator: + Tot en met versie 7.3 van &xorg; kon + de toetsencombinatie Ctrl + AltBackspace gebruikt + worden om uit &xorg; te breken. Om het in + versie 7.4 en hoger aan te zetten, kunt u òfwel het volgende + commando uitvoeren vanaf elke X-terminal-emulator: &prompt.user; setxkbmap -option terminate:ctrl_alt_bksp @@ -546,6 +551,12 @@ U moet uw machine opnieuw opstarten om hald te forceren om dit bestand te lezen. + + De volgende regel dient ook aan de sectie + ServerLayout of ServerFlags van + xorg.conf.new te worden toegevoegd: + + Option "DontZap" "off" Als de muis niet werkt, dan moet deze eerst ingesteld From owner-p4-projects@FreeBSD.ORG Tue Nov 17 12:03:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99AC7106568D; Tue, 17 Nov 2009 12:03: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 5DE2510656A6 for ; Tue, 17 Nov 2009 12:03:07 +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 4BF018FC36 for ; Tue, 17 Nov 2009 12:03:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHC37Ej098205 for ; Tue, 17 Nov 2009 12:03:07 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHC37mu098203 for perforce@freebsd.org; Tue, 17 Nov 2009 12:03:07 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Nov 2009 12:03:07 GMT Message-Id: <200911171203.nAHC37mu098203@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 Precedence: bulk Cc: Subject: PERFORCE change 170700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 12:03:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=170700 Change 170700 by rene@rene_self on 2009/11/17 12:02:42 [porters handbook/clang] English lessons from mcl@ and aspell(1) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#54 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#54 (text+ko) ==== @@ -13607,9 +13607,9 @@ A future version of &os; will likely have the Clang C/C++ compiler as its base compiler. Some modifications to the Ports - Collection are necessary. In general, these are write proper - ports and write proper source code. More - specifically: + Collection are necessary. In general, these involve + generalizing the port and making the source + code portable. More specifically: @@ -13644,7 +13644,7 @@ The -traditional option is not supported, - so existing occurences have to be removed. No concensus has yet + so existing occurrences have to be removed. No consensus has yet been reached on ports abusing this option to preserve white space in text formatting. Note that the Clang preprocessor does not preserve white space. @@ -13666,7 +13666,7 @@ - The maximum useable optimization level is 3. Level 4 is + The maximum usable optimization level is 3. Level 4 is reserved for link-time optimization for the Clang backend. From owner-p4-projects@FreeBSD.ORG Tue Nov 17 16:11:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C99281065695; Tue, 17 Nov 2009 16:11: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 74A401065693 for ; Tue, 17 Nov 2009 16:11:24 +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 594278FC1D for ; Tue, 17 Nov 2009 16:11:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHGBOqd031749 for ; Tue, 17 Nov 2009 16:11:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHGBOrF031747 for perforce@freebsd.org; Tue, 17 Nov 2009 16:11:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 17 Nov 2009 16:11:24 GMT Message-Id: <200911171611.nAHGBOrF031747@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 Precedence: bulk Cc: Subject: PERFORCE change 170720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 16:11:25 -0000 http://p4web.freebsd.org/chv.cgi?CH=170720 Change 170720 by hselasky@hselasky_laptop001 on 2009/11/17 16:10:26 USB controller (device side) - correct some programming details Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#29 (text+ko) ==== @@ -1539,18 +1539,18 @@ /* Configure endpoint */ switch (ep_type) { case UE_INTERRUPT: - MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, MUSB2_MASK_CSRH_TXMODE | temp); break; case UE_ISOCHRONOUS: - MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, MUSB2_MASK_CSRH_TXMODE | MUSB2_MASK_CSRH_TXISO | temp); break; case UE_BULK: - MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRH, MUSB2_MASK_CSRH_TXMODE | temp); break; @@ -1600,18 +1600,18 @@ /* Configure endpoint */ switch (ep_type) { case UE_INTERRUPT: - MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, MUSB2_MASK_CSRH_RXNYET | temp); break; case UE_ISOCHRONOUS: - MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, MUSB2_MASK_CSRH_RXNYET | MUSB2_MASK_CSRH_RXISO | temp); break; case UE_BULK: - MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, wMaxPacket); + MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, wMaxPacket); MUSB2_WRITE_1(sc, MUSB2_REG_RXCSRH, temp); break; default: @@ -1807,23 +1807,35 @@ if (dynfifo) { if (frx && (temp <= nrx)) { - frx = 10; /* 1K */ - MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, - MUSB2_VAL_FIFOSZ_512 | - MUSB2_MASK_FIFODB); + if (temp < 8) { + frx = 10; /* 1K */ + MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, + MUSB2_VAL_FIFOSZ_512 | + MUSB2_MASK_FIFODB); + } else { + frx = 7; /* 128 bytes */ + MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, + MUSB2_VAL_FIFOSZ_128); + } - MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOADD, + MUSB2_WRITE_2(sc, MUSB2_REG_RXFIFOADD, offset >> 3); offset += (1 << frx); } if (ftx && (temp <= ntx)) { - ftx = 10; /* 1K */ - MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, - MUSB2_VAL_FIFOSZ_512 | - MUSB2_MASK_FIFODB); + if (temp < 8) { + ftx = 10; /* 1K */ + MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, + MUSB2_VAL_FIFOSZ_512 | + MUSB2_MASK_FIFODB); + } else { + ftx = 7; /* 128 bytes */ + MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, + MUSB2_VAL_FIFOSZ_128); + } - MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOADD, + MUSB2_WRITE_2(sc, MUSB2_REG_TXFIFOADD, offset >> 3); offset += (1 << ftx); From owner-p4-projects@FreeBSD.ORG Tue Nov 17 22:16:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CF061065670; Tue, 17 Nov 2009 22:16:34 +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 18E93106566C for ; Tue, 17 Nov 2009 22:16:34 +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 067CE8FC13 for ; Tue, 17 Nov 2009 22:16:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHMGYAv086349 for ; Tue, 17 Nov 2009 22:16:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHMGXsR086347 for perforce@freebsd.org; Tue, 17 Nov 2009 22:16:33 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Nov 2009 22:16:33 GMT Message-Id: <200911172216.nAHMGXsR086347@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 Precedence: bulk Cc: Subject: PERFORCE change 170754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 22:16:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=170754 Change 170754 by rene@rene_self on 2009/11/17 22:16:07 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#19 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#22 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -483,7 +483,8 @@ CVS Tutorial from Cal Poly. + url="http://users.csc.calpoly.edu/~gfisher/classes/205/handouts/cvs-basics.html">CVS Tutorial from California + Polytechnic State University. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -36,21 +36,21 @@ - How to install FreeBSD on an &intel;-based &apple; &macintosh; + How to install &os; on an &intel;-based &apple; &macintosh; computer. - How to install FreeBSD on Linux with &xen;. + How to install &os; on Linux with &xen;. - How to install FreeBSD on µsoft.windows; with + How to install &os; on µsoft.windows; with Virtual PC. - How to tune a FreeBSD system for best performance under + How to tune a &os; system for best performance under virtualization. @@ -60,11 +60,11 @@ - Understand the basics of &unix; and FreeBSD (Understand the basics of &unix; and &os; (). - Know how to install FreeBSD (Know how to install &os; (). Know how to set up your network connection ( - FreeBSD as a Guest OS + &os; as a Guest OS Parallels on MacOS Parallels Desktop for &mac; is a commercial software product available for &intel; based &apple; - &mac; computers running &macos; 10.4.6 or higher. FreeBSD is a + &mac; computers running &macos; 10.4.6 or higher. &os; is a fully supported guest operating system. Once Parallels has been installed on &macos; X, the user must configure a virtual machine and then install the desired guest operating system. - Installing FreeBSD on Parallels/&macos; X + Installing &os; on Parallels/&macos; X - The first step in installing FreeBSD on &macos; + The first step in installing &os; on &macos; X/Parallels is to create a new virtual - machine for installing FreeBSD. Select FreeBSD + machine for installing &os;. Select &os; as the Guest OS Type when prompted: @@ -107,9 +107,9 @@ And choose a reasonable amount of disk and - memory depending on your plans for this virtual FreeBSD - instance. 4GB of disk space and 512MB of RAM work well for most uses of - FreeBSD under Parallels: + memory depending on your plans for this virtual &os; + instance. 4GB of disk space and 512MB of RAM work well for most + uses of &os; under Parallels: @@ -164,13 +164,13 @@ - After your FreeBSD virtual machine has been created, - you will need to install FreeBSD on it. This is best done - with an official FreeBSD CDROM or with an ISO image + After your &os; virtual machine has been created, + you will need to install &os; on it. This is best done + with an official &os; CDROM or with an ISO image downloaded from an official FTP site. When you have the appropriate ISO image on your local &mac; filesystem or a CDROM in your &mac;'s CD drive, click on the disc icon in the - bottom right corner of your FreeBSD + bottom right corner of your &os; Parallels window. This will bring up a window that allows you to associate the CDROM drive in your virtual machine with an ISO file on @@ -183,7 +183,7 @@ Once you have made this association with your CDROM - source, reboot your FreeBSD virtual machine as normal by + source, reboot your &os; virtual machine as normal by clicking the reboot icon. Parallels will reboot with a special BIOS that first checks if you have a CDROM just as a @@ -195,7 +195,7 @@ - In this case it will find the FreeBSD installation media + In this case it will find the &os; installation media and begin a normal sysinstall based installation as described in . You may install, but do not attempt to configure X11 at @@ -208,7 +208,7 @@ When you have finished the installation, reboot - into your newly installed FreeBSD virtual machine. + into your newly installed &os; virtual machine. @@ -218,9 +218,9 @@ - Configuring FreeBSD on &macos; X/Parallels + Configuring &os; on &macos; X/Parallels - After FreeBSD has been successfully installed on &macos; + After &os; has been successfully installed on &macos; X with Parallels, there are a number of configuration steps that can be taken to optimize the system for virtualized operation. @@ -231,13 +231,13 @@ The most important step is to reduce the tunable to reduce the CPU utilization - of FreeBSD under the Parallels + of &os; under the Parallels environment. This is accomplished by adding the following line to /boot/loader.conf: kern.hz=100 - Without this setting, an idle FreeBSD + Without this setting, an idle &os; Parallels guest OS will use roughly 15% of the CPU of a single processor &imac;. After this change the usage will be @@ -286,13 +286,13 @@ - FreeBSD with &xen; on Linux + &os; with &xen; on Linux The &xen; hypervisor is an open source paravirtualization product which is now supported by the commercial XenSource company. Guest operating systems are known as domU domains, and the host operating system is known as dom0. - The first step in running a virtual FreeBSD instance under Linux + The first step in running a virtual &os; instance under Linux is to install &xen; for Linux dom0. The host operating system will be a Slackware Linux distribution. @@ -367,9 +367,9 @@ - FreeBSD 7-CURRENT domU + &os; 7-CURRENT domU - Download the FreeBSD domU kernel for &xen; 3.0 and + Download the &os; domU kernel for &xen; 3.0 and disk image from http://www.fsmware.com/ @@ -580,11 +580,11 @@ system. - Installing FreeBSD on Virtual PC/µsoft.windows; + Installing &os; on Virtual PC/µsoft.windows; - The first step in installing FreeBSD on µsoft.windows; + The first step in installing &os; on µsoft.windows; /Virtual PC is to create a new virtual - machine for installing FreeBSD. Select Create a + machine for installing &os;. Select Create a virtual machine when prompted: @@ -609,9 +609,9 @@ Then, choose a reasonable amount of disk and - memory depending on your plans for this virtual FreeBSD - instance. 4GB of disk space and 512MB of RAM work well for most uses of - FreeBSD under Virtual PC: + memory depending on your plans for this virtual &os; + instance. 4GB of disk space and 512MB of RAM work well for most + uses of &os; under Virtual PC: @@ -633,7 +633,7 @@ - Select your FreeBSD virtual machine and click + Select your &os; virtual machine and click Settings, then set the type of networking and a network interface: @@ -649,12 +649,12 @@ - After your FreeBSD virtual machine has been created, - you will need to install FreeBSD on it. This is best done - with an official FreeBSD CDROM or with an ISO image + After your &os; virtual machine has been created, + you will need to install &os; on it. This is best done + with an official &os; CDROM or with an ISO image downloaded from an official FTP site. When you have the appropriate ISO image on your local &windows; filesystem or a - CDROM in your CD drive, double click on your FreeBSD + CDROM in your CD drive, double click on your &os; virtual machine to boot. Then, click CD and choose Capture ISO Image... on Virtual PC window. This @@ -675,7 +675,7 @@ Once you have made this association with your CDROM - source, reboot your FreeBSD virtual machine as normal by + source, reboot your &os; virtual machine as normal by clicking the Action and Reset. Virtual PC will reboot with a special BIOS that first checks if you have a @@ -687,7 +687,7 @@ - In this case it will find the FreeBSD installation media + In this case it will find the &os; installation media and begin a normal sysinstall based installation as described in . You may install, but do not attempt to configure X11 at @@ -701,7 +701,7 @@ When you have finished the installation, remember to eject CDROM or release ISO image. Finally, reboot into your newly - installed FreeBSD virtual machine. + installed &os; virtual machine. @@ -711,9 +711,9 @@ - Configuring FreeBSD on µsoft.windows;/Virtual PC + Configuring &os; on µsoft.windows;/Virtual PC - After FreeBSD has been successfully installed on + After &os; has been successfully installed on µsoft.windows; with Virtual PC, there are a number of configuration steps that can be taken to optimize the system for virtualized operation. @@ -724,13 +724,13 @@ The most important step is to reduce the tunable to reduce the CPU utilization - of FreeBSD under the Virtual PC + of &os; under the Virtual PC environment. This is accomplished by adding the following line to /boot/loader.conf: kern.hz=100 - Without this setting, an idle FreeBSD + Without this setting, an idle &os; Virtual PC guest OS will use roughly 40% of the CPU of a single processor computer. After this change the usage will be @@ -772,14 +772,14 @@ VMware Fusion for &mac; is a commercial software product available for &intel; based &apple; - &mac; computers running &macos; 10.4.9 or higher. FreeBSD is a + &mac; computers running &macos; 10.4.9 or higher. &os; is a fully supported guest operating system. Once VMware Fusion has been installed on &macos; X, the user must configure a virtual machine and then install the desired guest operating system. - Installing FreeBSD on VMware/&macos; X + Installing &os; on VMware/&macos; X The first step is to start VMware Fusion, the Virtual Machine Library will load. Click "New" to create the VM: @@ -801,8 +801,8 @@ Select Other as the Operating System and - FreeBSD or - FreeBSD 64-bit, depending on if + &os; or + &os; 64-bit, depending on if you want 64-bit support, as the Version when prompted: @@ -902,13 +902,13 @@ After you have finished modifying the settings, boot the - newly installed FreeBSD virtual machine. + newly installed &os; virtual machine. - Configuring FreeBSD on &macos; X/VMware + Configuring &os; on &macos; X/VMware - After FreeBSD has been successfully installed on &macos; + After &os; has been successfully installed on &macos; X with VMware, there are a number of configuration steps that can be taken to optimize the system for virtualized operation. @@ -919,13 +919,13 @@ The most important step is to reduce the tunable to reduce the CPU utilization - of FreeBSD under the VMware + of &os; under the VMware environment. This is accomplished by adding the following line to /boot/loader.conf: kern.hz=100 - Without this setting, an idle FreeBSD + Without this setting, an idle &os; VMware guest OS will use roughly 15% of the CPU of a single processor &imac;. After this change the usage will be @@ -961,7 +961,7 @@ - FreeBSD as a Host OS + &os; as a Host OS For a number of years, &os; was not officially supported as a host OS by any of the available virtualization solutions. Some people were ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#22 (text+ko) ==== @@ -1,7 +1,7 @@ From owner-p4-projects@FreeBSD.ORG Tue Nov 17 22:31:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E234310656C6; Tue, 17 Nov 2009 22:31:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6B8510656C3 for ; Tue, 17 Nov 2009 22:31:49 +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 954D68FC0C for ; Tue, 17 Nov 2009 22:31:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHMVnWw087496 for ; Tue, 17 Nov 2009 22:31:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHMVnl0087494 for perforce@freebsd.org; Tue, 17 Nov 2009 22:31:49 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Nov 2009 22:31:49 GMT Message-Id: <200911172231.nAHMVnl0087494@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 Precedence: bulk Cc: Subject: PERFORCE change 170756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 22:31:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=170756 Change 170756 by rene@rene_self on 2009/11/17 22:31:04 MFen handbook: * virtualization 1.21 -> 1.22 (SRCID bump) * mirrors 1.468 -> 1.469 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#32 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#32 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.468 + %SRCID% 1.469 --> @@ -514,8 +514,9 @@ CVS - Tutorial van Cal Poly. + url="http://users.csc.calpoly.edu/~gfisher/classes/205/handouts/cvs-basics.html">CVS + Tutorial van California Polytechnic State + University. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#15 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.7 2009/11/08 16:28:53 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml - %SRCID% 1.21 + %SRCID% 1.22 --> From owner-p4-projects@FreeBSD.ORG Tue Nov 17 23:10:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAA681065698; Tue, 17 Nov 2009 23:10: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 619441065693 for ; Tue, 17 Nov 2009 23:10:29 +0000 (UTC) (envelope-from josh@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DE608FC18 for ; Tue, 17 Nov 2009 23:10:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHNAT9O091475 for ; Tue, 17 Nov 2009 23:10:29 GMT (envelope-from josh@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHNASIs091473 for perforce@freebsd.org; Tue, 17 Nov 2009 23:10:28 GMT (envelope-from josh@freebsd.org) Date: Tue, 17 Nov 2009 23:10:28 GMT Message-Id: <200911172310.nAHNASIs091473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to josh@freebsd.org using -f From: Josh Carter To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 23:10:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=170759 Change 170759 by josh@josh-freebsd on 2009/11/17 23:09:48 Creating //depot/projects/zfs project from PJD's work in his user directory. Further ZFS integration from OpenSolaris to FreeBSD will happen in this tree. Affected files ... .. //depot/projects/zfs/COPYRIGHT#1 branch .. //depot/projects/zfs/KNOWN_PROBLEMS#1 branch .. //depot/projects/zfs/LOCKS#1 branch .. //depot/projects/zfs/LOR#1 branch .. //depot/projects/zfs/MAINTAINERS#1 branch .. //depot/projects/zfs/Makefile#1 branch .. //depot/projects/zfs/Makefile.inc1#1 branch .. //depot/projects/zfs/NOTES#1 branch .. //depot/projects/zfs/ObsoleteFiles.inc#1 branch .. //depot/projects/zfs/README#1 branch .. //depot/projects/zfs/TODO#1 branch .. //depot/projects/zfs/UPDATING#1 branch .. //depot/projects/zfs/bin/Makefile#1 branch .. //depot/projects/zfs/bin/Makefile.inc#1 branch .. //depot/projects/zfs/bin/cat/Makefile#1 branch .. //depot/projects/zfs/bin/cat/cat.1#1 branch .. //depot/projects/zfs/bin/cat/cat.c#1 branch .. //depot/projects/zfs/bin/chflags/Makefile#1 branch .. //depot/projects/zfs/bin/chflags/chflags.1#1 branch .. //depot/projects/zfs/bin/chflags/chflags.c#1 branch .. //depot/projects/zfs/bin/chio/Makefile#1 branch .. //depot/projects/zfs/bin/chio/chio.1#1 branch .. //depot/projects/zfs/bin/chio/chio.c#1 branch .. //depot/projects/zfs/bin/chio/defs.h#1 branch .. //depot/projects/zfs/bin/chio/pathnames.h#1 branch .. //depot/projects/zfs/bin/chmod/Makefile#1 branch .. //depot/projects/zfs/bin/chmod/chmod.1#1 branch .. //depot/projects/zfs/bin/chmod/chmod.c#1 branch .. //depot/projects/zfs/bin/cp/Makefile#1 branch .. //depot/projects/zfs/bin/cp/cp.1#1 branch .. //depot/projects/zfs/bin/cp/cp.c#1 branch .. //depot/projects/zfs/bin/cp/extern.h#1 branch .. //depot/projects/zfs/bin/cp/utils.c#1 branch .. //depot/projects/zfs/bin/csh/Makefile#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/zfs/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/zfs/bin/csh/config.h#1 branch .. //depot/projects/zfs/bin/csh/config_p.h#1 branch .. //depot/projects/zfs/bin/csh/host.defs#1 branch .. //depot/projects/zfs/bin/csh/iconv.h#1 branch .. //depot/projects/zfs/bin/csh/iconv_stub.c#1 branch .. //depot/projects/zfs/bin/date/Makefile#1 branch .. //depot/projects/zfs/bin/date/date.1#1 branch .. //depot/projects/zfs/bin/date/date.c#1 branch .. //depot/projects/zfs/bin/date/extern.h#1 branch .. //depot/projects/zfs/bin/date/netdate.c#1 branch .. //depot/projects/zfs/bin/date/vary.c#1 branch .. //depot/projects/zfs/bin/date/vary.h#1 branch .. //depot/projects/zfs/bin/dd/Makefile#1 branch .. //depot/projects/zfs/bin/dd/args.c#1 branch .. //depot/projects/zfs/bin/dd/conv.c#1 branch .. //depot/projects/zfs/bin/dd/conv_tab.c#1 branch .. //depot/projects/zfs/bin/dd/dd.1#1 branch .. //depot/projects/zfs/bin/dd/dd.c#1 branch .. //depot/projects/zfs/bin/dd/dd.h#1 branch .. //depot/projects/zfs/bin/dd/extern.h#1 branch .. //depot/projects/zfs/bin/dd/gen.c#1 branch .. //depot/projects/zfs/bin/dd/misc.c#1 branch .. //depot/projects/zfs/bin/dd/position.c#1 branch .. //depot/projects/zfs/bin/dd/ref.ascii#1 branch .. //depot/projects/zfs/bin/dd/ref.ebcdic#1 branch .. //depot/projects/zfs/bin/dd/ref.ibm#1 branch .. //depot/projects/zfs/bin/dd/ref.lcase#1 branch .. //depot/projects/zfs/bin/dd/ref.oldascii#1 branch .. //depot/projects/zfs/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/zfs/bin/dd/ref.oldibm#1 branch .. //depot/projects/zfs/bin/dd/ref.pareven#1 branch .. //depot/projects/zfs/bin/dd/ref.parnone#1 branch .. //depot/projects/zfs/bin/dd/ref.parodd#1 branch .. //depot/projects/zfs/bin/dd/ref.parset#1 branch .. //depot/projects/zfs/bin/dd/ref.swab#1 branch .. //depot/projects/zfs/bin/dd/ref.ucase#1 branch .. //depot/projects/zfs/bin/df/Makefile#1 branch .. //depot/projects/zfs/bin/df/df.1#1 branch .. //depot/projects/zfs/bin/df/df.c#1 branch .. //depot/projects/zfs/bin/domainname/Makefile#1 branch .. //depot/projects/zfs/bin/domainname/domainname.1#1 branch .. //depot/projects/zfs/bin/domainname/domainname.c#1 branch .. //depot/projects/zfs/bin/echo/Makefile#1 branch .. //depot/projects/zfs/bin/echo/echo.1#1 branch .. //depot/projects/zfs/bin/echo/echo.c#1 branch .. //depot/projects/zfs/bin/ed/Makefile#1 branch .. //depot/projects/zfs/bin/ed/POSIX#1 branch .. //depot/projects/zfs/bin/ed/README#1 branch .. //depot/projects/zfs/bin/ed/buf.c#1 branch .. //depot/projects/zfs/bin/ed/cbc.c#1 branch .. //depot/projects/zfs/bin/ed/ed.1#1 branch .. //depot/projects/zfs/bin/ed/ed.h#1 branch .. //depot/projects/zfs/bin/ed/glbl.c#1 branch .. //depot/projects/zfs/bin/ed/io.c#1 branch .. //depot/projects/zfs/bin/ed/main.c#1 branch .. //depot/projects/zfs/bin/ed/re.c#1 branch .. //depot/projects/zfs/bin/ed/sub.c#1 branch .. //depot/projects/zfs/bin/ed/test/=.err#1 branch .. //depot/projects/zfs/bin/ed/test/Makefile#1 branch .. //depot/projects/zfs/bin/ed/test/README#1 branch .. //depot/projects/zfs/bin/ed/test/TODO#1 branch .. //depot/projects/zfs/bin/ed/test/a.d#1 branch .. //depot/projects/zfs/bin/ed/test/a.r#1 branch .. //depot/projects/zfs/bin/ed/test/a.t#1 branch .. //depot/projects/zfs/bin/ed/test/a1.err#1 branch .. //depot/projects/zfs/bin/ed/test/a2.err#1 branch .. //depot/projects/zfs/bin/ed/test/addr.d#1 branch .. //depot/projects/zfs/bin/ed/test/addr.r#1 branch .. //depot/projects/zfs/bin/ed/test/addr.t#1 branch .. //depot/projects/zfs/bin/ed/test/addr1.err#1 branch .. //depot/projects/zfs/bin/ed/test/addr2.err#1 branch .. //depot/projects/zfs/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/zfs/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/zfs/bin/ed/test/ascii.t#1 branch .. //depot/projects/zfs/bin/ed/test/bang1.d#1 branch .. //depot/projects/zfs/bin/ed/test/bang1.err#1 branch .. //depot/projects/zfs/bin/ed/test/bang1.r#1 branch .. //depot/projects/zfs/bin/ed/test/bang1.t#1 branch .. //depot/projects/zfs/bin/ed/test/bang2.err#1 branch .. //depot/projects/zfs/bin/ed/test/c.d#1 branch .. //depot/projects/zfs/bin/ed/test/c.r#1 branch .. //depot/projects/zfs/bin/ed/test/c.t#1 branch .. //depot/projects/zfs/bin/ed/test/c1.err#1 branch .. //depot/projects/zfs/bin/ed/test/c2.err#1 branch .. //depot/projects/zfs/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/zfs/bin/ed/test/d.d#1 branch .. //depot/projects/zfs/bin/ed/test/d.err#1 branch .. //depot/projects/zfs/bin/ed/test/d.r#1 branch .. //depot/projects/zfs/bin/ed/test/d.t#1 branch .. //depot/projects/zfs/bin/ed/test/e1.d#1 branch .. //depot/projects/zfs/bin/ed/test/e1.err#1 branch .. //depot/projects/zfs/bin/ed/test/e1.r#1 branch .. //depot/projects/zfs/bin/ed/test/e1.t#1 branch .. //depot/projects/zfs/bin/ed/test/e2.d#1 branch .. //depot/projects/zfs/bin/ed/test/e2.err#1 branch .. //depot/projects/zfs/bin/ed/test/e2.r#1 branch .. //depot/projects/zfs/bin/ed/test/e2.t#1 branch .. //depot/projects/zfs/bin/ed/test/e3.d#1 branch .. //depot/projects/zfs/bin/ed/test/e3.err#1 branch .. //depot/projects/zfs/bin/ed/test/e3.r#1 branch .. //depot/projects/zfs/bin/ed/test/e3.t#1 branch .. //depot/projects/zfs/bin/ed/test/e4.d#1 branch .. //depot/projects/zfs/bin/ed/test/e4.r#1 branch .. //depot/projects/zfs/bin/ed/test/e4.t#1 branch .. //depot/projects/zfs/bin/ed/test/f1.err#1 branch .. //depot/projects/zfs/bin/ed/test/f2.err#1 branch .. //depot/projects/zfs/bin/ed/test/g1.d#1 branch .. //depot/projects/zfs/bin/ed/test/g1.err#1 branch .. //depot/projects/zfs/bin/ed/test/g1.r#1 branch .. //depot/projects/zfs/bin/ed/test/g1.t#1 branch .. //depot/projects/zfs/bin/ed/test/g2.d#1 branch .. //depot/projects/zfs/bin/ed/test/g2.err#1 branch .. //depot/projects/zfs/bin/ed/test/g2.r#1 branch .. //depot/projects/zfs/bin/ed/test/g2.t#1 branch .. //depot/projects/zfs/bin/ed/test/g3.d#1 branch .. //depot/projects/zfs/bin/ed/test/g3.err#1 branch .. //depot/projects/zfs/bin/ed/test/g3.r#1 branch .. //depot/projects/zfs/bin/ed/test/g3.t#1 branch .. //depot/projects/zfs/bin/ed/test/g4.d#1 branch .. //depot/projects/zfs/bin/ed/test/g4.r#1 branch .. //depot/projects/zfs/bin/ed/test/g4.t#1 branch .. //depot/projects/zfs/bin/ed/test/g5.d#1 branch .. //depot/projects/zfs/bin/ed/test/g5.r#1 branch .. //depot/projects/zfs/bin/ed/test/g5.t#1 branch .. //depot/projects/zfs/bin/ed/test/h.err#1 branch .. //depot/projects/zfs/bin/ed/test/i.d#1 branch .. //depot/projects/zfs/bin/ed/test/i.r#1 branch .. //depot/projects/zfs/bin/ed/test/i.t#1 branch .. //depot/projects/zfs/bin/ed/test/i1.err#1 branch .. //depot/projects/zfs/bin/ed/test/i2.err#1 branch .. //depot/projects/zfs/bin/ed/test/i3.err#1 branch .. //depot/projects/zfs/bin/ed/test/j.d#1 branch .. //depot/projects/zfs/bin/ed/test/j.r#1 branch .. //depot/projects/zfs/bin/ed/test/j.t#1 branch .. //depot/projects/zfs/bin/ed/test/k.d#1 branch .. //depot/projects/zfs/bin/ed/test/k.r#1 branch .. //depot/projects/zfs/bin/ed/test/k.t#1 branch .. //depot/projects/zfs/bin/ed/test/k1.err#1 branch .. //depot/projects/zfs/bin/ed/test/k2.err#1 branch .. //depot/projects/zfs/bin/ed/test/k3.err#1 branch .. //depot/projects/zfs/bin/ed/test/k4.err#1 branch .. //depot/projects/zfs/bin/ed/test/l.d#1 branch .. //depot/projects/zfs/bin/ed/test/l.r#1 branch .. //depot/projects/zfs/bin/ed/test/l.t#1 branch .. //depot/projects/zfs/bin/ed/test/m.d#1 branch .. //depot/projects/zfs/bin/ed/test/m.err#1 branch .. //depot/projects/zfs/bin/ed/test/m.r#1 branch .. //depot/projects/zfs/bin/ed/test/m.t#1 branch .. //depot/projects/zfs/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/zfs/bin/ed/test/n.d#1 branch .. //depot/projects/zfs/bin/ed/test/n.r#1 branch .. //depot/projects/zfs/bin/ed/test/n.t#1 branch .. //depot/projects/zfs/bin/ed/test/nl.err#1 branch .. //depot/projects/zfs/bin/ed/test/nl1.d#1 branch .. //depot/projects/zfs/bin/ed/test/nl1.r#1 branch .. //depot/projects/zfs/bin/ed/test/nl1.t#1 branch .. //depot/projects/zfs/bin/ed/test/nl2.d#1 branch .. //depot/projects/zfs/bin/ed/test/nl2.r#1 branch .. //depot/projects/zfs/bin/ed/test/nl2.t#1 branch .. //depot/projects/zfs/bin/ed/test/p.d#1 branch .. //depot/projects/zfs/bin/ed/test/p.r#1 branch .. //depot/projects/zfs/bin/ed/test/p.t#1 branch .. //depot/projects/zfs/bin/ed/test/q.d#1 branch .. //depot/projects/zfs/bin/ed/test/q.r#1 branch .. //depot/projects/zfs/bin/ed/test/q.t#1 branch .. //depot/projects/zfs/bin/ed/test/q1.err#1 branch .. //depot/projects/zfs/bin/ed/test/r1.d#1 branch .. //depot/projects/zfs/bin/ed/test/r1.err#1 branch .. //depot/projects/zfs/bin/ed/test/r1.r#1 branch .. //depot/projects/zfs/bin/ed/test/r1.t#1 branch .. //depot/projects/zfs/bin/ed/test/r2.d#1 branch .. //depot/projects/zfs/bin/ed/test/r2.err#1 branch .. //depot/projects/zfs/bin/ed/test/r2.r#1 branch .. //depot/projects/zfs/bin/ed/test/r2.t#1 branch .. //depot/projects/zfs/bin/ed/test/r3.d#1 branch .. //depot/projects/zfs/bin/ed/test/r3.r#1 branch .. //depot/projects/zfs/bin/ed/test/r3.t#1 branch .. //depot/projects/zfs/bin/ed/test/s1.d#1 branch .. //depot/projects/zfs/bin/ed/test/s1.err#1 branch .. //depot/projects/zfs/bin/ed/test/s1.r#1 branch .. //depot/projects/zfs/bin/ed/test/s1.t#1 branch .. //depot/projects/zfs/bin/ed/test/s10.err#1 branch .. //depot/projects/zfs/bin/ed/test/s2.d#1 branch .. //depot/projects/zfs/bin/ed/test/s2.err#1 branch .. //depot/projects/zfs/bin/ed/test/s2.r#1 branch .. //depot/projects/zfs/bin/ed/test/s2.t#1 branch .. //depot/projects/zfs/bin/ed/test/s3.d#1 branch .. //depot/projects/zfs/bin/ed/test/s3.err#1 branch .. //depot/projects/zfs/bin/ed/test/s3.r#1 branch .. //depot/projects/zfs/bin/ed/test/s3.t#1 branch .. //depot/projects/zfs/bin/ed/test/s4.err#1 branch .. //depot/projects/zfs/bin/ed/test/s5.err#1 branch .. //depot/projects/zfs/bin/ed/test/s6.err#1 branch .. //depot/projects/zfs/bin/ed/test/s7.err#1 branch .. //depot/projects/zfs/bin/ed/test/s8.err#1 branch .. //depot/projects/zfs/bin/ed/test/s9.err#1 branch .. //depot/projects/zfs/bin/ed/test/t.d#1 branch .. //depot/projects/zfs/bin/ed/test/t.r#1 branch .. //depot/projects/zfs/bin/ed/test/t1.d#1 branch .. //depot/projects/zfs/bin/ed/test/t1.err#1 branch .. //depot/projects/zfs/bin/ed/test/t1.r#1 branch .. //depot/projects/zfs/bin/ed/test/t1.t#1 branch .. //depot/projects/zfs/bin/ed/test/t2.d#1 branch .. //depot/projects/zfs/bin/ed/test/t2.err#1 branch .. //depot/projects/zfs/bin/ed/test/t2.r#1 branch .. //depot/projects/zfs/bin/ed/test/t2.t#1 branch .. //depot/projects/zfs/bin/ed/test/u.d#1 branch .. //depot/projects/zfs/bin/ed/test/u.err#1 branch .. //depot/projects/zfs/bin/ed/test/u.r#1 branch .. //depot/projects/zfs/bin/ed/test/u.t#1 branch .. //depot/projects/zfs/bin/ed/test/v.d#1 branch .. //depot/projects/zfs/bin/ed/test/v.r#1 branch .. //depot/projects/zfs/bin/ed/test/v.t#1 branch .. //depot/projects/zfs/bin/ed/test/w.d#1 branch .. //depot/projects/zfs/bin/ed/test/w.r#1 branch .. //depot/projects/zfs/bin/ed/test/w.t#1 branch .. //depot/projects/zfs/bin/ed/test/w1.err#1 branch .. //depot/projects/zfs/bin/ed/test/w2.err#1 branch .. //depot/projects/zfs/bin/ed/test/w3.err#1 branch .. //depot/projects/zfs/bin/ed/test/x.err#1 branch .. //depot/projects/zfs/bin/ed/test/z.err#1 branch .. //depot/projects/zfs/bin/ed/undo.c#1 branch .. //depot/projects/zfs/bin/expr/Makefile#1 branch .. //depot/projects/zfs/bin/expr/expr.1#1 branch .. //depot/projects/zfs/bin/expr/expr.y#1 branch .. //depot/projects/zfs/bin/getfacl/Makefile#1 branch .. //depot/projects/zfs/bin/getfacl/getfacl.1#1 branch .. //depot/projects/zfs/bin/getfacl/getfacl.c#1 branch .. //depot/projects/zfs/bin/hostname/Makefile#1 branch .. //depot/projects/zfs/bin/hostname/hostname.1#1 branch .. //depot/projects/zfs/bin/hostname/hostname.c#1 branch .. //depot/projects/zfs/bin/kenv/Makefile#1 branch .. //depot/projects/zfs/bin/kenv/kenv.1#1 branch .. //depot/projects/zfs/bin/kenv/kenv.c#1 branch .. //depot/projects/zfs/bin/kill/Makefile#1 branch .. //depot/projects/zfs/bin/kill/kill.1#1 branch .. //depot/projects/zfs/bin/kill/kill.c#1 branch .. //depot/projects/zfs/bin/ln/Makefile#1 branch .. //depot/projects/zfs/bin/ln/ln.1#1 branch .. //depot/projects/zfs/bin/ln/ln.c#1 branch .. //depot/projects/zfs/bin/ln/symlink.7#1 branch .. //depot/projects/zfs/bin/ls/Makefile#1 branch .. //depot/projects/zfs/bin/ls/cmp.c#1 branch .. //depot/projects/zfs/bin/ls/extern.h#1 branch .. //depot/projects/zfs/bin/ls/ls.1#1 branch .. //depot/projects/zfs/bin/ls/ls.c#1 branch .. //depot/projects/zfs/bin/ls/ls.h#1 branch .. //depot/projects/zfs/bin/ls/print.c#1 branch .. //depot/projects/zfs/bin/ls/util.c#1 branch .. //depot/projects/zfs/bin/mkdir/Makefile#1 branch .. //depot/projects/zfs/bin/mkdir/mkdir.1#1 branch .. //depot/projects/zfs/bin/mkdir/mkdir.c#1 branch .. //depot/projects/zfs/bin/mv/Makefile#1 branch .. //depot/projects/zfs/bin/mv/mv.1#1 branch .. //depot/projects/zfs/bin/mv/mv.c#1 branch .. //depot/projects/zfs/bin/pax/Makefile#1 branch .. //depot/projects/zfs/bin/pax/ar_io.c#1 branch .. //depot/projects/zfs/bin/pax/ar_subs.c#1 branch .. //depot/projects/zfs/bin/pax/buf_subs.c#1 branch .. //depot/projects/zfs/bin/pax/cache.c#1 branch .. //depot/projects/zfs/bin/pax/cache.h#1 branch .. //depot/projects/zfs/bin/pax/cpio.1#1 branch .. //depot/projects/zfs/bin/pax/cpio.c#1 branch .. //depot/projects/zfs/bin/pax/cpio.h#1 branch .. //depot/projects/zfs/bin/pax/extern.h#1 branch .. //depot/projects/zfs/bin/pax/file_subs.c#1 branch .. //depot/projects/zfs/bin/pax/ftree.c#1 branch .. //depot/projects/zfs/bin/pax/ftree.h#1 branch .. //depot/projects/zfs/bin/pax/gen_subs.c#1 branch .. //depot/projects/zfs/bin/pax/getoldopt.c#1 branch .. //depot/projects/zfs/bin/pax/options.c#1 branch .. //depot/projects/zfs/bin/pax/options.h#1 branch .. //depot/projects/zfs/bin/pax/pat_rep.c#1 branch .. //depot/projects/zfs/bin/pax/pat_rep.h#1 branch .. //depot/projects/zfs/bin/pax/pax.1#1 branch .. //depot/projects/zfs/bin/pax/pax.c#1 branch .. //depot/projects/zfs/bin/pax/pax.h#1 branch .. //depot/projects/zfs/bin/pax/sel_subs.c#1 branch .. //depot/projects/zfs/bin/pax/sel_subs.h#1 branch .. //depot/projects/zfs/bin/pax/tables.c#1 branch .. //depot/projects/zfs/bin/pax/tables.h#1 branch .. //depot/projects/zfs/bin/pax/tar.1#1 branch .. //depot/projects/zfs/bin/pax/tar.c#1 branch .. //depot/projects/zfs/bin/pax/tar.h#1 branch .. //depot/projects/zfs/bin/pax/tty_subs.c#1 branch .. //depot/projects/zfs/bin/pkill/Makefile#1 branch .. //depot/projects/zfs/bin/pkill/pkill.1#1 branch .. //depot/projects/zfs/bin/pkill/pkill.c#1 branch .. //depot/projects/zfs/bin/ps/Makefile#1 branch .. //depot/projects/zfs/bin/ps/extern.h#1 branch .. //depot/projects/zfs/bin/ps/fmt.c#1 branch .. //depot/projects/zfs/bin/ps/keyword.c#1 branch .. //depot/projects/zfs/bin/ps/nlist.c#1 branch .. //depot/projects/zfs/bin/ps/print.c#1 branch .. //depot/projects/zfs/bin/ps/ps.1#1 branch .. //depot/projects/zfs/bin/ps/ps.c#1 branch .. //depot/projects/zfs/bin/ps/ps.h#1 branch .. //depot/projects/zfs/bin/pwd/Makefile#1 branch .. //depot/projects/zfs/bin/pwd/pwd.1#1 branch .. //depot/projects/zfs/bin/pwd/pwd.c#1 branch .. //depot/projects/zfs/bin/rcp/Makefile#1 branch .. //depot/projects/zfs/bin/rcp/extern.h#1 branch .. //depot/projects/zfs/bin/rcp/rcp.1#1 branch .. //depot/projects/zfs/bin/rcp/rcp.c#1 branch .. //depot/projects/zfs/bin/rcp/util.c#1 branch .. //depot/projects/zfs/bin/realpath/Makefile#1 branch .. //depot/projects/zfs/bin/realpath/realpath.1#1 branch .. //depot/projects/zfs/bin/realpath/realpath.c#1 branch .. //depot/projects/zfs/bin/rm/Makefile#1 branch .. //depot/projects/zfs/bin/rm/rm.1#1 branch .. //depot/projects/zfs/bin/rm/rm.c#1 branch .. //depot/projects/zfs/bin/rmail/Makefile#1 branch .. //depot/projects/zfs/bin/rmdir/Makefile#1 branch .. //depot/projects/zfs/bin/rmdir/rmdir.1#1 branch .. //depot/projects/zfs/bin/rmdir/rmdir.c#1 branch .. //depot/projects/zfs/bin/setfacl/Makefile#1 branch .. //depot/projects/zfs/bin/setfacl/file.c#1 branch .. //depot/projects/zfs/bin/setfacl/mask.c#1 branch .. //depot/projects/zfs/bin/setfacl/merge.c#1 branch .. //depot/projects/zfs/bin/setfacl/remove.c#1 branch .. //depot/projects/zfs/bin/setfacl/setfacl.1#1 branch .. //depot/projects/zfs/bin/setfacl/setfacl.c#1 branch .. //depot/projects/zfs/bin/setfacl/setfacl.h#1 branch .. //depot/projects/zfs/bin/setfacl/util.c#1 branch .. //depot/projects/zfs/bin/sh/Makefile#1 branch .. //depot/projects/zfs/bin/sh/TOUR#1 branch .. //depot/projects/zfs/bin/sh/alias.c#1 branch .. //depot/projects/zfs/bin/sh/alias.h#1 branch .. //depot/projects/zfs/bin/sh/arith.h#1 branch .. //depot/projects/zfs/bin/sh/arith.y#1 branch .. //depot/projects/zfs/bin/sh/arith_lex.l#1 branch .. //depot/projects/zfs/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/zfs/bin/sh/bltin/echo.1#1 branch .. //depot/projects/zfs/bin/sh/bltin/echo.c#1 branch .. //depot/projects/zfs/bin/sh/builtins.def#1 branch .. //depot/projects/zfs/bin/sh/cd.c#1 branch .. //depot/projects/zfs/bin/sh/cd.h#1 branch .. //depot/projects/zfs/bin/sh/error.c#1 branch .. //depot/projects/zfs/bin/sh/error.h#1 branch .. //depot/projects/zfs/bin/sh/eval.c#1 branch .. //depot/projects/zfs/bin/sh/eval.h#1 branch .. //depot/projects/zfs/bin/sh/exec.c#1 branch .. //depot/projects/zfs/bin/sh/exec.h#1 branch .. //depot/projects/zfs/bin/sh/expand.c#1 branch .. //depot/projects/zfs/bin/sh/expand.h#1 branch .. //depot/projects/zfs/bin/sh/funcs/cmv#1 branch .. //depot/projects/zfs/bin/sh/funcs/dirs#1 branch .. //depot/projects/zfs/bin/sh/funcs/kill#1 branch .. //depot/projects/zfs/bin/sh/funcs/login#1 branch .. //depot/projects/zfs/bin/sh/funcs/newgrp#1 branch .. //depot/projects/zfs/bin/sh/funcs/popd#1 branch .. //depot/projects/zfs/bin/sh/funcs/pushd#1 branch .. //depot/projects/zfs/bin/sh/funcs/suspend#1 branch .. //depot/projects/zfs/bin/sh/histedit.c#1 branch .. //depot/projects/zfs/bin/sh/init.h#1 branch .. //depot/projects/zfs/bin/sh/input.c#1 branch .. //depot/projects/zfs/bin/sh/input.h#1 branch .. //depot/projects/zfs/bin/sh/jobs.c#1 branch .. //depot/projects/zfs/bin/sh/jobs.h#1 branch .. //depot/projects/zfs/bin/sh/mail.c#1 branch .. //depot/projects/zfs/bin/sh/mail.h#1 branch .. //depot/projects/zfs/bin/sh/main.c#1 branch .. //depot/projects/zfs/bin/sh/main.h#1 branch .. //depot/projects/zfs/bin/sh/memalloc.c#1 branch .. //depot/projects/zfs/bin/sh/memalloc.h#1 branch .. //depot/projects/zfs/bin/sh/miscbltin.c#1 branch .. //depot/projects/zfs/bin/sh/mkbuiltins#1 branch .. //depot/projects/zfs/bin/sh/mkinit.c#1 branch .. //depot/projects/zfs/bin/sh/mknodes.c#1 branch .. //depot/projects/zfs/bin/sh/mksyntax.c#1 branch .. //depot/projects/zfs/bin/sh/mktokens#1 branch .. //depot/projects/zfs/bin/sh/myhistedit.h#1 branch .. //depot/projects/zfs/bin/sh/mystring.c#1 branch .. //depot/projects/zfs/bin/sh/mystring.h#1 branch .. //depot/projects/zfs/bin/sh/nodes.c.pat#1 branch .. //depot/projects/zfs/bin/sh/nodetypes#1 branch .. //depot/projects/zfs/bin/sh/options.c#1 branch .. //depot/projects/zfs/bin/sh/options.h#1 branch .. //depot/projects/zfs/bin/sh/output.c#1 branch .. //depot/projects/zfs/bin/sh/output.h#1 branch .. //depot/projects/zfs/bin/sh/parser.c#1 branch .. //depot/projects/zfs/bin/sh/parser.h#1 branch .. //depot/projects/zfs/bin/sh/redir.c#1 branch .. //depot/projects/zfs/bin/sh/redir.h#1 branch .. //depot/projects/zfs/bin/sh/sh.1#1 branch .. //depot/projects/zfs/bin/sh/shell.h#1 branch .. //depot/projects/zfs/bin/sh/show.c#1 branch .. //depot/projects/zfs/bin/sh/show.h#1 branch .. //depot/projects/zfs/bin/sh/trap.c#1 branch .. //depot/projects/zfs/bin/sh/trap.h#1 branch .. //depot/projects/zfs/bin/sh/var.c#1 branch .. //depot/projects/zfs/bin/sh/var.h#1 branch .. //depot/projects/zfs/bin/sleep/Makefile#1 branch .. //depot/projects/zfs/bin/sleep/sleep.1#1 branch .. //depot/projects/zfs/bin/sleep/sleep.c#1 branch .. //depot/projects/zfs/bin/stty/Makefile#1 branch .. //depot/projects/zfs/bin/stty/cchar.c#1 branch .. //depot/projects/zfs/bin/stty/extern.h#1 branch .. //depot/projects/zfs/bin/stty/gfmt.c#1 branch .. //depot/projects/zfs/bin/stty/key.c#1 branch .. //depot/projects/zfs/bin/stty/modes.c#1 branch .. //depot/projects/zfs/bin/stty/print.c#1 branch .. //depot/projects/zfs/bin/stty/stty.1#1 branch .. //depot/projects/zfs/bin/stty/stty.c#1 branch .. //depot/projects/zfs/bin/stty/stty.h#1 branch .. //depot/projects/zfs/bin/stty/util.c#1 branch .. //depot/projects/zfs/bin/sync/Makefile#1 branch .. //depot/projects/zfs/bin/sync/sync.8#1 branch .. //depot/projects/zfs/bin/sync/sync.c#1 branch .. //depot/projects/zfs/bin/test/Makefile#1 branch .. //depot/projects/zfs/bin/test/TEST.README#1 branch .. //depot/projects/zfs/bin/test/TEST.csh#1 branch .. //depot/projects/zfs/bin/test/TEST.sh#1 branch .. //depot/projects/zfs/bin/test/test.1#1 branch .. //depot/projects/zfs/bin/test/test.c#1 branch .. //depot/projects/zfs/bin/uuidgen/Makefile#1 branch .. //depot/projects/zfs/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/zfs/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/zfs/cddl/Makefile#1 branch .. //depot/projects/zfs/cddl/Makefile.inc#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/zfs/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 18 13:28:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D263106568D; Wed, 18 Nov 2009 13:28: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 30055106568B for ; Wed, 18 Nov 2009 13:28: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 1D2FC8FC1C for ; Wed, 18 Nov 2009 13:28:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAIDSk9F008655 for ; Wed, 18 Nov 2009 13:28:47 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAIDSkPg008653 for perforce@freebsd.org; Wed, 18 Nov 2009 13:28:46 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 18 Nov 2009 13:28:46 GMT Message-Id: <200911181328.nAIDSkPg008653@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 Precedence: bulk Cc: Subject: PERFORCE change 170768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 13:28:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=170768 Change 170768 by pgj@beehive on 2009/11/18 13:28:41 MFen (www): 1.78 -> 1.79 hu/share/sgml/events.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#23 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#23 (text+ko) ==== @@ -11,7 +11,7 @@ @@ -141,6 +141,30 @@ csúcstalálkozót. + + 11. Libre Software Meeting + http://2010.rmll.info/ + + 2010 + 7 + 6 + + + 2010 + 7 + 11 + + + Franciaország + Bordeaux + + 2000 júliusától + kezdõdõen minden évben jelentkezik a Libre Software + Meeting. Idén ismét lesz &os; stand, ahol az + érdeklõdõk betekintést nyerhetnek az + operációs rendszerbe. + + BSDCan 2010 http://www.bsdcan.org/2010/ @@ -172,6 +196,33 @@ egyaránt. + + Solutions Linux 2010 + http://www.solutionslinux.fr/ + + 2010 + 3 + 16 + + + 2010 + 3 + 8 + + + Franciaország + Párizs + Paris Expo +
Porte de Versailles
+ + Ezen a háromnapos rendezvényen + GNU/Linux-ot és nyílt forráskódú + szoftvereket mutatnak be cégek számára. A + Francia &os; Felhasználók Csoportja + természetesen idén is képviselni fogja a + &os;-t. A belépés ingyenes. + + AsiaBSDCon 2010 http://2010.asiabsdcon.org/ From owner-p4-projects@FreeBSD.ORG Wed Nov 18 18:05:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D87E21065710; Wed, 18 Nov 2009 18:05: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 9A959106570D for ; Wed, 18 Nov 2009 18:05:24 +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 87DA58FC19 for ; Wed, 18 Nov 2009 18:05:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAII5OjE043888 for ; Wed, 18 Nov 2009 18:05:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAII5OpU043886 for perforce@freebsd.org; Wed, 18 Nov 2009 18:05:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Nov 2009 18:05:24 GMT Message-Id: <200911181805.nAII5OpU043886@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 Precedence: bulk Cc: Subject: PERFORCE change 170778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 18:05:25 -0000 http://p4web.freebsd.org/chv.cgi?CH=170778 Change 170778 by hselasky@hselasky_laptop001 on 2009/11/18 18:05:01 LibUSB v2.0: - add new API function, libusb20_tr_bulk_intr_sync(). Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.3#5 edit .. //depot/projects/usb/src/lib/libusb/libusb20.c#11 edit .. //depot/projects/usb/src/lib/libusb/libusb20.h#8 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.3#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.4 2009/07/30 00:11:41 alfred Exp $ .\" -.Dd June 22, 2009 +.Dd November 18, 2009 .Dt LIBUSB20 3 .Os .Sh NAME @@ -98,6 +98,8 @@ .Fn libusb20_tr_setup_intr "struct libusb20_transfer *xfer" "void *pbuf" "uint32_t length" "uint32_t timeout" .Ft void .Fn libusb20_tr_setup_isoc "struct libusb20_transfer *xfer" "void *pbuf" "uint32_t length" "uint61_t fr_index" +.Ft uint8_t +.Fn libusb20_tr_bulk_intr_sync "struct libusb20_transfer *xfer" "void *pbuf" "uint32_t length" "uint32_t *pactlen" "uint32_t timeout" .Ft void .Fn libusb20_tr_start "struct libusb20_transfer *xfer" .Ft void @@ -451,6 +453,29 @@ . .Pp . +.Fn libusb20_tr_bulk_intr_sync +will perform a synchronous BULK or INTERRUPT transfer having length given by the +.Fa length +argument and buffer pointer given by the +.Fa pbuf +argument on the USB transfer given by the +.Fa xfer +argument. +. +If the +.Fa pactlen +argument is non-NULL the actual transfer length will be stored at the given pointer destination. +. +If the +.Fa timeout +argument is non-zero the transfer will timeout after the given value in milliseconds. +. +This function does not change the transfer flags, like short packet not ok. +. +This function returns zero on success else a LIBUSB20_TRANSFER_XXX value is returned. +. +.Pp +. .Fn libusb20_tr_start will get the USB transfer started, if not already started. ==== //depot/projects/usb/src/lib/libusb/libusb20.c#11 (text+ko) ==== @@ -1,6 +1,6 @@ /* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */ /*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -423,6 +423,72 @@ return; } +uint8_t +libusb20_tr_bulk_intr_sync(struct libusb20_transfer *xfer, + void *pbuf, uint32_t length, uint32_t *pactlen, + uint32_t timeout) +{ + struct libusb20_device *pdev = xfer->pdev; + uint32_t transfer_max; + uint32_t transfer_act; + uint8_t retval; + + /* set some sensible default value */ + if (pactlen != NULL) + *pactlen = 0; + + /* check for error condition */ + if (libusb20_tr_pending(xfer)) + return (LIBUSB20_ERROR_OTHER); + + do { + /* compute maximum transfer length */ + transfer_max = + libusb20_tr_get_max_total_length(xfer); + + if (transfer_max > length) + transfer_max = length; + + /* setup bulk or interrupt transfer */ + libusb20_tr_setup_bulk(xfer, pbuf, + transfer_max, timeout); + + /* start the transfer */ + libusb20_tr_start(xfer); + + /* wait for transfer completion */ + while (libusb20_dev_process(pdev) == 0) { + + if (libusb20_tr_pending(xfer) == 0) + break; + + libusb20_dev_wait_process(pdev, -1); + } + + transfer_act = libusb20_tr_get_actual_length(xfer); + + /* update actual length, if any */ + if (pactlen != NULL) + pactlen[0] += transfer_act; + + /* check transfer status */ + retval = libusb20_tr_get_status(xfer); + if (retval) + break; + + /* check for short transfer */ + if (transfer_act != transfer_max) + break; + + /* update buffer pointer and length */ + pbuf = ((uint8_t *)pbuf) + transfer_max; + length = length - transfer_max; + + } while (length != 0); + + return (retval); +} + void libusb20_tr_submit(struct libusb20_transfer *xfer) { ==== //depot/projects/usb/src/lib/libusb/libusb20.h#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* $FreeBSD: src/lib/libusb/libusb20.h,v 1.5 2009/06/12 16:07:06 thompsa Exp $ */ /*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. * Copyright (c) 2001 Johannes Erdfelt. All rights reserved. * @@ -226,6 +226,7 @@ void libusb20_tr_setup_control(struct libusb20_transfer *xfer, void *psetup, void *pbuf, uint32_t timeout); void libusb20_tr_setup_intr(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t timeout); void libusb20_tr_setup_isoc(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint16_t fr_index); +uint8_t libusb20_tr_bulk_intr_sync(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t *pactlen, uint32_t timeout); void libusb20_tr_start(struct libusb20_transfer *xfer); void libusb20_tr_stop(struct libusb20_transfer *xfer); void libusb20_tr_submit(struct libusb20_transfer *xfer); From owner-p4-projects@FreeBSD.ORG Wed Nov 18 18:34:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3BD31065672; Wed, 18 Nov 2009 18:34:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FF10106566B for ; Wed, 18 Nov 2009 18:34:54 +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 7DB488FC0C for ; Wed, 18 Nov 2009 18:34:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAIIYsgJ046093 for ; Wed, 18 Nov 2009 18:34:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAIIYscs046091 for perforce@freebsd.org; Wed, 18 Nov 2009 18:34:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Nov 2009 18:34:54 GMT Message-Id: <200911181834.nAIIYscs046091@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 Precedence: bulk Cc: Subject: PERFORCE change 170781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 18:34:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=170781 Change 170781 by hselasky@hselasky_laptop001 on 2009/11/18 18:34:28 LibUSB v1.0 - fix compliancy issue. If a transfer is cancelled when not actually running, the library will segfault. Also fix the return value from libusb_cancel_transfer() to be more according to the LibUSB v1.0.4 specification. - report by: Robert Jenssen - fix by: HPS Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#16 edit .. //depot/projects/usb/src/lib/libusb/libusb10.h#10 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#16 (text+ko) ==== @@ -833,8 +833,12 @@ if (pxfer != NULL) libusb20_tr_set_priv_sc1(pxfer, NULL); + /* set transfer status */ uxfer->status = status; + /* update super transfer state */ + sxfer->state = LIBUSB_SUPER_XFER_ST_NONE; + dev = libusb_get_device(uxfer->dev_handle); TAILQ_INSERT_TAIL(&dev->ctx->tr_done, sxfer, entry); @@ -1229,12 +1233,18 @@ if (pxfer0 == NULL || pxfer1 == NULL) { err = LIBUSB_ERROR_OTHER; } else if ((sxfer->entry.tqe_prev != NULL) || - (libusb20_tr_get_priv_sc1(pxfer0) == sxfer) || + (libusb20_tr_get_priv_sc1(pxfer0) == sxfer) || (libusb20_tr_get_priv_sc1(pxfer1) == sxfer)) { err = LIBUSB_ERROR_BUSY; } else { + + /* set pending state */ + sxfer->state = LIBUSB_SUPER_XFER_ST_PEND; + + /* insert transfer into transfer head list */ TAILQ_INSERT_TAIL(&dev->tr_head, sxfer, entry); + /* start work transfers */ libusb10_submit_transfer_sub( uxfer->dev_handle, endpoint); @@ -1258,6 +1268,7 @@ struct libusb_super_transfer *sxfer; struct libusb_device *dev; uint32_t endpoint; + int retval; if (uxfer == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -1277,39 +1288,50 @@ sxfer = (struct libusb_super_transfer *)( (uint8_t *)uxfer - sizeof(*sxfer)); + retval = 0; + CTX_LOCK(dev->ctx); pxfer0 = libusb10_get_transfer(uxfer->dev_handle, endpoint, 0); pxfer1 = libusb10_get_transfer(uxfer->dev_handle, endpoint, 1); - if (sxfer->entry.tqe_prev != NULL) { + if (sxfer->state != LIBUSB_SUPER_XFER_ST_PEND) { + /* only update the transfer status */ + uxfer->status = LIBUSB_TRANSFER_CANCELLED; + retval = LIBUSB_ERROR_NOT_FOUND; + } else if (sxfer->entry.tqe_prev != NULL) { /* we are lucky - transfer is on a queue */ TAILQ_REMOVE(&dev->tr_head, sxfer, entry); sxfer->entry.tqe_prev = NULL; - libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_CANCELLED); + libusb10_complete_transfer(NULL, + sxfer, LIBUSB_TRANSFER_CANCELLED); } else if (pxfer0 == NULL || pxfer1 == NULL) { /* not started */ + retval = LIBUSB_ERROR_NOT_FOUND; } else if (libusb20_tr_get_priv_sc1(pxfer0) == sxfer) { - libusb10_complete_transfer(pxfer0, sxfer, LIBUSB_TRANSFER_CANCELLED); + libusb10_complete_transfer(pxfer0, + sxfer, LIBUSB_TRANSFER_CANCELLED); libusb20_tr_stop(pxfer0); /* make sure the queue doesn't stall */ libusb10_submit_transfer_sub( uxfer->dev_handle, endpoint); } else if (libusb20_tr_get_priv_sc1(pxfer1) == sxfer) { - libusb10_complete_transfer(pxfer1, sxfer, LIBUSB_TRANSFER_CANCELLED); + libusb10_complete_transfer(pxfer1, + sxfer, LIBUSB_TRANSFER_CANCELLED); libusb20_tr_stop(pxfer1); /* make sure the queue doesn't stall */ libusb10_submit_transfer_sub( uxfer->dev_handle, endpoint); } else { /* not started */ + retval = LIBUSB_ERROR_NOT_FOUND; } CTX_UNLOCK(dev->ctx); DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_cancel_transfer leave"); - return (0); + return (retval); } UNEXPORTED void ==== //depot/projects/usb/src/lib/libusb/libusb10.h#10 (text+ko) ==== @@ -65,7 +65,9 @@ uint8_t *curr_data; uint32_t rem_len; uint32_t last_len; - uint8_t flags; + uint8_t state; +#define LIBUSB_SUPER_XFER_ST_NONE 0 +#define LIBUSB_SUPER_XFER_ST_PEND 1 }; struct libusb_context { From owner-p4-projects@FreeBSD.ORG Wed Nov 18 21:10:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6C671065676; Wed, 18 Nov 2009 21:10: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 7B10A1065670 for ; Wed, 18 Nov 2009 21:10: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 676288FC33 for ; Wed, 18 Nov 2009 21:10:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAILAV64070602 for ; Wed, 18 Nov 2009 21:10:31 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAILAU5u070595 for perforce@freebsd.org; Wed, 18 Nov 2009 21:10:30 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 18 Nov 2009 21:10:30 GMT Message-Id: <200911182110.nAILAU5u070595@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 Precedence: bulk Cc: Subject: PERFORCE change 170785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 21:10:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=170785 Change 170785 by rene@rene_self on 2009/11/18 21:10:07 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#38 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#32 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#27 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#33 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/share/pgpkeys/mandree.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#29 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#26 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#25 integrate .. //depot/projects/docproj_nl/www/en/docs/books.sgml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#57 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#38 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -209,6 +209,12 @@ ISBN: 0072224096 + + BSD Magazine, + published by Software Press Sp. z o.o. SK. + ISSN 1898-9144 + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#27 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.491 2009/10/29 23:37:50 sylvio Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.492 2009/11/18 13:39:41 mandree Exp $ --> aaron@FreeBSD.org"> @@ -670,6 +670,8 @@ makc@FreeBSD.org"> +mandree@FreeBSD.org"> + manolis@FreeBSD.org"> marcel@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#33 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -19,6 +19,11 @@ &pgpkey.brix; + + &a.mandree; + &pgpkey.mandree; + + &a.will; &pgpkey.will; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#26 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -178,6 +178,7 @@ + ==== //depot/projects/docproj_nl/www/en/developers.sgml#25 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.232 2009/10/29 23:45:07 sylvio Exp $ +$FreeBSD: www/en/developers.sgml,v 1.233 2009/11/18 13:47:24 mandree Exp $ --> @@ -333,6 +333,7 @@ + ==== //depot/projects/docproj_nl/www/en/docs/books.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -466,6 +466,16 @@
  • +

    Profiling + and Debugging the FreeBSD Kernel

    +
    • + +
  • +

    Debugging + Buffer Overruns in the FreeBSD Kernel

    +
    • + +

  • Setting up Split DNS on FreeBSD 4.1

    • ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#57 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.278 2009/11/18 15:14:34 mandree Exp $ @@ -36,6 +36,14 @@ 11 + 18 + + +

    New committer: Matthias Andree (ports)

    +     +     + + 12 From owner-p4-projects@FreeBSD.ORG Wed Nov 18 21:21:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AE001065693; Wed, 18 Nov 2009 21:21: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 C2582106566B for ; Wed, 18 Nov 2009 21:21: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 B001C8FC19 for ; Wed, 18 Nov 2009 21:21:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAILLgxU071432 for ; Wed, 18 Nov 2009 21:21:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAILLgOP071430 for perforce@freebsd.org; Wed, 18 Nov 2009 21:21:42 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 18 Nov 2009 21:21:42 GMT Message-Id: <200911182121.nAILLgOP071430@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 Precedence: bulk Cc: Subject: PERFORCE change 170786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 21:21:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=170786 Change 170786 by rene@rene_self on 2009/11/18 21:20:52 MFen handbook/bibliography 1.86 -> 1.87 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#7 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.6 2009/06/23 21:14:20 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml - %SRCID% 1.86 + %SRCID% 1.87 Vertaald door: Siebrand Mazeland --> @@ -231,6 +231,11 @@ 2003. ISBN: 0072224096 + + BSD Magazine, + gepubliceerd door Software Press Sp. z.o.o. SK. + ISSN 1898-9144 + From owner-p4-projects@FreeBSD.ORG Thu Nov 19 08:06:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 241B91065695; Thu, 19 Nov 2009 08:06: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 DCC47106568F for ; Thu, 19 Nov 2009 08:06: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 C9CB98FC13 for ; Thu, 19 Nov 2009 08:06:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJ86REJ051370 for ; Thu, 19 Nov 2009 08:06:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJ86RJS051368 for perforce@freebsd.org; Thu, 19 Nov 2009 08:06:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Nov 2009 08:06:27 GMT Message-Id: <200911190806.nAJ86RJS051368@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 Precedence: bulk Cc: Subject: PERFORCE change 170795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 08:06:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=170795 Change 170795 by hselasky@hselasky_laptop001 on 2009/11/19 08:06:13 LibUSB v1.0: - fix a transfer cancelling bug/segfault - reported by: Robert Jenssen Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#17 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#17 (text+ko) ==== @@ -1115,6 +1115,8 @@ return; case 2: sxfer = libusb20_tr_get_priv_sc1(pxfer1); + if (sxfer == NULL) + return; /* cancelling */ if (sxfer->rem_len) return; /* cannot queue another one */ /* swap transfers */ @@ -1122,6 +1124,8 @@ break; case 1: sxfer = libusb20_tr_get_priv_sc1(pxfer0); + if (sxfer == NULL) + return; /* cancelling */ if (sxfer->rem_len) return; /* cannot queue another one */ /* swap transfers */ From owner-p4-projects@FreeBSD.ORG Thu Nov 19 10:25:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B20081065670; Thu, 19 Nov 2009 10:25: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 75922106566B for ; Thu, 19 Nov 2009 10:25:47 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6075D8FC08 for ; Thu, 19 Nov 2009 10:25:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJAPlhe073532 for ; Thu, 19 Nov 2009 10:25:47 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJAPkv8073530 for perforce@freebsd.org; Thu, 19 Nov 2009 10:25:46 GMT (envelope-from raj@freebsd.org) Date: Thu, 19 Nov 2009 10:25:46 GMT Message-Id: <200911191025.nAJAPkv8073530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 10:25:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=170797 Change 170797 by raj@raj_fdt on 2009/11/19 10:24:52 IFC@170794 Affected files ... .. //depot/projects/fdt/ObsoleteFiles.inc#2 integrate .. //depot/projects/fdt/UPDATING#3 integrate .. //depot/projects/fdt/bin/Makefile#2 integrate .. //depot/projects/fdt/bin/ps/keyword.c#3 integrate .. //depot/projects/fdt/bin/pwait/Makefile#1 branch .. //depot/projects/fdt/bin/pwait/pwait.1#1 branch .. //depot/projects/fdt/bin/pwait/pwait.c#1 branch .. //depot/projects/fdt/bin/sh/parser.c#2 integrate .. //depot/projects/fdt/contrib/libpcap/inet.c#3 integrate .. //depot/projects/fdt/etc/Makefile#2 integrate .. //depot/projects/fdt/etc/etc.amd64/ttys#2 integrate .. //depot/projects/fdt/etc/etc.arm/ttys#2 integrate .. //depot/projects/fdt/etc/etc.i386/ttys#2 integrate .. //depot/projects/fdt/etc/etc.ia64/ttys#2 integrate .. //depot/projects/fdt/etc/etc.mips/ttys#2 integrate .. //depot/projects/fdt/etc/etc.pc98/ttys#1 branch .. //depot/projects/fdt/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/fdt/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/fdt/etc/root/dot.profile#2 integrate .. //depot/projects/fdt/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/fdt/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/fdt/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/fdt/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/fdt/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/fdt/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/fdt/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/fdt/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/fdt/lib/libc/posix1e/acl_from_text.c#2 integrate .. //depot/projects/fdt/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/fdt/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/fdt/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate .. //depot/projects/fdt/lib/librt/Makefile#2 integrate .. //depot/projects/fdt/lib/librt/mq.c#2 integrate .. //depot/projects/fdt/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/fdt/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/fdt/release/picobsd/floppy.tree/etc/ttys#2 integrate .. //depot/projects/fdt/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/fdt/share/man/man3/queue.3#2 integrate .. //depot/projects/fdt/share/man/man4/Makefile#2 integrate .. //depot/projects/fdt/share/man/man4/atp.4#1 branch .. //depot/projects/fdt/share/man/man4/netintro.4#3 integrate .. //depot/projects/fdt/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/fdt/share/man/man4/wi.4#2 integrate .. //depot/projects/fdt/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/fdt/share/man/man8/Makefile#2 integrate .. //depot/projects/fdt/share/man/man8/rc.8#2 integrate .. //depot/projects/fdt/share/misc/committers-ports.dot#2 integrate .. //depot/projects/fdt/share/skel/dot.profile#2 integrate .. //depot/projects/fdt/share/timedef/ja_JP.SJIS.src#3 integrate .. //depot/projects/fdt/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/fdt/share/timedef/ja_JP.eucJP.src#3 integrate .. //depot/projects/fdt/share/zoneinfo/antarctica#3 integrate .. //depot/projects/fdt/share/zoneinfo/australasia#2 integrate .. //depot/projects/fdt/share/zoneinfo/etcetera#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/fdt/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/fdt/sys/amd64/include/param.h#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/fdt/sys/cam/cam_periph.c#3 integrate .. //depot/projects/fdt/sys/cam/cam_queue.c#2 integrate .. //depot/projects/fdt/sys/cam/cam_queue.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/fdt/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/fdt/sys/conf/NOTES#3 integrate .. //depot/projects/fdt/sys/conf/files#3 integrate .. //depot/projects/fdt/sys/conf/options#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/fdt/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/fdt/sys/ddb/db_command.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/fdt/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/fdt/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/fdt/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/fdt/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/fdt/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/fdt/sys/dev/de/if_de.c#2 integrate .. //depot/projects/fdt/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/fdt/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/fdt/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/fdt/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/fdt/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/fdt/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/fdt/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/fdt/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/fdt/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/fdt/sys/dev/siis/siis.c#3 integrate .. //depot/projects/fdt/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/fdt/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/fdt/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/fdt/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/fdt/sys/dev/tl/if_tl.c#2 integrate .. //depot/projects/fdt/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/fdt/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/fdt/sys/dev/wb/if_wb.c#2 integrate .. //depot/projects/fdt/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/fdt/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/fdt/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/fdt/sys/isa/vga_isa.c#3 integrate .. //depot/projects/fdt/sys/kern/kern_jail.c#3 integrate .. //depot/projects/fdt/sys/kern/kern_linker.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_sig.c#3 integrate .. //depot/projects/fdt/sys/kern/tty.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/fdt/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/fdt/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/fdt/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/fdt/sys/net/if.c#3 integrate .. //depot/projects/fdt/sys/net/if.h#3 integrate .. //depot/projects/fdt/sys/net/if_var.h#3 integrate .. //depot/projects/fdt/sys/net/route.c#2 integrate .. //depot/projects/fdt/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctputil.c#2 integrate .. //depot/projects/fdt/sys/netinet6/nd6.c#3 integrate .. //depot/projects/fdt/sys/netipsec/key.c#2 integrate .. //depot/projects/fdt/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/fdt/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#3 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/fdt/sys/sys/param.h#3 integrate .. //depot/projects/fdt/sys/sys/priv.h#3 integrate .. //depot/projects/fdt/sys/sys/signal.h#2 integrate .. //depot/projects/fdt/sys/sys/signalvar.h#3 integrate .. //depot/projects/fdt/sys/sys/sockio.h#3 integrate .. //depot/projects/fdt/sys/vm/vm_extern.h#2 integrate .. //depot/projects/fdt/sys/vm/vm_fault.c#3 integrate .. //depot/projects/fdt/sys/vm/vm_map.c#3 integrate .. //depot/projects/fdt/sys/vm/vm_map.h#2 integrate .. //depot/projects/fdt/tools/regression/bin/sh/parser/for1.0#1 branch .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/Makefile#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate .. //depot/projects/fdt/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate .. //depot/projects/fdt/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/fdt/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate .. //depot/projects/fdt/usr.bin/gencat/gencat.c#2 integrate .. //depot/projects/fdt/usr.bin/gzip/unbzip2.c#3 integrate .. //depot/projects/fdt/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/fdt/usr.bin/make/arch.c#2 integrate .. //depot/projects/fdt/usr.bin/make/dir.c#2 integrate .. //depot/projects/fdt/usr.bin/make/job.c#2 integrate .. //depot/projects/fdt/usr.bin/systat/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/systat/main.c#2 integrate .. //depot/projects/fdt/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/fdt/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/fdt/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate .. //depot/projects/fdt/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/termcap.c#2 integrate Differences ... ==== //depot/projects/fdt/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij 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. # +# 20091117: removal of rc.early(8) link +OLD_FILES+=usr/share/man/man8/rc.early.8.gz # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed ==== //depot/projects/fdt/UPDATING#3 (text+ko) ==== @@ -22,6 +22,21 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091113: + The default terminal emulation for syscons(4) has been changed + from cons25 to xterm on all platforms except pc98. This means + that the /etc/ttys file needs to be updated to ensure correct + operation of applications on the console. + + The terminal emulation style can be toggled per window by using + vidcontrol(1)'s -T flag. The TEKEN_CONS25 kernel configuration + options can be used to change the compile-time default back to + cons25. + + To prevent graphical artifacts, make sure the TERM environment + variable is set to match the terminal emulation that is being + performed by syscons(4). + 20091109: The layout of the structure ieee80211req_scan_result has changed. Applications that require wireless scan results (e.g. ifconfig(8)) @@ -1057,4 +1072,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $ ==== //depot/projects/fdt/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $ +# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $ .include @@ -27,6 +27,7 @@ pax \ pkill \ ps \ + pwait \ pwd \ ${_rcp} \ realpath \ ==== //depot/projects/fdt/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $"); #include #include @@ -330,6 +330,7 @@ errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); + free(realfmt); } return ((VAR *)NULL); } ==== //depot/projects/fdt/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.66 2009/11/14 22:08:32 jilles Exp $"); #include #include @@ -364,7 +364,9 @@ n1 = (union node *)stalloc(sizeof (struct nfor)); n1->type = NFOR; n1->nfor.var = wordtext; - if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) { + while (readtoken() == TNL) + ; + if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) { app = ≈ while (readtoken() == TWORD) { n2 = (union node *)stalloc(sizeof (struct narg)); ==== //depot/projects/fdt/contrib/libpcap/inet.c#3 (text+ko) ==== @@ -403,30 +403,22 @@ pcap_addr_t *curaddr, *prevaddr, *nextaddr; #ifdef SIOCGIFDESCR struct ifreq ifrdesc; -#ifdef __FreeBSD__ -#define _IFDESCRSIZE 64 - char ifdescr[_IFDESCRSIZE]; -#else char ifdescr[IFDESCRSIZE]; + int s; #endif - int s; +#ifdef SIOCGIFDESCR /* * Get the description for the interface. */ memset(&ifrdesc, 0, sizeof ifrdesc); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); -#ifdef __FreeBSD__ - ifrdesc.ifr_buffer.buffer = ifdescr; - ifrdesc.ifr_buffer.length = _IFDESCRSIZE; -#else ifrdesc.ifr_data = (caddr_t)&ifdescr; -#endif s = socket(AF_INET, SOCK_DGRAM, 0); if (s >= 0) { if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 && - strlen(ifdescr) != 0) - description = ifdescr; + strlen(ifrdesc.ifr_data) != 0) + description = ifrdesc.ifr_data; close(s); } #endif ==== //depot/projects/fdt/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $ +# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ .include @@ -18,8 +18,13 @@ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ - sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys + sysctl.conf syslog.conf + +.if exists(${.CURDIR}/etc.${MACHINE}/ttys) +BIN1+= etc.${MACHINE}/ttys +.else +BIN1+= etc.${MACHINE_ARCH}/ttys +.endif OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ ==== //depot/projects/fdt/etc/etc.amd64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.19 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/fdt/etc/etc.arm/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/fdt/etc/etc.i386/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.19 2009/11/13 11:28:54 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/fdt/etc/etc.ia64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.ia64/ttys,v 1.12 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.ia64/ttys,v 1.13 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure -# Virtual terminals. -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals. The 'dialup' keyword identifies dialin lines to login, # fingerd etc. ==== //depot/projects/fdt/etc/etc.mips/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.6 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.7 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. ==== //depot/projects/fdt/etc/etc.powerpc/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/fdt/etc/etc.sparc64/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.20 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.21 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -34,15 +34,15 @@ ttya "/usr/libexec/getty 3wire.9600" vt100 off secure ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure # syscons(4) -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/fdt/etc/root/dot.profile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $ +# $FreeBSD: src/etc/root/dot.profile,v 1.22 2009/11/13 05:54:55 ed Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin export PATH HOME=/root export HOME -TERM=${TERM:-cons25} +TERM=${TERM:-xterm} export TERM PAGER=more export PAGER ==== //depot/projects/fdt/lib/libc/gen/tzset.3#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tzset.3 8.2 (Berkeley) 11/17/93 -.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.16 2007/01/09 00:27:56 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.17 2009/11/17 16:29:39 obrien Exp $ .\" .Dd November 17, 1993 .Dt TZSET 3 @@ -310,14 +310,14 @@ rules for .Tn POSIX Ns -style .Tn TZ Ns 's -.It Pa /usr/share/zoneinfo/GMT +.It Pa /usr/share/zoneinfo/Etc/GMT for .Tn UTC leap seconds .El .Pp If the file -.Pa /usr/share/zoneinfo/GMT +.Pa /usr/share/zoneinfo/UTC does not exist, .Tn UTC leap seconds are loaded from ==== //depot/projects/fdt/lib/libc/locale/isgraph.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isgraph.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.24 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.25 2009/11/13 09:03:50 roam Exp $ .\" .Dd July 17, 2005 .Dt ISGRAPH 3 @@ -50,7 +50,7 @@ function tests for any printing character except space .Pq Ql "\ " and other -locale specific space-like characters. +locale-specific space-like characters. The value of the argument must be representable as an .Vt "unsigned char" or the value of ==== //depot/projects/fdt/lib/libc/locale/isprint.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isprint.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.25 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.26 2009/11/13 09:07:33 roam Exp $ .\" .Dd July 17, 2005 .Dt ISPRINT 3 @@ -47,7 +47,7 @@ .Sh DESCRIPTION The .Fn isprint -function tests for any printing character including space +function tests for any printing character, including space .Pq Ql "\ " . The value of the argument must be representable as an .Vt "unsigned char" ==== //depot/projects/fdt/lib/libc/locale/nl_langinfo.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.6 2005/01/20 09:17:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.7 2009/11/16 14:33:31 brueffer Exp $ .\" .Dd May 3, 2001 .Dt NL_LANGINFO 3 @@ -53,7 +53,7 @@ or to the category .Dv LC_ALL , -may overwrite buffer pointed by the return value. +may overwrite the buffer pointed to by the return value. .Sh RETURN VALUES In a locale where langinfo data is not defined, .Fn nl_langinfo ==== //depot/projects/fdt/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -45,13 +45,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.21 2009/11/12 11:54:12 ume Exp $"); #include #include #include #include #include +#include #include #include #include @@ -385,6 +386,7 @@ { const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)(const void *)sa; + const struct fw_hwaddr *iha; int n; if (serv != NULL && servlen > 0) @@ -400,6 +402,15 @@ } switch (sdl->sdl_type) { + case IFT_IEEE1394: + if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo)) + return EAI_FAMILY; + iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl); + return hexname((const u_int8_t *)&iha->sender_unique_ID_hi, + sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo), + host, hostlen); /* * The following have zero-length addresses. * IFT_ATM (net/if_atmsubr.c) ==== //depot/projects/fdt/lib/libc/nls/hu_HU.ISO8859-2.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/hu_HU.ISO8859-2.msg,v 1.1 2009/03/13 10:40:38 gabor Exp $ +$ $FreeBSD: src/lib/libc/nls/hu_HU.ISO8859-2.msg,v 1.2 2009/11/17 18:57:44 gabor Exp $ $ $ Message catalog for hu_HU.ISO8859-2 locale $ @@ -181,6 +181,16 @@ 87 Attribútum nem található $ EDOOFUS 88 Programozási hiba +$ EBADMSG +89 Helytelen üzenet +$ EMULTIHOP +90 Multihop kísérlet +$ ENOLINK +91 A kapcsolat szigorítva lett +$ EPROTO +92 Protokol hiba +$ ENOTCAPABLE +93 Elégtelen képességek $ $ strsignal() support catalog $ @@ -247,3 +257,39 @@ 30 Felhasználói szignál 1 $ SIGUSR2 31 Felhasználói szignál 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (elavult) +1 A hosztnévhez tartozó címcsalád nem támogatott +$ EAI_AGAIN +2 Ideiglenes hiba a névfeloldáskor +$ EAI_BADFLAGS +3 Érvénytelen ai_flags érték +$ EAI_FAIL +4 Nem helyreállítható hiba a névfeloldásban +$ EAI_FAMILY +5 ai_family nem támogatott +$ EAI_MEMORY +6 Memóriafoglalási hiba +$ 7 (elavult) +7 Nem tartozik cím í hosztnévhez +$ EAI_NONAME +8 Se hosztnév, se szolgáltatásnév nem áll rendelkezésre +$ EAI_SERVICE +9 Nem támogatott ai_socktype szolgáltatásnév +$ EAI_SOCKTYPE +10 ai_socktype nem támogatott +$ EAI_SYSTEM +11 Rendszerhiba jött vissza az errno változóban +$ EAI_BADHINTS +12 Érvénytelen hint érték +$ EAI_PROTOCOL +13 A feloldott protokol ismeretlen +$ EAI_OVERFLOW +14 Az argumentumok puffere túlcsordult +$ 0 +32766 Siker +$ NL_MSGMAX +32767 Ismeretlen hiba ==== //depot/projects/fdt/lib/libc/nls/ko_KR.UTF-8.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $ +$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $ $ $ Message catalog for ko_KR.UTF-8 locale $ @@ -181,6 +181,16 @@ 87 ì†ì„±ì„ ì°¾ì„ ìˆ˜ 없습니다 $ EDOOFUS 88 í”„ë¡œê·¸ëž¨ìƒ ì˜¤ë¥˜ìž…ë‹ˆë‹¤ +$ EBADMSG +89 ìž˜ëª»ëœ ë©”ì‹œì§€ìž…ë‹ˆë‹¤ +$ EMULTIHOP +90 ë©€í‹°í™‰ì´ ì‹œë„ë˜ì—ˆìŠµë‹ˆë‹¤ +$ ENOLINK +91 ì—°ê²°ì´ ëŠê²¼ìŠµë‹ˆë‹¤ +$ EPROTO +92 í”„ë¡œí† ì½œì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ +$ ENOTCAPABLE +93 ì ‘ê·¼ ëŠ¥ë ¥ì´ ì¶©ë¶„ì¹˜ 않습니다 $ $ strsignal() support catalog $ @@ -230,7 +240,7 @@ $ SIGTTOU 22 정지 (í„°ë¯¸ë„ ì¶œë ¥) $ SIGIO -23 I/O possible +23 I/O 가능 $ SIGXCPU 24 CPU 사용 시간 초과 $ SIGXFSZ @@ -247,3 +257,39 @@ 30 ì‚¬ìš©ìž ì •ì˜ ì‹œê·¸ë„ 1 $ SIGUSR2 31 ì‚¬ìš©ìž ì •ì˜ ì‹œê·¸ë„ 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 호스트 ì´ë¦„ì´ ì§€ì›í•˜ì§€ 않는 주소군입니다 +$ EAI_AGAIN +2 주소 ë³€í™˜ì— ì¼ì‹œì ìœ¼ë¡œ 실패했습니다 +$ EAI_BADFLAGS +3 ìž˜ëª»ëœ ai_flags입니다 +$ EAI_FAIL +4 주소 ë³€í™˜ì— ì™„ì „ížˆ 실패했습니다 +$ EAI_FAMILY +5 지ì›ë˜ì§€ 않는 ai_family입니다 +$ EAI_MEMORY +6 메모리 í• ë‹¹ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ +$ 7 (obsolete) +7 호스트 ì´ë¦„ê³¼ ì¼ì¹˜í•˜ëŠ” 주소가 없습니다 +$ EAI_NONAME +8 호스트 ì´ë¦„ ë˜ëŠ” 서비스 ì´ë¦„ì´ ì§€ì •ë˜ì§€ 않았거나 ì•Œ 수 없습니다 +$ EAI_SERVICE +9 서비스 ì´ë¦„ì€ ai_socktypeì—ì„œ 지ì›ë˜ì§€ 않습니다 +$ EAI_SOCKTYPE +10 지ì›ë˜ì§€ 않는 ai_socktype입니다 +$ EAI_SYSTEM +11 시스템 오류가 errnoì— ë°˜í™˜ë˜ì—ˆìŠµë‹ˆë‹¤ +$ EAI_BADHINTS +12 ìž˜ëª»ëœ hints입니다 +$ EAI_PROTOCOL +13 ì•Œ 수 없는 í”„ë¡œí† ì½œì´ ë³€í™˜ë˜ì—ˆìŠµë‹ˆë‹¤ +$ EAI_OVERFLOW +14 ì¸ìž ë²„í¼ ê³µê°„ì´ ëª¨ìžëžë‹ˆë‹¤ +$ 0 +32766 성공 +$ NL_MSGMAX +32767 ì•Œ 수 없는 오류 ==== //depot/projects/fdt/lib/libc/nls/ko_KR.eucKR.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $ +$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $ $ $ Message catalog for ko_KR.eucKR locale $ @@ -181,6 +181,16 @@ 87 ¼Ó¼ºÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù $ EDOOFUS 88 ÇÁ·Î±×·¥»ó ¿À·ùÀÔ´Ï´Ù +$ EBADMSG >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 19 10:52:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 422AD1065679; Thu, 19 Nov 2009 10:52: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 05CAE106566B for ; Thu, 19 Nov 2009 10:52:14 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6D448FC13 for ; Thu, 19 Nov 2009 10:52:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJAqD2b075439 for ; Thu, 19 Nov 2009 10:52:13 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJAqDE0075437 for perforce@freebsd.org; Thu, 19 Nov 2009 10:52:13 GMT (envelope-from raj@freebsd.org) Date: Thu, 19 Nov 2009 10:52:13 GMT Message-Id: <200911191052.nAJAqDE0075437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 10:52:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=170798 Change 170798 by raj@raj_fdt on 2009/11/19 10:51:37 Make dtc compile with yacc (which is in BSD base) and not only bison. Affected files ... .. //depot/projects/fdt/sys/contrib/dtc/dtc-lexer.l#2 edit .. //depot/projects/fdt/sys/contrib/dtc/dtc-parser.y#2 edit Differences ... ==== //depot/projects/fdt/sys/contrib/dtc/dtc-lexer.l#2 (text+ko) ==== @@ -38,6 +38,8 @@ #include "srcpos.h" #include "dtc-parser.tab.h" +YYLTYPE yylloc; + #define YY_USER_ACTION \ { \ yylloc.file = srcpos_file; \ ==== //depot/projects/fdt/sys/contrib/dtc/dtc-parser.y#2 (text+ko) ==== @@ -18,14 +18,14 @@ * USA */ -%locations - %{ #include #include "dtc.h" #include "srcpos.h" +YYLTYPE yylloc; + extern int yylex(void); extern void yyerror(char const *s); From owner-p4-projects@FreeBSD.ORG Thu Nov 19 10:54:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AF1B1065672; Thu, 19 Nov 2009 10:54: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 2F614106566C for ; Thu, 19 Nov 2009 10:54:16 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C9478FC13 for ; Thu, 19 Nov 2009 10:54:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJAsFS7075557 for ; Thu, 19 Nov 2009 10:54:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJAsFkK075555 for perforce@freebsd.org; Thu, 19 Nov 2009 10:54:15 GMT (envelope-from raj@freebsd.org) Date: Thu, 19 Nov 2009 10:54:15 GMT Message-Id: <200911191054.nAJAsFkK075555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 10:54:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=170799 Change 170799 by raj@raj_fdt on 2009/11/19 10:53:49 Provide a BSD-style makefile for the 'dtc'. This lets build the tool with the regular BSD make and not rely on optional components (gmake). Affected files ... .. //depot/projects/fdt/gnu/usr.bin/Makefile#2 edit .. //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#1 add .. //depot/projects/fdt/share/mk/bsd.own.mk#2 edit .. //depot/projects/fdt/tools/build/options/WITH_FDT#1 add Differences ... ==== //depot/projects/fdt/gnu/usr.bin/Makefile#2 (text+ko) ==== @@ -11,6 +11,7 @@ dialog \ diff \ diff3 \ + ${_dtc} \ ${_gdb} \ ${_gperf} \ ${_grep} \ @@ -42,6 +43,10 @@ _cvs= cvs .endif +.if ${MK_FDT} != "no" +_dtc= dtc +.endif + .if ${MK_GNU_GREP} != "no" _grep= grep .endif ==== //depot/projects/fdt/share/mk/bsd.own.mk#2 (text+ko) ==== @@ -407,6 +407,7 @@ BIND_LIBS \ BIND_SIGCHASE \ BIND_XML \ + FDT \ GNU_CPIO \ HESIOD \ IDEA From owner-p4-projects@FreeBSD.ORG Thu Nov 19 16:36:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26D671065696; Thu, 19 Nov 2009 16:36:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEE06106568B for ; Thu, 19 Nov 2009 16:35:59 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCF268FC1D for ; Thu, 19 Nov 2009 16:35:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJGZxhT017311 for ; Thu, 19 Nov 2009 16:35:59 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJGZxgf017309 for perforce@freebsd.org; Thu, 19 Nov 2009 16:35:59 GMT (envelope-from raj@freebsd.org) Date: Thu, 19 Nov 2009 16:35:59 GMT Message-Id: <200911191635.nAJGZxgf017309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 16:36:00 -0000 http://p4web.freebsd.org/chv.cgi?CH=170815 Change 170815 by raj@raj_fdt on 2009/11/19 16:35:58 IFC @170814 Affected files ... .. //depot/projects/fdt/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/fdt/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/fdt/sys/conf/files#4 integrate .. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/fdt/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/fdt/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/fdt/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/fdt/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#3 integrate Differences ... ==== //depot/projects/fdt/contrib/ipfilter/man/ipf.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.8 2007/06/04 02:54:34 darrenr Exp $ +.\" $FreeBSD: src/contrib/ipfilter/man/ipf.8,v 1.9 2009/11/19 08:10:24 darrenr Exp $ .TH IPF 8 .SH NAME ipf \- alters packet filtering lists for IP packet input and output @@ -46,7 +46,7 @@ \fBC\fB (-cc) for which two files - \fBip_rules.c\fP and \fBip_rules.h\fP are generated in the \fBCURRENT DIRECTORY\fP when \fBipf\fP is being run. These files can be used with the -\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticly into +\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticlly into the kernel. .TP .B \-d ==== //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.16 2009/11/18 23:40:19 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.17 2009/11/19 15:45:24 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -491,7 +491,7 @@ #ifdef _KERNEL stream.ibuf = (char *)contigmalloc(stream.cur_ip, M_BPFJIT, - M_NOWAIT, 0, ~0ULL, 16, 0); + M_NOWAIT, 0, ~0UL, 16, 0); if (stream.ibuf == NULL) break; #else ==== //depot/projects/fdt/sys/boot/uboot/common/metadata.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/common/metadata.c,v 1.1 2008/09/03 15:52:05 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/common/metadata.c,v 1.2 2009/11/19 16:25:41 raj Exp $"); #include #include @@ -231,6 +231,7 @@ struct preloaded_file *fp; struct file_metadata *md; int c; + vm_offset_t a; c = addr != 0; /* start with the first module on the list, should be the kernel */ @@ -240,7 +241,8 @@ MOD_TYPE(addr, fp->f_type, c); if (fp->f_args) MOD_ARGS(addr, fp->f_args, c); - MOD_ADDR(addr, fp->f_addr, c); + a = fp->f_addr - __elfN(relocation_offset); + MOD_ADDR(addr, a, c); MOD_SIZE(addr, fp->f_size, c); for (md = fp->f_metadata; md != NULL; md = md->md_next) { if (!(md->md_type & MODINFOMD_NOCOPY)) ==== //depot/projects/fdt/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1484 2009/11/16 21:47:12 jkim Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1485 2009/11/19 16:26:07 mav Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -112,12 +112,12 @@ cam/cam_xpt.c optional scbus cam/ata/ata_all.c optional scbus cam/ata/ata_xpt.c optional scbus +cam/ata/ata_pmp.c optional scbus cam/scsi/scsi_xpt.c optional scbus cam/scsi/scsi_all.c optional scbus cam/scsi/scsi_cd.c optional cd cam/scsi/scsi_ch.c optional ch -cam/ata/ata_da.c optional da -cam/ata/ata_pmp.c optional da +cam/ata/ata_da.c optional ada | da cam/scsi/scsi_da.c optional da cam/scsi/scsi_low.c optional ct | ncv | nsp | stg cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg ==== //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.16 2009/11/18 23:40:19 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.17 2009/11/19 15:45:24 jkim Exp $"); #ifdef _KERNEL #include "opt_bpf.h" @@ -514,7 +514,7 @@ #ifdef _KERNEL stream.ibuf = (char *)contigmalloc(stream.cur_ip, M_BPFJIT, - M_NOWAIT, 0, ~0ULL, 16, 0); + M_NOWAIT, 0, ~0UL, 16, 0); if (stream.ibuf == NULL) break; #else ==== //depot/projects/fdt/sys/kern/vfs_subr.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.770 2009/10/01 17:22:03 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.771 2009/11/19 14:33:03 jh Exp $"); #include "opt_ddb.h" @@ -2761,6 +2761,7 @@ DB_SHOW_COMMAND(mount, db_show_mount) { struct mount *mp; + struct vfsopt *opt; struct statfs *sp; struct vnode *vp; char buf[512]; @@ -2866,6 +2867,18 @@ } db_printf(" mnt_kern_flag = %s\n", buf); + db_printf(" mnt_opt = "); + opt = TAILQ_FIRST(mp->mnt_opt); + if (opt != NULL) { + db_printf("%s", opt->name); + opt = TAILQ_NEXT(opt, link); + while (opt != NULL) { + db_printf(", %s", opt->name); + opt = TAILQ_NEXT(opt, link); + } + } + db_printf("\n"); + sp = &mp->mnt_stat; db_printf(" mnt_stat = { version=%u type=%u flags=0x%016jx " "bsize=%ju iosize=%ju blocks=%ju bfree=%ju bavail=%jd files=%ju " ==== //depot/projects/fdt/sys/netinet/in_mcast.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.34 2009/09/18 15:12:31 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.35 2009/11/19 13:21:37 bms Exp $"); #include #include @@ -1967,7 +1967,7 @@ imf = &imo->imo_mfilters[idx]; if (ssa->ss.ss_family != AF_UNSPEC) { /* - * MCAST_JOIN_SOURCE on an exclusive membership + * MCAST_JOIN_SOURCE_GROUP on an exclusive membership * is an error. On an existing inclusive membership, * it just adds the source to the filter list. */ ==== //depot/projects/fdt/sys/netinet6/in6_mcast.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_mcast.c,v 1.9 2009/08/01 19:26:27 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_mcast.c,v 1.14 2009/11/19 13:39:07 bms Exp $"); #include "opt_inet6.h" @@ -1814,6 +1814,7 @@ ifp = NULL; imf = NULL; + lims = NULL; error = 0; is_new = 0; @@ -1917,11 +1918,6 @@ */ (void)in6_setscope(&gsa->sin6.sin6_addr, ifp, NULL); - /* - * MCAST_JOIN_SOURCE on an exclusive membership is an error. - * On an existing inclusive membership, it just adds the - * source to the filter list. - */ imo = in6p_findmoptions(inp); idx = im6o_match_group(imo, ifp, &gsa->sa); if (idx == -1) { @@ -1929,16 +1925,53 @@ } else { inm = imo->im6o_membership[idx]; imf = &imo->im6o_mfilters[idx]; - if (ssa->ss.ss_family != AF_UNSPEC && - imf->im6f_st[1] != MCAST_INCLUDE) { + if (ssa->ss.ss_family != AF_UNSPEC) { + /* + * MCAST_JOIN_SOURCE_GROUP on an exclusive membership + * is an error. On an existing inclusive membership, + * it just adds the source to the filter list. + */ + if (imf->im6f_st[1] != MCAST_INCLUDE) { + error = EINVAL; + goto out_in6p_locked; + } + /* + * Throw out duplicates. + * + * XXX FIXME: This makes a naive assumption that + * even if entries exist for *ssa in this imf, + * they will be rejected as dupes, even if they + * are not valid in the current mode (in-mode). + * + * in6_msource is transactioned just as for anything + * else in SSM -- but note naive use of in6m_graft() + * below for allocating new filter entries. + * + * This is only an issue if someone mixes the + * full-state SSM API with the delta-based API, + * which is discouraged in the relevant RFCs. + */ + lims = im6o_match_source(imo, idx, &ssa->sa); + if (lims != NULL /*&& + lims->im6sl_st[1] == MCAST_INCLUDE*/) { + error = EADDRNOTAVAIL; + goto out_in6p_locked; + } + } else { + /* + * MCAST_JOIN_GROUP alone, on any existing membership, + * is rejected, to stop the same inpcb tying up + * multiple refs to the in_multi. + * On an existing inclusive membership, this is also + * an error; if you want to change filter mode, + * you must use the userland API setsourcefilter(). + * XXX We don't reject this for imf in UNDEFINED + * state at t1, because allocation of a filter + * is atomic with allocation of a membership. + */ error = EINVAL; goto out_in6p_locked; } - lims = im6o_match_source(imo, idx, &ssa->sa); - if (lims != NULL) { - error = EADDRNOTAVAIL; - goto out_in6p_locked; - } } /* @@ -1970,7 +2003,13 @@ /* * Graft new source into filter list for this inpcb's * membership of the group. The in6_multi may not have - * been allocated yet if this is a new membership. + * been allocated yet if this is a new membership, however, + * the in_mfilter slot will be allocated and must be initialized. + * + * Note: Grafting of exclusive mode filters doesn't happen + * in this path. + * XXX: Should check for non-NULL lims (node exists but may + * not be in-mode) for interop with full-state API. */ if (ssa->ss.ss_family != AF_UNSPEC) { /* Membership starts in IN mode */ @@ -1987,6 +2026,12 @@ error = ENOMEM; goto out_im6o_free; } + } else { + /* No address specified; Membership starts in EX mode */ + if (is_new) { + CTR1(KTR_MLD, "%s: new join w/o source", __func__); + im6f_init(imf, MCAST_UNDEFINED, MCAST_EXCLUDE); + } } /* @@ -2272,8 +2317,10 @@ if (is_final) { /* Remove the gap in the membership array. */ - for (++idx; idx < imo->im6o_num_memberships; ++idx) + for (++idx; idx < imo->im6o_num_memberships; ++idx) { imo->im6o_membership[idx-1] = imo->im6o_membership[idx]; + imo->im6o_mfilters[idx-1] = imo->im6o_mfilters[idx]; + } imo->im6o_num_memberships--; } @@ -2340,9 +2387,11 @@ if (error) return (error); - if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc || - (msfr.msfr_fmode != MCAST_EXCLUDE && - msfr.msfr_fmode != MCAST_INCLUDE)) + if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc) + return (ENOBUFS); + + if (msfr.msfr_fmode != MCAST_EXCLUDE && + msfr.msfr_fmode != MCAST_INCLUDE) return (EINVAL); if (msfr.msfr_group.ss_family != AF_INET6 || ==== //depot/projects/fdt/sys/netinet6/raw_ip6.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.111 2009/08/01 19:26:27 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.112 2009/11/19 11:55:19 bms Exp $"); #include "opt_ipsec.h" #include "opt_inet6.h" @@ -213,17 +213,39 @@ */ if (in6p->in6p_moptions && IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { - struct sockaddr_in6 mcaddr; + /* + * If the incoming datagram is for MLD, allow it + * through unconditionally to the raw socket. + * + * Use the M_RTALERT_MLD flag to check for MLD + * traffic without having to inspect the mbuf chain + * more deeply, as all MLDv1/v2 host messages MUST + * contain the Router Alert option. + * + * In the case of MLDv1, we may not have explicitly + * joined the group, and may have set IFF_ALLMULTI + * on the interface. im6o_mc_filter() may discard + * control traffic we actually need to see. + * + * Userland multicast routing daemons should continue + * filter the control traffic appropriately. + */ int blocked; - bzero(&mcaddr, sizeof(struct sockaddr_in6)); - mcaddr.sin6_len = sizeof(struct sockaddr_in6); - mcaddr.sin6_family = AF_INET6; - mcaddr.sin6_addr = ip6->ip6_dst; + blocked = MCAST_PASS; + if ((m->m_flags & M_RTALERT_MLD) == 0) { + struct sockaddr_in6 mcaddr; + + bzero(&mcaddr, sizeof(struct sockaddr_in6)); + mcaddr.sin6_len = sizeof(struct sockaddr_in6); + mcaddr.sin6_family = AF_INET6; + mcaddr.sin6_addr = ip6->ip6_dst; - blocked = im6o_mc_filter(in6p->in6p_moptions, ifp, - (struct sockaddr *)&mcaddr, - (struct sockaddr *)&fromsa); + blocked = im6o_mc_filter(in6p->in6p_moptions, + ifp, + (struct sockaddr *)&mcaddr, + (struct sockaddr *)&fromsa); + } if (blocked != MCAST_PASS) { IP6STAT_INC(ip6s_notmember); continue; ==== //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#3 (text+ko) ==== @@ -55,7 +55,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from $NetBSD: cpu_subr.c,v 1.1 2003/02/03 17:10:09 matt Exp $ - * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.21 2009/11/06 06:09:04 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/cpu.c,v 1.22 2009/11/19 16:21:26 raj Exp $ */ #include @@ -429,6 +429,8 @@ { register_t hid0; + printf("\n"); + hid0 = mfspr(SPR_HID0); printf("cpu%d: HID0 %b", cpuid, (int)hid0, HID0_E500_BITMASK); } From owner-p4-projects@FreeBSD.ORG Thu Nov 19 22:35:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F9751065676; Thu, 19 Nov 2009 22:35: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 AFD75106566B for ; Thu, 19 Nov 2009 22:35: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 9BABA8FC08 for ; Thu, 19 Nov 2009 22:35:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJMZ2Rc072197 for ; Thu, 19 Nov 2009 22:35:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAJMZ2XH072195 for perforce@freebsd.org; Thu, 19 Nov 2009 22:35:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Nov 2009 22:35:02 GMT Message-Id: <200911192235.nAJMZ2XH072195@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 Precedence: bulk Cc: Subject: PERFORCE change 170842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 22:35:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=170842 Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 USB input: - ATP patch from Rohit Grover: - fixes some minor issues and makes the control transfer fully asynchronous Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/atp.c#2 (text+ko) ==== @@ -341,6 +341,7 @@ enum { ATP_INTR_DT, + ATP_RESET, ATP_N_TRANSFER, }; @@ -421,6 +422,7 @@ /* device initialization and shutdown */ static usb_error_t atp_req_get_report(struct usb_device *udev, void *data); static int atp_set_device_mode(device_t dev, interface_mode mode); +static void atp_reset_callback(struct usb_xfer *, usb_error_t); static int atp_enable(struct atp_softc *sc); static void atp_disable(struct atp_softc *sc); static int atp_softc_populate(struct atp_softc *); @@ -501,6 +503,40 @@ return (0); } +void +atp_reset_callback(struct usb_xfer *xfer, usb_error_t error) +{ + usb_device_request_t req; + struct usb_page_cache *pc; + struct atp_softc *sc = usbd_xfer_softc(xfer); + + switch (USB_GET_STATE(xfer)) { + case USB_ST_SETUP: + sc->sc_mode_bytes[0] = RAW_SENSOR_MODE; + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = UR_SET_REPORT; + USETW2(req.wValue, + (uint8_t)0x03 /* type */, (uint8_t)0x00 /* id */); + USETW(req.wIndex, 0); + USETW(req.wLength, MODE_LENGTH); + + pc = usbd_xfer_get_frame(xfer, 0); + usbd_copy_in(pc, 0, &req, sizeof(req)); + pc = usbd_xfer_get_frame(xfer, 1); + usbd_copy_in(pc, 0, sc->sc_mode_bytes, MODE_LENGTH); + + usbd_xfer_set_frame_len(xfer, 0, sizeof(req)); + usbd_xfer_set_frame_len(xfer, 1, MODE_LENGTH); + usbd_xfer_set_frames(xfer, 2); + usbd_transfer_submit(xfer); + break; + + case USB_ST_TRANSFERRED: + default: + break; + } +} + static int atp_enable(struct atp_softc *sc) { @@ -1515,6 +1551,14 @@ .bufsize = 0, /* use wMaxPacketSize */ .callback = &atp_intr, }, + [ATP_RESET] = { + .type = UE_CONTROL, + .endpoint = 0, /* Control pipe */ + .direction = UE_DIR_ANY, + .bufsize = sizeof(struct usb_device_request) + MODE_LENGTH, + .callback = &atp_reset_callback, + .interval = 0, /* no pre-delay */ + }, }; static int @@ -1530,7 +1574,7 @@ return (ENXIO); if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) - return BUS_PROBE_SPECIFIC; + return 0; else return ENXIO; } @@ -1542,12 +1586,6 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); usb_error_t err; - /* ensure that the probe was successful */ - if (uaa->driver_info >= ATP_N_DEV_PARAMS) { - DPRINTF("device probe returned bad id: %lu\n", - uaa->driver_info); - return (ENXIO); - } DPRINTFN(ATP_LLEVEL_INFO, "sc=%p\n", sc); sc->sc_dev = dev; @@ -1626,7 +1664,6 @@ atp_detach(device_t dev) { struct atp_softc *sc; - int err; sc = device_get_softc(dev); if (sc->sc_state & ATP_ENABLED) { @@ -1641,12 +1678,6 @@ mtx_destroy(&sc->sc_mutex); - err = atp_set_device_mode(dev, HID_MODE); - if (err != 0) { - DPRINTF("failed to reset mode to 'HID' (%d)\n", err); - return (err); - } - return (0); } @@ -1823,10 +1854,7 @@ if (sc->sc_idlecount >= ATP_IDLENESS_THRESHOLD) { DPRINTFN(ATP_LLEVEL_INFO, "idle\n"); sc->sc_idlecount = 0; - - mtx_unlock(&sc->sc_mutex); - atp_set_device_mode(sc->sc_dev,RAW_SENSOR_MODE); - mtx_lock(&sc->sc_mutex); + usbd_transfer_start(sc->sc_xfer[ATP_RESET]); } } else { sc->sc_idlecount = 0; From owner-p4-projects@FreeBSD.ORG Thu Nov 19 23:16:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38D2B106568D; Thu, 19 Nov 2009 23:16: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 F0D9B1065676 for ; Thu, 19 Nov 2009 23:16:22 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from mail.icecube.wisc.edu (trout.icecube.wisc.edu [128.104.255.119]) by mx1.freebsd.org (Postfix) with ESMTP id C746B8FC18 for ; Thu, 19 Nov 2009 23:16:22 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.icecube.wisc.edu (Postfix) with ESMTP id A3D04581BD; Thu, 19 Nov 2009 16:48:00 -0600 (CST) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from mail.icecube.wisc.edu ([127.0.0.1]) by localhost (trout.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id mWRqF4FJjttM; Thu, 19 Nov 2009 16:48:00 -0600 (CST) Received: from wanderer.tachypleus.net (i3-dhcp-172-16-223-119.icecube.wisc.edu [172.16.223.119]) by mail.icecube.wisc.edu (Postfix) with ESMTP id 8617D58176; Thu, 19 Nov 2009 16:48:00 -0600 (CST) Message-ID: <4B05CB1F.8020100@freebsd.org> Date: Thu, 19 Nov 2009 16:47:59 -0600 From: Nathan Whitehorn User-Agent: Thunderbird 2.0.0.23 (X11/20090909) MIME-Version: 1.0 To: Hans Petter Selasky References: <200911192235.nAJMZ2XH072195@repoman.freebsd.org> In-Reply-To: <200911192235.nAJMZ2XH072195@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170842 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, 19 Nov 2009 23:16:23 -0000 Hans Petter Selasky wrote: > http://p4web.freebsd.org/chv.cgi?CH=170842 > > Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 > > > USB input: > - ATP patch from Rohit Grover: > - fixes some minor issues and > makes the control transfer > fully asynchronous > > > [...] > @@ -1530,7 +1574,7 @@ > return (ENXIO); > > if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) > - return BUS_PROBE_SPECIFIC; > + return 0; > else > return ENXIO; > } Why are you replacing symbolic constants with less informative numeric ones? -Nathan From owner-p4-projects@FreeBSD.ORG Fri Nov 20 07:48:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4B241065672; Fri, 20 Nov 2009 07:48: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 78C63106566C for ; Fri, 20 Nov 2009 07:48:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 66AB08FC15 for ; Fri, 20 Nov 2009 07:48:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAK7mI4s043347 for ; Fri, 20 Nov 2009 07:48:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAK7mICx043344 for perforce@freebsd.org; Fri, 20 Nov 2009 07:48:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Nov 2009 07:48:18 GMT Message-Id: <200911200748.nAK7mICx043344@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 Precedence: bulk Cc: Subject: PERFORCE change 170854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 07:48:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=170854 Change 170854 by hselasky@hselasky_laptop001 on 2009/11/20 07:47:46 LibUSB 1.0: - correct a return code in the transfer cancel function. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#18 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#18 (text+ko) ==== @@ -1277,8 +1277,9 @@ if (uxfer == NULL) return (LIBUSB_ERROR_INVALID_PARAM); + /* check if not initialised */ if (uxfer->dev_handle == NULL) - return (LIBUSB_ERROR_INVALID_PARAM); + return (LIBUSB_ERROR_NOT_FOUND); endpoint = uxfer->endpoint; From owner-p4-projects@FreeBSD.ORG Fri Nov 20 08:45:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4023010656AA; Fri, 20 Nov 2009 08:45: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 D9E85106566B for ; Fri, 20 Nov 2009 08:45:26 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe03.swip.net [212.247.154.65]) by mx1.freebsd.org (Postfix) with ESMTP id 686C28FC0A for ; Fri, 20 Nov 2009 08:45:26 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=IUOrzmqebuoA:10 a=RERtC8nhXGhYvIZhK0yWrQ==:17 a=6I5d2MoRAAAA:8 a=sF_zMzOa3JytTgiJurUA:9 a=N-ghdWLVBQ_JKSUbk4QA:7 a=vb905cmgOYz1UhKj2V17596r9EAA:4 Received: from [90.149.203.35] (account mc467741@c2i.net HELO laptop.adsl.tele2.no) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.16) with ESMTPA id 1348168802; Fri, 20 Nov 2009 08:45:23 +0100 Received-SPF: softfail receiver=mailfe03.swip.net; client-ip=90.149.203.35; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Nathan Whitehorn Date: Fri, 20 Nov 2009 08:46:48 +0100 User-Agent: KMail/1.11.4 (FreeBSD/9.0-CURRENT; KDE/4.2.4; i386; ; ) References: <200911192235.nAJMZ2XH072195@repoman.freebsd.org> <4B05CB1F.8020100@freebsd.org> In-Reply-To: <4B05CB1F.8020100@freebsd.org> X-Face: (%:6u[ldzJ`0qjD7sCkfdMmD*RxpOwEEQ+KWt[{J#x6ow~JO:,zwp.(t; @Aq :4:&nFCgDb8[3oIeTb^'",;u{5{}C9>"PuY\)!=#\u9SSM-nz8+SR~B\!qBv MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200911200846.54559.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170842 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, 20 Nov 2009 08:45:28 -0000 On Thursday 19 November 2009 23:47:59 Nathan Whitehorn wrote: > Hans Petter Selasky wrote: > > http://p4web.freebsd.org/chv.cgi?CH=170842 > > > > Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 > > > > > > USB input: > > - ATP patch from Rohit Grover: > > - fixes some minor issues and > > makes the control transfer > > fully asynchronous > > [...] > > > @@ -1530,7 +1574,7 @@ > > return (ENXIO); > > > > if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) > > - return BUS_PROBE_SPECIFIC; > > + return 0; > > else > > return ENXIO; > > } > > Why are you replacing symbolic constants with less informative numeric > ones? -Nathan Because returning zero in probe has special meaning and is hardcoded in the subr_bus.c code aswell. The other return values will not be changed. --HPS From owner-p4-projects@FreeBSD.ORG Fri Nov 20 08:53:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 718EB1065672; Fri, 20 Nov 2009 08:53: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 35EBE106566C for ; Fri, 20 Nov 2009 08:53:24 +0000 (UTC) (envelope-from olli@fromme.com) Received: from haluter.fromme.com (haluter.fromme.com [212.17.241.231]) by mx1.freebsd.org (Postfix) with ESMTP id B14A88FC26 for ; Fri, 20 Nov 2009 08:53:23 +0000 (UTC) Received: from haluter.fromme.com (irc_sucks@localhost [127.0.0.1]) by haluter.fromme.com (8.14.3/8.14.3) with ESMTP id nAK8rFqw012641; Fri, 20 Nov 2009 09:53:22 +0100 (CET) (envelope-from olli@fromme.com) Received: (from olli@localhost) by haluter.fromme.com (8.14.3/8.14.3/Submit) id nAK8rEhF012639; Fri, 20 Nov 2009 09:53:14 +0100 (CET) (envelope-from olli) From: Oliver Fromme Message-Id: <200911200853.nAK8rEhF012639@haluter.fromme.com> To: nwhitehorn@freebsd.org (Nathan Whitehorn) Date: Fri, 20 Nov 2009 09:53:14 +0100 (CET) In-Reply-To: <4B05CB1F.8020100@freebsd.org> X-Mailer: ELM [version 2.5 PL8] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (haluter.fromme.com [127.0.0.1]); Fri, 20 Nov 2009 09:53:22 +0100 (CET) Cc: Perforce Change Reviews , Hans Petter Selasky Subject: Re: PERFORCE change 170842 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, 20 Nov 2009 08:53:24 -0000 Nathan Whitehorn wrote: > Hans Petter Selasky wrote: > > http://p4web.freebsd.org/chv.cgi?CH=170842 > > > > Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 > > > > > > USB input: > > - ATP patch from Rohit Grover: > > - fixes some minor issues and > > makes the control transfer > > fully asynchronous > > > > > > > [...] > > @@ -1530,7 +1574,7 @@ > > return (ENXIO); > > > > if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) > > - return BUS_PROBE_SPECIFIC; > > + return 0; > > else > > return ENXIO; > > } > > Why are you replacing symbolic constants with less informative numeric ones? As far as I can see, the change makes sense. The function atp_probe() returns 0 on success, or an errno value if an error occurs, but BUS_PROBE_SPECIFIC is not an errno symbol, and there is no symbolic constant for the errno value 0, according to intro(2), so it's appropriate to use the numeric constant 0. Many kernel functions do that. However, it could be argued that a better way might be to define your own error symbol space, like USB_SUCCESS, USB_ERROR or possibly others, and translate to proper errno values only where necessary. Several kernel sub- systems do this. By the way, style(9) states that return values should always be put in parentheses, even though the C standard doesn't require it. So it should be return (0). Best regards Oliver -- Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany ``We are all but compressed light'' (Albert Einstein) From owner-p4-projects@FreeBSD.ORG Fri Nov 20 11:20:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 268DA1065782; Fri, 20 Nov 2009 11:20: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 DF8111065780 for ; Fri, 20 Nov 2009 11:20:39 +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 CCAA78FC27 for ; Fri, 20 Nov 2009 11:20:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAKBKdnJ073028 for ; Fri, 20 Nov 2009 11:20:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAKBKdC1073026 for perforce@freebsd.org; Fri, 20 Nov 2009 11:20:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Nov 2009 11:20:39 GMT Message-Id: <200911201120.nAKBKdC1073026@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 Precedence: bulk Cc: Subject: PERFORCE change 170858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 11:20:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=170858 Change 170858 by hselasky@hselasky_laptop001 on 2009/11/20 11:20:16 USB input: - style change Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/atp.c#3 (text+ko) ==== @@ -1573,10 +1573,7 @@ (uaa->info.bInterfaceProtocol != UIPROTO_MOUSE)) return (ENXIO); - if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) - return 0; - else - return ENXIO; + return (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa)); } static int From owner-p4-projects@FreeBSD.ORG Fri Nov 20 11:20:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A206106578A; Fri, 20 Nov 2009 11:20:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E2211065782; Fri, 20 Nov 2009 11:20:54 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe01.swip.net [212.247.154.1]) by mx1.freebsd.org (Postfix) with ESMTP id 7C3128FC15; Fri, 20 Nov 2009 11:20:53 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=IUOrzmqebuoA:10 a=Qa35spukGxu/rmuNTmr4yg==:17 a=6I5d2MoRAAAA:8 a=cac5N7nujaoDLmz8bd8A:9 a=WlLqQwA74hZbsJodjFUA:7 a=iO88Gl-TbSytDj0nl7U9SpJKDNwA:4 Received: from [85.19.72.137] (account mc467741@c2i.net HELO laptop.adsl.tele2.no) by mailfe01.swip.net (CommuniGate Pro SMTP 5.2.16) with ESMTPA id 279133050; Fri, 20 Nov 2009 12:20:51 +0100 Received-SPF: softfail receiver=mailfe01.swip.net; client-ip=85.19.72.137; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Oliver Fromme Date: Fri, 20 Nov 2009 12:22:23 +0100 User-Agent: KMail/1.11.4 (FreeBSD/9.0-CURRENT; KDE/4.2.4; i386; ; ) References: <200911200853.nAK8rEhF012639@haluter.fromme.com> In-Reply-To: <200911200853.nAK8rEhF012639@haluter.fromme.com> X-Face: (%:6u[ldzJ`0qjD7sCkfdMmD*RxpOwEEQ+KWt[{J#x6ow~JO:,zwp.(t; @Aq :4:&nFCgDb8[3oIeTb^'",;u{5{}C9>"PuY\)!=#\u9SSM-nz8+SR~B\!qBv MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200911201222.25052.hselasky@freebsd.org> Cc: Perforce Change Reviews , Nathan Whitehorn Subject: Re: PERFORCE change 170842 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, 20 Nov 2009 11:20:54 -0000 On Friday 20 November 2009 09:53:14 Oliver Fromme wrote: > Nathan Whitehorn wrote: > > Hans Petter Selasky wrote: > > > http://p4web.freebsd.org/chv.cgi?CH=170842 > > > > > > Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 > > > > > > > > > USB input: > > > - ATP patch from Rohit Grover: > > > - fixes some minor issues and > > > makes the control transfer > > > fully asynchronous > > > > [...] > > > > > @@ -1530,7 +1574,7 @@ > > > return (ENXIO); > > > > > > if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) > > > - return BUS_PROBE_SPECIFIC; > > > + return 0; > > > else > > > return ENXIO; > > > } > > > > Why are you replacing symbolic constants with less informative numeric > > ones? > > As far as I can see, the change makes sense. The function > atp_probe() returns 0 on success, or an errno value if an > error occurs, but BUS_PROBE_SPECIFIC is not an errno symbol, > and there is no symbolic constant for the errno value 0, > according to intro(2), so it's appropriate to use the > numeric constant 0. Many kernel functions do that. > > However, it could be argued that a better way might be to > define your own error symbol space, like USB_SUCCESS, > USB_ERROR or possibly others, and translate to proper > errno values only where necessary. Several kernel sub- > systems do this. > > By the way, style(9) states that return values should always > be put in parentheses, even though the C standard doesn't > require it. So it should be return (0). Fixed. --HPS From owner-p4-projects@FreeBSD.ORG Fri Nov 20 12:58:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31FF41065693; Fri, 20 Nov 2009 12:58: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 D1ECB106566C for ; Fri, 20 Nov 2009 12:58:17 +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 BE0758FC14 for ; Fri, 20 Nov 2009 12:58:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAKCwH8K091279 for ; Fri, 20 Nov 2009 12:58:17 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAKCwHTh091275 for perforce@freebsd.org; Fri, 20 Nov 2009 12:58:17 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 20 Nov 2009 12:58:17 GMT Message-Id: <200911201258.nAKCwHTh091275@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 Precedence: bulk Cc: Subject: PERFORCE change 170861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 12:58:18 -0000 http://p4web.freebsd.org/chv.cgi?CH=170861 Change 170861 by pgj@beehive on 2009/11/20 12:57:55 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#40 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#14 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/mandree.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#35 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#33 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/stas.key#4 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#34 integrate .. //depot/projects/docproj_hu/www/en/docs/books.sgml#5 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#24 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#63 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#26 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#23 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#75 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#40 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.491 2009/10/29 23:37:50 sylvio Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.492 2009/11/18 13:39:41 mandree Exp $ --> aaron@FreeBSD.org"> @@ -670,6 +670,8 @@ makc@FreeBSD.org"> +mandree@FreeBSD.org"> + manolis@FreeBSD.org"> marcel@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -19,6 +19,11 @@ &pgpkey.brix; + + &a.mandree; + &pgpkey.mandree; + + &a.will; &pgpkey.will; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#33 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -178,6 +178,7 @@ + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/stas.key#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + uid Stanislav Sedov (Corporate email) uid Stanislav Sedov (Corporate email) -uid Stanislav Sedov (Corporate email) uid Stanislav Sedov +uid Stanislav Sedov (Corporate email) sub 4096R/6FD2025F 2009-05-23 -sub 4096R/98BC2774 2009-05-23 ]]> ==== //depot/projects/docproj_hu/www/en/developers.sgml#34 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.232 2009/10/29 23:45:07 sylvio Exp $ +$FreeBSD: www/en/developers.sgml,v 1.233 2009/11/18 13:47:24 mandree Exp $ --> @@ -333,6 +333,7 @@ + ==== //depot/projects/docproj_hu/www/en/docs/books.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -466,6 +466,16 @@
  • +

    Profiling + and Debugging the FreeBSD Kernel

    +
    • + +
  • +

    Debugging + Buffer Overruns in the FreeBSD Kernel

    +
    • + +

  • Setting up Split DNS on FreeBSD 4.1

    • ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#24 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: www/hu/share/sgml/events.xml,v 1.10 2009/11/11 16:45:32 pgj Exp $ + $FreeBSD: www/hu/share/sgml/events.xml,v 1.11 2009/11/18 13:55:17 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#63 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.26 2009/11/11 16:45:32 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.27 2009/11/15 21:45:34 pgj Exp $ ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#26 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/press.xml,v 1.11 2009/09/05 08:03:27 pgj Exp $ + $FreeBSD: www/hu/share/sgml/press.xml,v 1.12 2009/11/15 21:45:34 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#23 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.78 2009/11/08 14:27:01 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.79 2009/11/17 07:29:02 brueffer Exp $ @@ -111,6 +111,28 @@ track, tutorials, and FreeBSD developer summit.     + + 11th Libre Software Meeting + http://2010.rmll.info/ + + 2010 + 7 + 6 + + + 2010 + 7 + 11 + + + France + Bordeaux + + The Libre Software Meeting has occurred each year + since July 2000. This year there will again be a &os; boot + camp to introduce new users to the Operating System. + + BSDCan 2010 http://www.bsdcan.org/2010/ @@ -136,6 +158,31 @@ from commercial vendors. + + Solutions Linux 2010 + http://www.solutionslinux.fr/ + + 2010 + 3 + 16 + + + 2010 + 3 + 18 + + + France + Paris + Paris Expo +
    Porte de Versailles
    +     + A 3 days event to promote GNU/Linux and Open Source + Software to companies. As usual, a French &os; User Group will + be there to promote &os;. The access to the event is free of + charge. +     + AsiaBSDCon 2010 http://2010.asiabsdcon.org/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#75 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.278 2009/11/18 15:14:34 mandree Exp $ @@ -36,6 +36,14 @@ 11 + 18 + + +

    New committer: Matthias Andree (ports)

    +     +     + + 12 From owner-p4-projects@FreeBSD.ORG Fri Nov 20 13:10:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C6201065672; Fri, 20 Nov 2009 13:10: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 2F55D106566C for ; Fri, 20 Nov 2009 13:10:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C6828FC1C for ; Fri, 20 Nov 2009 13:10:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAKDAT0G093240 for ; Fri, 20 Nov 2009 13:10:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAKDATet093238 for perforce@freebsd.org; Fri, 20 Nov 2009 13:10:29 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 20 Nov 2009 13:10:29 GMT Message-Id: <200911201310.nAKDATet093238@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 Precedence: bulk Cc: Subject: PERFORCE change 170862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 13:10:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=170862 Change 170862 by pgj@beehive on 2009/11/20 13:09:34 MFen (www): 1.39 -> 1.40 hu/docs/books.sgml 1.277 -> 1.278 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#24 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#64 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#24 (text+ko) ==== @@ -15,7 +15,7 @@ @@ -627,6 +627,16 @@

  • Hibakeresés és teljesítménymérés a &os; rendszermagjában

    +
    • + +
  • +

    Puffer túlcsordulások keresése a &os; rendszermagjában

    +
    • + +
  • +

    Osztott DNS beállítása &os; 4.1-en

    • ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#64 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,14 @@ 11 + 18 + + +

    Új tag: Matthias Andree (ports)

    +     +     + + 12 From owner-p4-projects@FreeBSD.ORG Fri Nov 20 14:30:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B721065679; Fri, 20 Nov 2009 14:30:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA66C106566C for ; Fri, 20 Nov 2009 14:30:50 +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 C75518FC13 for ; Fri, 20 Nov 2009 14:30:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAKEUoIN000217 for ; Fri, 20 Nov 2009 14:30:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAKEUo3t000215 for perforce@freebsd.org; Fri, 20 Nov 2009 14:30:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Nov 2009 14:30:50 GMT Message-Id: <200911201430.nAKEUo3t000215@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 Precedence: bulk Cc: Subject: PERFORCE change 170866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 14:30:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=170866 Change 170866 by hselasky@hselasky_laptop001 on 2009/11/20 14:29:55 USB audio: - add support for MIDI devices without audio control stream. Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#62 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#62 (text+ko) ==== @@ -559,6 +559,13 @@ else return (0); } + + /* check for MIDI stream */ + + if ((uaa->info.bInterfaceClass == UICLASS_AUDIO) && + (uaa->info.bInterfaceSubClass == UISUBCLASS_MIDISTREAM)) { + return (0); + } return (ENXIO); } From owner-p4-projects@FreeBSD.ORG Fri Nov 20 16:11:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D538106568D; Fri, 20 Nov 2009 16:11:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D355E1065698 for ; Fri, 20 Nov 2009 16:11:48 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from adsum.doit.wisc.edu (adsum.doit.wisc.edu [144.92.197.210]) by mx1.freebsd.org (Postfix) with ESMTP id A66178FC13 for ; Fri, 20 Nov 2009 16:11:48 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=ISO-8859-1; format=flowed Received: from avs-daemon.smtpauth1.wiscmail.wisc.edu by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7.0-5.01 32bit (built Feb 19 2009)) id <0KTE00A00Y7NSX00@smtpauth1.wiscmail.wisc.edu>; Fri, 20 Nov 2009 09:11:47 -0600 (CST) Received: from comporellon.tachypleus.net (adsl-75-50-88-113.dsl.mdsnwi.sbcglobal.net [75.50.88.113]) by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7.0-5.01 32bit (built Feb 19 2009)) with ESMTPSA id <0KTE00J17Y74C360@smtpauth1.wiscmail.wisc.edu>; Fri, 20 Nov 2009 09:11:29 -0600 (CST) Date: Fri, 20 Nov 2009 09:11:27 -0600 From: Nathan Whitehorn In-reply-to: <200911200846.54559.hselasky@freebsd.org> To: Hans Petter Selasky Message-id: <4B06B19F.7050501@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=75.50.88.113 X-Spam-PmxInfo: Server=avs-10, Version=5.5.5.374460, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2009.11.20.150038, SenderIP=75.50.88.113 References: <200911192235.nAJMZ2XH072195@repoman.freebsd.org> <4B05CB1F.8020100@freebsd.org> <200911200846.54559.hselasky@freebsd.org> User-Agent: Thunderbird 2.0.0.23 (X11/20090905) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 170842 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, 20 Nov 2009 16:11:49 -0000 Hans Petter Selasky wrote: > On Thursday 19 November 2009 23:47:59 Nathan Whitehorn wrote: > >> Hans Petter Selasky wrote: >> >>> http://p4web.freebsd.org/chv.cgi?CH=170842 >>> >>> Change 170842 by hselasky@hselasky_laptop001 on 2009/11/19 22:34:49 >>> >>> >>> USB input: >>> - ATP patch from Rohit Grover: >>> - fixes some minor issues and >>> makes the control transfer >>> fully asynchronous >>> >> [...] >> >> >>> @@ -1530,7 +1574,7 @@ >>> return (ENXIO); >>> >>> if (usbd_lookup_id_by_uaa(atp_devs, sizeof(atp_devs), uaa) == 0) >>> - return BUS_PROBE_SPECIFIC; >>> + return 0; >>> else >>> return ENXIO; >>> } >>> >> Why are you replacing symbolic constants with less informative numeric >> ones? -Nathan >> > > Because returning zero in probe has special meaning and is hardcoded in the > subr_bus.c code aswell. The other return values will not be changed. > It's the same thing as far as the code is concerned, of course, my complaint was merely a style issue. Using the constant makes the meaning of the return value clearer, especially since this driver uses this return value to override the BUS_PROBE_GENERIC priority of ums(4). Changing it from the constant that was already there seemed like a step backward in readability. -Nathan From owner-p4-projects@FreeBSD.ORG Sat Nov 21 12:01:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FA5D10656AB; Sat, 21 Nov 2009 12:01: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 30D8310656A7 for ; Sat, 21 Nov 2009 12:01:27 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C87E8FC39 for ; Sat, 21 Nov 2009 12:01:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nALC1Rtf084727 for ; Sat, 21 Nov 2009 12:01:27 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nALC1QOS084723 for perforce@freebsd.org; Sat, 21 Nov 2009 12:01:26 GMT (envelope-from mav@freebsd.org) Date: Sat, 21 Nov 2009 12:01:26 GMT Message-Id: <200911211201.nALC1QOS084723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Nov 2009 12:01:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=170892 Change 170892 by mav@mav_mavtest on 2009/11/21 12:00:40 Improve transfer settings API between ATA XPT and SIM: - give SIM number of supported tags per device. It allows to properly handle devices with lower number of tags supported. Change slot allocation logic in ahci(4) and siis(4) to handle this limitation as effectively as possible. - negotiate ATA PIO and DMA modes with SIM. - make SATA SIMs store/report devices connection speed (SATA revision). As side effect it allows PMP to report connection speeds for devices connected to it. Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#30 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#23 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#23 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#20 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#59 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#32 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#130 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#82 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#28 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#35 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#24 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#21 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#30 (text+ko) ==== @@ -226,6 +226,12 @@ static int atapm(struct cam_device *device, int argc, char **argv, char *combinedopt, int retry_count, int timeout); #endif /* MINIMALISTIC */ +#ifndef min +#define min(a,b) (((a)<(b))?(a):(b)) +#endif +#ifndef max +#define max(a,b) (((a)>(b))?(a):(b)) +#endif camcontrol_optret getoption(char *arg, cam_cmdmask *cmdnum, cam_argmask *argnum, @@ -950,21 +956,29 @@ if (sas->valid & CTS_SAS_VALID_SPEED) speed = sas->bitrate; + } else if (ccb->cts.transport == XPORT_ATA) { + struct ccb_trans_settings_ata *ata = + &ccb->cts.xport_specific.ata; + + if (ata->valid & CTS_ATA_VALID_PIOMODE) + speed = ata_mode2speed(ata->piomode); + if (ata->valid & CTS_ATA_VALID_DMAMODE) + speed = max(speed, ata_mode2speed(ata->dmamode)); } else if (ccb->cts.transport == XPORT_SATA) { - struct ccb_trans_settings_sata *sata = + struct ccb_trans_settings_sata *sata = &ccb->cts.xport_specific.sata; - if (sata->valid & CTS_SATA_VALID_SPEED) - speed = sata->bitrate; + if (sata->valid & CTS_SATA_VALID_REVISION) + speed = ata_revision2speed(sata->revision); } mb = speed / 1000; if (mb > 0) { - fprintf(stdout, "%s%d: %d.%03dMB/s transfers ", + fprintf(stdout, "%s%d: %d.%03dMB/s transfers", device->device_name, device->dev_unit_num, mb, speed % 1000); } else { - fprintf(stdout, "%s%d: %dKB/s transfers ", + fprintf(stdout, "%s%d: %dKB/s transfers", device->device_name, device->dev_unit_num, speed); } @@ -975,7 +989,7 @@ if (((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0) && (spi->sync_offset != 0)) - fprintf(stdout, "(%d.%03dMHz, offset %d", freq / 1000, + fprintf(stdout, " (%d.%03dMHz, offset %d", freq / 1000, freq % 1000, spi->sync_offset); if (((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) @@ -995,18 +1009,28 @@ struct ccb_trans_settings_ata *ata = &ccb->cts.xport_specific.ata; - if (ata->valid & CTS_ATA_VALID_BYTECOUNT) { - fprintf(stdout, "(PIO size %dbytes)", - ata->bytecount); - } + printf(" ("); + if (ata->valid & CTS_ATA_VALID_PIOMODE) + printf("%s, ", ata_mode2string(ata->piomode)); + if (ata->valid & CTS_ATA_VALID_DMAMODE) + printf("%s, ", ata_mode2string(ata->dmamode)); + if (ata->valid & CTS_ATA_VALID_BYTECOUNT) + printf("PIO size %dbytes", ata->bytecount); + printf(")"); } else if (ccb->cts.transport == XPORT_SATA) { struct ccb_trans_settings_sata *sata = &ccb->cts.xport_specific.sata; - if (sata->valid & CTS_SATA_VALID_BYTECOUNT) { - fprintf(stdout, "(PIO size %dbytes)", - sata->bytecount); - } + printf(" ("); + if (sata->valid & CTS_SATA_VALID_REVISION) + printf("SATA %d.x, ", sata->revision); + if (sata->valid & CTS_SATA_VALID_PIOMODE) + printf("%s, ", ata_mode2string(sata->piomode)); + if (sata->valid & CTS_SATA_VALID_DMAMODE) + printf("%s, ", ata_mode2string(sata->dmamode)); + if (sata->valid & CTS_SATA_VALID_BYTECOUNT) + printf("PIO size %dbytes", sata->bytecount); + printf(")"); } if (ccb->cts.protocol == PROTO_SCSI) { ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#23 (text+ko) ==== @@ -501,22 +501,122 @@ } int -ata_max_mode(struct ata_params *ap, int mode, int maxmode) +ata_max_piomode(struct ata_params *ap, int maxmode) +{ + + if (maxmode == 0) + return (ata_max_pmode(ap)); + return (min(maxmode, ata_max_pmode(ap))); +} + +int +ata_max_dmamode(struct ata_params *ap, int maxmode) { - if (maxmode && mode > maxmode) - mode = maxmode; + if (maxmode == 0 && ata_max_umode(ap) > 0) + return (ata_max_umode(ap)); + if (maxmode >= ATA_UDMA0 && ata_max_umode(ap) > 0) + return (min(maxmode, ata_max_umode(ap))); + if (maxmode == 0 && ata_max_wmode(ap) > 0) + return (ata_max_wmode(ap)); + if (ata_max_wmode(ap) > 0) + return (min(maxmode, ata_max_wmode(ap))); + return (-1); +} - if (mode >= ATA_UDMA0 && ata_max_umode(ap) > 0) - return (min(mode, ata_max_umode(ap))); +char * +ata_mode2string(int mode) +{ + switch (mode) { + case -1: return "UNSUPPORTED"; + case 0: return "NONE"; + case ATA_PIO0: return "PIO0"; + case ATA_PIO1: return "PIO1"; + case ATA_PIO2: return "PIO2"; + case ATA_PIO3: return "PIO3"; + case ATA_PIO4: return "PIO4"; + case ATA_WDMA0: return "WDMA0"; + case ATA_WDMA1: return "WDMA1"; + case ATA_WDMA2: return "WDMA2"; + case ATA_UDMA0: return "UDMA0"; + case ATA_UDMA1: return "UDMA1"; + case ATA_UDMA2: return "UDMA2"; + case ATA_UDMA3: return "UDMA3"; + case ATA_UDMA4: return "UDMA4"; + case ATA_UDMA5: return "UDMA5"; + case ATA_UDMA6: return "UDMA6"; + default: + if (mode & ATA_DMA_MASK) + return "BIOSDMA"; + else + return "BIOSPIO"; + } +} - if (mode >= ATA_WDMA0 && ata_max_wmode(ap) > 0) - return (min(mode, ata_max_wmode(ap))); +u_int +ata_mode2speed(int mode) +{ + switch (mode) { + case ATA_PIO0: + default: + return (3300); + case ATA_PIO1: + return (5200); + case ATA_PIO2: + return (8300); + case ATA_PIO3: + return (11100); + case ATA_PIO4: + return (16700); + case ATA_WDMA0: + return (4200); + case ATA_WDMA1: + return (13300); + case ATA_WDMA2: + return (16700); + case ATA_UDMA0: + return (16700); + case ATA_UDMA1: + return (25000); + case ATA_UDMA2: + return (33300); + case ATA_UDMA3: + return (44400); + case ATA_UDMA4: + return (66700); + case ATA_UDMA5: + return (100000); + case ATA_UDMA6: + return (133000); + } +} - if (mode > ata_max_pmode(ap)) - return (min(mode, ata_max_pmode(ap))); +u_int +ata_revision2speed(int revision) +{ + switch (revision) { + case 1: + default: + return (150000); + case 2: + return (300000); + case 3: + return (600000); + } +} - return (mode); +int +ata_speed2revision(u_int speed) +{ + switch (speed) { + case 150000: + default: + return (1); + case 300000: + return (2); + case 600000: + return (3); + } } int ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#23 (text+ko) ==== @@ -113,7 +113,13 @@ int ata_max_pmode(struct ata_params *ap); int ata_max_wmode(struct ata_params *ap); int ata_max_umode(struct ata_params *ap); -int ata_max_mode(struct ata_params *ap, int mode, int maxmode); +int ata_max_piomode(struct ata_params *ap, int maxmode); +int ata_max_dmamode(struct ata_params *ap, int maxmode); + +char * ata_mode2string(int mode); +u_int ata_mode2speed(int mode); +u_int ata_revision2speed(int revision); +int ata_speed2revision(u_int speed); int ata_identify_match(caddr_t identbuffer, caddr_t table_entry); int ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#20 (text+ko) ==== @@ -516,6 +516,7 @@ static void pmpdone(struct cam_periph *periph, union ccb *done_ccb) { + struct ccb_trans_settings cts; struct pmp_softc *softc; struct ccb_ataio *ataio; union ccb *work_ccb; @@ -635,6 +636,19 @@ done_ccb->ataio.res.sector_count; if ((res & 0xf0f) == 0x103 && (res & 0x0f0) != 0) { printf("PM status: %d - %08x\n", softc->pm_step, res); + /* Report device speed. */ + if (xpt_create_path(&dpath, periph, + xpt_path_path_id(periph->path), + softc->pm_step, 0) == CAM_REQ_CMP) { + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + cts.xport_specific.sata.revision = (res & 0x0f0) >> 4; + cts.xport_specific.sata.valid = CTS_SATA_VALID_REVISION; + xpt_action((union ccb *)&cts); + xpt_free_path(dpath); + } softc->found |= (1 << softc->pm_step); softc->pm_step++; } else { ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#59 (text+ko) ==== @@ -275,7 +275,7 @@ static void probestart(struct cam_periph *periph, union ccb *start_ccb) { - /* Probe the device that our peripheral driver points to */ + struct ccb_trans_settings cts; struct ccb_ataio *ataio; struct ccb_scsiio *csio; probe_softc *softc; @@ -333,6 +333,73 @@ ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); break; case PROBE_SETMODE: + { + int piomode, dmamode, wantpio, wantdma, mode; + + wantpio = 0; + wantdma = 0; + /* Fetch user modes from SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (path->device->transport == XPORT_ATA) { + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_PIOMODE) + wantpio = cts.xport_specific.ata.piomode; + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_DMAMODE) + wantdma = cts.xport_specific.ata.dmamode; + } else { + if (cts.xport_specific.ata.valid & CTS_SATA_VALID_PIOMODE) + wantpio = cts.xport_specific.sata.piomode; + if (cts.xport_specific.ata.valid & CTS_SATA_VALID_DMAMODE) + wantdma = cts.xport_specific.sata.dmamode; + } +negotiate: + /* Honor device capabilities. */ + wantpio = piomode = ata_max_piomode(ident_buf, wantpio); + wantdma = dmamode = ata_max_dmamode(ident_buf, wantdma); + /* Report modes to SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + if (path->device->transport == XPORT_ATA) { + cts.xport_specific.ata.piomode = piomode; + cts.xport_specific.ata.dmamode = dmamode; + cts.xport_specific.ata.valid = + CTS_ATA_VALID_PIOMODE | CTS_ATA_VALID_DMAMODE; + } else { + cts.xport_specific.sata.piomode = piomode; + cts.xport_specific.sata.dmamode = dmamode; + cts.xport_specific.sata.valid = + CTS_SATA_VALID_PIOMODE | CTS_SATA_VALID_DMAMODE; + } + xpt_action((union ccb *)&cts); + /* Fetch user modes from SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + xpt_action((union ccb *)&cts); + if (path->device->transport == XPORT_ATA) { + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_PIOMODE) + piomode = cts.xport_specific.ata.piomode; + if (cts.xport_specific.ata.valid & CTS_ATA_VALID_DMAMODE) + dmamode = cts.xport_specific.ata.dmamode; + } else { + if (cts.xport_specific.ata.valid & CTS_SATA_VALID_PIOMODE) + piomode = cts.xport_specific.sata.piomode; + if (cts.xport_specific.ata.valid & CTS_SATA_VALID_DMAMODE) + dmamode = cts.xport_specific.sata.dmamode; + } + /* If SIM disagree - renegotiate. */ + if (piomode != wantpio || dmamode != wantdma) + goto negotiate; + if (dmamode > 0) + mode = dmamode; + else + mode = piomode; cam_fill_ataio(ataio, 1, probedone, @@ -341,12 +408,11 @@ /*data_ptr*/NULL, /*dxfer_len*/0, 30 * 1000); - ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, - ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6)); + ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, mode); break; + } case PROBE_SET_MULTI: { - struct ccb_trans_settings cts; u_int sectors; sectors = max(1, min(ident_buf->sectors_intr & 0xff, 16)); @@ -564,6 +630,7 @@ static void probedone(struct cam_periph *periph, union ccb *done_ccb) { + struct ccb_trans_settings cts; struct ata_params *ident_buf; probe_softc *softc; struct cam_path *path; @@ -619,9 +686,7 @@ PROBE_SET_ACTION(softc, PROBE_IDENTIFY); } else if (sign == 0x9669 && done_ccb->ccb_h.target_id == 15) { - struct ccb_trans_settings cts; - - /* Report SIM that PM is present. */ + /* Report SIM that PM is present. */ bzero(&cts, sizeof(cts)); xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; @@ -716,11 +781,17 @@ ATA_QUEUE_LEN(ident_buf->queue) + 1; } ata_find_quirk(path->device); - /* XXX: If not all tags allowed, we must to tell SIM which are. */ - if (path->device->mintags < path->bus->sim->max_tagged_dev_openings) - path->device->mintags = path->device->maxtags = 0; if (path->device->mintags != 0 && path->bus->sim->max_tagged_dev_openings != 0) { + /* Report SIM which tags are allowed. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + cts.xport_specific.sata.tags = path->device->maxtags; + cts.xport_specific.sata.valid = CTS_SATA_VALID_TAGS; + xpt_action((union ccb *)&cts); + /* Reconfigure queues for tagged queueing. */ xpt_start_tags(path); } ata_device_transport(path); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#32 (text+ko) ==== @@ -818,20 +818,28 @@ struct ccb_trans_settings_ata { u_int valid; /* Which fields to honor */ -#define CTS_ATA_VALID_MODE 0x01 +#define CTS_ATA_VALID_PIOMODE 0x01 +#define CTS_ATA_VALID_DMAMODE 0x02 #define CTS_ATA_VALID_BYTECOUNT 0x04 - u_int32_t mode; + int piomode; /* PIO mode */ + int dmamode; /* DMA mode */ u_int bytecount; /* Length of PIO transaction */ }; struct ccb_trans_settings_sata { u_int valid; /* Which fields to honor */ -#define CTS_SATA_VALID_SPEED 0x01 -#define CTS_SATA_VALID_PM 0x02 +#define CTS_SATA_VALID_PIOMODE 0x01 +#define CTS_SATA_VALID_DMAMODE 0x02 #define CTS_SATA_VALID_BYTECOUNT 0x04 - u_int32_t bitrate; /* Mbps */ +#define CTS_SATA_VALID_REVISION 0x08 +#define CTS_SATA_VALID_PM 0x10 +#define CTS_SATA_VALID_TAGS 0x20 + int piomode; /* Legacy PATA PIO mode */ + int dmamode; /* Legacy PATA DMA mode */ + u_int bytecount; /* Length of PIO transaction */ + u_int revision; /* SATA revision */ u_int pm_present; /* PM is present (XPT->SIM) */ - u_int bytecount; /* Length of PIO transaction */ + u_int tags; /* Number of allowed tags */ }; /* Get/Set transfer rate/width/disconnection/tag queueing settings */ ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#130 (text+ko) ==== @@ -1140,12 +1140,21 @@ if (sas->valid & CTS_SAS_VALID_SPEED) speed = sas->bitrate; } + if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_ATA) { + struct ccb_trans_settings_ata *ata = + &cts.xport_specific.ata; + + if (ata->valid & CTS_ATA_VALID_PIOMODE) + speed = ata_mode2speed(ata->piomode); + if (ata->valid & CTS_ATA_VALID_DMAMODE) + speed = max(speed, ata_mode2speed(ata->dmamode)); + } if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) { struct ccb_trans_settings_sata *sata = &cts.xport_specific.sata; - if (sata->valid & CTS_SATA_VALID_SPEED) - speed = sata->bitrate; + if (sata->valid & CTS_SATA_VALID_REVISION) + speed = ata_revision2speed(sata->revision); } mb = speed / 1000; @@ -1195,15 +1204,29 @@ struct ccb_trans_settings_ata *ata = &cts.xport_specific.ata; + printf(" ("); + if (ata->valid & CTS_ATA_VALID_PIOMODE) + printf("%s, ", ata_mode2string(ata->piomode)); + if (ata->valid & CTS_ATA_VALID_DMAMODE) + printf("%s, ", ata_mode2string(ata->dmamode)); if (ata->valid & CTS_ATA_VALID_BYTECOUNT) - printf(" (PIO size %dbytes)", ata->bytecount); + printf("PIO size %dbytes", ata->bytecount); + printf(")"); } if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) { struct ccb_trans_settings_sata *sata = &cts.xport_specific.sata; + printf(" ("); + if (sata->valid & CTS_SATA_VALID_REVISION) + printf("SATA %d.x, ", sata->revision); + if (sata->valid & CTS_SATA_VALID_PIOMODE) + printf("%s, ", ata_mode2string(sata->piomode)); + if (sata->valid & CTS_SATA_VALID_DMAMODE) + printf("%s, ", ata_mode2string(sata->dmamode)); if (sata->valid & CTS_SATA_VALID_BYTECOUNT) - printf(" (PIO size %dbytes)", sata->bytecount); + printf("PIO size %dbytes", sata->bytecount); + printf(")"); } if (path->device->inq_flags & SID_CmdQue || path->device->flags & CAM_DEV_TAG_AFTER_COUNT) { ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#82 (text+ko) ==== @@ -772,7 +772,7 @@ struct ahci_controller *ctlr = device_get_softc(device_get_parent(dev)); struct ahci_channel *ch = device_get_softc(dev); struct cam_devq *devq; - int rid, error; + int rid, error, i; ch->dev = dev; ch->unit = (intptr_t)device_get_ivars(dev); @@ -785,6 +785,14 @@ device_get_unit(dev), "pm_level", &ch->pm_level); if (ch->pm_level > 3) callout_init_mtx(&ch->pm_timer, &ch->mtx, 0); + for (i = 0; i < 16; i++) { + ch->user[i].revision = 0; + ch->user[i].piomode = 0; + ch->user[i].dmamode = 0; + ch->user[i].bytecount = 8192; + ch->user[i].tags = 2; + ch->curr[i] = ch->user[i]; + } /* Limit speed for my onboard JMicron external port. * It is not eSATA really. */ if (pci_get_devid(ctlr->dev) == 0x2363197b && @@ -1271,6 +1279,10 @@ if (ch->numtslots != 0 && ch->taggedtarget != ccb->ccb_h.target_id) return (1); + /* Tagged command while we have no supported tag free. */ + if (((~ch->oslots) & (0xffffffff >> (32 - + ch->curr[ccb->ccb_h.target_id].tags))) == 0) + return (1); } else { /* Untagged command while tagged are active. */ if (ch->numrslots != 0 && ch->numtslots != 0) @@ -1294,15 +1306,21 @@ { struct ahci_channel *ch = device_get_softc(dev); struct ahci_slot *slot; - int tag; + int tag, tags; /* Choose empty slot. */ + tags = ch->numslots; + if ((ccb->ccb_h.func_code == XPT_ATA_IO) && + (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) + tags = ch->curr[ccb->ccb_h.target_id].tags; tag = ch->lastslot; - while (ch->slot[tag].state != AHCI_SLOT_EMPTY) { - if (++tag >= ch->numslots) + while (1) { + if (tag >= tags) tag = 0; - KASSERT(tag != ch->lastslot, ("ahci: ALL SLOTS BUSY!")); - } + if (ch->slot[tag].state == AHCI_SLOT_EMPTY) + break; + tag++; + }; ch->lastslot = tag; /* Occupy chosen slot. */ slot = &ch->slot[tag]; @@ -1311,6 +1329,7 @@ if (ch->numrslots == 0 && ch->pm_level > 3) callout_stop(&ch->pm_timer); /* Update channel stats. */ + ch->oslots |= (1 << slot->slot); ch->numrslots++; if ((ccb->ccb_h.func_code == XPT_ATA_IO) && (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) { @@ -1631,6 +1650,7 @@ ccb->ccb_h.status |= CAM_REQ_CMP_ERR; } /* Free slot. */ + ch->oslots &= ~(1 << slot->slot); ch->rslots &= ~(1 << slot->slot); ch->aslots &= ~(1 << slot->slot); slot->state = AHCI_SLOT_EMPTY; @@ -1660,7 +1680,7 @@ } else xpt_done(ccb); /* Unfreeze frozen command. */ - if (ch->frozen && ch->numrslots == 0) { + if (ch->frozen && !ahci_check_collision(dev, ch->frozen)) { union ccb *fccb = ch->frozen; ch->frozen = NULL; ahci_begin_transaction(dev, fccb); @@ -2121,10 +2141,24 @@ case XPT_SET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; + struct ahci_device *d; - if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PM) { + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else + d = &ch->user[ccb->ccb_h.target_id]; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_REVISION) + d->revision = cts->xport_specific.sata.revision; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PIOMODE) + d->piomode = cts->xport_specific.sata.piomode; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_DMAMODE) + d->dmamode = cts->xport_specific.sata.dmamode; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT) + d->bytecount = min(8192, cts->xport_specific.sata.bytecount); + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_TAGS) + d->tags = min(ch->numslots, cts->xport_specific.sata.tags); + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PM) ch->pm_present = cts->xport_specific.sata.pm_present; - } ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; @@ -2133,36 +2167,43 @@ /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; + struct ahci_device *d; uint32_t status; + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else + d = &ch->user[ccb->ccb_h.target_id]; cts->protocol = PROTO_ATA; cts->protocol_version = PROTO_VERSION_UNSPECIFIED; cts->transport = XPORT_SATA; cts->transport_version = XPORT_VERSION_UNSPECIFIED; cts->proto_specific.valid = 0; cts->xport_specific.sata.valid = 0; - if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + if (cts->type == CTS_TYPE_CURRENT_SETTINGS && + (ccb->ccb_h.target_id == 15 || + (ccb->ccb_h.target_id == 0 && !ch->pm_present))) { status = ATA_INL(ch->r_mem, AHCI_P_SSTS) & ATA_SS_SPD_MASK; - else - status = ATA_INL(ch->r_mem, AHCI_P_SCTL) & ATA_SC_SPD_MASK; - if (status & ATA_SS_SPD_GEN3) { - cts->xport_specific.sata.bitrate = 600000; - cts->xport_specific.sata.valid |= CTS_SATA_VALID_SPEED; - } else if (status & ATA_SS_SPD_GEN2) { - cts->xport_specific.sata.bitrate = 300000; - cts->xport_specific.sata.valid |= CTS_SATA_VALID_SPEED; - } else if (status & ATA_SS_SPD_GEN1) { - cts->xport_specific.sata.bitrate = 150000; - cts->xport_specific.sata.valid |= CTS_SATA_VALID_SPEED; + if (status & 0x0f0) { + cts->xport_specific.sata.revision = + (status & 0x0f0) >> 4; + cts->xport_specific.sata.valid |= + CTS_SATA_VALID_REVISION; + } + } else if (d->revision) { + cts->xport_specific.sata.revision = d->revision; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; } - if (cts->type == CTS_TYPE_CURRENT_SETTINGS) { - cts->xport_specific.sata.pm_present = - (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_PMA) ? - 1 : 0; - } else { - cts->xport_specific.sata.pm_present = ch->pm_present; - } + cts->xport_specific.sata.piomode = d->piomode; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_PIOMODE; + cts->xport_specific.sata.dmamode = d->dmamode; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_DMAMODE; + cts->xport_specific.sata.bytecount = d->bytecount; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_BYTECOUNT; + cts->xport_specific.sata.pm_present = ch->pm_present; cts->xport_specific.sata.valid |= CTS_SATA_VALID_PM; + cts->xport_specific.sata.tags = d->tags; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_TAGS; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#28 (text+ko) ==== @@ -340,6 +340,14 @@ struct callout timeout; /* Execution timeout */ }; +struct ahci_device { + u_int revision; + int piomode; + int dmamode; + u_int bytecount; + u_int tags; +}; + /* structure describing an ATA channel */ struct ahci_channel { device_t dev; /* Device handle */ @@ -362,6 +370,7 @@ struct mtx mtx; /* state lock */ int devices; /* What is present */ int pm_present; /* PM presence reported */ + uint32_t oslots; /* Occupied slots */ uint32_t rslots; /* Running slots */ uint32_t aslots; /* Slots with atomic commands */ int numrslots; /* Number of running slots */ @@ -372,6 +381,9 @@ int taggedtarget; /* Last tagged target */ union ccb *frozen; /* Frozen command */ struct callout pm_timer; /* Power management events */ + + struct ahci_device user[16]; /* User-specified settings */ + struct ahci_device curr[16]; /* Current settings */ }; /* structure describing a AHCI controller */ ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#35 (text+ko) ==== @@ -131,7 +131,7 @@ ata_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); - int error, rid; + int error, rid, i; #ifdef ATA_CAM struct cam_devq *devq; #endif @@ -150,8 +150,12 @@ TAILQ_INIT(&ch->ata_queue); TASK_INIT(&ch->conntask, 0, ata_conn_event, dev); #ifdef ATA_CAM - ch->bytecount[0] = 16 * 512; - ch->bytecount[1] = 16 * 512; + for (i = 0; i < 16; i++) { + ch->user[i].piomode = 0; + ch->user[i].dmamode = 0; + ch->user[i].bytecount = 8192; + ch->curr[i] = ch->user[i]; + } #endif /* reset the controller HW, the channel and device(s) */ @@ -1280,7 +1284,7 @@ request->flags |= ATA_R_WRITE; } request->transfersize = min(request->bytecount, - ch->bytecount[ccb->ccb_h.target_id]); + ch->curr[ccb->ccb_h.target_id].bytecount); // request->callback = ad_done; request->retries = 0; request->timeout = (ccb->ccb_h.timeout + 999) / 1000; @@ -1405,12 +1409,20 @@ case XPT_SET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; + struct ata_cam_device *d; - if (ccb->ccb_h.target_id >= 0 && ccb->ccb_h.target_id <= 1 && - (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)) { - ch->bytecount[ccb->ccb_h.target_id] = - cts->xport_specific.ata.bytecount; - } + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else + d = &ch->user[ccb->ccb_h.target_id]; +// if (cts->xport_specific.sata.valid & CTS_SATA_VALID_REVISION) +// d->revision = cts->xport_specific.sata.revision; + if (cts->xport_specific.ata.valid & CTS_ATA_VALID_PIOMODE) + d->piomode = cts->xport_specific.ata.piomode; + if (cts->xport_specific.ata.valid & CTS_ATA_VALID_DMAMODE) + d->dmamode = cts->xport_specific.ata.dmamode; + if (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT) + d->bytecount = min(8192, cts->xport_specific.ata.bytecount); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; @@ -1418,16 +1430,22 @@ case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; + struct ata_cam_device *d; + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else + d = &ch->user[ccb->ccb_h.target_id]; cts->protocol = PROTO_ATA; cts->protocol_version = PROTO_VERSION_UNSPECIFIED; cts->transport = XPORT_ATA; cts->transport_version = XPORT_VERSION_UNSPECIFIED; - if (ccb->ccb_h.target_id >= 0 && ccb->ccb_h.target_id <= 1) { - cts->xport_specific.valid = CTS_ATA_VALID_BYTECOUNT; - cts->xport_specific.ata.bytecount = - ch->bytecount[ccb->ccb_h.target_id]; - } + cts->xport_specific.ata.piomode = d->piomode; + cts->xport_specific.ata.valid |= CTS_ATA_VALID_PIOMODE; + cts->xport_specific.ata.dmamode = d->dmamode; + cts->xport_specific.ata.valid |= CTS_ATA_VALID_DMAMODE; + cts->xport_specific.ata.bytecount = d->bytecount; + cts->xport_specific.ata.valid |= CTS_ATA_VALID_BYTECOUNT; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#24 (text+ko) ==== @@ -534,6 +534,15 @@ int offset; }; +#ifdef ATA_CAM +struct ata_cam_device { + u_int revision; + int piomode; + int dmamode; + u_int bytecount; +}; +#endif + /* structure describing an ATA channel */ struct ata_channel { device_t dev; /* device handle */ @@ -573,7 +582,8 @@ #ifdef ATA_CAM struct cam_sim *sim; struct cam_path *path; - u_int bytecount[2]; /* Length of PIO transaction */ + struct ata_cam_device user[16]; /* User-specified settings */ + struct ata_cam_device curr[16]; /* Current settings */ #endif }; ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#21 (text+ko) ==== @@ -415,12 +415,20 @@ { struct siis_channel *ch = device_get_softc(dev); struct cam_devq *devq; - int rid, error; + int rid, error, i; ch->dev = dev; ch->unit = (intptr_t)device_get_ivars(dev); resource_int_value(device_get_name(dev), device_get_unit(dev), "pm_level", &ch->pm_level); + for (i = 0; i < 16; i++) { + ch->user[i].revision = 0; + ch->user[i].piomode = 0; + ch->user[i].dmamode = 0; + ch->user[i].bytecount = 8192; + ch->user[i].tags = 2; + ch->curr[i] = ch->user[i]; + } resource_int_value(device_get_name(dev), device_get_unit(dev), "sata_rev", &ch->sata_rev); mtx_init(&ch->mtx, "SIIS channel lock", NULL, MTX_DEF); @@ -833,6 +841,13 @@ mtx_assert(&ch->mtx, MA_OWNED); if ((ccb->ccb_h.func_code == XPT_ATA_IO) && + (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) { + /* Tagged command while we have no supported tag free. */ + if (((~ch->oslots) & (0x7fffffff >> (31 - + ch->curr[ccb->ccb_h.target_id].tags))) == 0) + return (1); + } + if ((ccb->ccb_h.func_code == XPT_ATA_IO) && (ccb->ataio.cmd.flags & (CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT))) { /* Atomic command while anything active. */ if (ch->numrslots != 0) @@ -850,21 +865,20 @@ { struct siis_channel *ch = device_get_softc(dev); struct siis_slot *slot; - int tag; + int tag, tags; mtx_assert(&ch->mtx, MA_OWNED); /* Choose empty slot. */ - tag = ch->lastslot; - while (ch->slot[tag].state != SIIS_SLOT_EMPTY) { - if (++tag >= SIIS_MAX_SLOTS) - tag = 0; - KASSERT(tag != ch->lastslot, ("siis: ALL SLOTS BUSY!")); - } - ch->lastslot = tag; + tags = SIIS_MAX_SLOTS; + if ((ccb->ccb_h.func_code == XPT_ATA_IO) && + (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) + tags = ch->curr[ccb->ccb_h.target_id].tags; + tag = fls((~ch->oslots) & (0x7fffffff >> (31 - tags))) - 1; /* Occupy chosen slot. */ slot = &ch->slot[tag]; slot->ccb = ccb; /* Update channel stats. */ + ch->oslots |= (1 << slot->slot); ch->numrslots++; if ((ccb->ccb_h.func_code == XPT_ATA_IO) && (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) { @@ -1118,6 +1132,7 @@ ccb->ccb_h.status |= CAM_REQ_CMP_ERR; } /* Free slot. */ + ch->oslots &= ~(1 << slot->slot); ch->rslots &= ~(1 << slot->slot); ch->aslots &= ~(1 << slot->slot); if (et != SIIS_ERR_TIMEOUT) { @@ -1143,7 +1158,7 @@ } else xpt_done(ccb); /* Unfreeze frozen command. */ - if (ch->frozen && ch->numrslots == 0) { + if (ch->frozen && !siis_check_collision(dev, ch->frozen)) { union ccb *fccb = ch->frozen; ch->frozen = NULL; siis_begin_transaction(dev, fccb); @@ -1554,7 +1569,22 @@ case XPT_SET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; + struct siis_device *d; + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else + d = &ch->user[ccb->ccb_h.target_id]; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_REVISION) + d->revision = cts->xport_specific.sata.revision; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PIOMODE) + d->piomode = cts->xport_specific.sata.piomode; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_DMAMODE) + d->dmamode = cts->xport_specific.sata.dmamode; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_BYTECOUNT) + d->bytecount = min(8192, cts->xport_specific.sata.bytecount); + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_TAGS) + d->tags = min(SIIS_MAX_SLOTS, cts->xport_specific.sata.tags); if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PM) { ch->pm_present = cts->xport_specific.sata.pm_present; if (ch->pm_present) @@ -1570,30 +1600,43 @@ /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; + struct siis_device *d; uint32_t status; + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + d = &ch->curr[ccb->ccb_h.target_id]; + else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 21 13:00:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6456B1065694; Sat, 21 Nov 2009 13:00: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 28C10106568F for ; Sat, 21 Nov 2009 13:00:26 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16D428FC12 for ; Sat, 21 Nov 2009 13:00:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nALD0P1X000265 for ; Sat, 21 Nov 2009 13:00:25 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nALD0PEw000263 for perforce@freebsd.org; Sat, 21 Nov 2009 13:00:25 GMT (envelope-from mav@freebsd.org) Date: Sat, 21 Nov 2009 13:00:25 GMT Message-Id: <200911211300.nALD0PEw000263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Nov 2009 13:00:26 -0000 http://p4web.freebsd.org/chv.cgi?CH=170893 Change 170893 by mav@mav_mavtest on 2009/11/21 12:59:42 Fix legacy mode build. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#36 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#36 (text+ko) ==== @@ -131,9 +131,10 @@ ata_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); - int error, rid, i; + int error, rid; #ifdef ATA_CAM struct cam_devq *devq; + int i; #endif /* check that we have a virgin channel to attach */