From owner-p4-projects@FreeBSD.ORG Sun May 24 00:53:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3F8F1065672; Sun, 24 May 2009 00:53:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71D6C106564A for ; Sun, 24 May 2009 00:53:46 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4581D8FC25 for ; Sun, 24 May 2009 00:53:46 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4O0ribw042737 for ; Sun, 24 May 2009 00:53:44 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4O0rioN042735 for perforce@freebsd.org; Sun, 24 May 2009 00:53:44 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 24 May 2009 00:53:44 GMT Message-Id: <200905240053.n4O0rioN042735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 162620 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, 24 May 2009 00:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=162620 Change 162620 by nikron@nmfreebsd on 2009/05/24 00:53:05 File for Milestones NetworkManager port GSoC project. Submitted by: Nikhil Bysani Affected files ... .. //depot/projects/soc2009/nm-port/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 24 01:25:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5055B1065674; Sun, 24 May 2009 01:25:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 107321065670 for ; Sun, 24 May 2009 01:25:17 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2BD98FC12 for ; Sun, 24 May 2009 01:25:16 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4O1PGtU046100 for ; Sun, 24 May 2009 01:25:16 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4O1PGgn046098 for perforce@freebsd.org; Sun, 24 May 2009 01:25:16 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 24 May 2009 01:25:16 GMT Message-Id: <200905240125.n4O1PGgn046098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 162622 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, 24 May 2009 01:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=162622 Change 162622 by nikron@nmfreebsd on 2009/05/24 01:25:05 Milestones for nm-port. Submitted by: Nikhil Bysani Affected files ... .. //depot/projects/soc2009/nm-port/Milestones#2 edit Differences ... ==== //depot/projects/soc2009/nm-port/Milestones#2 (text+ko) ==== @@ -1,0 +1,6 @@ +May 23 - 30th, Get Network Manager to compile on FreeBSD (no functionality) +May 30 - June 13th Get Ethernet working +June 13th - June 27th Get Wireless working. +June 27th - July 6th Pass test cases in ethernet/wireless. +July 6th - July 24th Have generally working NetworkManager daemon. +July 24th - August 17th Complete extra components such as plugins and nm-applet if possible, try to commit to upstream. From owner-p4-projects@FreeBSD.ORG Sun May 24 06:51:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74C3E1065675; Sun, 24 May 2009 06:51: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 34136106566C for ; Sun, 24 May 2009 06:51:54 +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 20EB98FC17 for ; Sun, 24 May 2009 06:51:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4O6psbl085274 for ; Sun, 24 May 2009 06:51:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4O6prgT085272 for perforce@freebsd.org; Sun, 24 May 2009 06:51:53 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 24 May 2009 06:51:53 GMT Message-Id: <200905240651.n4O6prgT085272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162626 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, 24 May 2009 06:51:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=162626 Change 162626 by pgj@petymeg on 2009/05/24 06:51:28 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#28 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#29 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#14 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/jilles.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#22 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#22 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/stas.key#3 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/tota.key#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#8 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#24 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#11 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/errata.html#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#16 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#56 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#28 (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.477 2009/05/05 09:13:27 snb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.479 2009/05/22 21:46:28 jilles Exp $ --> aaron@FreeBSD.org"> @@ -496,6 +496,8 @@ jhs@FreeBSD.org"> +jilles@FreeBSD.org"> + jim@FreeBSD.org"> jinmei@FreeBSD.org"> @@ -1084,6 +1086,8 @@ toshi@FreeBSD.org"> +tota@FreeBSD.org"> + trasz@FreeBSD.org"> trevor@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1256,6 +1256,11 @@ &pgpkey.nyan; + + &a.tota; + &pgpkey.tota; + + &a.itetcu; &pgpkey.itetcu; @@ -1301,6 +1306,11 @@ &pgpkey.yar; + + &a.jilles; + &pgpkey.jilles; + + &a.ganbold; &pgpkey.ganbold; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#22 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -124,6 +124,7 @@ + @@ -284,6 +285,7 @@ + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/stas.key#3 (text+ko) ==== @@ -1,55 +1,191 @@ - + +uid Stanislav Sedov +uid Stanislav Sedov (Corporate email) +uid Stanislav Sedov (Corporate email) +uid Stanislav Sedov (Corporate email) +uid Stanislav Sedov (Corporate email) uid Stanislav Sedov -uid Stanislav Sedov (Corporate email) -uid Stanislav Sedov -sub 1024g/B47898B1 2006-05-20 [expires: 2011-05-19] +sub 4096R/6FD2025F 2009-05-23 +sub 4096R/98BC2774 2009-05-23 ]]> ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#8 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.78 2009/02/23 12:27:32 pgj Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.81 2009/05/21 21:02:58 joerg Exp $ @@ -1461,6 +1461,8 @@ ftp.ru.FreeBSD.org ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/ + http://ftp.ru.FreeBSD.org/FreeBSD/ + @@ -1580,6 +1582,8 @@ ftp://ftp.sk.FreeBSD.org/pub/FreeBSD/ http://ftp.sk.FreeBSD.org/pub/FreeBSD/ http://ftp.sk.FreeBSD.org/pub/FreeBSD/ + + ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1100 2009/05/11 07:57:29 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1101 2009/05/18 22:46:59 delphij Exp $ 2000 @@ -443,6 +443,9 @@ CVS has been updated from 1.11.17 to a post-1.11.22 snapshot from 10 March 2008. + FILE has been updated from 4.23 + to 5.03. + hostapd has been updated from 0.5.8 to 0.5.10. ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.109 2009/04/17 15:54:41 nyan Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.110 2009/05/21 10:04:51 brueffer Exp $ # # @@ -93,7 +93,6 @@ nfe i386,amd64 ng_bt3c i386,pc98,amd64 ng_ubt i386,pc98,amd64 -nge i386,pc98,amd64 nsp i386,pc98 nve i386,amd64 nxge i386,amd64 ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#7 (text+ko) ==== @@ -37,7 +37,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.13 2009/05/04 19:00:25 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.14 2009/05/20 00:55:26 hrs Exp $ 2008 @@ -183,6 +183,15 @@ Errata Notice to fix this problem is planned after the release. + [20090507] A bug was found in the &man.fxp.4; driver. This + would cause poor TCP performance when TSO is enabled, and the + receiver has a smaller MSS than the interface MTU setting. To + workaround this issue, one can disable TSO by using + &man.ifconfig.8; parameter (per interface + basis) or setting net.inet.tcp.tso to + 0 (globally on the system). An Errata Notice + to fix this problem is planned after the release. + Late-Breaking News and Corrections @@ -190,5 +199,10 @@ &man.malloc.3; implementation and threading library has been committed to the RELENG_7 branch for public testing. + + [20090507] A patch to solve the bug in the &man.fxp.4; + driver that caused poor TCP performance has been committed to + the RELENG_7 branch for public + testing. ==== //depot/projects/docproj_hu/www/en/developers.sgml#24 (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.219 2009/05/05 09:23:45 snb Exp $ +$FreeBSD: www/en/developers.sgml,v 1.221 2009/05/22 22:04:35 jilles Exp $ --> @@ -249,6 +249,7 @@ + @@ -542,6 +543,7 @@ + ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#11 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.130 2009/03/26 14:14:18 brooks Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.132 2009/05/22 20:48:46 danger Exp $ @@ -373,7 +373,7 @@

In some recent operating systems, it is common that crashes are automatically reported to its vendor, which is very helpful for finding hidden problems that can not be easily triggered by usual - test cases. Newer GNOME applications also has similar functionalities.

+ test cases. Newer GNOME applications also have similar functionalities.

This project would consist two parts. One is some improvements over the current savecore rc.d script to teach it how to collect necessary @@ -578,8 +578,8 @@

Technical contact: Luigi Rizzo

-

In early 2007 we started a project was started to support the - building of linux device drivers on FreeBSD. +

In early 2007 we started a project to support + building Linux device drivers on FreeBSD. This was done through an in-kernel emulation layer, which implements part of the linux kernel API on top of the FreeBSD kernel API. The initial implementation was good enough to @@ -588,7 +588,7 @@ href="http://info.iet.unipi.it/~luigi/FreeBSD/linux_bsd_kld.html">here. The code is actually available as a port, devel/linux-kmod-compat, and a popular driver that uses this infrastructure is - multimedia/linux-gspca-kmod . + multimedia/linux-gspca-kmod.

We would like to use a similar approach to add support for DVB devices, which are widely supported in Linux ==== //depot/projects/docproj_hu/www/en/releases/7.2R/errata.html#4 (text+ko) ==== @@ -19,7 +19,7 @@

Copyright © 2008, 2009 The FreeBSD Documentation Project

$FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml -191791 2009-05-04 19:00:25Z hrs $
+192411 2009-05-20 00:55:26Z hrs $

@@ -122,6 +122,17 @@ lagg(4) driver in the LACP (IEEE 802.3ad Link Aggregation Control Protocol) mode. An Errata Notice to fix this problem is planned after the release.

+ +

[20090507] A bug was found in the fxp(4) driver. This +would cause poor TCP performance when TSO is enabled, and the receiver has a smaller MSS +than the interface MTU setting. To workaround this issue, one can disable TSO by using +ifconfig(8) +-tso parameter (per interface basis) or setting net.inet.tcp.tso to 0 (globally on the +system). An Errata Notice to fix this problem is planned after the release.

@@ -134,6 +145,12 @@ malloc(3) implementation and threading library has been committed to the RELENG_7 branch for public testing.

+ +

[20090507] A patch to solve the bug in the fxp(4) driver that +caused poor TCP performance has been committed to the RELENG_7 +branch for public testing.

==== //depot/projects/docproj_hu/www/share/sgml/events.xml#16 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.71 2009/04/14 12:29:35 jkoshy Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.72 2009/05/18 12:53:22 brueffer Exp $ @@ -30,7 +30,7 @@ UK Cambridge - Universe of Cambridge + University of Cambridge The ninth annual European BSD Conference will take place @@ -38,6 +38,57 @@ track, tutorials, and FreeBSD developer summit. + + FrOSCon 2009 + http://www.froscon.org/ + + 2009 + 8 + 22 + + + 2009 + 8 + 23 + + + Germany + Sankt Augustin + Fachhochschule Bonn-Rhein-Sieg +
Grantham-Allee 20
+ + FrOSCon is a two day conference on Free Software + and Open Source, taking place in Sankt Augustin near the cities + of Bonn and Cologne. The conference revolves around a rich schedule + of talks, highlighting current topics in Free Software and Open + Source. + + + + Kernel Conference Australia 2009 + http://www.kernelconference.net/ + + 2009 + 7 + 15 + + + 2009 + 7 + 17 + + + Australia + Brisbane + University of Queensland + + + Kernel Conference Australia is a Kernel-focused technical conference. + Any and all Open Source kernels and the technologies within those kernels are open + for discussion. The only hard criteria is that the kernel must be covered by an + OSI-approved license. + + BSDday Argentina 2009 http://www.bsdday.com.ar/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#56 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.254 2009/05/11 07:40:46 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.256 2009/05/22 22:08:41 jilles Exp $ @@ -36,6 +36,24 @@ 5 + 22 + + +

New committer: Jilles + Tjoelker (src)

+ + + + + 20 + + +

New committer: TAKATSU + Tomonari (ports)

+ + + + 10 From owner-p4-projects@FreeBSD.ORG Sun May 24 07:30:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C39E1065676; Sun, 24 May 2009 07:30: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 E369F1065673 for ; Sun, 24 May 2009 07:30:33 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C904F8FC17 for ; Sun, 24 May 2009 07:30:33 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4O7UXvb091743 for ; Sun, 24 May 2009 07:30:33 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4O7UXPd091741 for perforce@freebsd.org; Sun, 24 May 2009 07:30:33 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 24 May 2009 07:30:33 GMT Message-Id: <200905240730.n4O7UXPd091741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162627 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, 24 May 2009 07:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=162627 Change 162627 by syl@syl_rincewind on 2009/05/24 07:30:23 Implement SoC file for at91sam9261ek. Import header for sam9261 registers and pio. Add AT91SAM9261EK config file. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pio_sam9261.h#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91sam9261reg.h#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/board_at91sam9261ek.c#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/std.at91sam9261ek#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AT91SAM9261EK#1 add Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/board_at91sam9261ek.c#2 (text+ko) ==== @@ -1,0 +1,36 @@ +/*- + * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include + +#include + +long +board_init(void) +{ + return (at91_ramsize()); +} ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#3 (text) ==== @@ -22,7 +22,7 @@ # All the SoC we support # arm/at91/soc_at91rm9200.c optional at91rm9200 -arm/at91/soc_ar91sam9261.c optional at91sam9261 +arm/at91/soc_at91sam9261.c optional at91sam9261 # # All the boards we support # @@ -30,4 +30,4 @@ arm/at91/board_hl200.c optional at91_board_hl200 arm/at91/board_kb920x.c optional at91_board_kb920x arm/at91/board_tsc4370.c optional at91_board_tsc4370 -arm/at91/board_at91sam9261ek optional at91_board_at91sam9261ek +arm/at91/board_at91sam9261ek.c optional at91_board_at91sam9261ek ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#4 (text+ko) ==== @@ -275,9 +275,6 @@ { 0, 0, 0, 0, 0 } }; -/* - * Attach stuff SoC dependant. - */ void soc_attach(struct at91_softc *sc) { ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#3 (text+ko) ==== @@ -23,10 +23,165 @@ * SUCH DAMAGE. */ + +#include +#include +#include +#include + +#include +#include + /* * Need to calcul the master clock instead of fixing an * hard coded value. */ +uint32_t at91_master_clock = 198656000/2; -uint32_t at91_master_clock = 198656000/2; +/* Static device mappings. */ +const struct pmap_devmap at91_devmap[] = { + /* + * Map the on-board devices VA == PA so that we can access them + * with the MMU on or off. + */ + { + /* + * This at least maps the interrupt controller, the UART + * and the timer. Other devices should use newbus to + * map their memory anyway. + */ + 0xdff00000, + 0xfff00000, + 0x100000, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + /* + * We can't just map the OHCI registers VA == PA, because + * AT91RM92_OHCI_BASE belongs to the userland address space. + * We could just choose a different virtual address, but a better + * solution would probably be to just use pmap_mapdev() to allocate + * KVA, as we don't need the OHCI controller before the vm + * initialization is done. However, the AT91 resource allocation + * system doesn't know how to use pmap_mapdev() yet. + */ + { + /* + * Add the ohci controller, and anything else that might be + * on this chip select for a VA/PA mapping. + */ + AT91SAM9261_OHCI_BASE, + AT91SAM9261_OHCI_PA_BASE, + AT91SAM9261_OHCI_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + 0, + 0, + 0, + 0, + 0, + } +}; + +/* + * Standard priority levels for the system. 0 is lowest and 7 is highest. + * These values are the ones Atmel uses for its Linux port, which differ + * a little form the ones that are in the standard distribution. Also, + * the ones marked with 'TWEEK' are different based on experience. + */ + +int at91_irq_prio[32] = +{ + 7, /* Advanced Interrupt Controller (FIQ) */ + 7, /* System Peripherals */ + 1, /* Parallel IO Controller A */ + 1, /* Parallel IO Controller B */ + 1, /* Parallel IO Controller C */ + 0, + 5, /* USART 0 */ + 5, /* USART 1 */ + 5, /* USART 2 */ + 0, /* Multimedia Card Interface */ + 2, /* USB Device Port */ + 6, /* Two-Wire Interface */ + 5, /* Serial Peripheral Interface 0 */ + 5, /* Serial Peripheral Interface 1 */ + 4, /* Serial Synchronous Controller 0 */ + 4, /* Serial Synchronous Controller 1 */ + 4, /* Serial Synchronous Controller 2 */ + 0, /* Timer Counter 0 */ + 0, /* Timer Counter 1 */ + 0, /* Timer Counter 2 */ + 2, /* USB Host Port */ + 3, /* LCD Controller */ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, /* Advanced Interface Controller (IRQ0) */ + 0, /* Advanced Interface Controller (IRQ1) */ + 0 /* Advanced Interrupt Controller (IRQ2) */ +}; + +struct cpu_devs at91_devs[] = +{ + /* PIO need to be check */ + { + "at91_udp", 0, + AT91SAM9261_BASE + AT91SAM9261_UDP_BASE, AT91SAM9261_UDP_SIZE, + AT91SAM9261_IRQ_UDP, AT91SAM9261_IRQ_PIOB + }, + { + "ohci", 0, + AT91SAM9261_OHCI_BASE, AT91SAM9261_OHCI_SIZE, + AT91SAM9261_IRQ_UHP + }, + { 0, 0, 0, 0, 0 } +}; + +void +soc_attach(struct at91_softc *sc) +{ + if (rman_manage_region(&sc->sc_mem_rman, AT91SAM9261_OHCI_BASE, + AT91SAM9261_OHCI_BASE + AT91SAM9261_OHCI_SIZE - 1) != 0) + panic("at91_attach: failed to set up ohci memory"); +} + +/* + * Accessor for BASE SYS_BASE SYS_SIZE and IRQ_SYSTEM + */ + +uint32_t +at91_sys_base(void) +{ + return (AT91SAM9261_SYS_BASE); +} + +uint32_t +at91_sys_size(void) +{ + return (AT91SAM9261_SYS_SIZE); +} + +uint32_t +at91_base(void) +{ + return (AT91SAM9261_BASE); +} + +uint32_t +at91_irq_sys(void) +{ + return (AT91SAM9261_IRQ_SYSTEM); +} +uint32_t +at91_sdramc_base(void) +{ + return (AT91SAM9261_SDRAMC_BASE); +} From owner-p4-projects@FreeBSD.ORG Sun May 24 10:18:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D65A1065672; Sun, 24 May 2009 10:18: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 4E4D2106564A for ; Sun, 24 May 2009 10:18:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CA638FC0A for ; Sun, 24 May 2009 10:18:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OAIOqq017546 for ; Sun, 24 May 2009 10:18:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OAIOYF017544 for perforce@freebsd.org; Sun, 24 May 2009 10:18:24 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 10:18:24 GMT Message-Id: <200905241018.n4OAIOYF017544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162631 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, 24 May 2009 10:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=162631 Change 162631 by trasz@trasz_victim on 2009/05/24 10:17:50 Remove unneccessary includes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.h#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#12 (text+ko) ==== @@ -29,45 +29,10 @@ #include #include - -/* XXX: Most of these isn't needed either. */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "acl_compat.h" ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.h#3 (text+ko) ==== @@ -33,4 +33,3 @@ int acl_from_aces(struct acl *aclp, const ace_t *aces, int nentries); #endif /* ACL_COMPAT_H */ - From owner-p4-projects@FreeBSD.ORG Sun May 24 10:18:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED2321065739; Sun, 24 May 2009 10:18: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 67960106566B for ; Sun, 24 May 2009 10:18:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 544648FC1C for ; Sun, 24 May 2009 10:18:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OAIO7G017553 for ; Sun, 24 May 2009 10:18:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OAIOxb017549 for perforce@freebsd.org; Sun, 24 May 2009 10:18:24 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 10:18:24 GMT Message-Id: <200905241018.n4OAIOxb017549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162632 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, 24 May 2009 10:18:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=162632 Change 162632 by trasz@trasz_victim on 2009/05/24 10:18:02 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ipsec.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec6.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#36 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#25 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.189 2009/05/22 13:57:44 rwatson Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.190 2009/05/23 16:54:07 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -18,7 +18,11 @@ OLD_FILES+=etc/rc.d/idmapd OLD_FILES+=sbin/idmapd OLD_FILES+=sbin/mount_nfs4 +OLD_FILES+=usr/share/man/man8/idmapd.8.gz OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz +# 20090513: removal of legacy versions of USB network interface drivers +OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h # 20090417: removal of legacy versions of USB network interface drivers OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ipsec.4#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.22 2007/08/05 16:16:14 bz Exp $ +.\" $FreeBSD: src/share/man/man4/ipsec.4,v 1.23 2009/05/23 16:42:38 bz Exp $ .\" -.Dd August 5, 2007 +.Dd May 23, 2009 .Dt IPSEC 4 .Os .Sh NAME @@ -37,7 +37,6 @@ .Nd Internet Protocol Security protocol .Sh SYNOPSIS .Cd "options IPSEC" -.Cd "options IPSEC_FILTERTUNNEL" .Cd "device crypto" .Pp .In sys/types.h @@ -88,9 +87,12 @@ .Pp To properly filter on the inner packets of an .Nm -tunnel with firewalls, add -.Cd "options IPSEC_FILTERTUNNEL" -to the kernel configuration file. +tunnel with firewalls, you can change the values of the following sysctls +.Bl -column net.inet6.ipsec6.filtertunnel default enable +.It Sy "Name Default Enable" +.It net.inet.ipsec.filtertunnel 0 1 +.It net.inet6.ipsec6.filtertunnel 0 1 +.El .\" .Ss Kernel interface .Nm ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1538 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1539 2009/05/23 16:42:38 bz Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -524,9 +524,10 @@ options IPSEC #IP security (requires device crypto) #options IPSEC_DEBUG #debug for IP security # -# Set IPSEC_FILTERTUNNEL to force packets coming through a tunnel -# to be processed by any configured packet filtering twice. -# The default is that packets coming out of a tunnel are _not_ processed; +# #DEPRECATED# +# Set IPSEC_FILTERTUNNEL to change the default of the sysctl to force packets +# coming through a tunnel to be processed by any configured packet filtering +# twice. The default is that packets coming out of a tunnel are _not_ processed; # they are assumed trusted. # # IPSEC history is preserved for such packets, and can be filtered ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.100 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.101 2009/05/23 16:13:26 jamie Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -1196,14 +1196,6 @@ if (flags & ~JAIL_GET_MASK) return (EINVAL); - if (jailed(td->td_ucred)) { - /* - * Don't allow a jailed process to see any jails, - * not even its own. - */ - vfs_opterror(opts, "jail not found"); - return (ENOENT); - } /* Get the parameter list. */ error = vfs_buildopts(optuio, &opts); @@ -1211,6 +1203,12 @@ return (error); errmsg_pos = vfs_getopt_pos(opts, "errmsg"); + /* Don't allow a jailed process to see any jails, not even its own. */ + if (jailed(td->td_ucred)) { + vfs_opterror(opts, "jail not found"); + return (ENOENT); + } + /* * Find the prison specified by one of: lastjid, jid, name. */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.17 2009/04/28 11:10:33 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.18 2009/05/23 16:42:38 bz Exp $"); #include "opt_ipsec.h" #include "opt_sctp.h" @@ -71,6 +71,10 @@ extern struct protosw inetsw[]; +#ifdef VIMAGE_GLOBALS +int ip4_ipsec_filtertunnel; +#endif + /* * Check if we have to jump over firewall processing for this packet. * Called from ip_input(). @@ -79,11 +83,14 @@ int ip_ipsec_filtertunnel(struct mbuf *m) { -#if defined(IPSEC) && !defined(IPSEC_FILTERTUNNEL) +#if defined(IPSEC) + INIT_VNET_IPSEC(curvnet); + /* * Bypass packet filtering for packets from a tunnel. */ - if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL) + if (!V_ip4_ipsec_filtertunnel && + m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL) return 1; #endif return 0; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.340 2009/04/30 13:36:26 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.341 2009/05/23 17:02:30 bz Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -373,7 +373,7 @@ &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_porthashmask); - V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), + V_tcbinfo.ipi_zone = uma_zcreate("tcp_inpcb", sizeof(struct inpcb), NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#21 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.253 2009/04/30 13:36:26 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.254 2009/05/23 16:51:13 bz Exp $"); #include "opt_ipfw.h" #include "opt_inet6.h" @@ -137,6 +137,7 @@ #ifdef VIMAGE_GLOBALS struct inpcbhead udb; /* from udp_var.h */ struct inpcbinfo udbinfo; +static uma_zone_t udpcb_zone; struct udpstat udpstat; /* from udp_var.h */ #endif @@ -158,6 +159,7 @@ INIT_VNET_INET(curvnet); uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); + uma_zone_set_max(V_udpcb_zone, maxsockets); } static int @@ -187,13 +189,39 @@ &V_udbinfo.ipi_hashmask); V_udbinfo.ipi_porthashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.ipi_porthashmask); - V_udbinfo.ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, - NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + V_udbinfo.ipi_zone = uma_zcreate("udp_inpcb", sizeof(struct inpcb), + NULL, NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); + + V_udpcb_zone = uma_zcreate("udpcb", sizeof(struct udpcb), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_udpcb_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, EVENTHANDLER_PRI_ANY); } +int +udp_newudpcb(struct inpcb *inp) +{ + INIT_VNET_INET(curvnet); + struct udpcb *up; + + up = uma_zalloc(V_udpcb_zone, M_NOWAIT | M_ZERO); + if (up == NULL) + return (ENOBUFS); + inp->inp_ppcb = up; + return (0); +} + +void +udp_discardcb(struct udpcb *up) +{ + INIT_VNET_INET(curvnet); + + uma_zfree(V_udpcb_zone, up); +} + /* * Subroutine of udp_input(), which appends the provided mbuf chain to the * passed pcb/socket. The caller must provide a sockaddr_in via udp_in that @@ -272,6 +300,7 @@ struct udphdr *uh; struct ifnet *ifp; struct inpcb *inp; + struct udpcb *up; int len; struct ip save_ip; struct sockaddr_in udp_in; @@ -455,28 +484,25 @@ struct mbuf *n; n = m_copy(m, 0, M_COPYALL); - if (last->inp_ppcb == NULL) { + up = intoudpcb(last); + if (up->u_tun_func == NULL) { if (n != NULL) udp_append(last, ip, n, iphlen + sizeof(struct udphdr), &udp_in); - INP_RUNLOCK(last); } else { /* * Engage the tunneling protocol we * will have to leave the info_lock * up, since we are hunting through * multiple UDP's. - * */ - udp_tun_func_t tunnel_func; - tunnel_func = (udp_tun_func_t)last->inp_ppcb; - tunnel_func(n, iphlen, last); - INP_RUNLOCK(last); + (*up->u_tun_func)(n, iphlen, last); } + INP_RUNLOCK(last); } last = inp; /* @@ -501,22 +527,18 @@ UDPSTAT_INC(udps_noportbcast); goto badheadlocked; } - if (last->inp_ppcb == NULL) { + up = intoudpcb(last); + if (up->u_tun_func == NULL) { udp_append(last, ip, m, iphlen + sizeof(struct udphdr), &udp_in); - INP_RUNLOCK(last); - INP_INFO_RUNLOCK(&V_udbinfo); } else { /* * Engage the tunneling protocol. */ - udp_tun_func_t tunnel_func; - - tunnel_func = (udp_tun_func_t)last->inp_ppcb; - tunnel_func(m, iphlen, last); - INP_RUNLOCK(last); - INP_INFO_RUNLOCK(&V_udbinfo); + (*up->u_tun_func)(m, iphlen, last); } + INP_RUNLOCK(last); + INP_INFO_RUNLOCK(&V_udbinfo); return; } @@ -560,18 +582,16 @@ INP_RUNLOCK(inp); goto badunlocked; } - if (inp->inp_ppcb != NULL) { + up = intoudpcb(inp); + if (up->u_tun_func == NULL) { + udp_append(inp, ip, m, iphlen + sizeof(struct udphdr), &udp_in); + } else { /* * Engage the tunneling protocol. */ - udp_tun_func_t tunnel_func; - tunnel_func = (udp_tun_func_t)inp->inp_ppcb; - tunnel_func(m, iphlen, inp); - INP_RUNLOCK(inp); - return; + (*up->u_tun_func)(m, iphlen, inp); } - udp_append(inp, ip, m, iphlen + sizeof(struct udphdr), &udp_in); INP_RUNLOCK(inp); return; @@ -1142,18 +1162,19 @@ } inp = (struct inpcb *)so->so_pcb; - INP_INFO_WUNLOCK(&V_udbinfo); inp->inp_vflag |= INP_IPV4; inp->inp_ip_ttl = V_ip_defttl; - /* - * UDP does not have a per-protocol pcb (inp->inp_ppcb). - * We use this pointer for kernel tunneling pointer. - * If we ever need to have a protocol block we will - * need to move this function pointer there. Null - * in this pointer means "do the normal thing". - */ - inp->inp_ppcb = NULL; + + error = udp_newudpcb(inp); + if (error) { + in_pcbdetach(inp); + in_pcbfree(inp); + INP_INFO_WUNLOCK(&V_udbinfo); + return (error); + } + INP_WUNLOCK(inp); + INP_INFO_WUNLOCK(&V_udbinfo); return (0); } @@ -1161,24 +1182,26 @@ udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f) { struct inpcb *inp; + struct udpcb *up; - inp = (struct inpcb *)so->so_pcb; KASSERT(so->so_type == SOCK_DGRAM, ("udp_set_kernel_tunneling: !dgram")); KASSERT(so->so_pcb != NULL, ("udp_set_kernel_tunneling: NULL inp")); if (so->so_type != SOCK_DGRAM) { /* Not UDP socket... sorry! */ return (ENOTSUP); } + inp = (struct inpcb *)so->so_pcb; if (inp == NULL) { /* NULL INP? */ return (EINVAL); } INP_WLOCK(inp); - if (inp->inp_ppcb != NULL) { + up = intoudpcb(inp); + if (up->u_tun_func != NULL) { INP_WUNLOCK(inp); return (EBUSY); } - inp->inp_ppcb = f; + up->u_tun_func = f; INP_WUNLOCK(inp); return (0); } @@ -1256,6 +1279,7 @@ { INIT_VNET_INET(so->so_vnet); struct inpcb *inp; + struct udpcb *up; inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp_detach: inp == NULL")); @@ -1263,9 +1287,13 @@ ("udp_detach: not disconnected")); INP_INFO_WLOCK(&V_udbinfo); INP_WLOCK(inp); + up = intoudpcb(inp); + KASSERT(up != NULL, ("%s: up == NULL", __func__)); + inp->inp_ppcb = NULL; in_pcbdetach(inp); in_pcbfree(inp); INP_INFO_WUNLOCK(&V_udbinfo); + udp_discardcb(up); } static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)udp_var.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/udp_var.h,v 1.36 2009/04/12 11:42:40 rwatson Exp $ + * $FreeBSD: src/sys/netinet/udp_var.h,v 1.37 2009/05/23 16:51:13 bz Exp $ */ #ifndef _NETINET_UDP_VAR_H_ @@ -51,6 +51,19 @@ #define ui_ulen ui_u.uh_ulen #define ui_sum ui_u.uh_sum +typedef void(*udp_tun_func_t)(struct mbuf *, int off, struct inpcb *); + +/* + * UDP control block; one per udp. + */ +struct udpcb { + udp_tun_func_t u_tun_func; /* UDP kernel tunneling callback. */ + u_int u_flags; /* Generic UDP flags. */ +}; + +#define intoudpcb(ip) ((struct udpcb *)(ip)->inp_ppcb) +#define sotoudpcb(so) (intoudpcb(sotoinpcb(so))) + struct udpstat { /* input statistics: */ u_long udps_ipackets; /* total input packets */ @@ -110,14 +123,15 @@ extern u_long udp_recvspace; extern int udp_log_in_vain; +int udp_newudpcb(struct inpcb *); +void udp_discardcb(struct udpcb *); + void udp_ctlinput(int, struct sockaddr *, void *); void udp_init(void); void udp_input(struct mbuf *, int); struct inpcb *udp_notify(struct inpcb *inp, int errno); int udp_shutdown(struct socket *so); - -typedef void(*udp_tun_func_t)(struct mbuf *, int off, struct inpcb *); int udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f); #endif ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/vinet.h,v 1.15 2009/05/02 08:16:26 zec Exp $ + * $FreeBSD: src/sys/netinet/vinet.h,v 1.16 2009/05/23 16:51:13 bz Exp $ */ #ifndef _NETINET_VINET_H_ @@ -149,6 +149,7 @@ struct inpcbhead _udb; struct inpcbinfo _udbinfo; + uma_zone_t _udpcb_zone; struct udpstat _udpstat; int _udp_blackhole; @@ -373,6 +374,7 @@ #define V_twq_2msl VNET_INET(twq_2msl) #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) +#define V_udpcb_zone VNET_INET(udpcb_zone) #define V_udp_blackhole VNET_INET(udp_blackhole) #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_ipsec.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/ip6_ipsec.c,v 1.15 2009/02/08 09:27:07 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/ip6_ipsec.c,v 1.16 2009/05/23 16:42:38 bz Exp $"); #include "opt_ipsec.h" @@ -76,6 +76,10 @@ extern struct protosw inet6sw[]; +#ifdef VIMAGE_GLOBALS +int ip6_ipsec6_filtertunnel; +#endif + /* * Check if we have to jump over firewall processing for this packet. * Called from ip_input(). @@ -84,11 +88,14 @@ int ip6_ipsec_filtertunnel(struct mbuf *m) { -#if defined(IPSEC) && !defined(IPSEC_FILTERTUNNEL) +#if defined(IPSEC) + INIT_VNET_IPSEC(curvnet); + /* * Bypass packet filtering for packets from a tunnel. */ - if (m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL) + if (!V_ip6_ipsec6_filtertunnel && + m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL) != NULL) return 1; #endif return 0; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#17 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.110 2009/05/01 11:05:24 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.111 2009/05/23 16:51:13 bz Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -181,6 +181,7 @@ struct ip6_hdr *ip6; struct udphdr *uh; struct inpcb *inp; + struct udpcb *up; int off = *offp; int plen, ulen; struct sockaddr_in6 fromsa; @@ -315,7 +316,10 @@ if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { INP_RLOCK(last); - if (last->inp_ppcb != NULL) { + up = intoudpcb(last); + if (up->u_tun_func == NULL) { + udp6_append(last, n, off, &fromsa); + } else { /* * Engage the tunneling * protocol we will have to @@ -324,15 +328,9 @@ * through multiple UDP's. * */ - udp_tun_func_t tunnel_func; - - tunnel_func = (udp_tun_func_t)last->inp_ppcb; - tunnel_func(n, off, last); - INP_RUNLOCK(last); - } else { - udp6_append(last, n, off, &fromsa); - INP_RUNLOCK(last); + (*up->u_tun_func)(n, off, last); } + INP_RUNLOCK(last); } } last = inp; @@ -361,18 +359,15 @@ } INP_RLOCK(last); INP_INFO_RUNLOCK(&V_udbinfo); - if (last->inp_ppcb != NULL) { + up = intoudpcb(last); + if (up->u_tun_func == NULL) { + udp6_append(last, m, off, &fromsa); + } else { /* * Engage the tunneling protocol. */ - udp_tun_func_t tunnel_func; - - tunnel_func = (udp_tun_func_t)inp->inp_ppcb; - tunnel_func(m, off, last); - INP_RUNLOCK(last); - return (IPPROTO_DONE); + (*up->u_tun_func)(m, off, last); } - udp6_append(last, m, off, &fromsa); INP_RUNLOCK(last); return (IPPROTO_DONE); } @@ -409,18 +404,16 @@ } INP_RLOCK(inp); INP_INFO_RUNLOCK(&V_udbinfo); - if (inp->inp_ppcb != NULL) { + up = intoudpcb(inp); + if (up->u_tun_func == NULL) { + udp6_append(inp, m, off, &fromsa); + } else { /* * Engage the tunneling protocol. */ - udp_tun_func_t tunnel_func; - tunnel_func = (udp_tun_func_t)inp->inp_ppcb; - tunnel_func(m, off, inp); - INP_RUNLOCK(inp); - return (IPPROTO_DONE); + (*up->u_tun_func)(m, off, inp); } - udp6_append(inp, m, off, &fromsa); INP_RUNLOCK(inp); return (IPPROTO_DONE); @@ -820,7 +813,6 @@ return (error); } inp = (struct inpcb *)so->so_pcb; - INP_INFO_WUNLOCK(&V_udbinfo); inp->inp_vflag |= INP_IPV6; if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) inp->inp_vflag |= INP_IPV4; @@ -833,7 +825,16 @@ * which may match an IPv4-mapped IPv6 address. */ inp->inp_ip_ttl = V_ip_defttl; + + error = udp_newudpcb(inp); + if (error) { + in_pcbdetach(inp); + in_pcbfree(inp); + INP_INFO_WUNLOCK(&V_udbinfo); + return (error); + } INP_WUNLOCK(inp); + INP_INFO_WUNLOCK(&V_udbinfo); return (0); } @@ -968,15 +969,19 @@ { INIT_VNET_INET(so->so_vnet); struct inpcb *inp; + struct udpcb *up; inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp6_detach: inp == NULL")); INP_INFO_WLOCK(&V_udbinfo); INP_WLOCK(inp); + up = intoudpcb(inp); + KASSERT(up != NULL, ("%s: up == NULL", __func__)); in_pcbdetach(inp); in_pcbfree(inp); INP_INFO_WUNLOCK(&V_udbinfo); + udp_discardcb(up); } static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.49 2009/04/30 13:36:26 zec Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.50 2009/05/23 16:42:38 bz Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /*- @@ -167,6 +167,9 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ipsec, OID_AUTO, ipsecstats, CTLFLAG_RD, ipsec4stat, ipsecstat, "IPsec IPv4 statistics."); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet_ipsec, OID_AUTO, + filtertunnel, CTLFLAG_RW, ip4_ipsec_filtertunnel, 0, + "If set filter packets from an IPsec tunnel."); #ifdef REGRESSION #ifdef VIMAGE_GLOBALS @@ -228,6 +231,9 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet6_ipsec6, IPSECCTL_STATS, ipsecstats, CTLFLAG_RD, ipsec6stat, ipsecstat, "IPsec IPv6 statistics."); +SYSCTL_V_INT(V_NET, vnet_ipsec, _net_inet6_ipsec6, OID_AUTO, + filtertunnel, CTLFLAG_RW, ip6_ipsec6_filtertunnel, 0, + "If set filter packets from an IPsec tunnel."); #endif /* INET6 */ static int ipsec_setspidx_inpcb __P((struct mbuf *, struct inpcb *)); @@ -273,6 +279,11 @@ V_ip4_ah_net_deflev = IPSEC_LEVEL_USE; V_ip4_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ V_ip4_esp_randpad = -1; +#ifdef IPSEC_FILTERTUNNEL + V_ip4_ipsec_filtertunnel = 1; +#else + V_ip4_ipsec_filtertunnel = 0; +#endif V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; @@ -287,6 +298,11 @@ V_ip6_ah_trans_deflev = IPSEC_LEVEL_USE; V_ip6_ah_net_deflev = IPSEC_LEVEL_USE; V_ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ +#ifdef IPSEC_FILTERTUNNEL + V_ip6_ipsec6_filtertunnel = 1; +#else + V_ip6_ipsec6_filtertunnel = 0; +#endif #endif } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec.h,v 1.23 2009/02/08 09:27:07 bz Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec.h,v 1.24 2009/05/23 16:42:38 bz Exp $ */ /* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */ /*- @@ -348,6 +348,7 @@ extern int ip4_ah_offsetmask; extern int ip4_ipsec_dfbit; extern int ip4_ipsec_ecn; +extern int ip4_ipsec_filtertunnel; extern int ip4_esp_randpad; extern int crypto_support; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec6.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec6.h,v 1.7 2009/02/08 09:27:07 bz Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec6.h,v 1.8 2009/05/23 16:42:38 bz Exp $ */ /* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */ /*- @@ -47,6 +47,7 @@ extern int ip6_ah_trans_deflev; extern int ip6_ah_net_deflev; extern int ip6_ipsec_ecn; +extern int ip6_ipsec6_filtertunnel; struct inpcb; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.8 2009/05/02 08:16:26 zec Exp $ + * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.9 2009/05/23 16:42:38 bz Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ @@ -57,6 +57,7 @@ int _ip4_ah_offsetmask; int _ip4_ipsec_dfbit; int _ip4_ipsec_ecn; + int _ip4_ipsec_filtertunnel; int _ip4_esp_randpad; int _ipsec_replay; @@ -90,6 +91,7 @@ int _ip6_ah_trans_deflev; int _ip6_ah_net_deflev; int _ip6_ipsec_ecn; + int _ip6_ipsec6_filtertunnel; int _ah_enable; int _ah_cleartos; @@ -142,12 +144,14 @@ #define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) #define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) #define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) +#define V_ip4_ipsec_filtertunnel VNET_IPSEC(ip4_ipsec_filtertunnel) #define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) #define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) #define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) #define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad) #define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev) #define V_ip6_ipsec_ecn VNET_IPSEC(ip6_ipsec_ecn) +#define V_ip6_ipsec6_filtertunnel VNET_IPSEC(ip6_ipsec6_filtertunnel) #define V_ipcomp_enable VNET_IPSEC(ipcomp_enable) #define V_ipcompstat VNET_IPSEC(ipcompstat) #define V_ipip_allow VNET_IPSEC(ipip_allow) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.78 2009/05/23 00:07:55 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/bootp_subr.c,v 1.79 2009/05/23 16:27:42 bz Exp $"); #include "opt_route.h" #include "opt_bootp.h" @@ -359,6 +359,7 @@ void bootpboot_p_rtlist(void) { + INIT_VNET_NET(curvnet); printf("Routing table:\n"); RADIX_NODE_HEAD_RLOCK(V_rt_tables[0][AF_INET]); /* could sleep XXX */ @@ -383,6 +384,7 @@ void bootpboot_p_iflist(void) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; @@ -1592,6 +1594,7 @@ void bootpc_init(void) { + INIT_VNET_NET(curvnet); struct bootpc_ifcontext *ifctx, *nctx; /* Interface BOOTP contexts */ struct bootpc_globalcontext *gctx; /* Global BOOTP context */ struct ifnet *ifp; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#36 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 1999-2001 Robert N. M. Watson + * Copyright (c) 2008 Edward Tomasz NapieraÅ‚a * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -25,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/acl.h,v 1.32 2009/05/22 15:56:43 trasz Exp $ + * $FreeBSD: src/sys/sys/acl.h,v 1.33 2009/05/23 17:09:47 trasz Exp $ */ /* * Developed by the TrustedBSD Project. @@ -40,7 +41,7 @@ #include /* - * POSIX.1e ACL types and related constants. + * POSIX.1e and NFSv4 ACL types and related constants. */ typedef uint32_t acl_tag_t; @@ -53,7 +54,7 @@ /* * With 254 entries, "struct acl_t_struct" is exactly one 4kB page big. - * Note that with NFS4 ACLs, the maximum number of ACL entries one + * Note that with NFSv4 ACLs, the maximum number of ACL entries one * may set on file or directory is about half of ACL_MAX_ENTRIES. * * If you increase this, you might also need to increase @@ -110,7 +111,7 @@ /* * Internal ACL structure, used in libc, kernel APIs and for on-disk - * storage of NFS4 ACLs. POSIX.1e ACLs use "struct oldacl" for on-disk + * storage of NFSv4 ACLs. POSIX.1e ACLs use "struct oldacl" for on-disk * storage. */ struct acl { @@ -167,7 +168,7 @@ #define ACL_EVERYONE 0x00000040 /* - * Possible valid values for ae_entry_type field. + * Possible valid values for ae_entry_type field, valid only for NFSv4 ACLs. */ #define ACL_ENTRY_TYPE_ALLOW 0x0100 #define ACL_ENTRY_TYPE_DENY 0x0200 @@ -185,7 +186,7 @@ #define ACL_TYPE_NFS4 0x00000004 /* - * Possible flags in ae_perm field for POSIX.1e ACLs. Note + * Possible bits in ae_perm field for POSIX.1e ACLs. Note * that ACL_EXECUTE may be used in both NFSv4 and POSIX.1e ACLs. */ #define ACL_EXECUTE 0x0001 @@ -196,25 +197,25 @@ #define ACL_POSIX1E_BITS (ACL_EXECUTE | ACL_WRITE | ACL_READ) /* - * Possible flags in ae_perm field for NFSv4 ACLs. + * Possible bits in ae_perm field for NFSv4 ACLs. */ -#define ACL_READ_DATA 0x00000020 -#define ACL_LIST_DIRECTORY 0x00000020 -#define ACL_WRITE_DATA 0x00000040 -#define ACL_ADD_FILE 0x00000040 -#define ACL_APPEND_DATA 0x00000080 -#define ACL_ADD_SUBDIRECTORY 0x00000080 -#define ACL_READ_NAMED_ATTRS 0x00000100 -#define ACL_WRITE_NAMED_ATTRS 0x00000200 +#define ACL_READ_DATA 0x00000008 +#define ACL_LIST_DIRECTORY 0x00000008 +#define ACL_WRITE_DATA 0x00000010 +#define ACL_ADD_FILE 0x00000010 +#define ACL_APPEND_DATA 0x00000020 +#define ACL_ADD_SUBDIRECTORY 0x00000020 +#define ACL_READ_NAMED_ATTRS 0x00000040 +#define ACL_WRITE_NAMED_ATTRS 0x00000080 /* ACL_EXECUTE is defined above. */ -#define ACL_DELETE_CHILD 0x00000400 -#define ACL_READ_ATTRIBUTES 0x00000800 -#define ACL_WRITE_ATTRIBUTES 0x00001000 -#define ACL_DELETE 0x00002000 -#define ACL_READ_ACL 0x00004000 -#define ACL_WRITE_ACL 0x00008000 -#define ACL_WRITE_OWNER 0x00010000 -#define ACL_SYNCHRONIZE 0x00020000 +#define ACL_DELETE_CHILD 0x00000100 +#define ACL_READ_ATTRIBUTES 0x00000200 +#define ACL_WRITE_ATTRIBUTES 0x00000400 +#define ACL_DELETE 0x00000800 +#define ACL_READ_ACL 0x00001000 +#define ACL_WRITE_ACL 0x00002000 +#define ACL_WRITE_OWNER 0x00004000 +#define ACL_SYNCHRONIZE 0x00008000 #define ACL_NFS4_PERM_BITS (ACL_READ_DATA | ACL_WRITE_DATA | \ ACL_APPEND_DATA | ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | \ @@ -266,6 +267,7 @@ #define ACL_PRESERVE_MASK (~ACL_OVERRIDE_MASK) #ifdef _KERNEL + /* * Filesystem-independent code to move back and forth between POSIX mode and * POSIX.1e ACL representations. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#25 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 24 10:22:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35D231065670; Sun, 24 May 2009 10:22: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 E9CA2106566B for ; Sun, 24 May 2009 10:22:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D730E8FC0C for ; Sun, 24 May 2009 10:22:28 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OAMSGS017895 for ; Sun, 24 May 2009 10:22:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OAMSDD017893 for perforce@freebsd.org; Sun, 24 May 2009 10:22:28 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 24 May 2009 10:22:28 GMT Message-Id: <200905241022.n4OAMSDD017893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162633 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, 24 May 2009 10:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162633 Change 162633 by pgj@petymeg on 2009/05/24 10:21:53 MFen (doc): 1.87 -> 1.89 hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml 1.116 -> 1.118 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#27 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#27 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -3501,7 +3501,7 @@ protokoll DHCP - internetes szoftverkonzorcium + internetes rendszerkonzorcium (ISC) A Dinamikus állomáskonfigurációs @@ -3511,8 +3511,8 @@ és miként tudja azon belül megszerezni a kommunikációhoz szükséges információkat. A &os; 6.0 elõtti - változatai az ISC (Internet Software Consortium, vagyis - az internetes szoftverkonzorcium) által kidolgozott DHCP + változatai az ISC (Internet Systems Consortium, vagyis + az internetes rendszerkonzorcium) által kidolgozott DHCP kliens (&man.dhclient.8;) implementációját tartalmazzák. A késõbbi verziókban pedig az OpenBSD 3.7 verziójából @@ -3785,7 +3785,7 @@ Ebben a szakaszban arról olvashatunk, hogy miként kell egy &os; típusú rendszert DHCP szervernek beállítani, ha az ISC - (internetes szoftverkonzorcium) DHCP szerverét + (internetes rendszerkonzorcium) DHCP szerverét használjuk. Ez a szerver nem része a &os;-nek, ezért a @@ -4156,7 +4156,7 @@ tárolnak és táraznak. A BIND fejlesztését jelenleg az Internet - Software Consortium () + Systems Consortium () felügyeli. @@ -4199,8 +4199,7 @@ - named, BIND, - névszerver (name server) + named, BIND A &os;-n belüli BIND névszerver különbözõ megnevezései. @@ -4218,9 +4217,7 @@ Inverz névfeloldás (reverse DNS) - A rendes névfeloldás - ellentéte, vagyis az - IP-címek + Az IP-címek leképzése hálózati nevekre. @@ -4258,8 +4255,9 @@ - A . - gyökérzóna. + A gyökérzónára a + leírásokban általában + . néven szoktak hivatkozni. @@ -4278,8 +4276,8 @@ A 1.168.192.in-addr.arpa egy olyan zóna, amelyek a 192.168.1.* - IP-tartományban szereplõ - összes címet jelöli. + IP-címtartományban + szereplõ összes címet jelöli. @@ -4451,11 +4449,13 @@ A named alapértelmezett beállítása szerint egy &man.chroot.8; környezetben futó egyszerû - névfeloldást végzõ szerver. Ezzel a + névfeloldást végzõ szerver, amely a + helyi IPv4 interfészen (127.0.0.1) fogadja a + kéréseket. Ezzel a beállítással a következõ parancson keresztül tudjuk elindítani: - &prompt.root; /etc/rc.d/named forcestart + &prompt.root; /etc/rc.d/named onestart Ha engedélyezni akarjuk a named démont minden egyes @@ -4503,32 +4503,6 @@ részét. - A <command>make-localhost</command> - használata - - Ha a helyi gépen egy központi - zónát akarunk beállítani, akkor - lépjünk be az /etc/namedb könyvtárba - és futtassuk le a következõ parancsot: - - &prompt.root; sh make-localhost - - Ha nem történt semmilyen hiba, akkor a - master - alkönyvtárban most meg kell jelennie egy új - állománynak. A helyi - tartománynévhez tartozó - állomány a localhost.rev, - valamint IPv6 környezetben a - localhost-v6.rev. Alapértelmezett - konfigurációs állományként - a named.conf ehhez tartalmaz minden - szükséges információt. - - - - <filename>/etc/namedb/named.conf</filename> // $FreeBSD$ @@ -4544,6 +4518,7 @@ // options { + // A chroot könyvtárhoz relatív elérési út, amennyiben létezik directory "/etc/namedb"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; @@ -4562,12 +4537,12 @@ // egy IPv6 címet, vagy az "any" kulcsszót. // listen-on-v6 { ::1; }; -// A "forwarders" blokk mellett a következõ sorral megkérhetjük a -// névszervert, hogy önmagától soha nem kezdeményezzen kéréseket, -// hanem mindig az iménti helyen megjelölt szerverekhez irányítsa -// ezeket: -// -// forward only; +// Az alábbi zónákat már a lentebb található üres zónák eleve lefedik. +// Ha tehát a lenti üres zónákat kivesszük a konfigurációból, akkor +// ezeket a sorokat is tegyük megjegyzésbe. + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // Ha a szolgáltatónk névszervert is elérhetõvé tett számunkra, akkor // itt adjuk meg annak az IP-címét és engedélyezzük az alábbi sort. @@ -4577,7 +4552,23 @@ forwarders { 127.0.0.1; }; -*/ +* + +// Ha a 'forwarders' rész nem üres, akkor alapértelmezés szerint a +// 'forward first' értékkel rendelkezik. Ekkor a kérést a helyi szerver +// kapja abban az esetben, amikor a 'forwarders' részben megadott +// szerverek nem tudják megválaszolni. Emellett a névszerverben a +// következõ sor hozzáadásával letilthatjuk, hogy önmagától ne +// kezdeményezzen kéréseket: +// forward only; + +// Ha a kérések továbbítását az /etc/resolv.conf állományban megadott +// bejegyzések mentén szeretnénk automatikusan konfigurálni, akkor vegyük +// ki a megjegyzésbõl az alábbi sort és adjuk hozzá az /etc/rc.conf +// állományhoz a name_auto_forward=yes sort. Emellett használható még a +// named_auto_forward_only beállítás is (amely fentebb leírt funkciót +// valósítja meg). +// include "/etc/namedb/auto_forward.conf"; Ahogy arról a megjegyzésekben is szó esik, úgy tudjuk aktiválni a @@ -4609,65 +4600,220 @@ /* - * Ha köztünk és az elérni kívánt névszerverek között tûzfal - * is található, akkor az alábbi "query-source" direktívát is - * engedélyeznünk kell. A BIND korábbi változatait mindig az - * 53-as porton keresztül küldték el a kéréseiket, de BIND - * nyolcadik verziójától kezdve alapértelmezés szerint - * erre a feladatra már egy véletlenszerûen választott, nem - * privilegizált UDP portot használnak. + A BIND legújabb változataiban alapértelmezés szerint minden egyes + kimenõ kérésnél más, véletlenszerûen választott UDP portot + használnak, ezáltal jelentõs mértékben csökkenthetõ a gyorsítótár + meghamisíthatóságának (cache poisoning) esélye. Javasoljuk + mindenkinek, hogy használják ki ezt a lehetõséget és eszerint + állítsák be a tûzfalakat. + + Ha nem sikerül a tûzfalat hozzáigazítani ehhez a + viselkedéshez AKKOR ÉS CSAK IS AKKOR engedélyezzük a lenti + beállítást. Alkalmazásával sokkal kevésbé lesz ellenálló a + névszerver a különbözõ hamisítási kísérletekkel szemben, + ezért lehetõség szerint kerüljük el. + + Az NNNNN helyére egy 49160 és 65530 közti számot kell + beírnunk. */ - // query-source address * port 53; + // query-source address * port NNNNN; }; // Ha engedélyezzük a helyi névszervert, akkor az /etc/resolv.conf // állományban elsõ helyen megadni a 127.0.0.1 címet. Sõt, az // /etc/rc.conf állományból se felejtsük ki. +// A hagyományos "root-hints" megoldás. Használjuk ezt VAGY a lentebb +// megadott alárendelt zónákat. +zone "." { type hint; file "named.root"; }; + +/* Több szempontból is elõnyös, ha a következõ zónákat alárendeljük a + gyökér névfeloldó szervereknek: + 1. A helyi felhasználók kéréseit gyorsabban tudjuk feloldalni. + 2. A gyökérszerverek felé nem megy semmilyen hamis forgalom. + 3. A gyökérszerverek meghibásodása vagy elosztott DoS támadás + esetén rugalmasabban tudunk reagálni. + + Másfelöl azonban ez a módszer a "hints" állomány alkalmazásával + szemben több felügyeletet igényel, mivel figyelnünk kell, nehogy + egy váratlan meghibásodás mûködésképtelenné tegye a + szerverünket. Ez a megoldás leginkább a sok klienst kiszolgáló + névszerverek esetén bizonyulhat jövedelmezõbbnek. Óvatosan + bánjunk vele! + + A módszer alkalmazásához vegyük ki a megjegyzésbõl a következõ + bejegyzéseket és tegyük megjegyzésbe a fenti hint zónát. +*/ + zone "." { - type hint; - file "named.root"; + type slave; + file "slave/root.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; -zone "0.0.127.IN-ADDR.ARPA" { - type master; - file "master/localhost.rev"; +zone "arpa" { + type slave; + file "slave/arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; +} + +zone "in-addr.arpa" { + type slave; + file "slave/in-addr.arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; +*/ + +/* Az alábbi zónák helyi kiszolgálásával meg tudjuk akadályozni, hogy + a belõlük indított kérések elhagyják a hálózatunkat és a elérjük + a gyökér névfeloldó szervereket. Ez a megközelítés két komoly + elõnnyel rendelkezik: + 1. A helyi felhasználók kéréseit gyorsabban tudjuk + megválaszolni. + 2. A gyökérszerverek felé nem továbbítódik semmilyen hamis + forgalom. +*/ +// RFC 1912 +zone "localhost" { type master; file "master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; + +// A helyi IPv6 címek részére létrehozott RFC 1912-szerû zóna +zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; + +// "Ez" a hálózat (RFC 1912 és 3330) +zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Magáncélú hálózatok (RFC 1918) +zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Helyi link/APIPA (RFC 3330 és 3927) +zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Dokumentációs próbahálózat (RFC 3330) +zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Útválasztási teljesítmény tesztelésére (RFC 3330) +zone "18.198.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.198.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Az IANA részére fentartott - a régi E osztályú címtér +zone "240.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Hozzárendelés nélküli IPv6-címek (RFC 4291) +zone "1.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 ULA (RFC 4193) +zone "c.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "master/empty.db"; }; -// RFC 3152 -zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA" { - type master; - file "master/localhost-v6.rev"; -}; +// IPv6 helyi link (RFC 4291) +zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// Elavult IPv6 helyi címek (RFC 3879) +zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// Az IP6.INT már elavult (RFC 4159) +zone "ip6.int" { type master; file "master/empty.db"; }; // FONTOS: Ne használjuk ezeket az IP-címeket, mert nem valódiak, // csupán illusztrációs és dokumentációs célokból adtuk meg! // // Az alárendelt zónák beállításaira vonatkozó bejegyzések. Érdemes // ilyet beállítani legalább ahhoz a zónához, amelyhez a tartományunk is -// tartozik. Az elsõdleges zónához tartozó IP-címet érdeklõdjük meg +// tartozik. Az elsõdleges névszerverhez tartozó IP-címet érdeklõdjük meg // az illetékes hálózati rendszergazdától. // -// Soha ne felejtsünk el megadni zónát az inverz kereséshez -// IN-ADDR.ARPA)! (A neve a IP-cím tagjainak fordított sorrendjébõl -// származik, amelyhez hozzátoldunk még egy ".IN-ADDR.ARPA" részt.) +// Soha ne felejtsünk el megadni zónát az inverz kereséshez! A neve az IP-cím +// tagjainak fordított sorrendjébõl // származik, amelyhez hozzátoldunk még egy +// ".IN-ADDR.ARPA" (illetve IPv6 esetén ".IP6.ARPA") részt. // // Mielõtt nekilátnánk egy elsõdleges zóna beállításának, gondoljuk // végig, hogy tényleg a megfelelõ szinten ismerjük a névfeloldás és // a BIND mûködését. Gyakran ugyanis egyáltalán nem nyilvánvaló -// csapdákba tudunk esni. Egy alárendelt zóna beállítása sokkal -// egyszerûbb feladat. +// csapdákba tudunk esni. Egy alárendelt zóna beállítása általában sokkal egyszerûbb feladat. // // FONTOS: Ne kövessük vakon a most következõ példát :-) Helyette inkább // valódi neveket és címeket adjunk meg. -/* Példa központi zónára -zone "minta.net" { - type master; - file "master/minta.net"; -}; -*/ - /* Példa dinamikus zónára key "mintaorgkulcs" { algorithm hmac-md5; @@ -4682,14 +4828,7 @@ }; */ -/* Példa közvetlen és inverz alárendelt zónákra -zone "minta.com" { - type slave; - file "slave/minta.com"; - masters { - 192.168.1.1; - }; -}; +/* Példa inverz alárendelt zónákra zone "1.168.192.in-addr.arpa" { type slave; file "slave/1.168.192.in-addr.arpa"; @@ -4741,7 +4880,6 @@ átküldött zóna információk alapján képes helyette kiszolgálni a kéréseket. - @@ -4758,13 +4896,13 @@ /etc/namedb/master/néven.org érhetõ el) tartalma az alábbi: - $TTL 3600 ; 1 óra + $TTL 3600 ; alapértelmezés szerint 1 óra minta.org. IN SOA ns1.minta.org. admin.minta.org. ( 2006051501 ; sorozatszám 10800 ; frissítés 3600 ; ismétlés 604800 ; lejárat - 86400 ; minimális TTL + 300 ; TTL negatív válasz ) ; névszerverek @@ -4785,19 +4923,16 @@ levelezes IN A 192.168.1.5 ; álnevek -www IN CNAME @ +www IN CNAME minta.org. A .-ra végzõdõ hálózati nevek abszolút nevek, míg minden más . nélküli név az õsére vezehetõ vissza - (tehát relatív). Például a - www a - www.õs. A - kitalált zóna állományunkban itt - most az õs a minta.org, így a - www névbõl a - www.minta.org név keletkezik. + (tehát relatív). Például az + ns1 névbõl az + ns1.minta.org + keletkezik. A zóna állományok felépítése a következõ: @@ -4870,9 +5005,7 @@ 10800 ; 3 óránként frissítsünk 3600 ; 1 óra után próbálkozzunk újra 604800 ; 1 hét után jár le - 86400 ) ; a minimális TTL 1 nap - - + 300 ) ; TTL negatív válasz @@ -4933,15 +5066,14 @@ - IN NS ns1.minta.org. + IN NS ns1.minta.org. Ez egy NS bejegyzés. A zónához tartozó minden hitelesített névszervernek lennie kell legalább egy ilyen bejegyzésének. - -localhost IN A 127.0.0.1 + localhost IN A 127.0.0.1 ns1 IN A 192.168.1.2 ns2 IN A 192.168.1.3 mx IN A 192.168.1.4 @@ -4953,35 +5085,29 @@ 192.168.1.2 címre képzõdik le. - - IN A 192.168.1.1 + IN A 192.168.1.1 Ez a sor 192.168.1.1 címet rendeli az aktuális õshöz, amely jelen esetünkben az example.org. - -www IN CNAME @ + www IN CNAME @ A kanonikus neveket tároló rekordokat általában egy gép álneveihez használjuk. Ebben a példában a www a fõgép egyik - álneve, amely itt a minta.org (192.168.1.1) tartomány. A CNAME - rekordok tehát álnevek megadására - használhatóak, vagy egyetlen - állománynév körkörös - rendszerû (round robin típusú) - feloldására több gép - között. + álneve, amely itt éppenséggel a minta.org (192.168.1.1) tartományneve. A + CNAME rekordok mellé más típusú + rekordokat ugyanarra a hálózati névre + soha ne adjunk meg. MX rekord - - IN MX 10 levelezes.minta.org. + IN MX 10 levelezes.minta.org. Az MX rekord adja meg, hogy milyen levelezõ szerverek felelõsek a zónába érkezõ @@ -5015,7 +5141,7 @@ 10800 ; frissítés 3600 ; ismétlés 604800 ; lejárat - 3600 ) ; minimum + 300 ) ; TTL negatív válasz IN NS ns1.minta.org. IN NS ns2.minta.org. @@ -5031,6 +5157,11 @@ IP-címek és hálózati nevek összerendelését. + Érdemes megemlíteni, hogy a PTR rekordok + jobb oldalán álló nevek + mindegyikének teljes hálózati + névnek kell lennie (vagyis . karakterrel + kell végzõdnie). @@ -5045,15 +5176,13 @@ A gyorsítótárazó - névszerver az a névszerver, amelyik egyik - zónában sem hitelesített. Egyszerûen - csak öncélú kéréseket - küld, és a kapott válaszokat megjegyzi. A - beállításához mindössze annyit - kell tennünk, hogy az eddigiekhez hasonlóan, de - zónák nélkül beállítunk - egy névszervert. - + névszerver az a névszerver, amely elsõdleges + feladata a rekurzív kérések + kiszolgálása. Egyszerûen + továbbítja a beérkezõ + kéréseket, majd megjegyzi azokat, így + késõbb közvetlenül tud + válaszolni. @@ -5100,41 +5229,34 @@ - Az ISC + Az ISC BIND hivatalos honlapja (angolul) - Az ISC BIND + Az ISC BIND hivatalos fóruma (angolul) - A BIND9 GYIK (angolul) - - - - O'Reilly DNS and + url="http://www.oreilly.com/catalog/dns5/">O'Reilly DNS and BIND 5th Edition RFC1034 - + url="http://www.rfc-editor.org/rfc/rfc1034.txt">RFC1034 - Domain Names - Concepts and Facilities RFC1035 - + url="http://www.rfc-editor.org/rfc/rfc1035.txt">RFC1035 - Domain Names - Implementation and Specification - From owner-p4-projects@FreeBSD.ORG Sun May 24 11:10:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CBCC106567C; Sun, 24 May 2009 11:10:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C3661065679 for ; Sun, 24 May 2009 11:10: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 1B51B8FC08 for ; Sun, 24 May 2009 11:10:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OBAG3n022425 for ; Sun, 24 May 2009 11:10:16 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OBAG0K022423 for perforce@freebsd.org; Sun, 24 May 2009 11:10:16 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 24 May 2009 11:10:16 GMT Message-Id: <200905241110.n4OBAG0K022423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162634 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, 24 May 2009 11:10:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=162634 Change 162634 by pgj@petymeg on 2009/05/24 11:09:56 MFen (www): 1.71 -> 1.72 hu/share/sgml/events.xml 1.254 -> 1.256 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#7 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#26 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#7 (text+ko) ==== @@ -11,7 +11,7 @@ @@ -48,6 +48,67 @@ és egy fejlesztõi gyûlés. + + FrOSCon 2009 + http://www.froscon.org/ + + 2009 + 8 + 22 + + + 2009 + 8 + 23 + + + Németország + Sankt Augustin + Fachhochschule Bonn-Rhein-Sieg +
Grantham-Allee 20
+ + + A FrOSCon egy szabad szoftverekrõl és a + nyílt forráskódról szóló + kétnapos konferencia, amely a Bonn és Köln + közelében található Sankt Augustin + városában kerül megrendezésre. A + konferencia tartalmát gazdagon díszítik + különbözõ szabad szoftveres és + nyílt forráskóddal foglalkozó + elõadások. + + + + Kernel Conference Australia 2009 + http://www.kernelconference.net/ + + 2009 + 7 + 15 + + + 2009 + 7 + 17 + + + Ausztrália + Brisbane + Queenslandi Egyetem + + + A Kernel Conference Australia elsõsorban a + rendszermagok és azok mûködésére + fókuszáló szakmai konferencia. Itt helyet + kapnak mindenféle nyílt + forráskódú rendszermagok és a + bennük alkalmazott technológiák. Egyetlen + megszorítás velük kapcsolatban, hogy a + fejlesztésük valamilyen OSI által elfogadott + licensz alapján történjen. + + BSDday Argentina 2009 http://www.bsdday.com.ar/ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#26 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,24 @@ 5 + 22 + + +

Új tag: Jilles + Tjoelker (src)

+ + + + + 20 + + +

Új tag: TAKATSU + Tomonari (ports)

+ + + + 10 From owner-p4-projects@FreeBSD.ORG Sun May 24 14:11:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 111471065672; Sun, 24 May 2009 14:11: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 B76E31065677 for ; Sun, 24 May 2009 14:11:28 +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 A4BEC8FC0C for ; Sun, 24 May 2009 14:11:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OEBPnp049246 for ; Sun, 24 May 2009 14:11:25 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OEBOgk049244 for perforce@freebsd.org; Sun, 24 May 2009 14:11:24 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 14:11:24 GMT Message-Id: <200905241411.n4OEBOgk049244@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 Cc: Subject: PERFORCE change 162644 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, 24 May 2009 14:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=162644 Change 162644 by mav@mav_mavbook on 2009/05/24 14:10:43 Add initial ATA XPT and ATA disk devices. It allows CAM to operate SIMs with XPORT_ATA transport type and devices with PROTO_ATA protocol. To send ATA commands new opcode XPT_ATA_IO added to xpt_action. Teach SCSI drivers do not try to attach to ATA devices. The only exception now is pass driver, I am just not sure. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#1 add .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#1 add .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#1 add .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#1 add .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.h#1 add .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#16 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#87 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#24 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#16 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#39 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#12 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#18 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#19 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#16 (text+ko) ==== @@ -40,6 +40,7 @@ #endif #include #include +#include /* General allocation length definitions for CCB structures */ @@ -169,6 +170,8 @@ * a device give the sector size and * volume size. */ + XPT_ATA_IO = 0x18 | XPT_FC_DEV_QUEUED, + /* Execute the requested ATA I/O operation */ /* HBA engine commands 0x20->0x2F */ XPT_ENG_INQ = 0x20 | XPT_FC_XPT_ONLY, @@ -284,7 +287,9 @@ /* Get Device Information CCB */ struct ccb_getdev { struct ccb_hdr ccb_h; + cam_proto protocol; struct scsi_inquiry_data inq_data; + struct ata_params ident_data; u_int8_t serial_num[252]; u_int8_t reserved; u_int8_t serial_num_len; @@ -412,7 +417,9 @@ path_id_t path_id; target_id_t target_id; lun_id_t target_lun; + cam_proto protocol; struct scsi_inquiry_data inq_data; + struct ata_params ident_data; dev_result_flags flags; }; @@ -617,6 +624,31 @@ u_int init_id; /* initiator id of who selected */ }; +/* + * ATA I/O Request CCB used for the XPT_ATA_IO function code. + */ +struct ccb_ataio { + struct ccb_hdr ccb_h; + union ccb *next_ccb; /* Ptr for next CCB for action */ + u_int8_t *req_map; /* Ptr to mapping info */ + struct ata_cmd cmd; + u_int8_t *data_ptr; /* Ptr to the data buf/SG list */ + u_int32_t dxfer_len; /* Data transfer length */ + /* Autosense storage */ + u_int16_t sglist_cnt; /* Number of SG list entries */ + u_int8_t status; /* Returned ATA status */ + u_int32_t resid; /* Transfer residual length: 2's comp */ + u_int8_t tag_action; /* What to do for tag queueing */ + /* + * The tag action should be either the define below (to send a + * non-tagged transaction) or one of the defined scsi tag messages + * from scsi_message.h. + */ +#define CAM_TAG_ACTION_NONE 0x00 + u_int tag_id; /* tag id from initator (target mode) */ + u_int init_id; /* initiator id of who selected */ +}; + struct ccb_accept_tio { struct ccb_hdr ccb_h; cdb_t cdb_io; /* Union for CDB bytes/pointer */ @@ -907,6 +939,7 @@ struct ccb_eng_exec cee; struct ccb_rescan crcn; struct ccb_debug cdbg; + struct ccb_ataio ataio; }; __BEGIN_DECLS @@ -924,7 +957,14 @@ u_int32_t flags, u_int tag_action, u_int tag_id, u_int init_id, u_int scsi_status, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int32_t timeout); - + +static __inline void +cam_fill_ataio(struct ccb_ataio *ataio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int32_t flags, u_int tag_action, + u_int8_t *data_ptr, u_int32_t dxfer_len, + u_int32_t timeout); + static __inline void cam_fill_csio(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), @@ -965,6 +1005,23 @@ csio->init_id = init_id; } +static __inline void +cam_fill_ataio(struct ccb_ataio *ataio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int32_t flags, u_int tag_action, + u_int8_t *data_ptr, u_int32_t dxfer_len, + u_int32_t timeout) +{ + ataio->ccb_h.func_code = XPT_ATA_IO; + ataio->ccb_h.flags = flags; + ataio->ccb_h.retry_count = retries; + ataio->ccb_h.cbfcnp = cbfcnp; + ataio->ccb_h.timeout = timeout; + ataio->data_ptr = data_ptr; + ataio->dxfer_len = dxfer_len; + ataio->tag_action = tag_action; +} + void cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended); __END_DECLS ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#87 (text+ko) ==== @@ -1686,9 +1686,14 @@ device->target->target_id; cdm->matches[j].result.device_result.target_lun = device->lun_id; + cdm->matches[j].result.device_result.protocol = + device->protocol; bcopy(&device->inq_data, &cdm->matches[j].result.device_result.inq_data, sizeof(struct scsi_inquiry_data)); + bcopy(&device->ident_data, + &cdm->matches[j].result.device_result.ident_data, + sizeof(struct ata_params)); /* Let the user know whether this device is unconfigured */ if (device->flags & CAM_DEV_UNCONFIGURED) @@ -2446,6 +2451,10 @@ start_ccb->csio.sense_resid = 0; start_ccb->csio.resid = 0; /* FALLTHROUGH */ + case XPT_ATA_IO: + if (start_ccb->ccb_h.func_code == XPT_ATA_IO) { + start_ccb->ataio.status = 0; + } case XPT_RESET_DEV: case XPT_ENG_EXEC: { @@ -2584,7 +2593,9 @@ cgd = &start_ccb->cgd; bus = cgd->ccb_h.path->bus; tar = cgd->ccb_h.path->target; + cgd->protocol = dev->protocol; cgd->inq_data = dev->inq_data; + cgd->ident_data = dev->ident_data; cgd->ccb_h.status = CAM_REQ_CMP; cgd->serial_num_len = dev->serial_num_len; if ((dev->serial_num_len > 0) @@ -3782,8 +3793,12 @@ case XPORT_SPI: case XPORT_SAS: case XPORT_FC: + case XPORT_USB: new_bus->xport = scsi_get_xport(); break; + case XPORT_ATA: + new_bus->xport = ata_get_xport(); + break; default: new_bus->xport = &xport_default; break; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#2 (text+ko) ==== @@ -64,6 +64,7 @@ cam_xport transport; u_int transport_version; struct scsi_inquiry_data inq_data; + struct ata_params ident_data; u_int8_t inq_flags; /* * Current settings for inquiry flags. * This allows us to override settings @@ -134,6 +135,7 @@ }; struct xpt_xport * scsi_get_xport(void); +struct xpt_xport * ata_get_xport(void); struct cam_ed * xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#24 (text+ko) ==== @@ -496,6 +496,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + if (SID_TYPE(&cgd->inq_data) != T_CDROM && SID_TYPE(&cgd->inq_data) != T_WORM) break; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#16 (text+ko) ==== @@ -287,6 +287,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + if (SID_TYPE(&cgd->inq_data)!= T_CHANGER) break; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#39 (text+ko) ==== @@ -1028,6 +1028,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + if (SID_TYPE(&cgd->inq_data) != T_DIRECT && SID_TYPE(&cgd->inq_data) != T_RBC && SID_TYPE(&cgd->inq_data) != T_OPTICAL) ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#12 (text+ko) ==== @@ -366,6 +366,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + if (SID_TYPE(&cgd->inq_data) != T_PROCESSOR) break; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#18 (text+ko) ==== @@ -1398,6 +1398,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + if (SID_TYPE(&cgd->inq_data) != T_SEQUENTIAL) break; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#19 (text+ko) ==== @@ -251,6 +251,9 @@ break; } + if (cgd->protocol != PROTO_SCSI) + break; + inq_len = cgd->inq_data.additional_length + 4; /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#12 (text+ko) ==== @@ -226,6 +226,9 @@ if (cgd == NULL) break; + if (cgd->protocol != PROTO_SCSI) + break; + /* * Allocate a peripheral instance for this device and * start the probe process. From owner-p4-projects@FreeBSD.ORG Sun May 24 14:17:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E2621065679; Sun, 24 May 2009 14:17:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E02E11065677 for ; Sun, 24 May 2009 14:17:34 +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 CE8D98FC1D for ; Sun, 24 May 2009 14:17:34 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OEHYDH049720 for ; Sun, 24 May 2009 14:17:34 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OEHYSU049718 for perforce@freebsd.org; Sun, 24 May 2009 14:17:34 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 14:17:34 GMT Message-Id: <200905241417.n4OEHYSU049718@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 Cc: Subject: PERFORCE change 162645 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, 24 May 2009 14:17:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=162645 Change 162645 by mav@mav_mavbook on 2009/05/24 14:17:08 Hook up new cam/ata parts to the kernel options. Affected files ... .. //depot/projects/scottl-camlock/src/sys/conf/files#29 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/conf/files#29 (text+ko) ==== @@ -95,10 +95,13 @@ cam/cam_queue.c optional scbus cam/cam_sim.c optional scbus cam/cam_xpt.c optional scbus +cam/ata/ata_all.c optional scbus +cam/ata/ata_xpt.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/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 From owner-p4-projects@FreeBSD.ORG Sun May 24 14:19:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63AEC1065676; Sun, 24 May 2009 14:19:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 218F01065674 for ; Sun, 24 May 2009 14:19:37 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 102A28FC1A for ; Sun, 24 May 2009 14:19:37 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OEJasw049844 for ; Sun, 24 May 2009 14:19:36 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OEJakD049842 for perforce@freebsd.org; Sun, 24 May 2009 14:19:36 GMT (envelope-from fangwang@FreeBSD.org) Date: Sun, 24 May 2009 14:19:36 GMT Message-Id: <200905241419.n4OEJakD049842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 162646 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, 24 May 2009 14:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=162646 Change 162646 by fangwang@fangwang_utobsd on 2009/05/24 14:18:43 Add TCP UTO(user timeout) relative macro defines in tcp.h. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp.h#2 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp.h#2 (text+ko) ==== @@ -96,6 +96,8 @@ #define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ #define TCPOLEN_SIGNATURE 18 +#define TCPOPT_UTO 28 +#define TCPOLEN_UTO 4 /* Miscellaneous constants */ #define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */ @@ -150,6 +152,7 @@ #define TCP_MD5SIG 0x10 /* use MD5 digests (RFC2385) */ #define TCP_INFO 0x20 /* retrieve tcp_info structure */ #define TCP_CONGESTION 0x40 /* get/set congestion control algorithm */ +#define TCP_UTO 0x80 /* set tcp user timeout */ #define TCP_CA_NAME_MAX 16 /* max congestion control name length */ @@ -158,6 +161,7 @@ #define TCPI_OPT_WSCALE 0x04 #define TCPI_OPT_ECN 0x08 #define TCPI_OPT_TOE 0x10 +#define TCPI_OPT_UTO 0x20 /* * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits @@ -217,9 +221,10 @@ u_int32_t tcpi_snd_nxt; /* Next egress seqno */ u_int32_t tcpi_rcv_nxt; /* Next ingress seqno */ u_int32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ - + u_int32_t tcpi_uto; /* tcp user timeout value */ + /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[29]; /* Padding. */ + u_int32_t __tcpi_pad[28]; /* Padding. */ }; #endif From owner-p4-projects@FreeBSD.ORG Sun May 24 14:21:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E61671065672; Sun, 24 May 2009 14:21: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 9C08B106564A for ; Sun, 24 May 2009 14:21:39 +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 8AA738FC0A for ; Sun, 24 May 2009 14:21:39 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OELdtA050054 for ; Sun, 24 May 2009 14:21:39 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OELdoL050052 for perforce@freebsd.org; Sun, 24 May 2009 14:21:39 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 14:21:39 GMT Message-Id: <200905241421.n4OELdoL050052@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 Cc: Subject: PERFORCE change 162647 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, 24 May 2009 14:21:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162647 Change 162647 by mav@mav_mavbook on 2009/05/24 14:20:55 Hook up new cam/ata parts to the cam kernel module. Affected files ... .. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#12 (text+ko) ==== @@ -2,7 +2,7 @@ S= ${.CURDIR}/../.. -.PATH: $S/cam $S/cam/scsi +.PATH: $S/cam $S/cam/scsi $S/cam/ata KMOD= cam @@ -25,6 +25,9 @@ SRCS+= scsi_sg.c SRCS+= scsi_targ_bh.c scsi_target.c SRCS+= scsi_xpt.c +SRCS+= ata_all.c +SRCS+= ata_xpt.c +SRCS+= ata_da.c EXPORT_SYMS= YES # XXX evaluate From owner-p4-projects@FreeBSD.ORG Sun May 24 14:48:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8B93106567B; Sun, 24 May 2009 14:48:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C7251065677 for ; Sun, 24 May 2009 14:48:06 +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 4A89F8FC20 for ; Sun, 24 May 2009 14:48:06 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OEm6DA052147 for ; Sun, 24 May 2009 14:48:06 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OEm6UA052145 for perforce@freebsd.org; Sun, 24 May 2009 14:48:06 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 14:48:06 GMT Message-Id: <200905241448.n4OEm6UA052145@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 Cc: Subject: PERFORCE change 162648 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, 24 May 2009 14:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=162648 Change 162648 by mav@mav_mavbook on 2009/05/24 14:47:18 Add driver for AHCI SATA controller to be used as CAM SIM. Driver provides CAM native access to SATA devices reporting transport type XPORT_ATA and protocol type PROTO_ATA and supporting XPT_ATA_IO operation. Comparing to ataahci this driver has: - controller command queueing up to 32 slots (no NCQ yet); - proper DMA load operation without preallocation; It does not supports yet: - ATAPI; - Port Multipliers; - some parts of error reporting and recovery. At this moment driver hacked to only attach JMB363 controller. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#1 add .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#1 add .. //depot/projects/scottl-camlock/src/sys/modules/ahci/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 24 16:18:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 166AE1065674; Sun, 24 May 2009 16:18: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 CABAB106564A for ; Sun, 24 May 2009 16:18:38 +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 B88EE8FC1E for ; Sun, 24 May 2009 16:18:38 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OGIcmx061464 for ; Sun, 24 May 2009 16:18:38 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OGIcSw061462 for perforce@freebsd.org; Sun, 24 May 2009 16:18:38 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 16:18:38 GMT Message-Id: <200905241618.n4OGIcSw061462@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 Cc: Subject: PERFORCE change 162653 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, 24 May 2009 16:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162653 Change 162653 by mav@mav_mavbook on 2009/05/24 16:18:04 Add byte-order swap for ATA_IDENTIFY command result. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#2 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -183,6 +184,50 @@ } static void +bswap(int8_t *buf, int len) +{ + u_int16_t *ptr = (u_int16_t*)(buf + len); + + while (--ptr >= (u_int16_t*)buf) + *ptr = ntohs(*ptr); +} + +static void +btrim(int8_t *buf, int len) +{ + int8_t *ptr; + + for (ptr = buf; ptr < buf+len; ++ptr) + if (!*ptr || *ptr == '_') + *ptr = ' '; + for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr) + *ptr = 0; +} + +static void +bpack(int8_t *src, int8_t *dst, int len) +{ + int i, j, blank; + + for (i = j = blank = 0 ; i < len; i++) { + if (blank && src[i] == ' ') continue; + if (blank && src[i] != ' ') { + dst[j++] = src[i]; + blank = 0; + continue; + } + if (src[i] == ' ') { + blank = 1; + if (i == 0) + continue; + } + dst[j++] = src[i]; + } + if (j < len) + dst[j] = 0x00; +} + +static void probe_periph_init() { } @@ -438,10 +483,30 @@ { if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { struct ata_params *ident_buf; + int16_t *ptr; path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; ident_buf = &path->device->ident_data; + for (ptr = (int16_t *)ident_buf; + ptr < (int16_t *)ident_buf + sizeof(struct ata_params)/2; ptr++) { + *ptr = le16toh(*ptr); + } + if (strncmp(ident_buf->model, "FX", 2) && + strncmp(ident_buf->model, "NEC", 3) && + strncmp(ident_buf->model, "Pioneer", 7) && + strncmp(ident_buf->model, "SHARP", 5)) { + bswap(ident_buf->model, sizeof(ident_buf->model)); + bswap(ident_buf->revision, sizeof(ident_buf->revision)); + bswap(ident_buf->serial, sizeof(ident_buf->serial)); + } + btrim(ident_buf->model, sizeof(ident_buf->model)); + bpack(ident_buf->model, ident_buf->model, sizeof(ident_buf->model)); + btrim(ident_buf->revision, sizeof(ident_buf->revision)); + bpack(ident_buf->revision, ident_buf->revision, sizeof(ident_buf->revision)); + btrim(ident_buf->serial, sizeof(ident_buf->serial)); + bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); + scsi_find_quirk(path->device); ata_devise_transport(path); From owner-p4-projects@FreeBSD.ORG Sun May 24 16:26:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 784EC1065672; Sun, 24 May 2009 16:26: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 379DC106566C for ; Sun, 24 May 2009 16:26:49 +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 2143B8FC14 for ; Sun, 24 May 2009 16:26:49 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OGQmm4062174 for ; Sun, 24 May 2009 16:26:48 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OGQmdS062172 for perforce@freebsd.org; Sun, 24 May 2009 16:26:48 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 16:26:48 GMT Message-Id: <200905241626.n4OGQmdS062172@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 Cc: Subject: PERFORCE change 162654 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, 24 May 2009 16:26:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=162654 Change 162654 by mav@mav_mavbook on 2009/05/24 16:26:08 Add proper ATA devices listing. Affected files ... .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#6 (text+ko) ==== @@ -396,19 +396,34 @@ } else skip_device = 0; - cam_strvis(vendor, dev_result->inq_data.vendor, + if (dev_result->protocol == PROTO_SCSI) { + cam_strvis(vendor, dev_result->inq_data.vendor, sizeof(dev_result->inq_data.vendor), sizeof(vendor)); - cam_strvis(product, + cam_strvis(product, dev_result->inq_data.product, sizeof(dev_result->inq_data.product), sizeof(product)); - cam_strvis(revision, + cam_strvis(revision, dev_result->inq_data.revision, sizeof(dev_result->inq_data.revision), sizeof(revision)); - sprintf(tmpstr, "<%s %s %s>", vendor, product, + sprintf(tmpstr, "<%s %s %s>", vendor, product, + revision); + } else if (dev_result->protocol == PROTO_ATA) { + cam_strvis(product, + dev_result->ident_data.model, + sizeof(dev_result->ident_data.model), + sizeof(product)); + cam_strvis(revision, + dev_result->ident_data.revision, + sizeof(dev_result->ident_data.revision), + sizeof(revision)); + sprintf(tmpstr, "<%s %s>", product, revision); + } else { + sprintf(tmpstr, "<>"); + } if (need_close) { fprintf(stdout, ")\n"); need_close = 0; From owner-p4-projects@FreeBSD.ORG Sun May 24 17:03:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB34106568A; Sun, 24 May 2009 17:03: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 257B3106567F for ; Sun, 24 May 2009 17:03: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 EE88A8FC25 for ; Sun, 24 May 2009 17:03:25 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OH3P38076260 for ; Sun, 24 May 2009 17:03:25 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OH3Ptx076258 for perforce@freebsd.org; Sun, 24 May 2009 17:03:25 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 17:03:25 GMT Message-Id: <200905241703.n4OH3Ptx076258@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 Cc: Subject: PERFORCE change 162655 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, 24 May 2009 17:03:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=162655 Change 162655 by mav@mav_mavbook on 2009/05/24 17:02:35 Give CAM a bit more information about device. Mostly cosmetics. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#2 (text+ko) ==== @@ -1718,50 +1718,24 @@ ccb->ccb_h.status = CAM_PROVIDE_FAIL; xpt_done(ccb); break; +#endif case XPT_GET_TRAN_SETTINGS: /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; - u_int target_mask = 0x01 << ccb->ccb_h.target_id; - struct ccb_trans_settings_scsi *scsi = - &cts->proto_specific.scsi; - struct ccb_trans_settings_spi *spi = - &cts->xport_specific.spi; - cts->protocol = PROTO_SCSI; + cts->protocol = PROTO_ATA; cts->protocol_version = SCSI_REV_2; - cts->transport = XPORT_SPI; + cts->transport = XPORT_ATA; cts->transport_version = 2; - if (cts->type == CTS_TYPE_USER_SETTINGS) { - spi->flags = 0; - if ((aha->disc_permitted & target_mask) != 0) - spi->flags |= CTS_SPI_FLAGS_DISC_ENB; - spi->bus_width = MSG_EXT_WDTR_BUS_8_BIT; - if ((aha->sync_permitted & target_mask) != 0) { - if (aha->boardid >= BOARD_1542CF) - spi->sync_period = 25; - else - spi->sync_period = 50; - } else { - spi->sync_period = 0; - } - - if (spi->sync_period != 0) - spi->sync_offset = 15; - - spi->valid = CTS_SPI_VALID_SYNC_RATE - | CTS_SPI_VALID_SYNC_OFFSET - | CTS_SPI_VALID_BUS_WIDTH - | CTS_SPI_VALID_DISC; - scsi->valid = CTS_SCSI_VALID_TQ; - } else { - ahafetchtransinfo(aha, cts); - } + cts->proto_specific.valid = 0; + cts->xport_specific.valid = 0; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; } +#if 0 case XPT_CALC_GEOMETRY: { struct ccb_calc_geometry *ccg; @@ -1817,7 +1791,7 @@ cpi->max_lun = 0; cpi->initiator_id = 0;//aha->scsi_id; cpi->bus_id = cam_sim_bus(sim); - cpi->base_transfer_speed = 3300; + cpi->base_transfer_speed = 150000; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); strncpy(cpi->hba_vid, "AHCI", HBA_IDLEN); strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); From owner-p4-projects@FreeBSD.ORG Sun May 24 17:05:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A06601065679; Sun, 24 May 2009 17:05: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 582E31065674 for ; Sun, 24 May 2009 17:05:28 +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 2B7E68FC16 for ; Sun, 24 May 2009 17:05:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OH5SDv076470 for ; Sun, 24 May 2009 17:05:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OH5Sx7076468 for perforce@freebsd.org; Sun, 24 May 2009 17:05:28 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 17:05:28 GMT Message-Id: <200905241705.n4OH5Sx7076468@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 Cc: Subject: PERFORCE change 162656 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, 24 May 2009 17:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162656 Change 162656 by mav@mav_mavbook on 2009/05/24 17:05:06 Teach kernel how to report ATA periphs. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#88 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#2 (text+ko) ==== @@ -65,6 +65,20 @@ } void +ata_print_ident(struct ata_params *ident_data) +{ + char product[48], revision[16]; + + cam_strvis(product, ident_data->model, sizeof(ident_data->model), + sizeof(product)); + cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision), + sizeof(revision)); + + printf("<%s %s> ATA device\n", + product, revision); +} + +void ata_read_write(struct ccb_ataio *ataio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#2 (text+ko) ==== @@ -47,6 +47,9 @@ u_int32_t timeout); void +ata_print_ident(struct ata_params *ident_data); + +void ata_read_write(struct ccb_ataio *ataio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#88 (text+ko) ==== @@ -1041,7 +1041,12 @@ path->target->target_id, path->device->lun_id); printf("%s%d: ", periph->periph_name, periph->unit_number); - scsi_print_inquiry(&path->device->inq_data); + if (path->device->protocol == PROTO_SCSI) + scsi_print_inquiry(&path->device->inq_data); + else if (path->device->protocol == PROTO_ATA) + ata_print_ident(&path->device->ident_data); + else + printf("Unknown protocol device\n"); if (bootverbose && path->device->serial_num_len > 0) { /* Don't wrap the screen - print only the first 60 chars */ printf("%s%d: Serial Number %.60s\n", periph->periph_name, From owner-p4-projects@FreeBSD.ORG Sun May 24 17:09:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5B211065691; Sun, 24 May 2009 17:09:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CE021065687 for ; Sun, 24 May 2009 17:09:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7884A8FC18 for ; Sun, 24 May 2009 17:09:32 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OH9Ws0076732 for ; Sun, 24 May 2009 17:09:32 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OH9Wtx076730 for perforce@freebsd.org; Sun, 24 May 2009 17:09:32 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 17:09:32 GMT Message-Id: <200905241709.n4OH9Wtx076730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162657 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, 24 May 2009 17:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=162657 Change 162657 by trasz@trasz_victim on 2009/05/24 17:08:47 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/chflags/chflags.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ps/print.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/stand.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonkrpc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_vimage.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_krpc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lockf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/README#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/gateworks/common#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/main.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/npestats.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/npestats.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/statfoo.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/npe/npestats/statfoo.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsv4.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/stablerestart.5#1 branch Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#28 (text+ko) ==== @@ -23,6 +23,11 @@ ln -s aj /etc/malloc.conf.) 20090523: + The layout of struct vnet_net has changed, therefore modules + need to be rebuilt. + Bump __FreeBSD_version to 800090. + +20090523: The newly imported zic(8) produces a new format in the output. Please run tzsetup(8) to install the newly created data to /etc/localtime. @@ -1530,4 +1535,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.603 2009/05/23 09:24:07 joel Exp $ +$FreeBSD: src/UPDATING,v 1.604 2009/05/23 21:43:44 zec Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.25 2009/05/24 15:27:25 jilles Exp $"); #include #include @@ -115,7 +115,7 @@ fts_options |= FTS_LOGICAL; } } else - fts_options = FTS_LOGICAL; + fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL; /* XXX: Why don't chflags and lchflags have compatible prototypes? */ if (hflag) ==== //depot/projects/soc2008/trasz_nfs4acl/bin/ps/print.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.99 2009/05/17 04:00:43 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.100 2009/05/24 15:32:34 jilles Exp $"); #include #include @@ -596,6 +596,10 @@ char obuff[128]; v = ve->var; + if (!k->ki_valid) { + (void)printf("%-*s", v->width, "-"); + return; + } val = now - k->ki_p->ki_start.tv_sec; days = val / (24 * 60 * 60); val %= 24 * 60 * 60; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/stand.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libstand/stand.h,v 1.44 2008/11/06 16:30:32 raj Exp $ + * $FreeBSD: src/lib/libstand/stand.h,v 1.45 2009/05/24 11:37:10 dfr Exp $ * From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $ */ @@ -167,7 +167,7 @@ #define SOPEN_RASIZE 512 }; -#define SOPEN_MAX 8 +#define SOPEN_MAX 64 extern struct open_file files[]; /* f_flags values */ ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/acl.9,v 1.16 2009/04/11 10:37:04 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/acl.9,v 1.17 2009/05/24 09:42:53 trasz Exp $ .\" .Dd December 23, 1999 .Os @@ -59,7 +59,9 @@ structure, defined as follows: .Bd -literal -offset indent struct acl { - int acl_cnt; + unsigned int acl_maxcnt; + unsigned int acl_cnt; + int acl_spare[4]; struct acl_entry acl_entry[ACL_MAX_ENTRIES]; }; .Ed @@ -67,6 +69,10 @@ An ACL is constructed from a fixed size array of ACL entries, each of which consists of a set of permissions, principal namespace, and principal identifier. +In this implementation, the +.Vt acl_maxcnt +field is always set to +.Dv ACL_MAX_ENTRIES . .Pp Each individual ACL entry is of the type .Vt acl_entry_t , @@ -107,7 +113,7 @@ .Dv ACL_OTHER . .It Dv ACL_EVERYONE Discretionary access rights for all users. -This is only valid for NFS4 ACLs. +This is only valid for NFSv4 ACLs. .El .Pp Each POSIX.1e ACL must contain exactly one @@ -126,6 +132,12 @@ entry should be present. .It Vt uid_t Va ae_id The ID of user for whom this ACL describes access permissions. +For entries other than +.Dv ACL_USER +and +.Dv ACL_GROUP , +this field should be set to +.Dv ACL_UNDEFINED_ID . .It Vt acl_perm_t Va ae_perm This field defines what kind of access the process matching this ACL has for accessing the associated file. @@ -142,13 +154,15 @@ to the associated file. .El .Pp -For NFS4 ACLs, the following are valid: +For NFSv4 ACLs, the following are valid: .Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" .It Dv ACL_READ_DATA +The process may read from the associated file. .It Dv ACL_LIST_DIRECTORY Same as .Dv ACL_READ_DATA . .It Dv ACL_WRITE_DATA +The process may write to the associated file. .It Dv ACL_ADD_FILE Same as .Dv ACL_ACL_WRITE_DATA . @@ -157,8 +171,11 @@ Same as .Dv ACL_APPEND_DATA . .It Dv ACL_READ_NAMED_ATTRS +Ignored. .It Dv ACL_WRITE_NAMED_ATTRS +Ignored. .It Dv ACL_EXECUTE +The process may execute the associated file. .It Dv ACL_DELETE_CHILD .It Dv ACL_READ_ATTRIBUTES .It Dv ACL_WRITE_ATTRIBUTES @@ -167,17 +184,18 @@ .It Dv ACL_WRITE_ACL .It Dv ACL_WRITE_OWNER .It Dv ACL_SYNCHRONIZE +Ignored. .El -.It Vt acl_extended_t Va ae_extended -This field defines the type of NFS4 ACL entry. +.It Vt acl_entry_type_t Va ae_entry_type +This field defines the type of NFSv4 ACL entry. It is not used with POSIX.1e ACLs. The following values are valid: .Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" -.It Dv ACL_EXTENDED_ALLOW -.It Dv ACL_EXTENDED_DENY +.It Dv ACL_ENTRY_TYPE_ALLOW +.It Dv ACL_ENTRY_TYPE_DENY .El .It Vt acl_flag_t Va ae_flags -This field defines the inheritance flags of NFS4 ACL entry. +This field defines the inheritance flags of NFSv4 ACL entry. It is not used with POSIX.1e ACLs. The following values are valid: .Bl -tag -width ".Dv ACL_ENTRY_DIRECTORY_INHERIT" ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.14 2009/03/10 19:35:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -143,6 +143,7 @@ struct npestats *sc_stats; bus_dmamap_t sc_stats_map; bus_addr_t sc_stats_phys; /* phys addr of sc_stats */ + struct npestats sc_totals; /* accumulated sc_stats */ }; /* @@ -374,6 +375,8 @@ CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tickinterval", CTLFLAG_RW, &sc->sc_tickinterval, 0, "periodic work frequency"); + SYSCTL_ADD_STRUCT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "stats", + CTLFLAG_RD, &sc->sc_totals, npestats, "onboard stats"); ether_ifattach(ifp, eaddr); return 0; @@ -867,12 +870,24 @@ static void npe_addstats(struct npe_softc *sc) { -#define MIBADD(x) sc->mibdata.x += be32toh(ns->x) +#define NPEADD(x) sc->sc_totals.x += be32toh(ns->x) +#define MIBADD(x) do { sc->mibdata.x += be32toh(ns->x); NPEADD(x); } while (0) struct ifnet *ifp = sc->sc_ifp; struct npestats *ns = sc->sc_stats; MIBADD(dot3StatsAlignmentErrors); MIBADD(dot3StatsFCSErrors); + MIBADD(dot3StatsInternalMacReceiveErrors); + NPEADD(RxOverrunDiscards); + NPEADD(RxLearnedEntryDiscards); + NPEADD(RxLargeFramesDiscards); + NPEADD(RxSTPBlockedDiscards); + NPEADD(RxVLANTypeFilterDiscards); + NPEADD(RxVLANIdFilterDiscards); + NPEADD(RxInvalidSourceDiscards); + NPEADD(RxBlackListDiscards); + NPEADD(RxWhiteListDiscards); + NPEADD(RxUnderflowEntryDiscards); MIBADD(dot3StatsSingleCollisionFrames); MIBADD(dot3StatsMultipleCollisionFrames); MIBADD(dot3StatsDeferredTransmissions); @@ -880,10 +895,12 @@ MIBADD(dot3StatsExcessiveCollisions); MIBADD(dot3StatsInternalMacTransmitErrors); MIBADD(dot3StatsCarrierSenseErrors); + NPEADD(TxLargeFrameDiscards); + NPEADD(TxVLANIdFilterDiscards); + sc->mibdata.dot3StatsFrameTooLongs += be32toh(ns->RxLargeFramesDiscards) + be32toh(ns->TxLargeFrameDiscards); - MIBADD(dot3StatsInternalMacReceiveErrors); sc->mibdata.dot3StatsMissedFrames += be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards); @@ -902,6 +919,7 @@ be32toh(ns->dot3StatsSingleCollisionFrames) + be32toh(ns->dot3StatsMultipleCollisionFrames) ; +#undef NPEADD #undef MIBADD } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#20 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonkrpc.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonkrpc.c,v 1.4 2009/05/23 00:40:17 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonkrpc.c,v 1.5 2009/05/24 03:22:49 rmacklem Exp $"); /* * Socket operations for use by nfs @@ -341,7 +341,9 @@ else auth = NULL; #endif - return (auth); + if (auth != NULL) + return (auth); + /* fallthrough */ #endif /* KGSSAPI */ case AUTH_SYS: default: @@ -402,7 +404,7 @@ { u_int32_t *tl; time_t waituntil; - int i, j; + int i, j, set_uid = 0; int trycnt, error = 0, usegssname = 0, secflavour = AUTH_SYS; u_int16_t procnum; u_int trylater_delay = 1; @@ -413,6 +415,7 @@ enum clnt_stat stat; struct nfsreq *rep = NULL; char *srv_principal = NULL; + uid_t saved_uid = (uid_t)-1; if (xidp != NULL) *xidp = 0; @@ -423,6 +426,14 @@ } /* + * XXX if not already connected call nfs_connect now. Longer + * term, change nfs_mount to call nfs_connect unconditionally + * and let clnt_reconnect_create handle reconnects. + */ + if (nrp->nr_client == NULL) + newnfs_connect(nmp, nrp, cred, td, 0); + + /* * For a client side mount, nmp is != NULL and clp == NULL. For * server calls (callbacks or upcalls), nmp == NULL. */ @@ -442,8 +453,30 @@ nd->nd_procnum != NFSPROC_NULL) { if (NFSHASALLGSSNAME(nmp) && nmp->nm_krbnamelen > 0) nd->nd_flag |= ND_USEGSSNAME; - if ((nd->nd_flag & ND_USEGSSNAME) && nmp->nm_krbnamelen > 0) - usegssname = 1; + if ((nd->nd_flag & ND_USEGSSNAME) != 0) { + /* + * If there is a client side host based credential, + * use that, otherwise use the system uid, if set. + */ + if (nmp->nm_krbnamelen > 0) { + usegssname = 1; + } else if (nmp->nm_uid != (uid_t)-1) { + saved_uid = cred->cr_uid; + cred->cr_uid = nmp->nm_uid; + set_uid = 1; + } + } else if (nmp->nm_krbnamelen == 0 && + nmp->nm_uid != (uid_t)-1 && cred->cr_uid == (uid_t)0) { + /* + * If there is no host based principal name and + * the system uid is set and this is root, use the + * system uid, since root won't have user + * credentials in a credentials cache file. + */ + saved_uid = cred->cr_uid; + cred->cr_uid = nmp->nm_uid; + set_uid = 1; + } if (NFSHASINTEGRITY(nmp)) secflavour = RPCSEC_GSS_KRB5I; else if (NFSHASPRIVACY(nmp)) @@ -462,14 +495,6 @@ ((nmp->nm_tprintf_delay)-(nmp->nm_tprintf_initial_delay)); } - /* - * XXX if not already connected call nfs_connect now. Longer - * term, change nfs_mount to call nfs_connect unconditionally - * and let clnt_reconnect_create handle reconnects. - */ - if (nrp->nr_client == NULL) - newnfs_connect(nmp, nrp, cred, td, 0); - if (nd->nd_procnum == NFSPROC_NULL) auth = authnone_create(); else if (usegssname) @@ -478,6 +503,8 @@ else auth = nfs_getauth(nrp, secflavour, NULL, srv_principal, NULL, cred); + if (set_uid) + cred->cr_uid = saved_uid; if (auth == NULL) { m_freem(nd->nd_mreq); return (EACCES); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvfsops.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvfsops.c,v 1.4 2009/05/22 15:08:12 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvfsops.c,v 1.5 2009/05/24 03:22:49 rmacklem Exp $"); #include "opt_bootp.h" @@ -1062,20 +1062,20 @@ nmp->nm_krbnamelen = argp->krbnamelen; nmp->nm_dirpathlen = argp->dirlen; nmp->nm_srvkrbnamelen = argp->srvkrbnamelen; - if (nmp->nm_dirpathlen > 0) { + if (td->td_ucred->cr_uid != (uid_t)0) { /* - * Since we will be doing dirpath as root, - * set nm_uid to the real uid doing the mount, - * since that is normally the user with a valid TGT. + * nm_uid is used to get KerberosV credentials for + * the nfsv4 state handling operations if there is + * no host based principal set. Use the uid of + * this user if not root, since they are doing the + * mount. I don't think setting this for root will + * work, since root normally does not have user + * credentials in a credentials cache. */ - nmp->nm_uid = td->td_ucred->cr_ruid; + nmp->nm_uid = td->td_ucred->cr_uid; } else { /* - * Just set to -1, so the first Op - * will set it later, to the uid of - * the process doing that (usually - * from a first open in the mount - * point). + * Just set to -1, so it won't be used. */ nmp->nm_uid = (uid_t)-1; } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nwfs/nwfs_io.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.48 2008/10/10 21:23:50 attilio Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_io.c,v 1.49 2009/05/23 18:25:11 alc Exp $ * */ #include @@ -463,10 +463,13 @@ if (nextoff <= size) { m->valid = VM_PAGE_BITS_ALL; - m->dirty = 0; + KASSERT(m->dirty == 0, + ("nwfs_getpages: page %p is dirty", m)); } else { int nvalid = ((size + DEV_BSIZE - 1) - toff) & ~(DEV_BSIZE - 1); - vm_page_set_validclean(m, 0, nvalid); + vm_page_set_valid(m, 0, nvalid); + KASSERT((m->dirty & vm_page_bits(0, nvalid)) == 0, + ("nwfs_getpages: page %p is dirty", m)); } if (i != ap->a_reqpage) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockf.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.67 2008/11/27 04:40:37 ganbold Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lockf.c,v 1.71 2009/05/24 12:39:38 kib Exp $"); #include "opt_debug_lockf.h" @@ -106,7 +106,7 @@ int); static struct lockf_entry * lf_alloc_lock(struct lock_owner *); -static void lf_free_lock(struct lockf_entry *); +static int lf_free_lock(struct lockf_entry *); static int lf_clearlock(struct lockf *, struct lockf_entry *); static int lf_overlaps(struct lockf_entry *, struct lockf_entry *); static int lf_blocks(struct lockf_entry *, struct lockf_entry *); @@ -347,9 +347,13 @@ return (lf); } -static void +static int lf_free_lock(struct lockf_entry *lock) { + + KASSERT(lock->lf_refs > 0, ("lockf_entry negative ref count %p", lock)); + if (--lock->lf_refs > 0) + return (0); /* * Adjust the lock_owner reference count and * reclaim the entry if this is the last lock @@ -394,6 +398,7 @@ printf("Freed lock %p\n", lock); #endif free(lock, M_LOCKF); + return (1); } /* @@ -540,6 +545,7 @@ * the lf_lock_owners_lock tax twice. */ lock = lf_alloc_lock(NULL); + lock->lf_refs = 1; lock->lf_start = start; lock->lf_end = end; lock->lf_owner = lo; @@ -633,7 +639,20 @@ } sx_xlock(&state->ls_lock); - switch(ap->a_op) { + /* + * Recheck the doomed vnode after state->ls_lock is + * locked. lf_purgelocks() requires that no new threads add + * pending locks when vnode is marked by VI_DOOMED flag. + */ + VI_LOCK(vp); + if (vp->v_iflag & VI_DOOMED) { + VI_UNLOCK(vp); + lf_free_lock(lock); + return (ENOENT); + } + VI_UNLOCK(vp); + + switch (ap->a_op) { case F_SETLK: error = lf_setlock(state, lock, vp, ap->a_cookiep); break; @@ -755,8 +774,11 @@ * the remaining locks. */ VI_LOCK(vp); + KASSERT(vp->v_iflag & VI_DOOMED, + ("lf_purgelocks: vp %p has not vgone yet", vp)); state = *statep; if (state) { + *statep = NULL; state->ls_threads++; VI_UNLOCK(vp); @@ -789,7 +811,6 @@ VI_LOCK(vp); while (state->ls_threads > 1) msleep(state, VI_MTX(vp), 0, "purgelocks", 0); - *statep = 0; VI_UNLOCK(vp); /* @@ -798,7 +819,9 @@ * above). We don't need to bother locking since we * are the last thread using this state structure. */ - LIST_FOREACH_SAFE(lock, &state->ls_pending, lf_link, nlock) { + KASSERT(LIST_EMPTY(&state->ls_pending), + ("lock pending for %p", state)); + LIST_FOREACH_SAFE(lock, &state->ls_active, lf_link, nlock) { LIST_REMOVE(lock, lf_link); lf_free_lock(lock); } @@ -1361,7 +1384,7 @@ /* * Scan lock list for this file looking for locks that would block us. */ - while (lf_getblock(state, lock)) { + if (lf_getblock(state, lock)) { /* * Free the structure and return if nonblocking. */ @@ -1430,7 +1453,13 @@ goto out; } + lock->lf_refs++; error = sx_sleep(lock, &state->ls_lock, priority, lockstr, 0); + if (lf_free_lock(lock)) { + error = EINTR; + goto out; + } + /* * We may have been awakened by a signal and/or by a * debugger continuing us (in which cases we must @@ -1792,6 +1821,7 @@ */ splitlock = lf_alloc_lock(lock1->lf_owner); memcpy(splitlock, lock1, sizeof *splitlock); + splitlock->lf_refs = 1; if (splitlock->lf_flags & F_REMOTE) vref(splitlock->lf_vnode); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_vimage.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_vimage.c,v 1.7 2009/05/22 22:09:00 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_vimage.c,v 1.8 2009/05/23 21:43:44 zec Exp $"); #include "opt_ddb.h" @@ -66,6 +66,10 @@ #endif #endif +#ifdef VIMAGE +struct vnet *vnet0; +#endif + void vnet_mod_register(const struct vnet_modinfo *vmi) { @@ -331,6 +335,7 @@ LIST_INSERT_HEAD(&vnet_head, vnet, vnet_le); vnet->vnet_magic_n = VNET_MAGIC_N; vip->v_net = vnet; + vnet0 = vnet; /* We MUST clear curvnet in vi_init_done before going SMP. */ curvnet = LIST_FIRST(&vnet_head); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.314 2009/05/14 03:24:22 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.315 2009/05/24 12:32:03 ed Exp $"); #include "opt_compat.h" @@ -206,6 +206,7 @@ ttydevsw_close(tp); tp->t_flags &= ~TF_OPENCLOSE; + cv_broadcast(&tp->t_dcdwait); tty_rel_free(tp); } @@ -231,13 +232,17 @@ tty_unlock(tp); return (ENXIO); } + /* - * Prevent the TTY from being opened when being torn down or - * built up by unrelated processes. + * Block when other processes are currently opening or closing + * the TTY. */ - if (tp->t_flags & TF_OPENCLOSE) { - tty_unlock(tp); - return (EBUSY); + while (tp->t_flags & TF_OPENCLOSE) { + error = tty_wait(tp, &tp->t_dcdwait); + if (error != 0) { + tty_unlock(tp); + return (error); + } } tp->t_flags |= TF_OPENCLOSE; @@ -299,6 +304,7 @@ tp->t_flags |= TF_OPENED_IN; done: tp->t_flags &= ~TF_OPENCLOSE; + cv_broadcast(&tp->t_dcdwait); ttydev_leave(tp); return (error); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gsstest.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kgssapi/gsstest.c,v 1.2 2008/11/12 15:31:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/kgssapi/gsstest.c,v 1.3 2009/05/24 11:10:27 dfr Exp $"); #include #include @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -227,7 +228,7 @@ { static char sbuf[512]; - snprintf(sbuf, sizeof(sbuf), "nfs@%s", hostname); + snprintf(sbuf, sizeof(sbuf), "nfs@%s", V_hostname); name_desc.value = sbuf; } @@ -430,7 +431,7 @@ case 1: if (server_context == GSS_C_NO_CONTEXT) { static char sbuf[512]; - snprintf(sbuf, sizeof(sbuf), "nfs@%s", hostname); + snprintf(sbuf, sizeof(sbuf), "nfs@%s", V_hostname); name_desc.value = sbuf; name_desc.length = strlen((const char *) name_desc.value); @@ -811,7 +812,7 @@ return(1); } - snprintf(service, sizeof(service), "host@%s", hostname); + snprintf(service, sizeof(service), "host@%s", V_hostname); auth = rpc_gss_seccreate(client, curthread->td_ucred, service, "kerberosv5", rpc_gss_svc_privacy, @@ -881,7 +882,7 @@ const char **mechs; static rpc_gss_callback_t cb; - snprintf(principal, sizeof(principal), "host@%s", hostname); + snprintf(principal, sizeof(principal), "host@%s", V_hostname); mechs = rpc_gss_get_mechanisms(); while (*mechs) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#12 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.16 2009/05/23 07:58:56 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.19 2009/05/23 22:05:14 alc Exp $"); #include "opt_ddb.h" #include "opt_msgbuf.h" @@ -1729,8 +1729,8 @@ * insert this page into the given map NOW. */ void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t fault_type, vm_page_t m, vm_prot_t prot, - boolean_t wired) +pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_offset_t pa, opa; register pt_entry_t *pte; @@ -3116,10 +3116,12 @@ */ rw = PTE_RWPAGE; vm_page_dirty(m); - } else if ((m->md.pv_flags & PV_TABLE_MOD) || m->dirty) + } else if ((m->md.pv_flags & PV_TABLE_MOD) || + m->dirty == VM_PAGE_BITS_ALL) rw = PTE_RWPAGE; else rw = PTE_CWPAGE; + vm_page_flag_set(m, PG_WRITEABLE); } return rw; } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if_clone.c,v 1.13 2009/05/05 10:56:12 zec Exp $ + * $FreeBSD: src/sys/net/if_clone.c,v 1.14 2009/05/23 21:43:44 zec Exp $ */ #include @@ -55,10 +55,13 @@ static void if_clone_free(struct if_clone *ifc); static int if_clone_createif(struct if_clone *ifc, char *name, size_t len, caddr_t params); +static int vnet_clone_iattach(const void *); static struct mtx if_cloners_mtx; +#ifdef VIMAGE_GLOBALS static int if_cloners_count; -LIST_HEAD(, if_clone) if_cloners = LIST_HEAD_INITIALIZER(if_cloners); +LIST_HEAD(, if_clone) if_cloners; +#endif #define IF_CLONERS_LOCK_INIT() \ mtx_init(&if_cloners_mtx, "if_cloners lock", NULL, MTX_DEF) @@ -112,10 +115,32 @@ static MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework"); +#ifndef VIMAGE_GLOBALS +static const vnet_modinfo_t vnet_clone_modinfo = { + .vmi_id = VNET_MOD_IF_CLONE, + .vmi_name = "if_clone", + .vmi_iattach = vnet_clone_iattach +}; +#endif /* !VIMAGE_GLOBALS */ + +static int vnet_clone_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + + LIST_INIT(&V_if_cloners); + return (0); +} + void if_clone_init(void) { + IF_CLONERS_LOCK_INIT(); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_clone_modinfo); +#else + vnet_clone_iattach(NULL); +#endif } /* @@ -124,15 +149,27 @@ int if_clone_create(char *name, size_t len, caddr_t params) { + INIT_VNET_NET(curvnet); struct if_clone *ifc; /* Try to find an applicable cloner for this request */ IF_CLONERS_LOCK(); - LIST_FOREACH(ifc, &if_cloners, ifc_list) { + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { if (ifc->ifc_match(ifc, name)) { break; } } +#ifdef VIMAGE + if (ifc == NULL && !IS_DEFAULT_VNET(curvnet)) { + CURVNET_SET_QUIET(vnet0); + INIT_VNET_NET(vnet0); + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { + if (ifc->ifc_match(ifc, name)) + break; + } + CURVNET_RESTORE(); + } +#endif IF_CLONERS_UNLOCK(); if (ifc == NULL) @@ -176,6 +213,7 @@ int if_clone_destroy(const char *name) { + INIT_VNET_NET(curvnet); struct if_clone *ifc; struct ifnet *ifp; @@ -185,11 +223,22 @@ /* Find the cloner for this interface */ IF_CLONERS_LOCK(); - LIST_FOREACH(ifc, &if_cloners, ifc_list) { + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { if (strcmp(ifc->ifc_name, ifp->if_dname) == 0) { break; } } +#ifdef VIMAGE + if (ifc == NULL && !IS_DEFAULT_VNET(curvnet)) { + CURVNET_SET_QUIET(vnet0); + INIT_VNET_NET(vnet0); + LIST_FOREACH(ifc, &V_if_cloners, ifc_list) { + if (ifc->ifc_match(ifc, name)) + break; + } + CURVNET_RESTORE(); + } +#endif IF_CLONERS_UNLOCK(); if (ifc == NULL) return (EINVAL); @@ -208,11 +257,17 @@ if (ifc->ifc_destroy == NULL) return(EOPNOTSUPP); + /* + * Given that the cloned ifnet might be attached to a different + * vnet from where its cloner was registered, we have to + * switch to the vnet context of the target vnet. + */ + CURVNET_SET_QUIET(ifp->if_vnet); + IF_CLONE_LOCK(ifc); IFC_IFLIST_REMOVE(ifc, ifp); IF_CLONE_UNLOCK(ifc); - CURVNET_SET_QUIET(ifp->if_vnet); if_delgroup(ifp, ifc->ifc_name); err = (*ifc->ifc_destroy)(ifc, ifp); @@ -234,6 +289,7 @@ void if_clone_attach(struct if_clone *ifc) { + INIT_VNET_NET(curvnet); int len, maxclone; /* @@ -249,8 +305,8 @@ IF_CLONE_ADDREF(ifc); IF_CLONERS_LOCK(); - LIST_INSERT_HEAD(&if_cloners, ifc, ifc_list); - if_cloners_count++; + LIST_INSERT_HEAD(&V_if_cloners, ifc, ifc_list); + V_if_cloners_count++; IF_CLONERS_UNLOCK(); LIST_INIT(&ifc->ifc_iflist); @@ -266,11 +322,12 @@ void if_clone_detach(struct if_clone *ifc) { + INIT_VNET_NET(curvnet); struct ifc_simple_data *ifcs = ifc->ifc_data; IF_CLONERS_LOCK(); LIST_REMOVE(ifc, ifc_list); - if_cloners_count--; + V_if_cloners_count--; IF_CLONERS_UNLOCK(); /* Allow all simples to be destroyed */ @@ -305,6 +362,7 @@ int if_clone_list(struct if_clonereq *ifcr) { + INIT_VNET_NET(curvnet); char *buf, *dst, *outbuf = NULL; struct if_clone *ifc; int buf_count, count, err = 0; @@ -321,23 +379,23 @@ * could be because that would let arbitrary users cause us to * allocate abritrary amounts of kernel memory. */ - buf_count = (if_cloners_count < ifcr->ifcr_count) ? >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 24 17:21:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE86106567C; Sun, 24 May 2009 17:21: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 070BC1065679 for ; Sun, 24 May 2009 17:21:45 +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 E92028FC15 for ; Sun, 24 May 2009 17:21:44 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OHLiXP077666 for ; Sun, 24 May 2009 17:21:44 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OHLiMb077664 for perforce@freebsd.org; Sun, 24 May 2009 17:21:44 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 17:21:44 GMT Message-Id: <200905241721.n4OHLiMb077664@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 Cc: Subject: PERFORCE change 162658 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, 24 May 2009 17:21:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=162658 Change 162658 by mav@mav_mavbook on 2009/05/24 17:21:40 Report device serial number. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#3 (text+ko) ==== @@ -507,6 +507,9 @@ btrim(ident_buf->serial, sizeof(ident_buf->serial)); bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); + path->device->serial_num = ident_buf->serial; + path->device->serial_num_len = strlen(ident_buf->serial); + scsi_find_quirk(path->device); ata_devise_transport(path); From owner-p4-projects@FreeBSD.ORG Sun May 24 17:44:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E4E0106567E; Sun, 24 May 2009 17:44:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCBB41065679 for ; Sun, 24 May 2009 17:44:07 +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 CAFAD8FC16 for ; Sun, 24 May 2009 17:44:07 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OHi7lr079314 for ; Sun, 24 May 2009 17:44:07 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OHi7Q6079312 for perforce@freebsd.org; Sun, 24 May 2009 17:44:07 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 17:44:07 GMT Message-Id: <200905241744.n4OHi7Q6079312@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 Cc: Subject: PERFORCE change 162660 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, 24 May 2009 17:44:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=162660 Change 162660 by mav@mav_mavbook on 2009/05/24 17:43:58 Serial number may be not terminated. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#4 (text+ko) ==== @@ -485,7 +485,6 @@ struct ata_params *ident_buf; int16_t *ptr; - path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; ident_buf = &path->device->ident_data; for (ptr = (int16_t *)ident_buf; @@ -507,8 +506,26 @@ btrim(ident_buf->serial, sizeof(ident_buf->serial)); bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); - path->device->serial_num = ident_buf->serial; - path->device->serial_num_len = strlen(ident_buf->serial); + /* Clean up from previous instance of this device */ + if (path->device->serial_num != NULL) { + free(path->device->serial_num, M_CAMXPT); + path->device->serial_num = NULL; + path->device->serial_num_len = 0; + } + path->device->serial_num = + (u_int8_t *)malloc((sizeof(ident_buf->serial) + 1), + M_CAMXPT, M_NOWAIT); + if (path->device->serial_num != NULL) { + bcopy(ident_buf->serial, + path->device->serial_num, + sizeof(ident_buf->serial)); + path->device->serial_num[sizeof(ident_buf->serial)] + = '\0'; + path->device->serial_num_len = + strlen(path->device->serial_num); + } + + path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; scsi_find_quirk(path->device); From owner-p4-projects@FreeBSD.ORG Sun May 24 18:43:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36AB11065676; Sun, 24 May 2009 18:43:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8EEF1065672 for ; Sun, 24 May 2009 18:43:07 +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 D6EC98FC15 for ; Sun, 24 May 2009 18:43:07 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OIh7dY084775 for ; Sun, 24 May 2009 18:43:07 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OIh7U0084773 for perforce@freebsd.org; Sun, 24 May 2009 18:43:07 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 18:43:07 GMT Message-Id: <200905241843.n4OIh7U0084773@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 Cc: Subject: PERFORCE change 162663 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, 24 May 2009 18:43:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=162663 Change 162663 by mav@mav_mavbook on 2009/05/24 18:42:33 Implement device change tracking in ATA XPT. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#5 (text+ko) ==== @@ -111,8 +111,6 @@ } while(0) typedef enum { - PROBE_INQUIRY_CKSUM = 0x01, - PROBE_SERIAL_CKSUM = 0x02, PROBE_NO_ANNOUNCE = 0x04 } probe_flags; @@ -121,7 +119,6 @@ probe_action action; union ccb saved_ccb; probe_flags flags; - MD5_CTX context; u_int8_t digest[16]; struct cam_periph *periph; } probe_softc; @@ -325,6 +322,23 @@ ident_buf = &periph->path->device->ident_data; + if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { + /* Prepare check that it is the same device. */ + MD5_CTX context; + + MD5Init(&context); + MD5Update(&context, + (unsigned char *)ident_buf->model, + sizeof(ident_buf->model)); + MD5Update(&context, + (unsigned char *)ident_buf->revision, + sizeof(ident_buf->revision)); + MD5Update(&context, + (unsigned char *)ident_buf->serial, + sizeof(ident_buf->serial)); + MD5Final(softc->digest, &context); + } + ata_ident(ataio, /*retries*/4, probedone, @@ -506,6 +520,30 @@ btrim(ident_buf->serial, sizeof(ident_buf->serial)); bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial)); + if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { + /* Check that it is the same device. */ + MD5_CTX context; + u_int8_t digest[16]; + + MD5Init(&context); + MD5Update(&context, + (unsigned char *)ident_buf->model, + sizeof(ident_buf->model)); + MD5Update(&context, + (unsigned char *)ident_buf->revision, + sizeof(ident_buf->revision)); + MD5Update(&context, + (unsigned char *)ident_buf->serial, + sizeof(ident_buf->serial)); + MD5Final(digest, &context); + if (bcmp(digest, softc->digest, sizeof(digest))) { + /* Device changed. */ + xpt_async(AC_LOST_DEVICE, path, NULL); + } + xpt_release_ccb(done_ccb); + break; + } + /* Clean up from previous instance of this device */ if (path->device->serial_num != NULL) { free(path->device->serial_num, M_CAMXPT); From owner-p4-projects@FreeBSD.ORG Sun May 24 19:38:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E3F9106567C; Sun, 24 May 2009 19:38:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 093EA106567A for ; Sun, 24 May 2009 19:38:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAFA08FC1F for ; Sun, 24 May 2009 19:38:03 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OJc3rE090148 for ; Sun, 24 May 2009 19:38:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OJc3if090146 for perforce@freebsd.org; Sun, 24 May 2009 19:38:03 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 19:38:03 GMT Message-Id: <200905241938.n4OJc3if090146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162666 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, 24 May 2009 19:38:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=162666 Change 162666 by trasz@trasz_victim on 2009/05/24 19:37:12 Move ACL wrappers from contrib/ to compat/. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 add .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#1 add .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#6 (text+ko) ==== @@ -16,6 +16,7 @@ SRCS+= u8_textprep.c .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern +SRCS+= opensolaris_acl.c SRCS+= opensolaris_kmem.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c @@ -66,7 +67,6 @@ ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/} SRCS+= ${ZFS_SRCS} SRCS+= vdev_geom.c -SRCS+= acl_compat.c # Use UMA for ZIO allocation. This is not stable. #CFLAGS+=-DZIO_USE_UMA From owner-p4-projects@FreeBSD.ORG Sun May 24 19:38:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AE02106570B; Sun, 24 May 2009 19:38:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 358A2106567B for ; Sun, 24 May 2009 19:38:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0861C8FC26 for ; Sun, 24 May 2009 19:38:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OJc3IJ090153 for ; Sun, 24 May 2009 19:38:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OJc3aO090151 for perforce@freebsd.org; Sun, 24 May 2009 19:38:03 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 19:38:03 GMT Message-Id: <200905241938.n4OJc3aO090151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162667 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, 24 May 2009 19:38:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=162667 Change 162667 by trasz@trasz_victim on 2009/05/24 19:37:49 Move, not copy. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#13 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 24 19:50:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0AF41065673; Sun, 24 May 2009 19:50: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 677B91065675 for ; Sun, 24 May 2009 19:50:16 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 532188FC1C for ; Sun, 24 May 2009 19:50:16 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OJoGm7091683 for ; Sun, 24 May 2009 19:50:16 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OJoG9X091681 for perforce@freebsd.org; Sun, 24 May 2009 19:50:16 GMT (envelope-from marius@freebsd.org) Date: Sun, 24 May 2009 19:50:16 GMT Message-Id: <200905241950.n4OJoG9X091681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 162668 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, 24 May 2009 19:50:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=162668 Change 162668 by marius@flak on 2009/05/24 19:49:48 - Improve the alignment checking of the completion and descriptor rings, remove padding as they are sized in a way so that this isn't required. - Implement TCP/UDP checksum offloading. - Implement support for jumbo frames. - Some performance improvements and minor bug fixes. - Turn on RX descriptor cleanup callout as this is still an issue with these chips and remove CAS_RINT_TIMEOUT as option. - Add workarounds for some silicon bugs. - Fix module loading. - Fix some CAS_DEBUG compilation. - Don't assign stack garbage as Ethernet address to single-port cards in !OFW machines. This driver should be feature complete and close to being committable to HEAD now. Affected files ... .. //depot/projects/usiii/dev/cas/if_cas.c#3 edit .. //depot/projects/usiii/dev/cas/if_casreg.h#4 edit .. //depot/projects/usiii/dev/cas/if_casvar.h#3 edit Differences ... ==== //depot/projects/usiii/dev/cas/if_cas.c#3 (text+ko) ==== @@ -41,10 +41,6 @@ #define CAS_DEBUG #endif -#if 0 /* XXX: In case of emergency, re-enable this. */ -#define CAS_RINT_TIMEOUT -#endif - #include #include #include @@ -96,22 +92,34 @@ #include "miibus_if.h" -CTASSERT(powerof2(CAS_NRXCOMP) && CAS_NRXCOMP >= 128 && CAS_NRXCOMP <= 32768); -CTASSERT(powerof2(CAS_NRXDESC) && CAS_NRXDESC >= 32 && CAS_NRXDESC <= 8192); -CTASSERT(powerof2(CAS_NRXDESC2) && CAS_NRXDESC2 >= 32 && CAS_NRXDESC2 <= 8192); -CTASSERT(powerof2(CAS_NTXDESC) && CAS_NTXDESC >= 32 && CAS_NTXDESC <= 8192); +#define RINGASSERT(n , min, max) \ + CTASSERT(powerof2(n) && (n) >= (min) && (n) <= (max)) + +RINGASSERT(CAS_NRXCOMP, 128, 32768); +RINGASSERT(CAS_NRXDESC, 32, 8192); +RINGASSERT(CAS_NRXDESC2, 32, 8192); +RINGASSERT(CAS_NTXDESC, 32, 8192); + +#undef RINGASSERT + +#define CCDASSERT(m, a) \ + CTASSERT((offsetof(struct cas_control_data, m) & ((a) - 1)) == 0) + +CCDASSERT(ccd_rxcomps, CAS_RX_COMP_ALIGN); +CCDASSERT(ccd_rxdescs, CAS_RX_DESC_ALIGN); +CCDASSERT(ccd_rxdescs2, CAS_RX_DESC_ALIGN); + +#undef CCDASSERT -#define TRIES 10000 +#define CAS_TRIES 10000 /* -XXXCAS - * The hardware supports basic TCP/UDP checksum offloading. However, - * the hardware doesn't compensate the checksum for UDP datagram which - * can yield to 0x0. As a safe guard, UDP checksum offload is disabled - * by default. It can be reactivated by setting special link option - * link0 with ifconfig(8). + * According to documentation, the hardware has support for basic TCP + * checksum offloading only, in practice this can be also used for UDP + * however (i.e. the problem of previous Sun NICs that a checksum of 0x0 + * was not converted to 0xffff no longer exists). */ -#define CAS_CSUM_FEATURES (CSUM_TCP) +#define CAS_CSUM_FEATURES (CSUM_TCP | CSUM_UDP) static inline void cas_add_rxdesc(struct cas_softc *sc, u_int idx); static int cas_attach(struct cas_softc *sc); @@ -143,10 +151,9 @@ static void cas_resume(struct cas_softc *sc); static u_int cas_descsize(u_int sz); static void cas_rint(struct cas_softc *sc); -#ifdef CAS_RINT_TIMEOUT static void cas_rint_timeout(void *arg); -#endif -static inline void cas_rxcksum(struct mbuf *m, uint64_t word4); +static inline void cas_rxcksum(struct mbuf *m, uint16_t cksum); +static inline void cas_rxcompinit(struct cas_rx_comp *rxcomp); static u_int cas_rxcompsize(u_int sz); static void cas_rxdma_callback(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); @@ -157,10 +164,12 @@ static void cas_suspend(struct cas_softc *sc); static void cas_tick(void *arg); static void cas_tint(struct cas_softc *sc); +static inline void cas_txkick(struct cas_softc *sc); static int cas_watchdog(struct cas_softc *sc); static devclass_t cas_devclass; -DRIVER_MODULE(miibus, cas, miibus_driver, miibus_devclass, 0, 0); + +MODULE_DEPEND(cas, ether, 1, 1, 1); MODULE_DEPEND(cas, miibus, 1, 1, 1); #ifdef CAS_DEBUG @@ -180,8 +189,6 @@ ifp = sc->sc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) return (ENOSPC); - if ((sc->sc_flags & CAS_NO_CSUM) == 0) - sc->sc_csum_features = CAS_CSUM_FEATURES; ifp->if_softc = sc; if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); @@ -194,9 +201,7 @@ IFQ_SET_READY(&ifp->if_snd); callout_init_mtx(&sc->sc_tick_ch, &sc->sc_mtx, 0); -#ifdef CAS_RINT_TIMEOUT callout_init_mtx(&sc->sc_rx_ch, &sc->sc_mtx, 0); -#endif /* Make sure the chip is stopped. */ cas_reset(sc); @@ -277,8 +282,8 @@ } /* - * Allocate the receive buffer, create and load the DMA maps - * for it. + * Allocate the receive buffers, create and load the DMA maps + * for them. */ for (i = 0; i < CAS_NRXDESC; i++) { if ((error = bus_dmamem_alloc(sc->sc_rdmatag, @@ -376,11 +381,12 @@ * Tell the upper layer(s) we support long frames/checksum offloads. */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); - ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_HWCSUM; - ifp->if_hwassist |= sc->sc_csum_features; -#if 0 -XXXCAS ifp->if_capenable |= IFCAP_VLAN_MTU | IFCAP_HWCSUM; -#endif + ifp->if_capabilities = IFCAP_VLAN_MTU; + if ((sc->sc_flags & CAS_NO_CSUM) == 0) { + ifp->if_capabilities |= IFCAP_HWCSUM; + ifp->if_hwassist = CAS_CSUM_FEATURES; + } + ifp->if_capenable = ifp->if_capabilities; return (0); @@ -431,9 +437,7 @@ cas_stop(ifp); CAS_UNLOCK(sc); callout_drain(&sc->sc_tick_ch); -#ifdef CAS_RINT_TIMEOUT callout_drain(&sc->sc_rx_ch); -#endif ether_ifdetach(ifp); if_free(ifp); device_delete_child(sc->sc_dev, sc->sc_miibus); @@ -493,7 +497,7 @@ } static inline void -cas_rxcksum(struct mbuf *m, uint64_t word4) +cas_rxcksum(struct mbuf *m, uint16_t cksum) { struct ether_header *eh; struct ip *ip; @@ -501,7 +505,6 @@ uint16_t *opts; int32_t hlen, len, pktlen; uint32_t temp32; - uint16_t cksum; pktlen = m->m_pkthdr.len; if (pktlen < sizeof(struct ether_header) + sizeof(struct ip)) @@ -540,8 +543,7 @@ return; } - cksum = ~(CAS_GET(word4, CAS_RC4_TCP_CSUM)); - /* checksum fixup for IP options */ + cksum = ~cksum; len = hlen - sizeof(struct ip); if (len > 0) { opts = (uint16_t *)(ip + 1); @@ -631,7 +633,7 @@ int i; uint32_t reg; - for (i = TRIES; i--; DELAY(100)) { + for (i = CAS_TRIES; i--; DELAY(100)) { reg = CAS_READ_4(sc, r); if ((reg & clr) == 0 && (reg & set) == set) return (1); @@ -675,13 +677,13 @@ #endif callout_stop(&sc->sc_tick_ch); -#ifdef CAS_RINT_TIMEOUT callout_stop(&sc->sc_rx_ch); -#endif + + /* Disable all interrupts in order to avoid spurious ones. */ + CAS_WRITE_4(sc, CAS_INTMASK, 0xffffffff); - /* XXX should we reset these instead? */ - cas_disable_tx(sc); - cas_disable_rx(sc); + cas_reset_tx(sc); + cas_reset_rx(sc); /* * Release any queued transmit buffers. @@ -784,11 +786,24 @@ return (cas_bitwait(sc, CAS_MAC_TX_CONF, CAS_MAC_TX_CONF_EN, 0)); } +static inline void +cas_rxcompinit(struct cas_rx_comp *rxcomp) +{ + + rxcomp->crc_word1 = 0; + rxcomp->crc_word2 = 0; + rxcomp->crc_word3 = + htole64(CAS_SET(ETHER_HDR_LEN + sizeof(struct ip), CAS_RC3_CSO)); + rxcomp->crc_word4 = htole64(CAS_RC4_ZERO); +} + static void cas_meminit(struct cas_softc *sc) { int i; + CAS_LOCK_ASSERT(sc, MA_OWNED); + /* * Initialize the transmit descriptor ring. */ @@ -803,12 +818,8 @@ /* * Initialize the receive completion ring. */ - for (i = 0; i < CAS_NRXCOMP; i++) { - sc->sc_rxcomps[i].crc_word1 = 0; - sc->sc_rxcomps[i].crc_word2 = 0; - sc->sc_rxcomps[i].crc_word3 = 0; - sc->sc_rxcomps[i].crc_word4 = htole64(CAS_RC4_ZERO); - } + for (i = 0; i < CAS_NRXCOMP; i++) + cas_rxcompinit(&sc->sc_rxcomps[i]); sc->sc_rxcptr = 0; /* @@ -934,29 +945,21 @@ cas_setladrf(sc); /* step 6 & 7. Program Ring Base Addresses. */ - KASSERT((CAS_CDTXDADDR(sc, 0) & (CAS_TX_DESC_ALIGN - 1)) == 0, - ("TX descriptors incorrectly aligned")); CAS_WRITE_4(sc, CAS_TX_DESC3_BASE_HI, (((uint64_t)CAS_CDTXDADDR(sc, 0)) >> 32)); CAS_WRITE_4(sc, CAS_TX_DESC3_BASE_LO, CAS_CDTXDADDR(sc, 0) & 0xffffffff); - KASSERT((CAS_CDRXCADDR(sc, 0) & (CAS_RX_COMP_ALIGN - 1)) == 0, - ("RX completions incorrectly aligned")); CAS_WRITE_4(sc, CAS_RX_COMP_BASE_HI, (((uint64_t)CAS_CDRXCADDR(sc, 0)) >> 32)); CAS_WRITE_4(sc, CAS_RX_COMP_BASE_LO, CAS_CDRXCADDR(sc, 0) & 0xffffffff); - KASSERT((CAS_CDRXDADDR(sc, 0) & (CAS_RX_DESC_ALIGN - 1)) == 0, - ("RX descriptors incorrectly aligned")); CAS_WRITE_4(sc, CAS_RX_DESC_BASE_HI, (((uint64_t)CAS_CDRXDADDR(sc, 0)) >> 32)); CAS_WRITE_4(sc, CAS_RX_DESC_BASE_LO, CAS_CDRXDADDR(sc, 0) & 0xffffffff); - KASSERT((CAS_CDRXD2ADDR(sc, 0) & (CAS_RX_DESC_ALIGN - 1)) == 0, - ("RX descriptors 2 incorrectly aligned")); if ((sc->sc_flags & CAS_REG_PLUS) != 0) { CAS_WRITE_4(sc, CAS_RX_DESC2_BASE_HI, (((uint64_t)CAS_CDRXD2ADDR(sc, 0)) >> 32)); @@ -977,12 +980,15 @@ CAS_WRITE_4(sc, CAS_CAW, CAS_CAW_RR_DIS); /* - * Enable infinite bursts for revisions without PCI issues. -XXXCAS - * Doing so greatly improves RX performance. + * Enable infinite bursts for revisions without PCI issues if + * applicable. Doing so greatly improves the TX performance on + * !__sparc64__. */ CAS_WRITE_4(sc, CAS_INF_BURST, - (sc->sc_flags & CAS_TABORT) == 0 ? CAS_INF_BURST_EN : 0); +#if !defined(__sparc64__) + (sc->sc_flags & CAS_TABORT) == 0 ? CAS_INF_BURST_EN : +#endif + 0); /* Set up interrupts. */ CAS_WRITE_4(sc, CAS_INTMASK, @@ -1037,12 +1043,6 @@ v |= cas_descsize(CAS_NRXDESC2) << CAS_RX_CONF_DESC2_SHFT; CAS_WRITE_4(sc, CAS_RX_CONF, v | (ETHER_ALIGN << CAS_RX_CONF_SOFF_SHFT)); -#if 0 -XXXCAS - /* RX TCP/UDP checksum offset */ - v |= ((ETHER_HDR_LEN + sizeof(struct ip)) << - CAS_RX_CONFIG_CXM_START_SHFT); -#endif /* Set the PAUSE thresholds. We use the maximum OFF threshold. */ CAS_WRITE_4(sc, CAS_RX_PTHRS, @@ -1133,6 +1133,8 @@ uint64_t cflags; int error, nexttx, nsegs, offset, seg; + CAS_LOCK_ASSERT(sc, MA_OWNED); + /* Get a work queue entry. */ if ((txs = STAILQ_FIRST(&sc->sc_txfreeq)) == NULL) { /* Ran out of descriptors. */ @@ -1140,7 +1142,7 @@ } cflags = 0; - if (((*m_head)->m_pkthdr.csum_flags & sc->sc_csum_features) != 0) { + if (((*m_head)->m_pkthdr.csum_flags & CAS_CSUM_FEATURES) != 0) { if (M_WRITABLE(*m_head) == 0) { m = m_dup(*m_head, M_DONTWAIT); m_freem(*m_head); @@ -1269,6 +1271,8 @@ int i; const u_char *laddr = IF_LLADDR(sc->sc_ifp); + CAS_LOCK_ASSERT(sc, MA_OWNED); + /* These registers are not cleared on reset. */ if ((sc->sc_flags & CAS_INITED) == 0) { /* magic values */ @@ -1280,7 +1284,7 @@ CAS_WRITE_4(sc, CAS_MAC_MIN_FRAME, ETHER_MIN_LEN); /* max frame length and max burst size */ CAS_WRITE_4(sc, CAS_MAC_MAX_BF, - ((ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) << + ((ETHER_MAX_LEN_JUMBO + ETHER_VLAN_ENCAP_LEN) << CAS_MAC_MAX_BF_FRM_SHFT) | (0x2000 << CAS_MAC_MAX_BF_BST_SHFT)); @@ -1354,12 +1358,32 @@ CAS_UNLOCK(sc); } +static inline void +cas_txkick(struct cas_softc *sc) +{ + + /* + * Update the TX kick register. This register has to point to the + * descriptor after the last valid one and for optimum performance + * should be incremented in multiples of 4 (the DMA engine fetches/ + * updates descriptors in batches of 4). + */ +#ifdef CAS_DEBUG + CTR3(KTR_CAS, "%s: %s: kicking TX %d", + device_get_name(sc->sc_dev), __func__, sc->sc_txnext); +#endif + CAS_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + CAS_WRITE_4(sc, CAS_TX_KICK3, sc->sc_txnext); +} + static void cas_start_locked(struct ifnet *ifp) { struct cas_softc *sc = ifp->if_softc; struct mbuf *m; - int ntx; + int kicked, ntx; + + CAS_LOCK_ASSERT(sc, MA_OWNED); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING || (sc->sc_flags & CAS_LINK) == 0) @@ -1371,6 +1395,7 @@ sc->sc_txnext); #endif ntx = 0; + kicked = 0; for (; !IFQ_DRV_IS_EMPTY(&ifp->if_snd) && sc->sc_txfree > 1;) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) @@ -1382,19 +1407,18 @@ IFQ_DRV_PREPEND(&ifp->if_snd, m); break; } + if ((sc->sc_txnext % 4) == 0) { + cas_txkick(sc); + kicked = 1; + } else + kicked = 0; ntx++; - /* Kick the transmitter. */ -#ifdef CAS_DEBUG - CTR3(KTR_CAS, "%s: %s: kicking TX %d", - device_get_name(sc->sc_dev), __func__, sc->sc_txnext); -#endif - CAS_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - CAS_WRITE_4(sc, CAS_TX_KICK3, sc->sc_txnext); - BPF_MTAP(ifp, m); } if (ntx > 0) { + if (kicked == 0) + cas_txkick(sc); #ifdef CAS_DEBUG CTR2(KTR_CAS, "%s: packets enqueued, OWN on %d", device_get_name(sc->sc_dev), sc->sc_txnext); @@ -1420,6 +1444,8 @@ #ifdef CAS_DEBUG int i; + CAS_LOCK_ASSERT(sc, MA_OWNED); + CTR2(KTR_CAS, "%s: %s", device_get_name(sc->sc_dev), __func__); #endif @@ -1430,7 +1456,6 @@ progress = 0; CAS_CDSYNC(sc, BUS_DMASYNC_POSTREAD); while ((txs = STAILQ_FIRST(&sc->sc_txdirtyq)) != NULL) { - #ifdef CAS_DEBUG if ((ifp->if_flags & IFF_DEBUG) != 0) { printf(" txsoft %p transmit chain:\n", txs); @@ -1511,8 +1536,8 @@ * and restart. */ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - sc->sc_wdog_timer = STAILQ_EMPTY(&sc->sc_txdirtyq) ? 0 : 5; - + if (STAILQ_EMPTY(&sc->sc_txdirtyq)) + sc->sc_wdog_timer = 0; cas_start_locked(ifp); } @@ -1522,34 +1547,44 @@ #endif } -#ifdef CAS_RINT_TIMEOUT static void cas_rint_timeout(void *arg) { struct cas_softc *sc = arg; CAS_LOCK_ASSERT(sc, MA_OWNED); + cas_rint(sc); } -#endif static void cas_rint(struct cas_softc *sc) { - struct cas_rxdsoft *rxds; + struct cas_rxdsoft *rxds, *rxds2; struct ifnet *ifp = sc->sc_ifp; - struct mbuf *m; + struct mbuf *m, *m2; uint64_t word1, word2, word3, word4; uint32_t rxhead; - u_int i, idx, len; + u_int idx, idx2, len, off, skip; + + CAS_LOCK_ASSERT(sc, MA_OWNED); -#ifdef CAS_RINT_TIMEOUT callout_stop(&sc->sc_rx_ch); -#endif + #ifdef CAS_DEBUG CTR2(KTR_CAS, "%s: %s", device_get_name(sc->sc_dev), __func__); #endif +#define PRINTWORD(n, delimiter) \ + printf("word ## n: 0x%016llx%c", (long long)word ## n, delimiter) + +#define SKIPASSERT(n) \ + KASSERT(sc->sc_rxcomps[sc->sc_rxcptr].crc_word ## n == 0, \ + ("%s: word ## n not 0", __func__)) + +#define WORDTOH(n) \ + word ## n = le64toh(sc->sc_rxcomps[sc->sc_rxcptr].crc_word ## n) + /* * Read the completion head register once. This limits * how long the following loop can execute. @@ -1559,27 +1594,37 @@ CTR4(KTR_CAS, "%s: sc->sc_rxcptr %d, sc->sc_rxdptr %d, head %d", __func__, sc->rxcptr, sc->sc_rxdptr, rxhead); #endif + skip = 0; CAS_CDSYNC(sc, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - for (i = sc->sc_rxcptr; i != rxhead; i = CAS_NEXTRXCOMP(i)) { - word1 = le64toh(sc->sc_rxcomps[i].crc_word1); - word2 = le64toh(sc->sc_rxcomps[i].crc_word2); - word3 = le64toh(sc->sc_rxcomps[i].crc_word3); - word4 = le64toh(sc->sc_rxcomps[i].crc_word4); + for (; sc->sc_rxcptr != rxhead; + sc->sc_rxcptr = CAS_NEXTRXCOMP(sc->sc_rxcptr)) { + if (skip != 0) { + SKIPASSERT(1); + SKIPASSERT(2); + SKIPASSERT(3); + + --skip; + goto skip; + } + + WORDTOH(1); + WORDTOH(2); + WORDTOH(3); + WORDTOH(4); #ifdef CAS_DEBUG if ((ifp->if_flags & IFF_DEBUG) != 0) { - printf(" completion %d: ", i); - printf("word1: 0x%016llx\t", (long long)word1); - printf("word2: 0x%016llx\t", (long long)word2); - printf("word3: 0x%016llx\t", (long long)word3); - printf("word4: 0x%016llx\n", (long long)word4); + printf(" completion %d: ", sc->sc_rxcptr); + PRINTWORD(1, '\t'); + PRINTWORD(2, '\t'); + PRINTWORD(3, '\t'); + PRINTWORD(4, '\n'); } #endif if (__predict_false( (word1 & CAS_RC1_TYPE_MASK) == CAS_RC1_TYPE_HW || (word4 & CAS_RC4_ZERO) != 0)) { -#ifdef CAS_RINT_TIMEOUT /* * The descriptor is still marked as owned, although * it is supposed to have completed. This has been @@ -1590,9 +1635,6 @@ */ callout_reset(&sc->sc_rx_ch, CAS_RXOWN_TICKS, cas_rint_timeout, sc); -#endif - device_printf(sc->sc_dev, - "completion still owned\n"); break; } @@ -1604,13 +1646,25 @@ continue; } - len = CAS_GET(word2, CAS_RC2_HDR_SIZE); - if (len != 0) { + KASSERT(CAS_GET(word1, CAS_RC1_DATA_SIZE) == 0 || + CAS_GET(word2, CAS_RC2_HDR_SIZE) == 0, + ("%s: data and header present", __func__)); + KASSERT((word1 & CAS_RC1_SPLIT_PKT) == 0 || + CAS_GET(word2, CAS_RC2_HDR_SIZE) == 0, + ("%s: split and header present", __func__)); + KASSERT(CAS_GET(word1, CAS_RC1_DATA_SIZE) == 0 || + (word1 & CAS_RC1_RELEASE_HDR) == 0, + ("%s: data present but header release", __func__)); + KASSERT(CAS_GET(word2, CAS_RC2_HDR_SIZE) == 0 || + (word1 & CAS_RC1_RELEASE_DATA) == 0, + ("%s: header present but data release", __func__)); + + if ((len = CAS_GET(word2, CAS_RC2_HDR_SIZE)) != 0) { idx = CAS_GET(word2, CAS_RC2_HDR_INDEX); + off = CAS_GET(word2, CAS_RC2_HDR_OFF); #ifdef CAS_DEBUG CTR4(KTR_CAS, "%s: hdr at idx %d, off %d, len %d", - __func__, idx, (u_int)CAS_GET(word2, - CAS_RC2_HDR_OFF), len); + __func__, idx, off, len); #endif rxds = &sc->sc_rxdsoft[idx]; MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -1619,8 +1673,7 @@ if (m != NULL) { refcount_acquire(&rxds->rxds_refcount); MEXTADD(m, (caddr_t)rxds->rxds_buf + - CAS_GET(word2, CAS_RC2_HDR_OFF) * 256 + - ETHER_ALIGN, len, cas_free, + off * 256 + ETHER_ALIGN, len, cas_free, #if __FreeBSD_version < 800016 rxds, #else @@ -1649,16 +1702,12 @@ if ((word1 & CAS_RC1_RELEASE_HDR) != 0 && refcount_release(&rxds->rxds_refcount) != 0) cas_add_rxdesc(sc, idx); - } -else if ((word1 & CAS_RC1_RELEASE_HDR) != 0) -device_printf(sc->sc_dev, "unexpected header release\n"); - - len = CAS_GET(word1, CAS_RC1_DATA_SIZE); - if (len != 0) { + } else if ((len = CAS_GET(word1, CAS_RC1_DATA_SIZE)) != 0) { idx = CAS_GET(word1, CAS_RC1_DATA_INDEX); + off = CAS_GET(word1, CAS_RC1_DATA_OFF); #ifdef CAS_DEBUG CTR4(KTR_CAS, "%s: data at idx %d, off %d, len %d", - idx, (u_int)CAS_GET(word1, CAS_RC2_HDR_OFF), len); + __func__, idx, off, len); #endif rxds = &sc->sc_rxdsoft[idx]; MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -1666,9 +1715,10 @@ BUS_DMASYNC_POSTREAD); if (m != NULL) { refcount_acquire(&rxds->rxds_refcount); - MEXTADD(m, (caddr_t)rxds->rxds_buf + - CAS_GET(word1, CAS_RC1_DATA_OFF) + - ETHER_ALIGN, len, cas_free, + off += ETHER_ALIGN; + m->m_len = min(CAS_PAGE_SIZE - off, len); + MEXTADD(m, (caddr_t)rxds->rxds_buf + off, + m->m_len, cas_free, #if __FreeBSD_version < 800016 rxds, #else @@ -1680,9 +1730,50 @@ m = NULL; } } + idx2 = 0; + rxds2 = NULL; + if ((word1 & CAS_RC1_SPLIT_PKT) != 0) { + KASSERT((word1 & CAS_RC1_RELEASE_NEXT) != 0, + ("%s: split but no release next", + __func__)); + + idx2 = CAS_GET(word2, CAS_RC2_NEXT_INDEX); +#ifdef CAS_DEBUG + CTR2(KTR_CAS, "%s: split at idx %d", + __func__, idx2); +#endif + rxds2 = &sc->sc_rxdsoft[idx2]; + MGET(m2, M_DONTWAIT, MT_DATA); + bus_dmamap_sync(sc->sc_rdmatag, + rxds2->rxds_dmamap, + BUS_DMASYNC_POSTREAD); + if (m2 != NULL) { + refcount_acquire( + &rxds2->rxds_refcount); + m2->m_len = len - m->m_len; + MEXTADD(m2, (caddr_t)rxds2->rxds_buf, + m2->m_len, cas_free, +#if __FreeBSD_version < 800016 + rxds2, +#else + sc, (void *)(uintptr_t)idx2, +#endif + 0, EXT_NET_DRV); + if ((m2->m_flags & M_EXT) == 0) { + m_freem(m2); + m2 = NULL; + } + } + if (m2 != NULL) + m->m_next = m2; + else { + m_freem(m); + m = NULL; + } + } if (m != NULL) { m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = len; + m->m_pkthdr.len = len; ifp->if_ipackets++; if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) cas_rxcksum(m, CAS_GET(word4, @@ -1697,27 +1788,23 @@ if ((word1 & CAS_RC1_RELEASE_DATA) != 0 && refcount_release(&rxds->rxds_refcount) != 0) cas_add_rxdesc(sc, idx); + if ((word1 & CAS_RC1_SPLIT_PKT) != 0 && + refcount_release(&rxds2->rxds_refcount) != 0) + cas_add_rxdesc(sc, idx2); } -else if ((word1 & CAS_RC1_RELEASE_DATA) != 0) -device_printf(sc->sc_dev, "unexpected data release\n"); -if ((word1 & CAS_RC1_SPLIT_PKT) != 0) -device_printf(sc->sc_dev, "unexpected split packet\n"); + skip = CAS_GET(word1, CAS_RC1_SKIP); - i += CAS_GET(word1, CAS_RC1_SKIP); - } - - for (; sc->sc_rxcptr != i; - sc->sc_rxcptr = CAS_NEXTRXCOMP(sc->sc_rxcptr)) { - sc->sc_rxcomps[sc->sc_rxcptr].crc_word1 = 0; - sc->sc_rxcomps[sc->sc_rxcptr].crc_word2 = 0; - sc->sc_rxcomps[sc->sc_rxcptr].crc_word3 = 0; - sc->sc_rxcomps[sc->sc_rxcptr].crc_word4 = - htole64(CAS_RC4_ZERO); + skip: + cas_rxcompinit(&sc->sc_rxcomps[sc->sc_rxcptr]); } CAS_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); CAS_WRITE_4(sc, CAS_RX_COMP_TAIL, sc->sc_rxcptr); +#undef PRINTWORD +#undef SKIPASSERT +#undef WORDTOH + #ifdef CAS_DEBUG CTR4(KTR_CAS, "%s: done sc->sc_rxcptr %d, sc->sc_rxdptr %d, head %d", __func__, sc->rxcptr, sc->sc_rxdptr, @@ -1753,15 +1840,17 @@ cas_add_rxdesc(struct cas_softc *sc, u_int idx) { + CAS_LOCK_ASSERT(sc, MA_OWNED); + CAS_UPDATE_RXDESC(sc, sc->sc_rxdptr, idx); + sc->sc_rxdptr = CAS_NEXTRXDESC(sc->sc_rxdptr); /* * Update the RX kick register. This register has to point to the * descriptor after the last valid one (before the current batch) - * and must be incremented in multiples of 4 (because the DMA - * engine fetches/updates descriptors in batches of 4). + * and for optimum performance should be incremented in multiples + * of 4 (the DMA engine fetches/updates descriptors in batches of 4). */ - sc->sc_rxdptr = CAS_NEXTRXDESC(sc->sc_rxdptr); if ((sc->sc_rxdptr % 4) == 0) { CAS_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); CAS_WRITE_4(sc, CAS_RX_KICK, @@ -1811,24 +1900,26 @@ /* * PCS interrupts must be cleared, otherwise no traffic is passed! */ - if ((status & CAS_INTR_PCS) != 0) { + if ((status & CAS_INTR_PCS_INT) != 0) { status2 = - CAS_READ_4(sc, CAS_MII_INTERRUP_STATUS) | - CAS_READ_4(sc, CAS_MII_INTERRUP_STATUS); - if ((status2 & CAS_MII_INTERRUP_LINK) != 0) + CAS_READ_4(sc, CAS_PCS_INTR_STATUS) | + CAS_READ_4(sc, CAS_PCS_INTR_STATUS); + if ((status2 & CAS_PCS_INTR_LINK) != 0) device_printf(sc->sc_dev, "%s: PCS link status changed\n", __func__); } if ((status & CAS_MAC_CTRL_STATUS) != 0) { status2 = CAS_READ_4(sc, CAS_MAC_CTRL_STATUS); - if ((status2 & CAS_MAC_PAUSED) != 0) + if ((status2 & CAS_MAC_CTRL_PAUSE) != 0) device_printf(sc->sc_dev, "%s: PAUSE received (PAUSE time %d slots)\n", - __func__, CAS_MAC_PAUSE_TIME(status2)); - if ((status2 & CAS_MAC_PAUSE) != 0) + __func__, + (status2 & CAS_MAC_CTRL_STATUS_PT_MASK) >> + CAS_MAC_CTRL_STATUS_PT_SHFT); + if ((status2 & CAS_MAC_CTRL_PAUSE) != 0) device_printf(sc->sc_dev, "%s: transited to PAUSE state\n", __func__); - if ((status2 & CAS_MAC_RESUME) != 0) + if ((status2 & CAS_MAC_CTRL_NON_PAUSE) != 0) device_printf(sc->sc_dev, "%s: transited to non-PAUSE state\n", __func__); } @@ -2078,13 +2169,17 @@ cas_mii_statchg(device_t dev) { struct cas_softc *sc; + struct ifnet *ifp; int gigabit; uint32_t rxcfg, txcfg, v; sc = device_get_softc(dev); + ifp = sc->sc_ifp; + CAS_LOCK_ASSERT(sc, MA_OWNED); + #ifdef CAS_DEBUG - if ((sc->sc_ifp->if_flags & IFF_DEBUG) != 0) + if ((ifp->if_flags & IFF_DEBUG) != 0) device_printf(sc->sc_dev, "%s: status change: PHY = %d\n", __func__, sc->sc_phyad); #endif @@ -2148,6 +2243,30 @@ #endif CAS_WRITE_4(sc, CAS_MAC_CTRL_CONF, v); + /* + * All supported chips have a bug causing incorrect checksum + * to be calculated when letting them strip the FCS in half- + * duplex mode. In theory we could disable FCS stripping and + * manually adjust the checksum accordingly. It seems to make + * more sense to optimze for the common case and just disable + * hardware checksumming in half-duplex mode though. + */ + if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_FDX) == 0) { + ifp->if_capenable &= ~IFCAP_HWCSUM; + ifp->if_hwassist = 0; + } else if ((sc->sc_flags & CAS_NO_CSUM) == 0) { + ifp->if_capenable = ifp->if_capabilities; + ifp->if_hwassist = CAS_CSUM_FEATURES; + } + + if (sc->sc_variant == CAS_SATURN) { + if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_FDX) == 0) + /* silicon bug workaround */ + CAS_WRITE_4(sc, CAS_MAC_PREAMBLE_LEN, 0x41); + else + CAS_WRITE_4(sc, CAS_MAC_PREAMBLE_LEN, 0x7); + } + if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_FDX) == 0 && gigabit != 0) CAS_WRITE_4(sc, CAS_MAC_SLOT_TIME, @@ -2229,13 +2348,21 @@ cas_init_locked(sc); } else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) cas_stop(ifp); - if ((ifp->if_flags & IFF_LINK0) != 0) - sc->sc_csum_features |= CSUM_UDP; + sc->sc_ifflags = ifp->if_flags; + CAS_UNLOCK(sc); + break; + case SIOCSIFCAP: + CAS_LOCK(sc); + if ((sc->sc_flags & CAS_NO_CSUM) != 0) { + error = EINVAL; + CAS_UNLOCK(sc); + break; + } + ifp->if_capenable = ifr->ifr_reqcap; + if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) + ifp->if_hwassist = CAS_CSUM_FEATURES; else - sc->sc_csum_features &= ~CSUM_UDP; - if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) - ifp->if_hwassist = sc->sc_csum_features; - sc->sc_ifflags = ifp->if_flags; + ifp->if_hwassist = 0; CAS_UNLOCK(sc); break; case SIOCADDMULTI: @@ -2244,19 +2371,17 @@ cas_setladrf(sc); CAS_UNLOCK(sc); break; + case SIOCSIFMTU: + if ((ifr->ifr_mtu < ETHERMIN) || + (ifr->ifr_mtu > ETHERMTU_JUMBO)) + error = EINVAL; + else + ifp->if_mtu = ifr->ifr_mtu; + break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii->mii_media, cmd); break; - case SIOCSIFCAP: - CAS_LOCK(sc); - ifp->if_capenable = ifr->ifr_reqcap; - if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) - ifp->if_hwassist = sc->sc_csum_features; - else - ifp->if_hwassist = 0; - CAS_UNLOCK(sc); - break; default: error = ether_ioctl(ifp, cmd, data); break; @@ -2366,7 +2491,7 @@ DEVMETHOD(miibus_writereg, cas_mii_writereg), DEVMETHOD(miibus_statchg, cas_mii_statchg), - { 0, 0 } + KOBJMETHOD_END }; static driver_t cas_pci_driver = { @@ -2376,8 +2501,8 @@ }; DRIVER_MODULE(cas, pci, cas_pci_driver, cas_devclass, 0, 0); +DRIVER_MODULE(miibus, cas, miibus_driver, miibus_devclass, 0, 0); MODULE_DEPEND(cas, pci, 1, 1, 1); -MODULE_DEPEND(cas, ether, 1, 1, 1); static const struct cas_pci_dev { uint32_t cpd_devid; @@ -2583,7 +2708,7 @@ goto fail; } i = 0; - if (found >= pci_get_slot(dev)) + if (found > 1 && pci_get_slot(dev) < sizeof(enaddr) / sizeof(*enaddr)) i = pci_get_slot(dev); memcpy(sc->sc_enaddr, enaddr[i], ETHER_ADDR_LEN); #endif ==== //depot/projects/usiii/dev/cas/if_casreg.h#4 (text+ko) ==== @@ -999,5 +999,6 @@ #define CAS_RC4_LEN_MMATCH 0x8000000000000000ULL /* length field mism. */ #define CAS_GET(reg, bits) (((reg) & (bits ## _MASK)) >> (bits ## _SHFT)) +#define CAS_SET(val, bits) (((val) << (bits ## _SHFT)) & (bits ## _MASK)) #endif ==== //depot/projects/usiii/dev/cas/if_casvar.h#3 (text+ko) ==== @@ -87,14 +87,8 @@ */ struct cas_control_data { struct cas_desc ccd_txdescs[CAS_NTXDESC]; /* TX descriptors */ - char ccd_pad0[(sizeof(struct cas_desc) * CAS_NTXDESC) % - CAS_RX_COMP_ALIGN]; struct cas_rx_comp ccd_rxcomps[CAS_NRXCOMP]; /* RX completions */ - char ccd_pad1[(sizeof(struct cas_rx_comp) * CAS_NRXCOMP) % - CAS_RX_DESC_ALIGN]; struct cas_desc ccd_rxdescs[CAS_NRXDESC]; /* RX descriptors */ - char ccd_pad2[(sizeof(struct cas_desc) * CAS_NRXDESC) % - CAS_RX_DESC_ALIGN]; struct cas_desc ccd_rxdescs2[CAS_NRXDESC2]; /* RX descriptors 2 */ }; @@ -202,7 +196,6 @@ u_int sc_rxdptr; /* next ready RX descriptor */ int sc_ifflags; - u_long sc_csum_features; }; #define CAS_BARRIER(sc, offs, len, flags) \ @@ -228,7 +221,7 @@ #define CAS_CDSYNC(sc, ops) \ bus_dmamap_sync((sc)->sc_cdmatag, (sc)->sc_cddmamap, (ops)); -#define __CAS_UPDATE_RXDESC(rxd, rxds, s) \ +#define __CAS_UPDATE_RXDESC(rxd, rxds, s) \ do { \ \ refcount_init(&(rxds)->rxds_refcount, 1); \ @@ -246,11 +239,12 @@ #if __FreeBSD_version < 800016 #define CAS_INIT_RXDESC(sc, d, s) \ do { \ - struct cas_rxdsoft *__rxds = &(sc)->sc_rxdsoft[(s)]; \ + struct cas_rxdsoft *__rxds; \ \ + __rxds = &(sc)->sc_rxdsoft[(s)]; \ __rxds->rxds_sc = (sc); \ __rxds->rxds_idx = (s); \ - __CAS_UPDATE_RXDESC(&(sc)->sc_rxdescs[(d)], __rxds, (s)); \ + __CAS_UPDATE_RXDESC(&(sc)->sc_rxdescs[(d)], __rxds, (s)); \ } while (0) #else #define CAS_INIT_RXDESC(sc, d, s) CAS_UPDATE_RXDESC(sc, d, s) From owner-p4-projects@FreeBSD.ORG Sun May 24 20:07:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A62C71065691; Sun, 24 May 2009 20:07: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 5FDA4106568D for ; Sun, 24 May 2009 20:07:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B4BD8FC08 for ; Sun, 24 May 2009 20:07:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OK7YSK094203 for ; Sun, 24 May 2009 20:07:34 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OK7YIc094201 for perforce@freebsd.org; Sun, 24 May 2009 20:07:34 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 20:07:34 GMT Message-Id: <200905242007.n4OK7YIc094201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162670 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, 24 May 2009 20:07:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=162670 Change 162670 by trasz@trasz_victim on 2009/05/24 20:07:32 Fix copyright year. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_clear_flags_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_flag_np.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flag_np.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#13 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_clear_flags_np.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_flag_np.3#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flag_np.3#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" This software was developed by Robert Watson for the TrustedBSD Project. @@ -57,8 +57,8 @@ For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. For NFS4 ACLs, ACL is trivial if it has the "canonical six" entries. -File having non-trivial ACL have a plus sign appended after mode bits -in "ls -al" output. +Files that have non-trivial ACL have a plus sign appended after mode bits +in "ls -l" output. .Sh RETURN VALUES .Rv -std acl_get_tag_type .Sh SEE ALSO ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip_np.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2008 Edward Tomasz Napierala +.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala .\" All rights reserved. .\" .\" This software was developed by Robert Watson for the TrustedBSD Project. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Edward Tomasz Napierała + * Copyright (c) 2008, 2009 Edward Tomasz Napierała * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Sun May 24 21:36:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9948F1065673; Sun, 24 May 2009 21:36: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 59107106566B for ; Sun, 24 May 2009 21:36:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C98A8FC14 for ; Sun, 24 May 2009 21:36:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OLa6Yl012068 for ; Sun, 24 May 2009 21:36:06 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OLa4jp012066 for perforce@freebsd.org; Sun, 24 May 2009 21:36:04 GMT (envelope-from trasz@freebsd.org) Date: Sun, 24 May 2009 21:36:04 GMT Message-Id: <200905242136.n4OLa4jp012066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162674 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, 24 May 2009 21:36:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=162674 Change 162674 by trasz@trasz_victim on 2009/05/24 21:35:53 Fix build. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#21 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#21 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include "../../../../../../../sys/acl.h" -#include "acl_compat.h" +#include /* * Programming rules. From owner-p4-projects@FreeBSD.ORG Sun May 24 21:51:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1044C106566C; Sun, 24 May 2009 21:51: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 C2A7E1065675 for ; Sun, 24 May 2009 21:51: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 B07488FC17 for ; Sun, 24 May 2009 21:51:22 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OLpMFn013221 for ; Sun, 24 May 2009 21:51:22 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OLpMal013219 for perforce@freebsd.org; Sun, 24 May 2009 21:51:22 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 May 2009 21:51:22 GMT Message-Id: <200905242151.n4OLpMal013219@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 Cc: Subject: PERFORCE change 162675 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, 24 May 2009 21:51:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=162675 Change 162675 by mav@mav_mavbook on 2009/05/24 21:51:15 Improve strings cleanup function. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#6 (text+ko) ==== @@ -183,45 +183,45 @@ static void bswap(int8_t *buf, int len) { - u_int16_t *ptr = (u_int16_t*)(buf + len); + u_int16_t *ptr = (u_int16_t*)(buf + len); - while (--ptr >= (u_int16_t*)buf) - *ptr = ntohs(*ptr); + while (--ptr >= (u_int16_t*)buf) + *ptr = ntohs(*ptr); } static void btrim(int8_t *buf, int len) { - int8_t *ptr; + int8_t *ptr; - for (ptr = buf; ptr < buf+len; ++ptr) - if (!*ptr || *ptr == '_') - *ptr = ' '; - for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr) - *ptr = 0; + for (ptr = buf; ptr < buf+len; ++ptr) + if (!*ptr || *ptr == '_') + *ptr = ' '; + for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr) + *ptr = 0; } static void bpack(int8_t *src, int8_t *dst, int len) { - int i, j, blank; + int i, j, blank; - for (i = j = blank = 0 ; i < len; i++) { - if (blank && src[i] == ' ') continue; - if (blank && src[i] != ' ') { - dst[j++] = src[i]; - blank = 0; - continue; + for (i = j = blank = 0 ; i < len; i++) { + if (blank && src[i] == ' ') continue; + if (blank && src[i] != ' ') { + dst[j++] = src[i]; + blank = 0; + continue; + } + if (src[i] == ' ') { + blank = 1; + if (i == 0) + continue; + } + dst[j++] = src[i]; } - if (src[i] == ' ') { - blank = 1; - if (i == 0) - continue; - } - dst[j++] = src[i]; - } - if (j < len) - dst[j] = 0x00; + while (j < len) + dst[j++] = 0x00; } static void From owner-p4-projects@FreeBSD.ORG Sun May 24 23:51:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4345F1065673; Sun, 24 May 2009 23:51:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF9E71065672 for ; Sun, 24 May 2009 23:51:24 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCC728FC1A for ; Sun, 24 May 2009 23:51:24 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4ONpOWX024233 for ; Sun, 24 May 2009 23:51:24 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4ONpOhn024231 for perforce@freebsd.org; Sun, 24 May 2009 23:51:24 GMT (envelope-from scottl@freebsd.org) Date: Sun, 24 May 2009 23:51:24 GMT Message-Id: <200905242351.n4ONpOhn024231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 162677 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, 24 May 2009 23:51:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=162677 Change 162677 by scottl@scottl-y1 on 2009/05/24 23:50:54 ATAPI definitions in this file are redundant with the ones now found in CAM, and aren't used in this driver anyways. Remove them. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/atapi.h#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/atapi.h#3 (text+ko) ==== @@ -180,201 +180,7 @@ #define MSNS_WRITE_PROTECT 0x40 #define MSNS_READ_PROTECT 0x80 -/*************************************************************************** - * ATAPI IO Register File - ***************************************************************************/ - /* - * ATAPI register definition - */ - -typedef struct _ATAPI_REGISTERS_1 { - USHORT Data; - UCHAR InterruptReason; /* Atapi Phase Port */ - UCHAR Unused1; - UCHAR ByteCountLow; /* Byte Count LSB */ - UCHAR ByteCountHigh; /* Byte Count MSB */ - UCHAR DriveSelect; - UCHAR Command; -} ATAPI_REGISTERS_1, *PATAPI_REGISTERS_1; - -/* - * Atapi Error Status - */ -#define IDE_ERROR_END_OF_MEDIA IDE_ERROR_TRACK0_NOT_FOUND -#define IDE_ERROR_ILLEGAL_LENGTH IDE_ERROR_ADDRESS_NOT_FOUND - -/* - * ATAPI interrupt reasons - */ -#define ATAPI_IR_COD 0x01 -#define ATAPI_IR_IO 0x02 - -/* sense key */ -#define ATAPI_SENSE_NO_SENSE 0x00 -#define ATAPI_SENSE_RECOVERED_ERROR 0x01 -#define ATAPI_SENSE_NOT_READY 0x02 -#define ATAPI_SENSE_MEDIUM_ERROR 0x03 -#define ATAPI_SENSE_HARDWARE_ERROR 0x04 -#define ATAPI_SENSE_ILLEGAL_REQUEST 0x05 -#define ATAPI_SENSE_UNIT_ATTENTION 0x06 -#define ATAPI_SENSE_DATA_PROTECT 0x07 -#define ATAPI_SENSE_BLANK_CHECK 0x08 -#define ATAPI_SENSE_UNIQUE 0x09 -#define ATAPI_SENSE_COPY_ABORTED 0x0A -#define ATAPI_SENSE_ABORTED_COMMAND 0x0B -#define ATAPI_SENSE_EQUAL 0x0C -#define ATAPI_SENSE_VOL_OVERFLOW 0x0D -#define ATAPI_SENSE_MISCOMPARE 0x0E -#define ATAPI_SENSE_RESERVED 0x0F - -/* Additional Sense codes */ -#define ATAPI_ASC_NO_SENSE 0x00 -#define ATAPI_ASC_LUN_NOT_READY 0x04 -#define ATAPI_ASC_TRACK_ERROR 0x14 -#define ATAPI_ASC_SEEK_ERROR 0x15 -#define ATAPI_ASC_REC_DATA_NOECC 0x17 -#define ATAPI_ASC_REC_DATA_ECC 0x18 -#define ATAPI_ASC_ILLEGAL_COMMAND 0x20 -#define ATAPI_ASC_ILLEGAL_BLOCK 0x21 -#define ATAPI_ASC_INVALID_CDB 0x24 -#define ATAPI_ASC_INVALID_LUN 0x25 -#define ATAPI_ASC_PROTECT 0x27 -#define ATAPI_ASC_MEDIUM_CHANGED 0x28 -#define ATAPI_ASC_BUS_RESET 0x29 -#define ATAPI_ASC_NO_MEDIA_IN_DEVICE 0x3a -#define ATAPI_ASC_MUSIC_AREA 0xA0 -#define ATAPI_ASC_DATA_AREA 0xA1 -#define ATAPI_ASC_VOLUME_OVERFLOW 0xA7 - -/* - * IDE command definitions ( for ATAPI ) - */ - -#define IDE_COMMAND_ATAPI_RESET 0x08 /* Atapi Software Reset command */ -#define IDE_COMMAND_ATAPI_PACKET 0xA0 /* Atapi Identify command */ -#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 /* Atapi Packet Command */ - - -/* - * ATAPI command definitions - */ - -#define ATAPI_TEST_UNIT_READY 0x00 -#define ATAPI_REZERO_UNIT 0x01 -#define ATAPI_REQUEST_SENSE 0x03 -#define ATAPI_FORMAT_UNIT6 0x04 -#define ATAPI_FORMAT_UNIT 0x24 -#define ATAPI_INQUIRY 0x12 -#define ATAPI_MODE_SELECT 0x15 -#define ATAPI_RELEASE6 0x17 -#define ATAPI_MODE_SENSE 0x1A -#define ATAPI_START_STOP_UNIT 0x1B -#define ATAPI_LOAD_UNLOAD 0x1B -#define ATAPI_RECEIVE_DIAGNOSTIC 0x1C -#define ATAPI_SEND_DIAGNOSTIC 0x1D -#define ATAPI_MEDIUM_REMOVAL 0x1E -#define ATAPI_READ_FORMAT_CAPACITY 0x23 -#define ATAPI_READ_CAPACITY 0x25 -#define ATAPI_READ 0x28 -#define ATAPI_WRITE 0x2A -#define ATAPI_SEEK 0x2B -#define ATAPI_ERASE 0x2C -#define ATAPI_VERIFY 0x2F -#define ATAPI_WRITE_VERIFY 0x2E -#define ATAPI_SYNCHRONIZE_CACHE 0x35 -#define ATAPI_LOCK_CACHE 0x36 -#define ATAPI_COMPARE 0x39 -#define ATAPI_WRITE_BUFFER 0x3B -#define ATAPI_READ_DATA_BUFF 0x3C -#define ATAPI_READ_SUB_CHANNEL 0x42 -#define ATAPI_READ_TOC 0x43 -#define ATAPI_READ_HEADER 0x44 -#define ATAPI_PLAY_AUDIO10 0x45 -#define ATAPI_GET_CONFIGURATION 0x46 -#define ATAPI_PLAY_AUDIO_MSF 0x47 -#define ATAPI_GET_EVENT_STATUS_NOTIFICATION 0x4A -#define ATAPI_PAUSE_RESUME 0x4B -#define ATAPI_LOG_SELECT 0x4C -#define ATAPI_LOG_SENSE 0x4D -#define ATAPI_STOP_PLAY_SCAN 0x4E -#define ATAPI_READ_DISK_INFORMATION 0x51 -#define ATAPI_READ_TRACK_INFORMATION 0x52 -#define ATAPI_RESERVE_TRACK_RZONE 0x53 -#define ATAPI_SEND_OPC_INFORMATION 0x54 -#define ATAPI_MODE_SELECT10 0x55 -#define ATAPI_RELEASE10 0x57 -#define ATAPI_REPAIR_ZONE 0x58 -#define ATAPI_MODE_SENSE10 0x5A -#define ATAPI_CLOSE_TRACK_SESSION 0x5B -#define ATAPI_READ_BUFFER_CAPACITY 0x5C -#define ATAPI_SEND_CUE_SHEET 0x5D -#define ATAPI_BLANK_COMMAND 0xA1 /*Provide the ability to erase any part of a CD-RW disc.*/ -#define ATAPI_SEND_EVENT 0xA2 /* add for DVD */ -#define ATAPI_SEND_KEY 0xA3 /* add for DVD */ -#define ATAPI_REPORT_KEY 0xA4 -#define ATAPI_PLAY_AUDIO 0xA5 -#define ATAPI_LOAD_UNLOAD_MEDIUM 0xA6 -#define ATAPI_SET_READ_AHEAD 0xA7 -#define ATAPI_READ12 0xA8 -#define ATAPI_READ_DVD_STRUCTURE 0xAD -#define ATAPI_WRITE12 0xAA -#define ATAPI_GET_PERFORM_NOTIFICATION 0xAC /* add for DVD-RW */ -#define ATAPI_SET_STREAM 0xB6 /* add for DVD-RW */ -#define ATAPI_READ_CD_MSF 0xB9 -#define ATAPI_SCAN 0xBA -#define ATAPI_SET_SPEED 0xBB /* no payload */ -#define ATAPI_MECHANISM_STATUS 0xBD -#define ATAPI_READ_CD 0xBE -#define ATAPI_SEND_DVD_STRUCTURE 0xBF -#define ATAPI_SET_CDRW_SPEED 0xDA /*WindowsXP need*/ - -#define MODE_DSP_WRITE_PROTECT 0x80 - - -/*************************************************************************** - * ATAPI IO Register File - ***************************************************************************/ - - -typedef struct _ATAPI_REGISTERS_2 { - UCHAR AlternateStatus; -} ATAPI_REGISTERS_2, *PATAPI_REGISTERS_2; - - -/*************************************************************************** - * ATAPI packets - ***************************************************************************/ -typedef struct _ATAPI_SENSE_DATA { -#ifdef __BIG_ENDIAN_BITFIELD - UCHAR Valid:1; - UCHAR ErrorCode:7; - UCHAR SegmentNumber; - UCHAR FileMark:1; - UCHAR EndOfMedia:1; - UCHAR IncorrectLength:1; - UCHAR Reserved:1; - UCHAR SenseKey:4; -#else - UCHAR ErrorCode:7; - UCHAR Valid:1; - UCHAR SegmentNumber; - UCHAR SenseKey:4; - UCHAR Reserved:1; - UCHAR IncorrectLength:1; - UCHAR EndOfMedia:1; - UCHAR FileMark:1; -#endif - UCHAR Information[4]; - UCHAR AdditionalSenseLength; - UCHAR CommandSpecificInformation[4]; - UCHAR AdditionalSenseCode; - UCHAR AdditionalSenseCodeQualifier; - UCHAR FieldReplaceableUnitCode; - UCHAR SenseKeySpecific[3]; -} ATAPI_SENSE_DATA, *PATAPI_SENSE_DATA; - -/* * IDENTIFY data */ typedef struct _IDENTIFY_DATA { @@ -580,6 +386,3 @@ #pragma pack() #endif - - - From owner-p4-projects@FreeBSD.ORG Mon May 25 08:04:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C46601065672; Mon, 25 May 2009 08:04: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 84795106564A for ; Mon, 25 May 2009 08:04:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69E478FC2B for ; Mon, 25 May 2009 08:04:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P84eDu097067 for ; Mon, 25 May 2009 08:04:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4P84ebN097065 for perforce@freebsd.org; Mon, 25 May 2009 08:04:40 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 08:04:40 GMT Message-Id: <200905250804.n4P84ebN097065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162705 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, 25 May 2009 08:04:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=162705 Change 162705 by trasz@trasz_victim on 2009/05/25 08:03:40 Fix ACL size handling in ZFS. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#22 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#3 (text+ko) ==== @@ -107,6 +107,18 @@ bzero(aclp, sizeof(*aclp)); + if (nentries > ACL_MAX_ENTRIES) { + /* + * I believe it may happen only when moving a pool + * from SunOS to FreeBSD. + */ + printf("acl_from_aces: ZFS ACL too big to fit " + "into 'struct acl'; returning EINVAL.\n"); + return (EINVAL); + } + + KASSERT(nentries >= 1, ("empty ZFS ACL")); + aclp->acl_cnt = nentries; aclp->acl_maxcnt = ACL_MAX_ENTRIES; @@ -147,14 +159,14 @@ entry->ae_entry_type = ACL_ENTRY_TYPE_ALARM; break; default: - panic("_acl_from_aces: a_type is 0x%x", ace->a_type); + panic("acl_from_aces: a_type is 0x%x", ace->a_type); } } return (0); } -int +void aces_from_acl(ace_t *aces, int *nentries, const struct acl *aclp) { int i; @@ -199,9 +211,7 @@ ace->a_type = ACE_SYSTEM_AUDIT_ACE_TYPE; break; default: - panic("_aces_from_acl: ae_entry_type is 0x%x", entry->ae_entry_type); + panic("aces_from_acl: ae_entry_type is 0x%x", entry->ae_entry_type); } } - - return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef OPENSOLARIS_ACL_H #define OPENSOLARIS_ACL_H -int aces_from_acl(ace_t *aces, int *nentries, const struct acl *aclp); +void aces_from_acl(ace_t *aces, int *nentries, const struct acl *aclp); int acl_from_aces(struct acl *aclp, const ace_t *aces, int nentries); #endif /* OPENSOLARIS_ACL_H */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#22 (text+ko) ==== @@ -4855,18 +4855,22 @@ if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) return (EINVAL); + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries, + * splitting every entry into two and appending "canonical six" + * entries at the end. Don't allow for setting an ACL that would + * cause chmod(2) to run out of ACL entries. + */ + if (inkernelacl->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + return (ENOSPC); + vsecattr.vsa_mask = VSA_ACE; aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); aaclp = vsecattr.vsa_aclentp; vsecattr.vsa_aclentsz = aclbsize; - error = aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); - if (error != 0) { - kmem_free(aaclp, aclbsize); - return (EINVAL); - } - + aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); if (error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) { kmem_free(aaclp, aclbsize); return (error); From owner-p4-projects@FreeBSD.ORG Mon May 25 13:51:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 538081065675; Mon, 25 May 2009 13:51: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 09F2D1065672 for ; Mon, 25 May 2009 13:51:40 +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 E91D88FC21 for ; Mon, 25 May 2009 13:51:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PDpdUo063704 for ; Mon, 25 May 2009 13:51:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PDpZAM063698 for perforce@freebsd.org; Mon, 25 May 2009 13:51:35 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 25 May 2009 13:51:35 GMT Message-Id: <200905251351.n4PDpZAM063698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162719 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, 25 May 2009 13:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=162719 Change 162719 by pgj@petymeg-current on 2009/05/25 13:50:35 IFC Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/UPDATING#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/print.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/.cvsignore#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/ChangeLog#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/animation#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/audio#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/elf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/epoc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/erlang#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/graphviz#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/images#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/kml#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/mach#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/perl#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/printer#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/python#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/timezone#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/windows#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/wireless#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Makefile.am#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Makefile.am-src#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/TODO#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/apprentice.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/apptype.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/ascmagic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/asprintf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/cdf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/cdf.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/cdf_time.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/compress.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/config.guess#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/config.h.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/config.sub#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/configure#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/configure.ac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/encoding.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/file.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/file.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/file.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/file_opts.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/fsmagic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/funcs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/getopt_long.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/is_tar.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/libmagic.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/magic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/magic.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/magic.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/patchlevel.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/print.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/readcdf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/readelf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/softmagic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/strlcat.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/strlcpy.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/tests/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/file/vasprintf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/COPYING#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/LICENSE#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/NEWS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/brac.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/ch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/charset.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/charset.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/cmd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/command.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/configure#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/configure.ac#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/decode.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/defines.ds#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/defines.o2#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/defines.o9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/defines.wn#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/edit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/filename.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/forwback.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/funcs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/help.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/ifile.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/input.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/install.sh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/jump.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/less.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/less.hlp#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/less.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/less.nro#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lessecho.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lessecho.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lessecho.nro#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lesskey.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lesskey.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lglob.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/line.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/linenum.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/lsystem.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/mark.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/mkhelp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/optfunc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/option.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/option.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/opttbl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/os.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/output.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/pckeys.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/position.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/position.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/prompt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/screen.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/scrsize.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/search.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/signal.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/tags.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/ttyin.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/less/version.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/PROTOCOL#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/addrmatch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2-jpake.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/canohost.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/canohost.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/channels.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/channels.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/cipher.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/cipher.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/compat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/compat.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.guess#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/defines.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/jpake.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/jpake.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kex.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/key.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/misc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/nchan.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/bsd-poll.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/packet.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/readconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/readconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/schnorr.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/scp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/servconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/servconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/session.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp-server-main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sftp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/version.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/devd.conf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/namedb/named.conf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/idmapd#2 delete .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/named#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/tmp#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/common.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/inp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/patch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/pch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/pch.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/patch/util.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/include/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_disk_entry_from_file.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libbluetooth/hci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tcgetsid.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/tcsetsid.3#1 branch .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_compat.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_delete.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_entry.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_init.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_set.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_set.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_valid.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/ptsname.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/private.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/time2posix.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/tzfile.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/tzfile.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libgeom/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmagic/config.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/memstat_malloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libstand/stand.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_tty.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/idmapd/Makefile#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sbin/idmapd/idmapd.8#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sbin/idmapd/idmapd.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/restore/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/altq.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ath.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/bge.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/bwi.4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/hifn.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ipsec.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/isp.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iwn.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iwnfw.4#1 branch .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/md.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/msk.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/nge.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/smp.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ubsec.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/uchcom.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/urtw.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/usb2_core.4#2 delete .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/acl.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/atomic.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/sbuf.9#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/bsd-family-tree#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-ports.dot#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-src.dot#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/iso639#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/boot/zfs/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.i386#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/options#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/age/if_age.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/spibus/spibus.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/mca.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/mca.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/tty.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/legacy/dev/usb/if_upgt.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/bwi/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_loop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/netisr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/netisr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/vnet.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_superg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/route6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_var.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_dev.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_idmap.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_socket.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_subs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vfs_subs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vfsops.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vn_subs.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4_vnops.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/nfsclient/nfs_diskless.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 25 15:02:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4BB7106567B; Mon, 25 May 2009 15:02:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FCF0106564A for ; Mon, 25 May 2009 15:02:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 436598FC16 for ; Mon, 25 May 2009 15:02:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PF2qQR071166 for ; Mon, 25 May 2009 15:02:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PF2qbK071164 for perforce@freebsd.org; Mon, 25 May 2009 15:02:52 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 15:02:52 GMT Message-Id: <200905251502.n4PF2qbK071164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162722 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, 25 May 2009 15:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162722 Change 162722 by trasz@trasz_victim on 2009/05/25 15:02:38 Simplify the ZFS ACL support. Submitted by: pjd Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 (text+ko) ==== @@ -4801,36 +4801,18 @@ { int error; vsecattr_t vsecattr; - int aclbsize; /* size of acl list in bytes */ if (ap->a_type != ACL_TYPE_NFS4) return (EOPNOTSUPP); - /* Mostly taken from common/syscall/acl.c. */ - vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) return (error); - aclbsize = vsecattr.vsa_aclcnt * sizeof (ace_t); - if (vsecattr.vsa_aclcnt > ACL_MAX_ENTRIES) { - printf("GETACL: no space\n"); - error = ENOSPC; - goto errout; - } - error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); - if (error != 0) - goto errout; - - if (vsecattr.vsa_aclcnt != 0) - kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); - - return (0); + if (vsecattr.vsa_aclentp != NULL) + kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); -errout: - if (aclbsize != 0 && vsecattr.vsa_aclentp != NULL) - kmem_free(vsecattr.vsa_aclentp, aclbsize); return (error); } @@ -4861,7 +4843,7 @@ * entries at the end. Don't allow for setting an ACL that would * cause chmod(2) to run out of ACL entries. */ - if (inkernelacl->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) return (ENOSPC); vsecattr.vsa_mask = VSA_ACE; @@ -4871,13 +4853,10 @@ vsecattr.vsa_aclentsz = aclbsize; aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); - if (error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) { - kmem_free(aaclp, aclbsize); - return (error); - } + error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL); + kmem_free(aaclp, aclbsize); - kmem_free(aaclp, aclbsize); - return (0); + return (error); } int @@ -4890,10 +4869,6 @@ struct thread *td; } */ *ap; { - if (ap->a_type != ACL_TYPE_NFS4) - return (EOPNOTSUPP); - - printf("ACLCHECK\n"); return (EOPNOTSUPP); } From owner-p4-projects@FreeBSD.ORG Mon May 25 16:32:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A82251065694; Mon, 25 May 2009 16:32: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 62FE5106567A for ; Mon, 25 May 2009 16:32:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5028E8FC26 for ; Mon, 25 May 2009 16:32:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PGWNd9080137 for ; Mon, 25 May 2009 16:32:23 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PGWNpp080135 for perforce@freebsd.org; Mon, 25 May 2009 16:32:23 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 16:32:23 GMT Message-Id: <200905251632.n4PGWNpp080135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162725 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, 25 May 2009 16:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=162725 Change 162725 by trasz@trasz_victim on 2009/05/25 16:32:02 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/journal/gjournal.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/msk.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonkrpc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx_reass.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/spx_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/compile.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/defs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/process.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/sed.1#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.8#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.40 2008/07/31 00:55:29 obrien Exp $ +.\" $FreeBSD: src/sbin/fdisk/fdisk.8,v 1.41 2009/05/25 09:23:26 brian Exp $ .\" .Dd April 30, 2007 .Dt FDISK 8 @@ -372,6 +372,31 @@ for .Ar length sectors. +If the +.Ar start +or +.Ar length +is suffixed with a +.Em K , +.Em M +or +.Em G , +it is taken as a +.Em Kilobyte , +.Em Megabyte +or +.Em Gigabyte +measurement respectively. +If the +.Ar start +is given as +.Qq * +it is set to the value of the previous partition end. +If the +.Ar length +is given as +.Qq * +the partition end is set to the end of the disk. .Pp Only those slices explicitly mentioned by these lines are modified; any slice not referenced by a @@ -421,6 +446,17 @@ downwards to correspond to head and cylinder boundaries): .Pp .Dl "p 1 165 1 2503871" +.Pp +Example: to set slices 1, 2 and 4 to +.Fx +slices, the first being 2 Gigabytes, the second being 10 Gigabytes and the +forth being the remainder of the disk (again, numbers will be rounded +appropriately): +.Pp +.Dl "p 1 165 63 2G" +.Dl "p 2 165 * 10G" +.Dl "p 3 0 0 0" +.Dl "p 4 165 * *" .It Ic a Ar slice Make .Ar slice ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.92 2009/01/14 22:05:51 luigi Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.93 2009/05/25 09:23:26 brian Exp $"); #include #include @@ -49,6 +49,7 @@ int iotest; +#define NOSECTORS ((u_int32_t)-1) #define LBUF 100 static char lbuf[LBUF]; @@ -106,6 +107,7 @@ struct arg { char argtype; int arg_val; + char *arg_str; } args[MAX_ARGS]; } CMD; @@ -970,16 +972,23 @@ */ while (1) { while (isspace(*cp)) ++cp; + if (*cp == '\0') + break; /* eol */ if (*cp == '#') break; /* found comment */ if (isalpha(*cp)) command->args[command->n_args].argtype = *cp++; - if (!isdigit(*cp)) - break; /* assume end of line */ end = NULL; command->args[command->n_args].arg_val = strtol(cp, &end, 0); - if (cp == end) - break; /* couldn't parse number */ + if (cp == end || (!isspace(*end) && *end != '\0')) { + char ch; + end = cp; + while (!isspace(*end) && *end != '\0') ++end; + ch = *end; *end = '\0'; + command->args[command->n_args].arg_str = strdup(cp); + *end = ch; + } else + command->args[command->n_args].arg_str = NULL; cp = end; command->n_args++; } @@ -1078,6 +1087,33 @@ return (status); } +static u_int32_t +str2sectors(const char *str) +{ + char *end; + unsigned long val; + + val = strtoul(str, &end, 0); + if (str == end || *end == '\0') { + warnx("ERROR line %d: unexpected size: \'%s\'", + current_line_number, str); + return NOSECTORS; + } + + if (*end == 'K') + val *= 1024UL / secsize; + else if (*end == 'M') + val *= 1024UL * 1024UL / secsize; + else if (*end == 'G') + val *= 1024UL * 1024UL * 1024UL / secsize; + else { + warnx("ERROR line %d: unexpected modifier: %c " + "(not K/M/G)", current_line_number, *end); + return NOSECTORS; + } + + return val; +} static int process_partition(CMD *command) @@ -1103,8 +1139,48 @@ partp = &mboot.parts[partition - 1]; bzero(partp, sizeof (*partp)); partp->dp_typ = command->args[1].arg_val; - partp->dp_start = command->args[2].arg_val; - partp->dp_size = command->args[3].arg_val; + if (command->args[2].arg_str != NULL) { + if (strcmp(command->args[2].arg_str, "*") == 0) { + int i; + partp->dp_start = dos_sectors; + for (i = 1; i < partition; i++) { + struct dos_partition *prev_partp; + prev_partp = ((struct dos_partition *) + &mboot.parts) + i - 1; + if (prev_partp->dp_typ != 0) + partp->dp_start = prev_partp->dp_start + + prev_partp->dp_size; + } + if (partp->dp_start % dos_sectors != 0) { + prev_head_boundary = partp->dp_start / + dos_sectors * dos_sectors; + partp->dp_start = prev_head_boundary + + dos_sectors; + } + } else { + partp->dp_start = str2sectors(command->args[2].arg_str); + if (partp->dp_start == NOSECTORS) + break; + } + } else + partp->dp_start = command->args[2].arg_val; + + if (command->args[3].arg_str != NULL) { + if (strcmp(command->args[3].arg_str, "*") == 0) + partp->dp_size = ((disksecs / dos_cylsecs) * + dos_cylsecs) - partp->dp_start; + else { + partp->dp_size = str2sectors(command->args[3].arg_str); + if (partp->dp_size == NOSECTORS) + break; + } + prev_cyl_boundary = ((partp->dp_start + partp->dp_size) / + dos_cylsecs) * dos_cylsecs; + if (prev_cyl_boundary > partp->dp_start) + partp->dp_size = prev_cyl_boundary - partp->dp_start; + } else + partp->dp_size = command->args[3].arg_val; + max_end = partp->dp_start + partp->dp_size; if (partp->dp_typ == 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/journal/gjournal.8#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.9 2009/04/29 10:02:50 trasz Exp $ +.\" $FreeBSD: src/sbin/geom/class/journal/gjournal.8,v 1.10 2009/05/25 09:52:58 maxim Exp $ .\" .Dd February 17, 2009 .Dt GJOURNAL 8 @@ -220,7 +220,7 @@ .Bd -literal -offset indent umount /dev/da0s1d gjournal label da0s1d da0s1e && \e - tunefs -J enable -n disable da01sd.journal && \e + tunefs -J enable -n disable da0s1d.journal && \e mount -o async /dev/da0s1d.journal /mnt || \e mount /dev/da0s1d /mnt .Ed ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/msk.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.6 2007/12/05 09:41:58 remko Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.8 2009/05/25 08:27:52 yongari Exp $ .\" -.Dd December 5, 2007 +.Dd May 25, 2009 .Dt MSK 4 .Os .Sh NAME @@ -176,13 +176,19 @@ .It Marvell Yukon 88E8062 SX/LX Gigabit Ethernet .It -Marvell Yukon 88E8035 Gigabit Ethernet +Marvell Yukon 88E8035 Fast Ethernet +.It +Marvell Yukon 88E8036 Fast Ethernet +.It +Marvell Yukon 88E8038 Fast Ethernet +.It +Marvell Yukon 88E8039 Fast Ethernet .It -Marvell Yukon 88E8036 Gigabit Ethernet +Marvell Yukon 88E8040 Fast Ethernet .It -Marvell Yukon 88E8038 Gigabit Ethernet +Marvell Yukon 88E8040T Fast Ethernet .It -Marvell Yukon 88E8039 Gigabit Ethernet +Marvell Yukon 88E8048 Fast Ethernet .It Marvell Yukon 88E8050 Gigabit Ethernet .It @@ -196,6 +202,8 @@ .It Marvell Yukon 88E8058 Gigabit Ethernet .It +Marvell Yukon 88E8070 Fast Ethernet +.It SysKonnect SK-9Sxx Gigabit Ethernet .It SysKonnect SK-9Exx Gigabit Ethernet ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_MOUNT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_MOUNT.9,v 1.14 2005/01/07 10:57:33 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.15 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_MOUNT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_MOUNT "struct mount *mp" "struct thread *td" +.Fn VFS_MOUNT "struct mount *mp" .Sh DESCRIPTION The .Fn VFS_MOUNT @@ -50,8 +50,6 @@ .Bl -tag -width data .It Fa mp Structure representing the file system. -.It Fa td -Thread which is mounting the file system. .El .Pp The ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_QUOTACTL.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_QUOTACTL.9,v 1.10 2003/10/23 06:24:55 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.11 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd July 24, 1996 +.Dd May 23, 2009 .Os .Dt VFS_QUOTACTL 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" "struct thread *td" +.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" .Sh DESCRIPTION Implement file system quotas. See ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_ROOT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_ROOT.9,v 1.12 2006/09/18 15:24:20 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd August 26, 2006 +.Dd May 23, 2009 .Os .Dt VFS_ROOT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" "struct thread *td" +.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" .Sh DESCRIPTION Return a locked vnode for the root directory of the file system. .Pp @@ -58,8 +58,6 @@ argument and instead acquire an exclusive lock. .It Fa vpp Return parameter for the root vnode. -.It Fa td -The calling thread. .El .Sh SEE ALSO .Xr VFS 9 , ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_STATFS.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_STATFS.9,v 1.12 2005/01/13 09:33:06 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_STATFS 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" "struct thread *td" +.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" .Sh DESCRIPTION The .Fn VFS_STATFS @@ -56,8 +56,6 @@ structure, as defined by .In sys/mount.h , into which information is placed about the file system. -.It Fa td -The thread which is querying the file system. .El .Pp The fields of ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_SYNC.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.17 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_SYNC 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct thread *td" +.Fn VFS_SYNC "struct mount *mp" "int waitfor" .Sh DESCRIPTION The .Fn VFS_SYNC @@ -61,8 +61,6 @@ .It Dv MNT_LAZY push data not written by file system syncer .El -.It Fa td -The calling thread. .El .Pp The ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VFS_UNMOUNT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_UNMOUNT.9,v 1.11 2005/01/07 11:45:11 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_UNMOUNT.9,v 1.12 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_UNMOUNT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_UNMOUNT "struct mount *mp" "int mntflags" "struct thread *td" +.Fn VFS_UNMOUNT "struct mount *mp" "int mntflags" .Sh DESCRIPTION The .Fn VFS_UNMOUNT @@ -58,8 +58,6 @@ .It Dv MNT_FORCE Open files are forcibly closed before the file system is unmounted. .El -.It Fa td -Thread which is unmounting the file system. .El .Sh SEE ALSO .Xr vflush 9 , ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/acl.9,v 1.17 2009/05/24 09:42:53 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/acl.9,v 1.19 2009/05/24 20:34:29 trasz Exp $ .\" .Dd December 23, 1999 .Os ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $"); #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.103 2009/03/07 07:26:22 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.104 2009/05/24 18:35:53 antoine Exp $"); #include #include @@ -543,7 +543,7 @@ return; } -int in_reset = 0; + void ndis_free_packet(p) ndis_packet *p; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1402 2009/05/22 12:35:12 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1403 2009/05/25 09:28:54 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2428,6 +2428,7 @@ netipx/ipx_proto.c optional ipx netipx/ipx_usrreq.c optional ipx netipx/spx_debug.c optional ipx +netipx/spx_reass.c optional ipx netipx/spx_usrreq.c optional ipx netnatm/natm.c optional natm netnatm/natm_pcb.c optional natm ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.23 2008/10/17 05:26:51 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.28 2009/05/25 02:36:29 yongari Exp $"); /* * driver for the Marvell 88E1000 series external 1000/100/10-BT PHY. @@ -107,6 +107,7 @@ MII_PHY_DESC(MARVELL, E1116), MII_PHY_DESC(MARVELL, E1116R), MII_PHY_DESC(MARVELL, E1118), + MII_PHY_DESC(MARVELL, E3016), MII_PHY_DESC(xxMARVELL, E1000), MII_PHY_DESC(xxMARVELL, E1011), MII_PHY_DESC(xxMARVELL, E1000_3), @@ -129,7 +130,6 @@ struct mii_softc *sc; struct mii_attach_args *ma; struct mii_data *mii; - int fast_ether; esc = device_get_softc(dev); sc = &esc->mii_sc; @@ -142,10 +142,8 @@ sc->mii_phy = ma->mii_phyno; sc->mii_service = e1000phy_service; sc->mii_pdata = mii; - sc->mii_anegticks = MII_ANEGTICKS_GIGE; mii->mii_instance++; - fast_ether = 0; esc->mii_model = MII_MODEL(ma->mii_id2); switch (esc->mii_model) { case MII_MODEL_MARVELL_E1011: @@ -167,54 +165,16 @@ */ PHY_WRITE(sc, E1000_EADR, 0); break; - case MII_MODEL_MARVELL_E3082: - /* 88E3082 10/100 Fast Ethernet PHY. */ - sc->mii_anegticks = MII_ANEGTICKS; - fast_ether = 1; - break; } e1000phy_reset(sc); + sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask; + if (sc->mii_capabilities & BMSR_EXTSTAT) + sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR); device_printf(dev, " "); - -#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL) - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst), - E1000_CR_ISOLATE); - if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, sc->mii_inst), - E1000_CR_SPEED_10); - printf("10baseT, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_10 | E1000_CR_FULL_DUPLEX); - printf("10baseT-FDX, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, sc->mii_inst), - E1000_CR_SPEED_100); - printf("100baseTX, "); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_100 | E1000_CR_FULL_DUPLEX); - printf("100baseTX-FDX, "); - if (fast_ether == 0) { - /* - * 1000BT-simplex not supported; driver must ignore - * this entry, but it must be present in order to - * manually set full-duplex. - */ - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, 0, - sc->mii_inst), E1000_CR_SPEED_1000); - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_T, IFM_FDX, - sc->mii_inst), - E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); - printf("1000baseTX-FDX, "); - } - } else { - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, IFM_FDX, sc->mii_inst), - E1000_CR_SPEED_1000 | E1000_CR_FULL_DUPLEX); - printf("1000baseSX-FDX, "); - } - ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst), 0); - printf("auto\n"); -#undef ADD + mii_phy_add_media(sc); + printf("\n"); MIIBUS_MEDIAINIT(sc->mii_dev); return (0); @@ -253,18 +213,29 @@ reg |= E1000_SCR_AUTO_X_MODE; if (esc->mii_model == MII_MODEL_MARVELL_E1116) reg &= ~E1000_SCR_POWER_DOWN; + reg |= E1000_SCR_ASSERT_CRS_ON_TX; break; case MII_MODEL_MARVELL_E3082: reg |= (E1000_SCR_AUTO_X_MODE >> 1); + reg |= E1000_SCR_ASSERT_CRS_ON_TX; + break; + case MII_MODEL_MARVELL_E3016: + reg |= E1000_SCR_AUTO_MDIX; + reg &= ~(E1000_SCR_EN_DETECT | + E1000_SCR_SCRAMBLER_DISABLE); + reg |= E1000_SCR_LPNP; + /* XXX Enable class A driver for Yukon FE+ A0. */ + PHY_WRITE(sc, 0x1C, PHY_READ(sc, 0x1C) | 0x0001); break; default: reg &= ~E1000_SCR_AUTO_X_MODE; + reg |= E1000_SCR_ASSERT_CRS_ON_TX; break; } - /* Enable CRS on TX. */ - reg |= E1000_SCR_ASSERT_CRS_ON_TX; - /* Auto correction for reversed cable polarity. */ - reg &= ~E1000_SCR_POLARITY_REVERSAL; + if (esc->mii_model != MII_MODEL_MARVELL_E3016) { + /* Auto correction for reversed cable polarity. */ + reg &= ~E1000_SCR_POLARITY_REVERSAL; + } PHY_WRITE(sc, E1000_SCR, reg); if (esc->mii_model == MII_MODEL_MARVELL_E1116) { @@ -283,6 +254,13 @@ case MII_MODEL_MARVELL_E1118: case MII_MODEL_MARVELL_E1149: break; + case MII_MODEL_MARVELL_E3016: + /* LED2 -> ACT, LED1 -> LINK, LED0 -> SPEED. */ + PHY_WRITE(sc, 0x16, 0x0B << 8 | 0x05 << 4 | 0x04); + /* Integrated register calibration workaround. */ + PHY_WRITE(sc, 0x1D, 17); + PHY_WRITE(sc, 0x1E, 0x3F60); + break; default: /* Force TX_CLK to 25MHz clock. */ reg = PHY_READ(sc, E1000_ESCR); @@ -339,12 +317,14 @@ speed = 0; switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_1000_T: - if (esc->mii_model == MII_MODEL_MARVELL_E3082) + if ((sc->mii_extcapabilities & + (EXTSR_1000TFDX | EXTSR_1000THDX)) == 0) return (EINVAL); speed = E1000_CR_SPEED_1000; break; case IFM_1000_SX: - if (esc->mii_model == MII_MODEL_MARVELL_E3082) + if ((sc->mii_extcapabilities & + (EXTSR_1000XFDX | EXTSR_1000XHDX)) == 0) return (EINVAL); speed = E1000_CR_SPEED_1000; break; @@ -390,7 +370,8 @@ PHY_WRITE(sc, E1000_1GCR, gig | E1000_1GCR_MS_ENABLE); } else { - if (esc->mii_model != MII_MODEL_MARVELL_E3082) + if ((sc->mii_extcapabilities & + (EXTSR_1000TFDX | EXTSR_1000THDX)) != 0) PHY_WRITE(sc, E1000_1GCR, 0); } PHY_WRITE(sc, E1000_AR, E1000_AR_SELECTOR_FIELD); @@ -432,7 +413,7 @@ if (sc->mii_ticks++ == 0) break; if (sc->mii_ticks <= sc->mii_anegticks) - return (0); + break; sc->mii_ticks = 0; e1000phy_reset(sc); @@ -452,18 +433,14 @@ e1000phy_status(struct mii_softc *sc) { struct mii_data *mii = sc->mii_pdata; - int bmsr, bmcr, esr, gsr, ssr, isr, ar, lpar; + int bmcr, bmsr, gsr, ssr, ar, lpar; mii->mii_media_status = IFM_AVALID; mii->mii_media_active = IFM_ETHER; bmsr = PHY_READ(sc, E1000_SR) | PHY_READ(sc, E1000_SR); - esr = PHY_READ(sc, E1000_ESR); bmcr = PHY_READ(sc, E1000_CR); ssr = PHY_READ(sc, E1000_SSR); - isr = PHY_READ(sc, E1000_ISR); - ar = PHY_READ(sc, E1000_AR); - lpar = PHY_READ(sc, E1000_LPAR); if (bmsr & E1000_SR_LINK_STATUS) mii->mii_media_status |= IFM_ACTIVE; @@ -471,22 +448,28 @@ if (bmcr & E1000_CR_LOOPBACK) mii->mii_media_active |= IFM_LOOP; - if ((((bmcr & E1000_CR_AUTO_NEG_ENABLE) != 0) && - ((bmsr & E1000_SR_AUTO_NEG_COMPLETE) == 0)) || - ((ssr & E1000_SSR_LINK) == 0) || - ((ssr & E1000_SSR_SPD_DPLX_RESOLVED) == 0)) { + if ((bmcr & E1000_CR_AUTO_NEG_ENABLE) != 0 && + (ssr & E1000_SSR_SPD_DPLX_RESOLVED) == 0) { /* Erg, still trying, I guess... */ mii->mii_media_active |= IFM_NONE; return; } if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { - if (ssr & E1000_SSR_1000MBS) + switch (ssr & E1000_SSR_SPEED) { + case E1000_SSR_1000MBS: mii->mii_media_active |= IFM_1000_T; - else if (ssr & E1000_SSR_100MBS) + break; + case E1000_SSR_100MBS: mii->mii_media_active |= IFM_100_TX; - else + break; + case E1000_SSR_10MBS: mii->mii_media_active |= IFM_10_T; + break; + default: + mii->mii_media_active |= IFM_NONE; + return; + } } else { if (ssr & E1000_SSR_1000MBS) mii->mii_media_active |= IFM_1000_SX; @@ -498,6 +481,8 @@ mii->mii_media_active |= IFM_HDX; if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { + ar = PHY_READ(sc, E1000_AR); + lpar = PHY_READ(sc, E1000_LPAR); /* FLAG0==rx-flow-control FLAG1==tx-flow-control */ if ((ar & E1000_AR_PAUSE) && (lpar & E1000_LPAR_PAUSE)) { mii->mii_media_active |= IFM_FLAG0 | IFM_FLAG1; @@ -524,16 +509,19 @@ e1000phy_mii_phy_auto(struct e1000phy_softc *esc) { struct mii_softc *sc; + uint16_t reg; sc = &esc->mii_sc; - if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) - PHY_WRITE(sc, E1000_AR, E1000_AR_10T | E1000_AR_10T_FD | + if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { + reg = PHY_READ(sc, E1000_AR); + reg |= E1000_AR_10T | E1000_AR_10T_FD | E1000_AR_100TX | E1000_AR_100TX_FD | - E1000_AR_PAUSE | E1000_AR_ASM_DIR); - else + E1000_AR_PAUSE | E1000_AR_ASM_DIR; + PHY_WRITE(sc, E1000_AR, reg | E1000_AR_SELECTOR_FIELD); + } else PHY_WRITE(sc, E1000_AR, E1000_FA_1000X_FD | E1000_FA_1000X | E1000_FA_SYM_PAUSE | E1000_FA_ASYM_PAUSE); - if (esc->mii_model != MII_MODEL_MARVELL_E3082) + if ((sc->mii_extcapabilities & (EXTSR_1000TFDX | EXTSR_1000THDX)) != 0) PHY_WRITE(sc, E1000_1GCR, E1000_1GCR_1000T_FD | E1000_1GCR_1000T); PHY_WRITE(sc, E1000_CR, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phyreg.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.5 2007/10/29 05:50:22 yongari Exp $ */ +/* $FreeBSD: src/sys/dev/mii/e1000phyreg.h,v 1.6 2009/05/25 02:36:29 yongari Exp $ */ /*- * Principal Author: Parag Patel * Copyright (c) 2001 @@ -236,6 +236,16 @@ #define E1000_SCR_TX_FIFO_DEPTH_10 0x8000 #define E1000_SCR_TX_FIFO_DEPTH_12 0xC000 +/* 88E3016 only */ +#define E1000_SCR_AUTO_MDIX 0x0030 +#define E1000_SCR_SIGDET_POLARITY 0x0040 +#define E1000_SCR_EXT_DISTANCE 0x0080 +#define E1000_SCR_FEFI_DISABLE 0x0100 +#define E1000_SCR_NLP_GEN_DISABLE 0x0800 +#define E1000_SCR_LPNP 0x1000 +#define E1000_SCR_NLP_CHK_DISABLE 0x2000 +#define E1000_SCR_EN_DETECT 0x4000 + #define E1000_SCR_EN_DETECT_MASK 0x0300 /* 88E1112 page 2 */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.63 2009/03/30 01:47:32 imp Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.64 2009/05/25 02:36:29 yongari Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -247,6 +247,7 @@ model MARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model MARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY model MARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY +model MARVELL E3016 0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY model xxMARVELL E1000 0x0005 Marvell 88E1000 Gigabit PHY model xxMARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#8 (text+ko) ==== @@ -99,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.40 2009/03/25 07:05:23 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/msk/if_msk.c,v 1.59 2009/05/25 08:26:39 yongari Exp $"); #include #include @@ -190,13 +190,21 @@ { VENDORID_MARVELL, DEVICEID_MRVL_8062X, "Marvell Yukon 88E8062 SX/LX Gigabit Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_8035, - "Marvell Yukon 88E8035 Gigabit Ethernet" }, + "Marvell Yukon 88E8035 Fast Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_8036, - "Marvell Yukon 88E8036 Gigabit Ethernet" }, + "Marvell Yukon 88E8036 Fast Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_8038, - "Marvell Yukon 88E8038 Gigabit Ethernet" }, + "Marvell Yukon 88E8038 Fast Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_8039, - "Marvell Yukon 88E8039 Gigabit Ethernet" }, + "Marvell Yukon 88E8039 Fast Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_8040, + "Marvell Yukon 88E8040 Fast Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_8040T, + "Marvell Yukon 88E8040T Fast Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_8048, + "Marvell Yukon 88E8048 Fast Ethernet" }, + { VENDORID_MARVELL, DEVICEID_MRVL_8070, + "Marvell Yukon 88E8070 Fast Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_4361, "Marvell Yukon 88E8050 Gigabit Ethernet" }, { VENDORID_MARVELL, DEVICEID_MRVL_4360, @@ -220,7 +228,8 @@ "Yukon EC Ultra", "Yukon Unknown", "Yukon EC", - "Yukon FE" + "Yukon FE", + "Yukon FE+" }; static int mskc_probe(device_t); @@ -285,7 +294,6 @@ static int msk_miibus_readreg(device_t, int, int); static int msk_miibus_writereg(device_t, int, int, int); static void msk_miibus_statchg(device_t); -static void msk_link_task(void *, int); static void msk_rxfilter(struct msk_if_softc *); static void msk_setvlan(struct msk_if_softc *, struct ifnet *); @@ -459,40 +467,44 @@ static void msk_miibus_statchg(device_t dev) { - struct msk_if_softc *sc_if; - - sc_if = device_get_softc(dev); - taskqueue_enqueue(taskqueue_swi, &sc_if->msk_link_task); -} - -static void -msk_link_task(void *arg, int pending) -{ struct msk_softc *sc; struct msk_if_softc *sc_if; struct mii_data *mii; struct ifnet *ifp; uint32_t gmac; - sc_if = (struct msk_if_softc *)arg; + sc_if = device_get_softc(dev); sc = sc_if->msk_softc; - MSK_IF_LOCK(sc_if); + MSK_IF_LOCK_ASSERT(sc_if); mii = device_get_softc(sc_if->msk_miibus); ifp = sc_if->msk_ifp; - if (mii == NULL || ifp == NULL) { - MSK_IF_UNLOCK(sc_if); + if (mii == NULL || ifp == NULL || + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) return; + + sc_if->msk_flags &= ~MSK_FLAG_LINK; + if ((mii->mii_media_status & (IFM_AVALID | IFM_ACTIVE)) == + (IFM_AVALID | IFM_ACTIVE)) { + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_10_T: + case IFM_100_TX: + sc_if->msk_flags |= MSK_FLAG_LINK; + break; + case IFM_1000_T: + case IFM_1000_SX: + case IFM_1000_LX: + case IFM_1000_CX: + if ((sc_if->msk_flags & MSK_FLAG_FASTETHER) == 0) + sc_if->msk_flags |= MSK_FLAG_LINK; + break; + default: + break; + } } - if (mii->mii_media_status & IFM_ACTIVE) { - if (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) - sc_if->msk_link = 1; - } else - sc_if->msk_link = 0; - - if (sc_if->msk_link != 0) { + if ((sc_if->msk_flags & MSK_FLAG_LINK) != 0) { /* Enable Tx FIFO Underrun. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 25 17:08:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C58811065688; Mon, 25 May 2009 17:08:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 809651065686 for ; Mon, 25 May 2009 17:08:09 +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 6DD888FC5B for ; Mon, 25 May 2009 17:08:09 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PH89eV093899 for ; Mon, 25 May 2009 17:08:09 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PH890r093897 for perforce@freebsd.org; Mon, 25 May 2009 17:08:09 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 25 May 2009 17:08:09 GMT Message-Id: <200905251708.n4PH890r093897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162729 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, 25 May 2009 17:08:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=162729 Change 162729 by rene@rene_self on 2009/05/25 17:07:12 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#21 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#21 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#29 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#19 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#34 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#7 integrate .. //depot/projects/docproj_nl/share/pgpkeys/dfr.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/jilles.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#17 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#17 integrate .. //depot/projects/docproj_nl/share/pgpkeys/stas.key#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/tota.key#1 branch .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#8 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#17 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#6 integrate .. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#5 integrate .. //depot/projects/docproj_nl/www/en/releases/7.2R/errata.html#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#17 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#41 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#21 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -1484,7 +1484,7 @@ logs all packets and can be used to create the legal evidence needed to prosecute the people who are attacking your system. - Another thing that should be taken care of, is to insure there is no + Another thing that should be taken care of, is to ensure there is no response returned for any of the undesirable traffic. Invalid packets should just get dropped and vanish. This way the attacker has no knowledge if his packets have reached your system. The @@ -3151,7 +3151,7 @@ and we want people on the public Internet to be able to access the local web site. The new inbound start request packet matches rule 100 and its IP address is mapped to LAN - IP for the firewall box. The packet is them matched against + IP for the firewall box. The packet is then matched against all the nasty things that need to be checked for and finally matches against rule 425. On a match two things occur. The packet rule is posted to the keep-state dynamic table but this time ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -184,6 +184,17 @@
+ LinuxCenter.Kz + Ust-Kamenogorsk + Kazakhstan + Phone: +7-705-501-6001 + Email: info@linuxcenter.kz + WWW: +
+ + + +
LinuxCenter.Ru Galernaya Street, 55 Saint-Petersburg ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2532,13 +2532,13 @@ DHCP - Internet Software Consortium (ISC) + Internet Systems Consortium (ISC) DHCP, the Dynamic Host Configuration Protocol, describes the means by which a system can connect to a network and obtain the necessary information for communication upon that network. FreeBSD - versions prior to 6.0 use the ISC (Internet Software + versions prior to 6.0 use the ISC (Internet Systems Consortium) DHCP client (&man.dhclient.8;) implementation. Later versions use the OpenBSD dhclient taken from OpenBSD 3.7. All @@ -2724,7 +2724,7 @@ This section provides information on how to configure a FreeBSD system to act as a DHCP server using the ISC - (Internet Software Consortium) implementation of the DHCP + (Internet Systems Consortium) implementation of the DHCP server. The server is not provided as part of @@ -2997,8 +2997,8 @@ information. Currently, BIND is maintained by the - Internet Software Consortium - . + Internet Systems Consortium + . @@ -3036,7 +3036,7 @@ - named, BIND, name server + named, BIND Common names for the BIND name server package within &os;. @@ -3049,8 +3049,7 @@ Reverse DNS - The opposite of forward DNS; - mapping of IP addresses to + Mapping of IP addresses to hostnames. @@ -3082,7 +3081,8 @@ - . is the root zone. + . is how the root zone is usually + referred to in documentation. @@ -3100,7 +3100,7 @@ 1.168.192.in-addr.arpa is a zone referencing all IP addresses which fall under the 192.168.1.* - IP space. + IP address space. @@ -3171,7 +3171,7 @@ How It Works In &os;, the BIND daemon is called - named for obvious reasons. + named. @@ -3218,6 +3218,7 @@ Starting BIND + BIND starting @@ -3228,10 +3229,12 @@ The default named configuration is that of a basic resolving name server, running in a - &man.chroot.8; environment. To start the server one time with + &man.chroot.8; environment, and restricted to listening on + the local IPv4 loopback address (127.0.0.1). + To start the server one time with this configuration, use the following command: - &prompt.root; /etc/rc.d/named forcestart + &prompt.root; /etc/rc.d/named onestart To ensure the named daemon is started at boot each time, put the following line into the @@ -3252,6 +3255,7 @@ Configuration Files + BIND configuration files @@ -3260,29 +3264,11 @@ Configuration files for named currently reside in /etc/namedb directory and - will need modification before use, unless all that is needed is + will need modification before use unless all that is needed is a simple resolver. This is where most of the configuration will be performed. - Using <command>make-localhost</command> - - To configure a master zone for the localhost visit the - /etc/namedb directory - and run the following command: - - &prompt.root; sh make-localhost - - If all went well, a new file should exist in the - master subdirectory. - The filenames should be localhost.rev for - the local domain name and localhost-v6.rev - for IPv6 configurations. As the default - configuration file, required information will - be present in the named.conf file. - - - <filename>/etc/namedb/named.conf</filename> // $FreeBSD$ @@ -3296,6 +3282,7 @@ // or cause huge amounts of useless Internet traffic. options { + // Relative to the chroot directory, if any directory "/etc/namedb"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; @@ -3311,11 +3298,11 @@ // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; -// In addition to the "forwarders" clause, you can force your name -// server to never initiate queries of its own, but always ask its -// forwarders only, by enabling the following line: -// -// forward only; +// These zones are already covered by the empty zones listed below. +// If you remove the related empty zones below, comment these lines out. + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // If you've got a DNS server around at your upstream provider, enter // its IP address here, and enable the line below. This will make you @@ -3324,7 +3311,20 @@ forwarders { 127.0.0.1; }; -*/ +*/ + +// If the 'forwarders' clause is not empty the default is to 'forward first' +// which will fall back to sending a query from your local server if the name +// servers in 'forwarders' do not have the answer. Alternatively you can +// force your name server to never initiate queries of its own by enabling the +// following line: +// forward only; + +// If you wish to have forwarding configured automatically based on +// the entries in /etc/resolv.conf, uncomment the following line and +// set named_auto_forward=yes in /etc/rc.conf. You can also enable +// named_auto_forward_only (the effect of which is described above). +// include "/etc/namedb/auto_forward.conf"; Just as the comment says, to benefit from an uplink's cache, forwarders can be enabled here. @@ -3344,34 +3344,187 @@ /* - * If there is a firewall between you and nameservers you want - * to talk to, you might need to uncomment the query-source - * directive below. Previous versions of BIND always asked - * questions using port 53, but BIND versions 8 and later - * use a pseudo-random unprivileged UDP port by default. - */ - // query-source address * port 53; + Modern versions of BIND use a random UDP port for each outgoing + query by default in order to dramatically reduce the possibility + of cache poisoning. All users are strongly encouraged to utilize + this feature, and to configure their firewalls to accommodate it. + + AS A LAST RESORT in order to get around a restrictive firewall + policy you can try enabling the option below. Use of this option + will significantly reduce your ability to withstand cache poisoning + attacks, and should be avoided if at all possible. + + Replace NNNNN in the example with a number between 49160 and 65530. + */ + // query-source address * port NNNNN; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. +// The traditional root hints mechanism. Use this, OR the slave zones below. +zone "." { type hint; file "named.root"; }; + +/* Slaving the following zones from the root name servers has some + significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots + 3. Greater resilience to any potential root server failure/DDoS + + On the other hand, this method requires more monitoring than the + hints file to be sure that an unexpected failure mode has not + incapacitated your server. Name servers that are serving a lot + of clients will benefit more from this approach than individual + hosts. Use with caution. + + To use this mechanism, uncomment the entries below, and comment + the hint zone above. +*/ +/* zone "." { - type hint; - file "named.root"; + type slave; + file "slave/root.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "arpa" { + type slave; + file "slave/arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; +}; +zone "in-addr.arpa" { + type slave; + file "slave/in-addr.arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; +*/ + +/* Serving the following zones locally will prevent any queries + for these zones leaving your network and going to the root + name servers. This has two significant advantages: + 1. Faster local resolution for your users + 2. No spurious traffic will be sent from your network to the roots +*/ +// RFC 1912 +zone "localhost" { type master; file "master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; + +// RFC 1912-style zone for IPv6 localhost address +zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; + +// "This" Network (RFCs 1912 and 3330) +zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Private Use Networks (RFC 1918) +zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Link-local/APIPA (RFCs 3330 and 3927) +zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; + +// TEST-NET for Documentation (RFC 3330) +zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Router Benchmark Testing (RFC 3330) +zone "18.198.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.198.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IANA Reserved - Old Class E Space +zone "240.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Unassigned Addresses (RFC 4291) +zone "1.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 ULA (RFC 4193) +zone "c.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "master/empty.db"; }; + +// IPv6 Link Local (RFC 4291) +zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; }; -zone "0.0.127.IN-ADDR.ARPA" { - type master; - file "master/localhost.rev"; -}; +// IPv6 Deprecated Site-Local Addresses (RFC 3879) +zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; }; -// RFC 3152 -zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA" { - type master; - file "master/localhost-v6.rev"; -}; +// IP6.INT is Deprecated (RFC 4159) +zone "ip6.int" { type master; file "master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! @@ -3379,26 +3532,19 @@ // Example slave zone config entries. It can be convenient to become // a slave at least for the zone your own domain is in. Ask // your network administrator for the IP address of the responsible -// primary. +// master name server. // -// Never forget to include the reverse lookup (IN-ADDR.ARPA) zone! -// (This is named after the first bytes of the IP address, in reverse -// order, with ".IN-ADDR.ARPA" appended.) +// Do not forget to include the reverse lookup zone! +// This is named after the first bytes of the IP address, in reverse +// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6. // -// Before starting to set up a primary zone, make sure you fully -// understand how DNS and BIND works. There are sometimes -// non-obvious pitfalls. Setting up a slave zone is simpler. +// Before starting to set up a master zone, make sure you fully +// understand how DNS and BIND work. There are sometimes +// non-obvious pitfalls. Setting up a slave zone is usually simpler. // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. -/* An example master zone -zone "example.net" { - type master; - file "master/example.net"; -}; -*/ - /* An example dynamic zone key "exampleorgkey" { algorithm hmac-md5; @@ -3413,14 +3559,7 @@ }; */ -/* Examples of forward and reverse slave zones -zone "example.com" { - type slave; - file "slave/example.com"; - masters { - 192.168.1.1; - }; -}; +/* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; file "slave/1.168.192.in-addr.arpa"; @@ -3469,19 +3608,19 @@ BIND zone files - + An example master zone file for example.org (existing within /etc/namedb/master/example.org) is as follows: - $TTL 3600 ; 1 hour + $TTL 3600 ; 1 hour default TTL example.org. IN SOA ns1.example.org. admin.example.org. ( 2006051501 ; Serial 10800 ; Refresh 3600 ; Retry 604800 ; Expire - 86400 ; Minimum TTL + 300 ; Negative Reponse TTL ) ; DNS Servers @@ -3502,31 +3641,24 @@ mail IN A 192.168.1.5 ; Aliases -www IN CNAME @ +www IN CNAME example.org. - - Note that every hostname ending in a . is an + Note that every hostname ending in a . is an exact hostname, whereas everything without a trailing - . is referenced to the origin. For example, - www is translated into - www.origin. - In our fictitious zone file, our origin is - example.org., so www - would translate to www.example.org. - + . is relative to the origin. For example, + ns1 is translated into + ns1.example.org. + + The format of a zone file follows: - - The format of a zone file follows: - recordname IN recordtype value DNS records - - The most commonly used DNS records: - + + The most commonly used DNS records: @@ -3567,37 +3699,39 @@ - -example.org. IN SOA ns1.example.org. admin.example.org. ( + example.org. IN SOA ns1.example.org. admin.example.org. ( 2006051501 ; Serial 10800 ; Refresh after 3 hours 3600 ; Retry after 1 hour 604800 ; Expire after 1 week - 86400 ) ; Minimum TTL of 1 day - + 300 ) ; Negative Reponse TTL - example.org. - the domain name, also the origin for this - zone file. + + the domain name, also the origin for this + zone file. + ns1.example.org. - the primary/authoritative name server for this - zone. + + the primary/authoritative name server for this + zone. + admin.example.org. - the responsible person for this zone, + + the responsible person for this zone, email address with @ - replaced. (admin@example.org becomes + replaced. (admin@example.org becomes admin.example.org) @@ -3605,91 +3739,75 @@ 2006051501 - the serial number of the file. This - must be incremented each time the zone file is - modified. Nowadays, many admins prefer a - yyyymmddrr format for the serial - number. 2006051501 would mean - last modified 05/15/2006, the latter - 01 being the first time the zone - file has been modified this day. The serial number - is important as it alerts slave name servers for a - zone when it is updated. - + + the serial number of the file. This + must be incremented each time the zone file is + modified. Nowadays, many admins prefer a + yyyymmddrr format for the serial + number. 2006051501 would mean + last modified 05/15/2006, the latter + 01 being the first time the zone + file has been modified this day. The serial number + is important as it alerts slave name servers for a + zone when it is updated. + - - IN NS ns1.example.org. + IN NS ns1.example.org. - - This is an NS entry. Every name server that is going to reply - authoritatively for the zone must have one of these entries. - + This is an NS entry. Every name server that is going to reply + authoritatively for the zone must have one of these entries. - -localhost IN A 127.0.0.1 + localhost IN A 127.0.0.1 ns1 IN A 192.168.1.2 ns2 IN A 192.168.1.3 mx IN A 192.168.1.4 mail IN A 192.168.1.5 - - The A record indicates machine names. As seen above, + The A record indicates machine names. As seen above, ns1.example.org would resolve - to 192.168.1.2. - + to 192.168.1.2. - - IN A 192.168.1.1 + IN A 192.168.1.1 This line assigns IP address 192.168.1.1 to the current origin, in this case example.org. - -www IN CNAME @ + www IN CNAME @ - - The canonical name record is usually used for giving aliases + The canonical name record is usually used for giving aliases to a machine. In the example, www is - aliased to the master machine which name equals - to domain name example.org + aliased to the master machine whose name happens + to be the same as the domain name + example.org (192.168.1.1). - CNAMEs can be used to provide alias - hostnames, or round robin one hostname among multiple - machines. - + CNAMEs can never be used together with another kind of record + for the same hostname. MX record - - IN MX 10 mail.example.org. + IN MX 10 mail.example.org. - - The MX record indicates which mail + The MX record indicates which mail servers are responsible for handling incoming mail for the zone. mail.example.org is the hostname of the mail server, and 10 being the priority of - that mail server. - + that mail server. - - One can have several mail servers, with priorities of 10, + One can have several mail servers, with priorities of 10, 20 and so on. A mail server attempting to deliver to example.org would first try the + role="domainname">example.org would first try the highest priority MX (the record with the lowest priority number), then the second highest, etc, until the mail can be - properly delivered. - + properly delivered. - - For in-addr.arpa zone files (reverse DNS), the same format is + For in-addr.arpa zone files (reverse DNS), the same format is used, except with PTR entries instead of - A or CNAME. - + A or CNAME. $TTL 3600 @@ -3698,7 +3816,7 @@ 10800 ; Refresh 3600 ; Retry 604800 ; Expire - 3600 ) ; Minimum + 300 ) ; Negative Reponse TTL IN NS ns1.example.org. IN NS ns2.example.org. @@ -3711,6 +3829,10 @@ This file gives the proper IP address to hostname mappings of our above fictitious domain. + + It is worth noting that all names on the right side + of a PTR record need to be fully qualified (i.e., end in + a .). @@ -3721,11 +3843,9 @@ caching name server - A caching name server is a name server that is not - authoritative for any zones. It simply asks queries of its - own, and remembers them for later use. To set one up, just - configure the name server as usual, omitting any inclusions of - zones. + A caching name server is a name server whose primary role + is to resolve recursive queries. It simply asks queries of its + own, and remembers the answers for later use. @@ -3763,36 +3883,30 @@ Official ISC BIND + url="https://www.isc.org/software/bind">Official ISC BIND Page Official ISC BIND + url="https://www.isc.org/software/guild">Official ISC BIND Forum - - BIND9 FAQ - - - O'Reilly DNS and BIND 5th Edition RFC1034 + url="http://www.rfc-editor.org/rfc/rfc1034.txt">RFC1034 - Domain Names - Concepts and Facilities RFC1035 + url="http://www.rfc-editor.org/rfc/rfc1035.txt">RFC1035 - Domain Names - Implementation and Specification @@ -3863,7 +3977,7 @@ This specifies the default directory hierarchy for the Apache installation. Binaries are stored in the - bin and + bin and sbin subdirectories of the server root, and configuration files are stored in etc/apache. @@ -4153,7 +4267,7 @@ from the ports system. &prompt.root; cd /usr/ports/www/rubygem-rails; make all install clean - + mod_perl @@ -5087,7 +5201,7 @@ Similar to log servers, clients must also meet a few minimum requirements: - + &man.syslogd.8; must be configured to send messages of ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#29 (text+ko) ==== @@ -1,7 +1,7 @@ OPTIONS definition must appear before - the inclusion of bsd.port.pre.mk. + the inclusion of bsd.port.options.mk. The WITH_* and WITHOUT_* variables can only be tested after the inclusion of - bsd.port.pre.mk. - + bsd.port.options.mk. Inclusion of + bsd.port.pre.mk can be used instead, too, + and is still widely used in ports written before the introduction + of bsd.port.options.mk. But be aware that + some variables will not work as expected after the inclusion of + bsd.port.pre.mk, typically + USE_* flags. - - Example Simple use of <makevar>OPTIONS</makevar> OPTIONS= FOO "Enable option foo" On \ BAR "Support feature bar" Off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 25 17:48:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A58A2106578E; Mon, 25 May 2009 17:48: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 62779106578B for ; Mon, 25 May 2009 17:48:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5181F8FC20 for ; Mon, 25 May 2009 17:48:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PHmppk097341 for ; Mon, 25 May 2009 17:48:51 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PHmpB4097339 for perforce@freebsd.org; Mon, 25 May 2009 17:48:51 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 17:48:51 GMT Message-Id: <200905251748.n4PHmpB4097339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162731 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, 25 May 2009 17:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162731 Change 162731 by trasz@trasz_victim on 2009/05/25 17:48:43 Makes including less ugly. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/acl.h#3 add .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/opensolaris_acl.h#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#24 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include #include -#include +#include struct zfs2bsd { uint32_t zb_zfs; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#24 (text+ko) ==== @@ -66,13 +66,7 @@ #include #include #include - -/* - * Pull FreeBSD sys/acl.h, not the ZFS one. - */ -#include "../../../../../../../sys/acl.h" - -#include +#include /* * Programming rules. From owner-p4-projects@FreeBSD.ORG Mon May 25 18:09:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FB901065698; Mon, 25 May 2009 18: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 2C0941065692 for ; Mon, 25 May 2009 18:09:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00DEF8FC4D for ; Mon, 25 May 2009 18:09:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PI9BU9000633 for ; Mon, 25 May 2009 18:09:11 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PI9Bjl000631 for perforce@freebsd.org; Mon, 25 May 2009 18:09:11 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 18:09:11 GMT Message-Id: <200905251809.n4PI9Bjl000631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162732 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, 25 May 2009 18:09:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=162732 Change 162732 by trasz@trasz_victim on 2009/05/25 18:08:25 Improve the include situation even more. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#5 (text+ko) ==== @@ -37,7 +37,7 @@ * included instead of FreeBSD one. Pull the original sys/acl.h as well. */ #undef _SYS_ACL_H -#include "../../../../../../sys/acl.h" +#include_next #define _SYS_ACL_H #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon May 25 19:06:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 181D81065678; Mon, 25 May 2009 19:06:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1E6E106566C for ; Mon, 25 May 2009 19:06:10 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F8C58FC17 for ; Mon, 25 May 2009 19:06:10 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PJ6ATA006999 for ; Mon, 25 May 2009 19:06:10 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PJ6A9R006997 for perforce@freebsd.org; Mon, 25 May 2009 19:06:10 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 19:06:10 GMT Message-Id: <200905251906.n4PJ6A9R006997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162734 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, 25 May 2009 19:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162734 Change 162734 by trasz@trasz_victim on 2009/05/25 19:05:42 Whitespace fixes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#14 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#10 (text) ==== @@ -84,4 +84,3 @@ acl_strip_np; acl_to_text_np; }; - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#10 (text+ko) ==== @@ -62,12 +62,14 @@ int _acl_brand(const acl_t acl) { + return (acl->ats_brand); } int _entry_brand(const acl_entry_t entry) { + return (_acl_brand(entry2acl(entry))); } @@ -77,6 +79,7 @@ int _acl_brand_may_be(const acl_t acl, int brand) { + if (_acl_brand(acl) == ACL_BRAND_UNKNOWN) return (1); @@ -89,6 +92,7 @@ int _entry_brand_may_be(const acl_entry_t entry, int brand) { + return (_acl_brand_may_be(entry2acl(entry), brand)); } @@ -98,6 +102,7 @@ void _acl_brand_as(acl_t acl, int brand) { + assert(_acl_brand_may_be(acl, brand)); acl->ats_brand = brand; @@ -106,23 +111,23 @@ void _entry_brand_as(const acl_entry_t entry, int brand) { + _acl_brand_as(entry2acl(entry), brand); } int _acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type) { + switch (_acl_brand(acl)) { case ACL_BRAND_NFS4: if (type == ACL_TYPE_NFS4) return (0); - break; case ACL_BRAND_POSIX: if (type == ACL_TYPE_ACCESS || type == ACL_TYPE_DEFAULT) return (0); - break; } @@ -132,16 +137,15 @@ void _acl_brand_from_type(acl_t acl, acl_type_t type) { + switch (type) { case ACL_TYPE_NFS4: _acl_brand_as(acl, ACL_BRAND_NFS4); break; - case ACL_TYPE_ACCESS: case ACL_TYPE_DEFAULT: _acl_brand_as(acl, ACL_BRAND_POSIX); break; - default: /* XXX: What to do here? */ break; @@ -151,13 +155,12 @@ int acl_get_brand_np(acl_t acl, int *brand_p) { + if (acl == NULL || brand_p == NULL) { errno = EINVAL; return (-1); } - *brand_p = _acl_brand(acl); return (0); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.c#5 (text+ko) ==== @@ -54,7 +54,6 @@ errno = EINVAL; return (-1); } - _acl_brand_as(*acl_p, ACL_BRAND_POSIX); /* ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#9 (text+ko) ==== ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#5 (text+ko) ==== @@ -30,11 +30,13 @@ #include #include #include + #include "acl_support.h" static int _flag_is_invalid(acl_flag_t flag) { + if ((flag & ACL_FLAGS_BITS) == flag) return (0); @@ -46,6 +48,7 @@ int acl_add_flag_np(acl_flagset_t flagset_d, acl_flag_t flag) { + if (flagset_d == NULL) { errno = EINVAL; return (-1); @@ -62,6 +65,7 @@ int acl_clear_flags_np(acl_flagset_t flagset_d) { + if (flagset_d == NULL) { errno = EINVAL; return (-1); @@ -75,6 +79,7 @@ int acl_delete_flag_np(acl_flagset_t flagset_d, acl_flag_t flag) { + if (flagset_d == NULL) { errno = EINVAL; return (-1); @@ -91,6 +96,7 @@ int acl_get_flag_np(acl_flagset_t flagset_d, acl_flag_t flag) { + if (flagset_d == NULL) { errno = EINVAL; return (-1); @@ -108,6 +114,7 @@ int acl_get_flagset_np(acl_entry_t entry_d, acl_flagset_t *flagset_p) { + if (entry_d == NULL || flagset_p == NULL) { errno = EINVAL; return (-1); @@ -126,6 +133,7 @@ int acl_set_flagset_np(acl_entry_t entry_d, acl_flagset_t flagset_d) { + if (entry_d == NULL) { errno = EINVAL; return (-1); @@ -145,4 +153,3 @@ return (0); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#11 (text+ko) ==== @@ -53,15 +53,14 @@ static int parse_tag(const char *str, acl_entry_t entry, int *need_qualifier) { + assert(need_qualifier != NULL); *need_qualifier = 0; if (strcmp(str, "owner@") == 0) return (acl_set_tag_type(entry, ACL_USER_OBJ)); - if (strcmp(str, "group@") == 0) return (acl_set_tag_type(entry, ACL_GROUP_OBJ)); - if (strcmp(str, "everyone@") == 0) return (acl_set_tag_type(entry, ACL_EVERYONE)); @@ -69,7 +68,6 @@ if (strcmp(str, "user") == 0 || strcmp(str, "u") == 0) return (acl_set_tag_type(entry, ACL_USER)); - if (strcmp(str, "group") == 0 || strcmp(str, "g") == 0) return (acl_set_tag_type(entry, ACL_GROUP)); @@ -176,15 +174,13 @@ static int parse_entry_type(const char *str, acl_entry_t entry) { + if (strcmp(str, "allow") == 0) return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALLOW)); - if (strcmp(str, "deny") == 0) return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_DENY)); - if (strcmp(str, "audit") == 0) return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_AUDIT)); - if (strcmp(str, "alarm") == 0) return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALARM)); @@ -314,4 +310,3 @@ errno = EINVAL; return (-1); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.c#11 (text+ko) ==== @@ -222,6 +222,7 @@ int acl_get_entry_type_np(acl_entry_t entry_d, acl_entry_type_t *entry_type_p) { + if (entry_d == NULL || entry_type_p == NULL) { errno = EINVAL; return (-1); @@ -236,4 +237,3 @@ return (0); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.c#8 (text+ko) ==== @@ -107,6 +107,7 @@ int acl_set_fd(int fd, acl_t acl) { + if (fpathconf(fd, _PC_EXTENDED_SECURITY_NP)) return (acl_set_fd_np(fd, acl, ACL_TYPE_NFS4)); @@ -154,17 +155,14 @@ } if ((*permset_d & ACL_POSIX1E_BITS) != *permset_d) { - if ((*permset_d & ACL_NFS4_PERM_BITS) != *permset_d) { errno = EINVAL; return (-1); } - if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) { errno = EINVAL; return (-1); } - _entry_brand_as(entry_d, ACL_BRAND_NFS4); } @@ -180,11 +178,11 @@ int acl_set_qualifier(acl_entry_t entry_d, const void *tag_qualifier_p) { + if (!entry_d || !tag_qualifier_p) { errno = EINVAL; return (-1); } - switch(entry_d->ae_tag) { case ACL_USER: case ACL_GROUP: @@ -218,16 +216,13 @@ errno = EINVAL; return (-1); } - _entry_brand_as(entry_d, ACL_BRAND_POSIX); break; - case ACL_EVERYONE: if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) { errno = EINVAL; return (-1); } - _entry_brand_as(entry_d, ACL_BRAND_NFS4); break; } @@ -251,16 +246,15 @@ int acl_set_entry_type_np(acl_entry_t entry_d, acl_entry_type_t entry_type) { + if (entry_d == NULL) { errno = EINVAL; return (-1); } - if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) { errno = EINVAL; return (-1); } - _entry_brand_as(entry_d, ACL_BRAND_NFS4); switch (entry_type) { @@ -268,7 +262,6 @@ case ACL_ENTRY_TYPE_DENY: case ACL_ENTRY_TYPE_AUDIT: case ACL_ENTRY_TYPE_ALARM: - entry_d->ae_entry_type = entry_type; return (0); } @@ -276,4 +269,3 @@ errno = EINVAL; return (-1); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#8 (text+ko) ==== @@ -198,4 +198,3 @@ return (-1); } } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#8 (text+ko) ==== @@ -92,6 +92,7 @@ static int _posix1e_acl_entry_compare(struct acl_entry *a, struct acl_entry *b) { + assert(_entry_brand(a) == ACL_BRAND_POSIX); assert(_entry_brand(b) == ACL_BRAND_POSIX); @@ -151,6 +152,7 @@ int _posix1e_acl(acl_t acl, acl_type_t type) { + if (_acl_brand(acl) != ACL_BRAND_POSIX) return (0); @@ -431,13 +433,12 @@ int _acl_type_unold(acl_type_t type) { + switch (type) { case ACL_TYPE_ACCESS_OLD: return (ACL_TYPE_ACCESS); - case ACL_TYPE_DEFAULT_OLD: return (ACL_TYPE_DEFAULT); - default: return (type); } @@ -447,9 +448,9 @@ string_skip_whitespace(char *string) { - while (*string && ((*string == ' ') || (*string == '\t'))) { + while (*string && ((*string == ' ') || (*string == '\t'))) string++; - } + return (string); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#12 (text+ko) ==== @@ -75,6 +75,7 @@ static const char * format_flag(uint32_t *var, const struct flagnames_struct *flags) { + for (; flags->name != 0; flags++) { if ((flags->flag & *var) == 0) continue; @@ -205,6 +206,7 @@ int _nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose) { + if (verbose) return (format_flags_verbose(str, size, var, a_flags)); @@ -214,6 +216,7 @@ int _nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose) { + if (verbose) return (format_flags_verbose(str, size, var, a_access_masks)); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#7 (text+ko) ==== @@ -242,13 +242,12 @@ char * acl_to_text_np(acl_t acl, ssize_t *len_p, int flags) { + switch (_acl_brand(acl)) { case ACL_BRAND_POSIX: return (_posix1e_acl_to_text(acl, len_p, flags)); - case ACL_BRAND_NFS4: return (_nfs4_acl_to_text_np(acl, len_p, flags)); - default: errno = EINVAL; return (NULL); @@ -258,6 +257,6 @@ char * acl_to_text(acl_t acl, ssize_t *len_p) { + return (acl_to_text_np(acl, len_p, 0)); } - ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#14 (text+ko) ==== @@ -120,19 +120,15 @@ case ACL_ENTRY_TYPE_ALLOW: snprintf(str, size, "allow"); break; - case ACL_ENTRY_TYPE_DENY: snprintf(str, size, "deny"); break; - case ACL_ENTRY_TYPE_AUDIT: snprintf(str, size, "audit"); break; - case ACL_ENTRY_TYPE_ALARM: snprintf(str, size, "alarm"); break; - default: return (-1); } @@ -268,4 +264,3 @@ return (str); } - From owner-p4-projects@FreeBSD.ORG Mon May 25 19:30:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3FFA1065692; Mon, 25 May 2009 19:30:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D5DF106568A for ; Mon, 25 May 2009 19:30:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22F4D8FC27 for ; Mon, 25 May 2009 19:30:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PJUZRk008994 for ; Mon, 25 May 2009 19:30:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PJUZgA008992 for perforce@freebsd.org; Mon, 25 May 2009 19:30:35 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 19:30:35 GMT Message-Id: <200905251930.n4PJUZgA008992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162735 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, 25 May 2009 19:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162735 Change 162735 by trasz@trasz_victim on 2009/05/25 19:30:06 Add milestones. Affected files ... .. //depot/projects/soc2009/trasz_limits/MILESTONES#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 25 19:47:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C32A1065675; Mon, 25 May 2009 19:47: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 F06D31065673 for ; Mon, 25 May 2009 19:47:52 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF1D28FC34 for ; Mon, 25 May 2009 19:47:52 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PJlqV3010288 for ; Mon, 25 May 2009 19:47:52 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PJlqI3010286 for perforce@freebsd.org; Mon, 25 May 2009 19:47:52 GMT (envelope-from truncs@FreeBSD.org) Date: Mon, 25 May 2009 19:47:52 GMT Message-Id: <200905251947.n4PJlqI3010286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 162737 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, 25 May 2009 19:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=162737 Change 162737 by truncs@aditya on 2009/05/25 19:47:26 Updated COPYRIGHT.INFO Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 (text+ko) ==== @@ -12,13 +12,14 @@ ext2_bitmap.c (in the cvs attic) ext2_fs.h - ext2_fs_i.h + ext2_fs_i.h (in the cvs attic) ext2_fs_sb.h ext2_linux_balloc.c ext2_linux_ialloc.c ext2_super.c (in the cvs attic) ext2_vfsops.c (has some GPL'ed code from ext2_super.c) i386-bitops.h + sparc64-bitops.h PS. THANKS GODMAR!!! From owner-p4-projects@FreeBSD.ORG Mon May 25 20:11:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50C4F1065673; Mon, 25 May 2009 20:11: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 0B5091065672 for ; Mon, 25 May 2009 20:11:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB4E38FC14 for ; Mon, 25 May 2009 20:11:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PKBL0Z013960 for ; Mon, 25 May 2009 20:11:21 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PKBGqU013948 for perforce@freebsd.org; Mon, 25 May 2009 20:11:16 GMT (envelope-from trasz@freebsd.org) Date: Mon, 25 May 2009 20:11:16 GMT Message-Id: <200905252011.n4PKBGqU013948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162738 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, 25 May 2009 20:11:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=162738 Change 162738 by trasz@trasz_victim on 2009/05/25 20:10:43 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/chflags/chflags.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/cp/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/print.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/ChangeLog#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/database#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/erlang#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/kml#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/linux#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/python#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/windows#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Makefile.am#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/README#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/apprentice.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/apptype.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/cdf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/cdf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/cdf_time.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/compress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/config.guess#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/file/config.h.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/config.sub#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/file/configure#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/configure.ac#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/file.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/file.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/funcs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/getopt_long.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/magic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/patchlevel.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/readcdf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/softmagic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/file/strlcat.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/file/strlcpy.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/file/tests/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/PROTOCOL#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/README#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/addrmatch.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2-jpake.c#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/auth2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/canohost.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/channels.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/channels.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/cipher.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/cipher.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/compat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/compat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.guess#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/config.h.in#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/defines.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.c#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/jpake.h#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/key.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/nchan.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/bsd-poll.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/packet.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/readconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/schnorr.c#1 branch .. //depot/projects/soc2009/trasz_limits/crypto/openssh/scp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/servconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/servconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/session.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp-server-main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp.1#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sftp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.1#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/crypto/openssh/version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/idmapd#2 delete .. //depot/projects/soc2009/trasz_limits/include/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_compat.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_delete.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_entry.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_init.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_set.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_set.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_valid.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/time2posix.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/tzfile.5#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/tzfile.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc_r/arch/i386/_atomic_lock.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libgeom/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/i386/_setjmp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/stand.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/e_sqrtf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_lrint.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_lrintf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_remquo.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_remquof.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbn.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbnf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/amd64/s_scalbnl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceil.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_ceill.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysign.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysignf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_copysignl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_cos.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_finite.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floor.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_floorl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_llrint.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_llrintf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_logb.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_logbf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_lrint.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_lrintf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_remquo.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_remquof.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_rint.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_rintf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbn.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbnf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_scalbnl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_significand.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_significandf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_sin.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_tan.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_trunc.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/i387/s_truncl.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/ia64/s_fma.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/ia64/s_fmaf.S#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/ia64/s_fmal.S#2 integrate .. //depot/projects/soc2009/trasz_limits/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/soc2009/trasz_limits/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/rescue/rescue/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/core/geom.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/idmapd/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/sbin/idmapd/idmapd.8#2 delete .. //depot/projects/soc2009/trasz_limits/sbin/idmapd/idmapd.c#2 delete .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/restore/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/altq.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ath.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/bge.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/geom.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ipsec.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/md.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/msk.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/nge.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/uchcom.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/usb.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/usb2_core.4#2 delete .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/acl.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/atomic.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/sbuf.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/iso639#2 integrate .. //depot/projects/soc2009/trasz_limits/share/syscons/keymaps/uk.iso-ctrl.kbd#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/bwiphy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwireg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/README.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_var.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/mca.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_info.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/bpf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_llatbl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_llatbl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_loop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/netisr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/vnet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipx/spx.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipx/spx_reass.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipx/spx_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_dev.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_idmap.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_socket.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_subs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vfs_subs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vfsops.c#3 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vn_subs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4_vnops.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/mutex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ocpbus.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/rpcclnt.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/rpc/rpcclnt.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/acl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/buf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/interrupt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/systm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vimage.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/KSE/ksetest/kse_asm.S#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/KSE/rr/kse_asm.S#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/date/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/date/regress.sh#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/date/regress.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/README#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/iso/check-iso3166.pl#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/iso/check-iso639.pl#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/gateworks/common#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/net80211/scripts/setup.tdma-slave#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/main.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/npestats.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/npestats.h#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/statfoo.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/npe/npestats/statfoo.h#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/find/function.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/perror/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/perror/perror.1#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/perror/perror.c#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/compile.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/defs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/process.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/sed.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bluetooth/btpand/btpand.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsv4.4#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/stablerestart.5#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pwd_mkdb/pwd_mkdb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/Arts.htm#2 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/README#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/Theory#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/ialloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/scheck.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/tz-art.htm#2 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/tz-link.htm#2 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zdump.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zdump.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zic.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.188 2009/04/18 22:16:46 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.190 2009/05/23 16:54:07 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090522: removal of University of Michigan NFSv4 client +OLD_FILES+=etc/rc.d/idmapd +OLD_FILES+=sbin/idmapd +OLD_FILES+=sbin/mount_nfs4 +OLD_FILES+=usr/share/man/man8/idmapd.8.gz +OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz +# 20090513: removal of legacy versions of USB network interface drivers +OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h # 20090417: removal of legacy versions of USB network interface drivers OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h ==== //depot/projects/soc2009/trasz_limits/UPDATING#2 (text+ko) ==== @@ -22,6 +22,28 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090523: + The layout of struct vnet_net has changed, therefore modules + need to be rebuilt. + Bump __FreeBSD_version to 800090. + +20090523: + The newly imported zic(8) produces a new format in the + output. Please run tzsetup(8) to install the newly created + data to /etc/localtime. + +20090520: + The sysctl tree for the usb stack has renamed from hw.usb2.* to + hw.usb.* and is now consistent again with previous releases. + +20090520: + 802.11 monitor mode support was revised and driver api's + were changed. Drivers dependent on net80211 now support + DLT_IEEE802_11_RADIO instead of DLT_IEEE802_11. No + user-visible data structures were changed but applications + that use DLT_IEEE802_11 may require changes. + Bump __FreeBSD_version to 800088. + 20090430: The layout of the following structs has changed: sysctl_oid, socket, ifnet, inpcbinfo, tcpcb, syncache_head, vnet_inet, @@ -262,7 +284,7 @@ memory segment of size > 2 GB on the 64-bit architectures. Due to a limitation of the existing ABI, the shm_segsz member of the struct shmid_ds, returned by shmctl(IPC_STAT) call is - wrong for large segments. Note that limits must be explicitely + wrong for large segments. Note that limits must be explicitly raised to allow such segments to be created. 20090301: @@ -1513,4 +1535,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.598 2009/04/30 13:36:26 zec Exp $ +$FreeBSD: src/UPDATING,v 1.604 2009/05/23 21:43:44 zec Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.25 2009/05/24 15:27:25 jilles Exp $"); #include #include @@ -115,7 +115,7 @@ fts_options |= FTS_LOGICAL; } } else - fts_options = FTS_LOGICAL; + fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL; /* XXX: Why don't chflags and lchflags have compatible prototypes? */ if (hflag) ==== //depot/projects/soc2009/trasz_limits/bin/cp/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/cp/Makefile,v 1.11 2002/07/15 12:08:21 sheldonh Exp $ +# $FreeBSD: src/bin/cp/Makefile,v 1.12 2009/05/22 15:56:43 trasz Exp $ PROG= cp SRCS= cp.c utils.c -CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED +CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED -D_ACL_PRIVATE .include ==== //depot/projects/soc2009/trasz_limits/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.99 2009/05/17 04:00:43 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.100 2009/05/24 15:32:34 jilles Exp $"); #include #include @@ -596,6 +596,10 @@ char obuff[128]; v = ve->var; + if (!k->ki_valid) { + (void)printf("%-*s", v->width, "-"); + return; + } val = now - k->ki_p->ki_start.tv_sec; days = val / (24 * 60 * 60); val %= 24 * 60 * 60; ==== //depot/projects/soc2009/trasz_limits/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.115 2009/05/17 04:00:43 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.116 2009/05/18 01:45:52 brian Exp $"); #include #include @@ -764,7 +764,7 @@ strlcat(pathbuf2, elem, sizeof(pathbuf2)); if (stat(pathbuf2, &sb) == 0 && S_ISCHR(sb.st_mode)) { /* No need to repeat stat() && S_ISCHR() checks */ - ttypath = NULL; + ttypath = NULL; break; } /* Check to see if /dev/pts/${elem} exists */ @@ -772,7 +772,7 @@ strlcat(pathbuf3, elem, sizeof(pathbuf3)); if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) { /* No need to repeat stat() && S_ISCHR() checks */ - ttypath = NULL; + ttypath = NULL; break; } break; @@ -992,7 +992,6 @@ ki[src].ki_d.prefix[n * 2] = path[n / 8] & 1 << (n % 8) ? '|' : ' '; ki[src].ki_d.prefix[n * 2 + 1] = ' '; - } if (n == lvl - 2) { /* Have I any more siblings? */ ==== //depot/projects/soc2009/trasz_limits/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,59 @@ +2009-05-06 10:25 Christos Zoulas + + * Avoid null dereference in cdf code (Drew Yao) + + * More cdf bounds checks and overflow checks + +2009-05-01 18:37 Christos Zoulas + + * Buffer overflow fixes from Drew Yao + +2009-04-30 17:10 Christos Zoulas + + * Fix more cdf lossage. All the documents I have + right now print the correct information. + +2009-03-27 18:43 Christos Zoulas + + * don't print \012- separators in the same magic entry + if it consists of multiple magic printing lines. + +2009-03-23 10:20 Christos Zoulas + + * Avoid file descriptor leak in compress code from + (Daniel Novotny) + +2009-03-18 16:50 Christos Zoulas + + * Allow escaping of relation characters, so that we can say \^[A-Z] + and the ^ is not eaten as a relation char. + + * Fix troff and fortran to their previous glory using + regex. This was broken since their removel from ascmagic. + +2009-03-10 16:50 Christos Zoulas + + * don't use strlen in strndup() (Toby Peterson) + +2009-03-10 7:45 Christos Zoulas + + * avoid c99 syntax. + +2009-02-23 15:45 Christos Zoulas + + * make the cdf code use the buffer first if available, + and then the fd code. + +2009-02-13 13:45 Christos Zoulas + + * look for struct option to determine if getopt.h is usable for IRIX. + + * sanitize cdf document strings + +2009-02-04 13:25 Christos Zoulas + + * fix OS/2 warnings. + 2008-12-12 15:50 Christos Zoulas * fix initial offset calculation for non 4K sector files ==== //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/cafebabe#2 (text+ko) ==== @@ -17,6 +17,15 @@ >4 belong >30 compiled Java class data, >>6 beshort x version %d. >>4 beshort x \b%d +# Which is which? +#>>4 belong 0x032d (Java 1.0) +#>>4 belong 0x032d (Java 1.1) +>>4 belong 0x002e (Java 1.2) +>>4 belong 0x002f (Java 1.3) +>>4 belong 0x0030 (Java 1.4) +>>4 belong 0x0031 (Java 1.5) +>>4 belong 0x0032 (Java 1.6) + 0 belong 0xcafebabe >4 belong 1 Mach-O fat file with 1 architecture ==== //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/compress#2 (text+ko) ==== @@ -195,6 +195,10 @@ # bug #364260) #0 string ]\000\000\200\000 LZMA compressed data +# http://tukaani.org/xz/xz-file-format.txt +0 ustring \xFD7zXZ\x00 xz compressed data +!:mime application/x-xz + # AFX compressed files (Wolfram Kleff) 2 string -afx- AFX compressed file data @@ -208,3 +212,8 @@ >4 byte x - version %d >5 byte x \b.%d >6 belong x (%d bytes) + +# Type: XZ +# URL: http://tukaani.org/xz/ +0 string \xfd\x37\x7a\x58\x5a\x00 XZ compressed data +!:mime application/x-xz ==== //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/database#2 (text+ko) ==== @@ -242,3 +242,28 @@ # URL: http://www.grc.nasa.gov/WWW/cgns/adf/ # From: Nicolas Chauvat 0 string @(#)ADF\ Database CGNS Advanced Data Format + +# Tokyo Cabinet magic data +# http://tokyocabinet.sourceforge.net/index.html +0 string ToKyO\ CaBiNeT\n Tokyo Cabinet +>14 string x \b (%s) +>32 byte 0 \b, Hash +!:mime application/x-tokyocabinet-hash +>32 byte 1 \b, B+ tree +!:mime application/x-tokyocabinet-btree +>32 byte 2 \b, Fixed-length +!:mime application/x-tokyocabinet-fixed +>32 byte 3 \b, Table +!:mime application/x-tokyocabinet-table +>33 byte &1 \b, [open] +>33 byte &2 \b, [fatal] +>34 byte x \b, apow=%d +>35 byte x \b, fpow=%d +>36 byte &0x01 \b, [large] +>36 byte &0x02 \b, [deflate] +>36 byte &0x04 \b, [bzip] +>36 byte &0x08 \b, [tcbs] +>36 byte &0x10 \b, [excodec] +>40 lequad x \b, bnum=%lld +>48 lequad x \b, rnum=%lld +>56 lequad x \b, fsiz=%lld ==== //depot/projects/soc2009/trasz_limits/contrib/file/Magdir/erlang#2 (text+ko) ==== @@ -12,7 +12,7 @@ >8 string BEAM Erlang BEAM file # 4.2 version may have a copyright notice! -4 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2 -79 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 25 21:44:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF1B51065672; Mon, 25 May 2009 21:44:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8ED7A106564A for ; Mon, 25 May 2009 21:44:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BE348FC0A for ; Mon, 25 May 2009 21:44:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PLi2SO044199 for ; Mon, 25 May 2009 21:44:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PLi21r044197 for perforce@freebsd.org; Mon, 25 May 2009 21:44:02 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 25 May 2009 21:44:02 GMT Message-Id: <200905252144.n4PLi21r044197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162743 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, 25 May 2009 21:44:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=162743 Change 162743 by rene@rene_self on 2009/05/25 21:43:21 MFen handbook/network-servers 1.116 -> 1.118 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#19 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#19 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.48 2006/01/05 21:13:23 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.116 + %SRCID% 1.118 --> @@ -24,6 +24,10 @@ Mazeland Vertaald door + + René + Ladan + @@ -2735,15 +2739,15 @@ DHCP - Internet Software Consortium (ISC) + Internet Systems Consortium (ISC) DHCP, het Dynamic Host Configuration Protocol, schrijft voor hoe een systeem verbinding kan maken met een netwerk en hoe het de benodigde informatie kan krijgen om met dat netwerk te - communiceren. &os; versies eerder dan 6.0 gebruiken de ISC - (Internet Software Consortium) DHCP-cliënt - (&man.dhclient.8;) implementatie. Latere versies gebruiken de - OpenBSD dhclient die uit OpenBSD 3.7 + communiceren. &os; versies eerder dan 6.0 gebruiken de + implementatie van de DHCP-cliënt van het ISC (Internet + Systems Consortium), &man.dhclient.8;. Latere versies gebruiken + de OpenBSD dhclient die uit OpenBSD 3.7 komt. Alle informatie over dhclient kan zowel voor de ISC als de OpenBSD DHCP-cliënt gebruikt worden. De DHCP-server zit bij de ISC-distributie. @@ -2950,7 +2954,7 @@ In dit onderdeel wordt beschreven hoe een &os; systeem zo ingesteld kan worden dat het opereert als DHCP-server door - gebruik te maken van de ISC (Internet Software Consortium) + gebruik te maken van de ISC (Internet Systems Consortium) implementatie van de DHCP-server. De server wordt niet geleverd als deel van &os; en om deze @@ -3249,8 +3253,8 @@ Domain (TLD), en andere kleinschaligere naamservers die individuele domeininformatie hosten en cachen. - Op dit moment wordt BIND beheerd door het Internet Software - Consortium . + Op dit moment wordt BIND beheerd door het Internet Systems + Consortium . @@ -3294,8 +3298,7 @@ - named, BIND, - naamserver + named, BIND Vaak gebruikte namen voor het naamserverpakket BIND in &os;. @@ -3312,8 +3315,7 @@ Reverse DNS - Het tegenovergestelde van voorwaartse DNS; het - afbeelden van IP-adressen op + Het afbeelden van IP-adressen op hostnamen. @@ -3347,7 +3349,8 @@ - . is de rootzone. + . is hoe de rootzone normaliter in de + documentatie genoemd wordt. @@ -3364,7 +3367,7 @@ 1.168.192.in-addr.arpa is een zone die naar alle IP-adressen verwijst die onder - de IP-ruimte IP-adresruimte 192.168.1.* vallen. @@ -3438,7 +3441,7 @@ Hoe het werkt - Om begrijpelijke redenen heet de daemon BIND in &os; + De daemon BIND heet in &os; named. @@ -3503,11 +3506,12 @@ De standaardconfiguratie van named is die van een eenvoudige - resolvende naamserver, draaiende in een &man.chroot.8;-omgeving. - Gebruik het volgende commando om de server eenmaal met deze - configuratie te starten: + resolverende naamserver, draaiende in een &man.chroot.8;-omgeving, + en beperkt tot het luisteren op het lokale IPv4-teruglusadres + (127.0.0.1). Gebruik het volgende commando om de server eenmaal + met deze configuratie te starten: - &prompt.root; /etc/rc.d/named forcestart + &prompt.root; /etc/rc.d/named onestart Om er zeker van te zijn dat de daemon named elke keer bij het opstarten @@ -3543,25 +3547,6 @@ nodig is. Hier vindt de meeste configuratie plaats. - <command>make-localhost</command> gebruiken - - Ga om een masterzone voor de lokale host in te stellen - naar de map /etc/namedb - en draai het volgende commando: - - &prompt.root; sh make-localhost - - Als alles goed ging zou er een nieuw bestand in de submap - master moeten staan. - De bestandsnamen zouden localhost.rev - voor de lokale domeinnaam en - localhost-v6.rev voor - IPv6-configuraties moeten zijn. Voor het - standaardinstellingenbestand staat de benodigde informatie in - het bestand named.conf. - - - <filename>/etc/namedb/named.conf</filename> // $FreeBSD$$ @@ -3574,6 +3559,7 @@ // Internetverkeer veroorzaken. options { + // Relatief aan de chroot-map, indien aanwezig directory "/etc/namedb"; pid-file "/var/run/named/pid" dump-file "/var/dump/named_dump.db" @@ -3592,12 +3578,12 @@ // sleutelwoord "any" gegeven te worden. // listen-on-v6 { ::1; }; -// Als aanvulling op de "forwarders" clausule kan de naamserver ook -// worden aangegeven dat hij nooit zelf verzoeken mag maken, maar dat -// altijd aan zijn forwarders moet vragen door de volgende regel te -// activeren: -// -// forward only; +// Deze zones zijn reeds opgenomen door de lege zones die hieronder +// staan. Als u de gerelateerde lege zones hieronder verwijdert, +// dienen deze regels uitgecommentarieerd te worden. + disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; + disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; + disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA"; // Als er een DNS-server beschikbaar is bij een upstream provider dan // kan het IP-adres op de regel hieronder ingegeven worden en kan die @@ -3607,7 +3593,23 @@ forwarders { 127.0.0.1; }; -*/ + +*/ + +// Als de 'forwarders'-clausule niet leeg is, is de standaard om "forward +// first" te gebruiken, welke terug zal vallen op het versturen van een +// verzoek naar uw lokale server als de naamservers in 'forwarders' het +// antwoord niet weten. Als alternatief kunt u uw naamserver dwingen om +// nooit zelf verzoeken in te dienen door de volgende regel aan te +// zetten: +// forward only; + +// Als u forwarding automatisch wilt configureren gebaseerd op de regels +// in /etc/resolv.conf, verwijder dan het commentaar van de volgende +// regel en stel named_auto_forward=yes in in /etc/rc.conf. U kunt ook +// named_auto_forward_only aanzetten (het effect hiervan is hierboven +// beschreven). +// include "/etc/namedb/auto_forward.conf"; Zoals al in het commentaar staat kan van een cache in de uplink geprofiteerd worden als forwarders @@ -3629,62 +3631,214 @@ /* - * Als er een firewall tussen een host en naamservers staat waarmee - * gesproken moet worden, dan dient het commentaar voor de - * query-source directive hieronder verwijderd te worden. In eerdere - * versies van BIND werden verzoeken altijd via poort 53 gedaan, maar - * versie 8 en later van BIND gebruiken standaard een pseudo-random - * poort zonder privileges. - */ - // query-source address * port 53; + Moderne versies van BIND gebruiken standaard een random + UDP-poort voor elk uitgaand verzoek om de kans op cache + poisoning drastisch te verminderen. Alle gebruikers wordt met + klem verzocht om deze mogelijkheid te gebruiken en hun + firewalls overeenkomstig aan te passen. + + ALS EEN LAATSTE UITVLUCHT om om een beperkende firewall heen + te werken kunt u proberen om onderstaande optie aan te zetten. + Het gebruik van deze optie vermindert uw kans om een cache + poisoning aanval te weerstaan aanzienlijk, en dient indien + mogelijk te worden vermeden. + + Vervang NNNNN in het voorbeeld door een getal tussen 49160 en + 65530. + */ + // query-source address * port NNNNN; }; // Als er een lokale naamserver wordt gebruikt, vergeet dan niet om // eerst 127.0.0.1 in /etc/resolv.conf te zetten zodat die gevraagd // wordt. Controleer ook dat het in /etc/rc.conf is aangezet. +// Het traditionele root-hint-mechanisme. Gebruik dit OF de +// onderstaande slaafzones. +zone "." { type hint; file "named.root"; }; + +/* Het slaaf maken van de volgende zones vanaf de root-naamservers + heeft een aantal aanzienlijke voordelen: + 1. Snellere lokale resolutie voor uw gebruikers + 2. Geen vals verkeer dat vanaf uw netwerk naar de roots wordt verzonden + 3. Betere weerstand tegen elke mogelijk falen van de rootserver/DDoS + + Wel is het zo dat deze methode meer toezicht vraagt dan het + hintbestand om er zeker van te zijn dat een onverwachte + faalmodus uw server niet heeft lamgelegd. Naamservers die + veel clienten serveren zullen meer voordeel uit deze aanpak + halen dan individuele hosts. Met zorg gebruiken. + + Verwijder het commentaar uit de onderstaande regels en + commentarieer de bovenstaande hintzone om dit mechanisme te + gebruiken. +*/ + zone "." { - type hint; - file "named.root"; + type slave; + file "slave/root.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; -zone "0.0.127.IN-ADDR.ARPA" { - type master; - file "master/localhost.rev"; +zone "arpa" { + type slave; + file "slave/arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; -// RFC 3152 -zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA" { - type master; - file "master/localhost-v6.rev"; +zone "in-addr.arpa" { + type slave; + file "slave/in-addr.arpa.slave"; + masters { + 192.5.5.241; // F.ROOT-SERVERS.NET. + }; + notify no; }; +/* Het lokaal serveren van de volgende zones voorkomt dat enig + verzoek voor deze zones uw netwerk verlaat en naar de + root-naamservers gaat. Dit heeft twee aanzienlijke voordelen: + 1. Snellere lokale resolutie voor uw gebruikers + 2. Er zal geen vals verkeer vanaf uw netwerk naar de roots worden verzonden +*/ +// RFC 1912 +zone "localhost" { type master; file "master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "master/empty.db"; }; + +// RFC 1912-stijl zone voor IPv6 localhost adres +zone "0.ip6.arpa" { type master; file "master/localhost-reverse.db"; }; + +// "Dit" netwerk (RFCs 1912 en 3330) +zone "0.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Netwerken voor privaat gebruik (RFC 1918) +zone "10.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Lokale link/APIPA (RFCs 3330 en 3927) +zone "254.169.in-addr.arpa" { type master; file "master/empty.db"; }; + +// TEST-NET voor documentatie (RFC 3330) +zone "2.0.192.in-addr.arpa" { type master; file "master/empty.db"; }; + +// Router benchmarken (RFC 3330) +zone "18.198.in-addr.arpa" { type master; file "master/empty.db"; } +zone "19.198.in-addr.arpa" { type master; file "master/empty.db"; } + +// Gereserveerd door IANA - oude ruimte van klasse E +zone "240.in-addr.arpa" { type master; file "master/empty.db"; } +zone "241.in-addr.arpa" { type master; file "master/empty.db"; } +zone "242.in-addr.arpa" { type master; file "master/empty.db"; } +zone "243.in-addr.arpa" { type master; file "master/empty.db"; } +zone "244.in-addr.arpa" { type master; file "master/empty.db"; } +zone "245.in-addr.arpa" { type master; file "master/empty.db"; } +zone "246.in-addr.arpa" { type master; file "master/empty.db"; } +zone "247.in-addr.arpa" { type master; file "master/empty.db"; } +zone "248.in-addr.arpa" { type master; file "master/empty.db"; } +zone "249.in-addr.arpa" { type master; file "master/empty.db"; } +zone "250.in-addr.arpa" { type master; file "master/empty.db"; } +zone "251.in-addr.arpa" { type master; file "master/empty.db"; } +zone "252.in-addr.arpa" { type master; file "master/empty.db"; } +zone "253.in-addr.arpa" { type master; file "master/empty.db"; } +zone "254.in-addr.arpa" { type master; file "master/empty.db"; } + +// Niet-toegewezen IPv6-adressen (RFC 4291) +zone "1.ip6.arpa" { type master; file "master/empty.db"; } +zone "2.ip6.arpa" { type master; file "master/empty.db"; } +zone "3.ip6.arpa" { type master; file "master/empty.db"; } +zone "4.ip6.arpa" { type master; file "master/empty.db"; } +zone "5.ip6.arpa" { type master; file "master/empty.db"; } +zone "6.ip6.arpa" { type master; file "master/empty.db"; } +zone "7.ip6.arpa" { type master; file "master/empty.db"; } +zone "8.ip6.arpa" { type master; file "master/empty.db"; } +zone "9.ip6.arpa" { type master; file "master/empty.db"; } +zone "a.ip6.arpa" { type master; file "master/empty.db"; } +zone "b.ip6.arpa" { type master; file "master/empty.db"; } +zone "c.ip6.arpa" { type master; file "master/empty.db"; } +zone "d.ip6.arpa" { type master; file "master/empty.db"; } +zone "e.ip6.arpa" { type master; file "master/empty.db"; } +zone "0.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "1.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "2.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "3.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "4.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "5.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "6.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "7.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "8.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "9.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "a.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "b.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "0.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "1.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "2.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "3.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "4.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "5.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "6.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "7.e.f.ip6.arpa" { type master; file "master/empty.db"; } + +// IPv6 ULA (RFC 4193) +zone "c.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "d.f.ip6.arpa" { type master; file "master/empty.db"; } + +// IPv6 lokale link (RFC 4291) +zone "8.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "9.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "a.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "b.e.f.ip6.arpa" { type master; file "master/empty.db"; } + +// IPv6 verouderde site-lokale adressen (RFC 3879) +zone "c.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "d.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "e.e.f.ip6.arpa" { type master; file "master/empty.db"; } +zone "f.e.f.ip6.arpa" { type master; file "master/empty.db"; } + +// IP6.INT is verouderd (RFC 4159) +zone "ip6.int" { type master; file "master/empty.db"; } + // NB: De IP-adressen hieronder zijn bedoeld als voorbeeld en dienen // niet gebruikt te worden! // // Voorbeeld instellingen voor slaafzones. Het kan handig zijn om // tenminste slaaf te worden voor de zone waar de host onderdeel van // uitmaakt. Bij uw netwerkbeheerder kan het IP-adres van de -// verantwoordelijke primaire zone nagevraagd worden. +// verantwoordelijke meester-naamserver nagevraagd worden. // -// De omgekeerde lookupzone (IN-ADDR.ARPA) mag nooit vergeten worden! -// (Dit is genoemd naar de eerste bytes van het IP-adres, in omgekeerde -// volgorde, met daarachter ".IN-ADDR.ARPA".) +// Vergeet niet om de omgekeerde lookup-zone op te nemen! +// Dit is genoemd na de eerste bytes van het IP-adres, in omgekeerde +// volgorde, met daarachter ".IN-ADDR.ARPA", of "IP6.ARPA" voor IPv6. // // Het is van groot belang om de werking van DNS en BIND te begrijpen -// voordat er een primaire zone wordt opgezet. Er zijn nogal wat +// voordat er een meester-zone wordt opgezet. Er zijn nogal wat // onverwachte valkuilen. Het opzetten van een slaafzone is -// eenvoudiger. +// gewoonlijk eenvoudiger. // // NB: Zet de onderstaande voorbeelden niet blindelings aan. :-) // Gebruik in plaats hiervan echte namen en adressen. -/* Een voorbeeld van een masterzone -zone "example.net" { - type master; - file "master/example.net"; -}; -*/ - /* Een voorbeeld van een dynamische zone key "exampleorgkey" { algorithm hmac-md5; @@ -3700,17 +3854,10 @@ }; */ -/* Voorbeelden van voorwaartse en omgekeerde slaafzones -zone "example.com" { - type slave; - file "slave/example.com"; - masters { - 192.168.1.1; - } -}; +/* Voorbeeld van een omgekeerde slaafzone zone "1.168.192.in-addr.arpa" { type slave; - file "s/1.168.192.in-addr.arpa.bak"; + file "slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; @@ -3765,13 +3912,13 @@ /etc/namedb/master/example.org) ziet er als volgt uit: - $TTL 3600 ; 1 uur + $TTL 3600 ; 1 uur standaard TTL example.org. IN SOA ns1.example.org. admin.example.org. ( 2006051501 ; Serienummer 10800 ; Verversen 3600 ; Opnieuw proberen 604800 ; Verlopen - 86400 ; Minimum TTL + 300 ; Negatieve antwoord-TTL ) ; DNS Servers @@ -3792,17 +3939,14 @@ mx IN A 192.168.1.5 ; Aliases -www IN CNAME @ +www IN CNAME example.org. Iedere hostnaam die eindigt op een . is een exacte hostnaam, terwijl alles zonder een - . op het einde refereert aan de oorsprong. - Zo wordt www bijvoorbeeld vertaald naar - www.origin. - In de zone uit het voorbeeld hierboven is de oorsprong - example.org., dus www - vertaalt naar www.example.org. + . op het einde relatief is aan de oorsprong. + Zo wordt ns1 bijvoorbeeld vertaald naar + ns1.example.org.. De regels in een zonebestand volgen de volgende opmaak: @@ -3869,13 +4013,12 @@ - -example.org. IN SOA ns1.example.org. admin.example.org. ( + example.org. IN SOA ns1.example.org. admin.example.org. ( 2006051501 ; Serienummer 10800 ; Ververs na 3 uur 3600 ; Opnieuw proberen na 1 uur 604800 ; Verlopen na 1 week - 86400 ) ; Minimum TTL van 1 dag + 300 ; Negatieve antwoord-TTL @@ -3926,15 +4069,13 @@ - - IN NS ns1.example.org. + IN NS ns1.example.org. Hierboven staat een NS-regel. Voor iedere naamserver die bevoegde antwoorden moet geven voor de zone hoort er zo'n regel te zijn. - -localhost IN A 127.0.0.1 + localhost IN A 127.0.0.1 ns1 IN A 192.168.1.2 ns2 IN A 192.168.1.3 mx IN A 192.168.1.4 @@ -3944,16 +4085,14 @@ zien dat ns1.example.org zou resolven naar 192.168.1.2. - - IN A 192.168.1.1 + IN A 192.168.1.1 Deze regel kent IP-adres 192.168.1.1 toe aan de huidige oorsprong, in dit geval example.org. - -www IN CNAME @ + www IN CNAME @ Een canoniek naamrecord wordt meestal gebruikt voor het geven van aliassen aan een machine. In het voorbeeld is @@ -3961,14 +4100,12 @@ machine waarvan de naam gelijk is aan de domeinnaam example.org (192.168.1.1). CNAME's kunnen - gebruikt worden om een alias aan hostnamen te geven of om - round-robin één hostnaam naar meerdere machines - te laten wijzen. + nooit samen met een ander soort record voor dezelfde hostnaam + gebruikt worden. MX record - - IN MX 10 mail.example.org. + IN MX 10 mail.example.org. MX records geven aan welke mailservers verantwoordelijk zijn voor het afhandelen van inkomende mail voor de zone. @@ -3995,7 +4132,7 @@ 10800 ; Ververs 3600 ; Opnieuw proberen 604800 ; Verlopen - 3600 ) ; Minimum + 300 ) ; Negatieve antwoord-TTL IN NS ns1.example.org. IN NS ns2.example.org. @@ -4008,6 +4145,10 @@ Dit bestand geeft de juiste IP-adressen voor hostnamen in het voorbeelddomein hierboven. + + Het is het vernoemen waard dat alle namen aan de rechterkant + van een PTR-record volledig gekwalificeerd dienen te zijn + (i.e. met een . eindigen). @@ -4020,10 +4161,9 @@ caching naamserver - Een caching naamserver is een naamserver die voor geen - enkele zone bevoegd is en alleen verzoeken doet en die onthoudt - voor later gebruik. Het opzetten ervan is eenvoudigweg het - opzetten van een naamserver zonder zones toe te voegen. + Een caching naamserver is een naamserver wiens primaire rol + het oplossen van recursieve verzoeken is. Het dient simpelweg + zelf verzoeken in en onthoudt de antwoorden voor later gebruik. @@ -4061,35 +4201,29 @@ Officiële + url="https://www.isc.org/software/bind/">Officiële ISC BIND pagina Officieel ISC BIND + url="https://www.isc.org/software/guild/">Officieel ISC BIND Forum BIND9 - FAQ - - - - O'Reilly DNS en BIND 5e Editie RFC1034 - + url="http://www.rfc-editor.org/rfc/rfc1034.txt">RFC1034 - Domeinnamen - Concepten en Faciliteiten RFC1035 - + url="http://www.rfc-editor.org/rfc/rfc1035.txt">RFC1035 - Domeinnamen - Implementatie en Specificatie From owner-p4-projects@FreeBSD.ORG Mon May 25 22:00:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 658CA1065675; Mon, 25 May 2009 22:00:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23A891065670 for ; Mon, 25 May 2009 22:00:19 +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 125418FC1F for ; Mon, 25 May 2009 22:00:19 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PM0IpC045425 for ; Mon, 25 May 2009 22:00:18 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PM0I73045423 for perforce@freebsd.org; Mon, 25 May 2009 22:00:18 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 25 May 2009 22:00:18 GMT Message-Id: <200905252200.n4PM0I73045423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 162744 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, 25 May 2009 22:00:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=162744 Change 162744 by rene@rene_self on 2009/05/25 21:59:18 MFen handbook/mirrors 1.463 -> 1.464 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#26 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#26 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.463 + %SRCID% 1.464 --> @@ -199,9 +199,21 @@
+ LinuxCenter.Kz + Ust-Kamenogorsk + Kazachstan + Telefoon: +7-705-501-6001 + Email: info@linuxcenter.kz + WWW: +
+ + + +
LinuxCenter.Ru Galernaya Street, 55 - Saint-Petersburg + Sint-Petersburg 190000 Rusland Telefoon: +7-812-3125208 From owner-p4-projects@FreeBSD.ORG Mon May 25 23:59:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD2081065676; Mon, 25 May 2009 23:59:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 887D11065674 for ; Mon, 25 May 2009 23:59:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 756F58FC17 for ; Mon, 25 May 2009 23:59:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4PNxKJl056529 for ; Mon, 25 May 2009 23:59:20 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4PNxKwU056526 for perforce@freebsd.org; Mon, 25 May 2009 23:59:20 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 25 May 2009 23:59:20 GMT Message-Id: <200905252359.n4PNxKwU056526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 162748 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, 25 May 2009 23:59:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=162748 Change 162748 by alepulver@alepulver_deimos on 2009/05/25 23:59:06 Integrate changes in ports/Mk from CVS. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gstreamer.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-apps.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.octave.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.perl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.scons.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#4 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.xfce.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.xorg.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#2 integrate Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/GIDs,v 1.62 2008/08/11 20:09:15 mm Exp $ +# $FreeBSD: ports/GIDs,v 1.71 2009/04/07 11:49:11 rafan Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -66,12 +66,15 @@ _spamd:*:132: freeradius:*:133: undernet:*:134: +rabbitmq:*:135: +dhcpd:*:136: dovecot:*:143: rbldns:*:153: sfs:*:171: agk:*:172: polipo:*:173: flowtools:*:174: +rt:*:180: nagios:*:181: moinmoin:*:192: cups:*:193: @@ -101,6 +104,7 @@ stunnel:*:341: openfire:*:342: _iodined:*:353: +httptunnel:*:361: ldap:*:389: tiarra:*:398: drweb:*:426: @@ -109,7 +113,7 @@ nullmail:*:522: dkimproxy:*:525: pgbouncer:*:534: -ejabberd:*:544: +ejabberd:*:543: qtss:*:554: ircdru:*:555: messagebus:*:556: @@ -132,3 +136,7 @@ iserv:*:911: _relayd:*:913: bitlbee:*:914: +logcheck:*:915: +ssmtp:*:916: +prayer:*:917: +nefu:*:918: ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#3 (text+ko) ==== @@ -7,11 +7,12 @@ # Default: ${CONFIGURE_ENV} # CMAKE_ARGS - Arguments passed to cmake # Default: see below -# CMAKE_USE_PTHREAD - Instruct cmake to use pthreads when +# CMAKE_USE_PTHREAD - Instruct cmake to use pthreads when # compiling/linking # Default: not set -# CMAKE_BUILD_TYPE - Type of build (release, debug) -# Default: Release +# CMAKE_BUILD_TYPE - Type of build (cmake predefined build types), +# affects on CFALGS and thus should not be set. +# Default: none (which respects CFLAGS) # CMAKE_VERBOSE - Verbose build # Default: not set # CMAKE_SOURCE_PATH - Path to sourcedir for cmake @@ -20,7 +21,7 @@ # Default: ${PREFIX} # # -# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.2 2008/08/10 15:43:46 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.5 2009/03/24 19:11:21 makc Exp $ CMAKE_MAINTAINER= kde@FreeBSD.org @@ -47,14 +48,15 @@ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ - -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" + -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ + -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES # # Default build type and sourcedir # -CMAKE_BUILD_TYPE?= Release CMAKE_SOURCE_PATH?= . CMAKE_INSTALL_PREFIX?= ${PREFIX} +CMAKE_BUILD_TYPE?= #none # # Instruct cmake to compile/link with pthreads @@ -69,10 +71,10 @@ .endif # -# Force DEBUG buildtype if needed +# Strip binaries # -.if defined(CMAKE_DEBUG) || defined(WITH_DEBUG) -CMAKE_BUILD_TYPE=DEBUG +.if !defined(WITH_DEBUG) +INSTALL_TARGET?= install/strip .endif # @@ -87,6 +89,6 @@ # .if !target(do-configure) do-configure: - @cd ${WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.30 2008/07/26 08:38:53 ale Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.35 2009/03/31 05:18:22 danfe Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -10,24 +10,26 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # This file contains some routines to interact with different databases, such -# as mysql, postgresql and berkley DB. For including this file define macro -# USE_[DATABASE], for example USE_MYSQL. Defining macro like USE_[DATABASE]_VER -# or WANT_[DATABSE]_VER will include this file too. +# as MySQL, PostgreSQL, and Berkley DB. To include this file, define macro +# USE_[DATABASE], for example USE_MYSQL. Defining macro like +# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well. # ## -# USE_MYSQL - Add MySQL client dependency. +# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default: +# client). # If no version is given (by the maintainer via the port or # by the user via defined variable), try to find the # currently installed version. Fall back to default if -# necessary (MySQL5.0 = 50). +# necessary (MySQL-5.0 = 50). # DEFAULT_MYSQL_VER -# - MySQL default version. Can be overriden within a port. +# - MySQL default version. Can be overridden within a port. # Default: 50. # WANT_MYSQL_VER -# - Maintainer can set an arbitrary version of MySQL by using it. +# - Maintainer can set an arbitrary version of MySQL to always +# build this port with (overrides WITH_MYSQL_VER). # IGNORE_WITH_MYSQL -# - This variable can be defined if the ports doesn't support -# one or more version of MySQL. +# - This variable can be defined if the ports does not support +# one or more versions of MySQL. # WITH_MYSQL_VER # - User defined variable to set MySQL version. # MYSQL_VER @@ -39,13 +41,13 @@ # currently installed version. Fall back to default if # necessary (PostgreSQL-8.2 = 82). # DEFAULT_PGSQL_VER -# - PostgreSQL default version. Can be overridden within a port. -# Default: 82. +# - PostgreSQL default version. Can be overridden within a +# port. Default: 82. # WANT_PGSQL_VER -# - Maintainer can set an arbitrary version of PostgreSQL by -# using it. +# - Maintainer can set an arbitrary version of PostgreSQL to +# always build this port with (overrides WITH_PGSQL_VER). # IGNORE_WITH_PGSQL -# - This variable can be defined if the ports doesn't support +# - This variable can be defined if the ports does not support # one or more versions of PostgreSQL. # WITH_PGSQL_VER # - User defined variable to set PostgreSQL version. @@ -58,41 +60,48 @@ # currently installed version. Fall back to default if # necessary (db41+). # INVALID_BDB_VER -# - This variable can be defined when the port doesn't +# - This variable can be defined when the port does not # support one or more versions of Berkeley DB. -# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always +# WANT_BDB_VER +# - Maintainer can set a version of Berkeley DB to always # build this port with (overrides WITH_BDB_VER). -# WITH_BDB_VER - User defined global variable to set Berkeley DB version +# WITH_BDB_VER +# - User defined global variable to set Berkeley DB version. # _WITH_BDB_VER -# - User defined port specific variable to set -# Berkeley DB version +# - User defined port specific variable to set Berkeley DB +# version. # WITH_BDB_HIGHEST -# - Use the highest installed version of Berkeley DB -# BDB_LIB_NAME - This variable is automatically set to the name of the -# Berkeley DB library (default: db41) +# - Use the highest installed version of Berkeley DB. +# BDB_LIB_NAME +# - This variable is automatically set to the name of the +# Berkeley DB library (default: db41). # BDB_LIB_CXX_NAME # - This variable is automatically set to the name of the -# Berkeley DB c++ library (default: db41_cxx) +# Berkeley DB C++ library (default: db41_cxx). # BDB_INCLUDE_DIR # - This variable is automatically set to the location of -# the Berkeley DB include directory. -# (default: ${LOCALBASE}/include/db41) -# BDB_LIB_DIR - This variable is automatically set to the location of +# the Berkeley DB include directory (default: +# ${LOCALBASE}/include/db41). +# BDB_LIB_DIR +# - This variable is automatically set to the location of # the Berkeley DB library directory. -# BDB_VER - Detected Berkeley DB version. +# BDB_VER +# - Detected Berkeley DB version. ## -# USE_SQLITE - Add dependency on sqlite library. Valid values are: -# 3 and 2. If version is not specified directly then -# sqlite3 is used (if USE_SQLITE= yes). -# SQLITE_VER - Detected sqlite version. +# USE_SQLITE - Add dependency on SQLite library. Valid values are: +# 3 and 2. If version is not specified directly then +# SQLite-3 is used (if USE_SQLITE= yes). +# SQLITE_VER +# - Detected SQLite version. ## -# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: -# 2 and 1. If no version is given by the maintainer (if +# USE_FIREBIRD - Add dependency on Firebird library. Valid values are: +# 2 and 1. If no version is given by the maintainer (if # USE_FIREBIRD= yes) and the user did not define # WITH_FIREBIRD_VER variable, fall back to default "2". # WITH_FIREBIRD_VER # - User defined variable to set Firebird version. -# FIREBIRD_VER - Detected Firebird version. +# FIREBIRD_VER +# - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 @@ -111,7 +120,7 @@ .if defined(WANT_MYSQL_VER) .if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER} -IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client. +IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client .endif MYSQL_VER= ${WANT_MYSQL_VER} .elif defined(WITH_MYSQL_VER) @@ -126,24 +135,31 @@ .if defined(_MYSQL_VER) .if ${_MYSQL_VER} != ${MYSQL_VER} -IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client +IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client .endif .endif +.if (${USE_MYSQL} == "embedded") +IGNORE_WITH_MYSQL= 323 40 41 +.endif + # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) -# compatability shim -.if defined(BROKEN_WITH_MYSQL) -IGNORE_WITH_MYSQL=${BROKEN_WITH_MYSQL} -.endif .if defined(IGNORE_WITH_MYSQL) . for VER in ${IGNORE_WITH_MYSQL} . if (${MYSQL_VER} == "${VER}") -IGNORE= cannot install: doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${IGNORE_WITH_MYSQL}) +IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) . endif . endfor .endif # IGNORE_WITH_MYSQL +.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") +RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +.if (${USE_MYSQL} == "embedded") +BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/databases/mysql${MYSQL_VER}-server +.endif +.else LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client +.endif .else IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs @@ -165,7 +181,7 @@ .if defined(WANT_PGSQL_VER) .if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${WANT_PGSQL_VER} -IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client. +IGNORE= cannot install: the port wants postgresql${WANT_PGSQL_VER}-client and you try to install postgresql${WITH_PGSQL_VER}-client .endif PGSQL_VER= ${WANT_PGSQL_VER} .elif defined(WITH_PGSQL_VER) @@ -184,14 +200,14 @@ # And now we are checking if we can use it .if defined(PGSQL${PGSQL_VER}_LIBVER) -# compatability shim +# compatibility shim .if defined(BROKEN_WITH_PGSQL) IGNORE_WITH_PGSQL=${BROKEN_WITH_PGSQL} .endif .if defined(IGNORE_WITH_PGSQL) . for VER in ${IGNORE_WITH_PGSQL} . if (${PGSQL_VER} == "${VER}") -IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client PostgresSQL (${IGNORE_WITH_PGSQL} not supported) +IGNORE= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported) . endif . endfor .endif # IGNORE_WITH_PGSQL @@ -316,7 +332,7 @@ # USE_BDB is specified incorrectly, so mark this as IGNORE .if ${_BDB_VER} == "no" -IGNORE= cannot install: unknown bdb version: ${USE_BDB} +IGNORE= cannot install: unknown Berkeley DB version: ${USE_BDB} .else # Now check if we can use it . if defined(INVALID_BDB_VER) @@ -339,9 +355,9 @@ . endfor . endif . if ${_BDB_IGNORE} == "yes" -IGNORE= cannot install: does not work with bdb version: ${_BDB_VER} (${INVALID_BDB_VER} not supported) +IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported) . else -# Now add the dependancy on Berkeley DB ${_BDB_VER) version +# Now add the dependency on Berkeley DB ${_BDB_VER) version .if defined(BDB_BUILD_DEPENDS) BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^db.*://} .else @@ -403,7 +419,7 @@ .endif # USE_BDB -# Handling sqlite dependency +# Handling SQLite dependency .if defined(USE_SQLITE) .if ${USE_SQLITE:L} == "yes" @@ -423,7 +439,7 @@ LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .else -IGNORE= cannot install: unknown sqlite version: ${_SQLITE_VER} +IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} .endif .endif # defined(USE_SQLITE) @@ -435,17 +451,19 @@ .endif .if ${USE_FIREBIRD:L} == "yes" -FIREBIRD_VER= 2 +FIREBIRD_VER= 20 .else FIREBIRD_VER= ${USE_FIREBIRD} .endif .if ${FIREBIRD_VER} == "2" -LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird2-client +LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird20-client +.elif ${FIREBIRD_VER} == "20" +LIB_DEPENDS+= fbclient.2:${PORTSDIR}/databases/firebird20-client .elif ${FIREBIRD_VER} == "1" LIB_DEPENDS+= fbclient.1:${PORTSDIR}/databases/firebird-client .else -IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} +IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} .endif .endif # defined(USE_FIREBIRD) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.emacs.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.73 2008/06/03 14:36:49 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.78 2009/04/02 21:37:31 pav Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -83,7 +83,7 @@ # Emacs-22.x .elif (${EMACS_PORT_NAME} == "emacs22") EMACS_NAME= emacs -EMACS_VER= 22.2 +EMACS_VER= 22.3 EMACS_MAJOR_VER= 22 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -100,7 +100,7 @@ # Emacs-23.x (development version) .elif (${EMACS_PORT_NAME} == "emacs-devel") EMACS_NAME= emacs -EMACS_VER= 23.0.60 +EMACS_VER= 23.0.92 EMACS_MAJOR_VER= 23 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -117,7 +117,7 @@ # XEmacs-21.x .elif (${EMACS_PORT_NAME} == "xemacs21") EMACS_NAME= xemacs -EMACS_VER= 21.4.21 +EMACS_VER= 21.4.22 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.1 2008/06/24 14:56:05 acm Exp $ +# $FreeBSD: ports/Mk/bsd.fpc.mk,v 1.9 2009/05/24 06:12:44 acm Exp $ # # bsd.fpc.mk - Support for FreePascal based ports. # @@ -23,14 +23,14 @@ # # -.if !defined(_POSTMKINCLUDED) && !defined(_FPCMKINCLUDED) +.if !defined(_FPCMKINCLUDED) _FPCMKINCLUDED= yes FPC_Include_MAINTAINER= acm@FreeBSD.org FPC_Pre_Include= bsd.fpc.mk -DEFAULT_FPC_VER= 2.2.0 +DEFAULT_FPC_VER= 2.2.4 FPC_VER= ${DEFAULT_FPC_VER} .if exists(${LOCALBASE}/bin/fpc) @@ -40,7 +40,7 @@ . endif .endif -BUILD_DEPENDS= ppc386:${PORTSDIR}/lang/fpc +BUILD_DEPENDS+= ppc386:${PORTSDIR}/lang/fpc BUILDNAME= ${ARCH}-freebsd UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME} @@ -55,21 +55,21 @@ @${ECHO_CMD} "" @${ECHO_CMD} "#################################################################" -_FPC_BASE_UNITS=gdbint graph ibase libasync hash httpd mysql netdb odbc oracle \ - pasjpeg paszlib pthreads postgres regexpr sqlite - -_FPC_ALL_UNITS=${_FPC_BASE_UNITS} bfd cairo fcl-base fcl-db fcl-fpcunit fcl-image \ - fcl-net fcl-passrc fcl-registry fcl-web fcl-xml fftw fpmkunit \ - forms fpgtk fv gconf gdbm ggi gnome gtk gtk2 imlib libcurl \ - libgd libpng ncurses opengl openssl pcap svgalib syslog tcl \ - unzip utmp x11 zlib zvt +_FPC_ALL_UNITS= aspell bfd cairo chm fcl-async fcl-base fcl-db fcl-fpcunit fcl-image \ + fcl-json fcl-net fcl-passrc fcl-process fcl-registry fcl-web fcl-xml fftw \ + fpmkunit fpgtk fv gdbint gdbm ggi gnome1 graph gtk1 gtk2 hash httpd13 httpd20 \ + httpd22 ibase iconvenc imagemagick imlib libcurl libgd libpng mysql ncurses numlib \ + odbc opengl openssl oracle pasjpeg paszlib pcap postgres pthreads pxlib \ + regexpr sdl sqlite svgalib symbolic syslog tcl unzip users utmp x11 xforms \ + zlib .if defined(WANT_FPC_BASE) -. if ${WANT_FPC_BASE:L} == "yes" -USE_FPC= ${_FPC_BASE_UNITS} -. else -IGNORE= unknown value, please use "yes" instead of -. endif +. if ${WANT_FPC_BASE:L} == "yes" +USE_FPC= gdbint graph ibase hash httpd13 httpd20 httpd22 mysql odbc oracle \ + pasjpeg paszlib pthreads postgres regexpr sqlite +. else +IGNORE= unknown value, please use "yes" instead of +. endif .endif .if defined(WANT_FPC_ALL) @@ -86,16 +86,17 @@ IGNORE= cannot install: unknown FPC unit ${UNITS} . endif . endfor +.endif # Base units gdbint_UNIT= devel/fpc-gdbint graph_UNIT= graphics/fpc-graph ibase_UNIT= databases/fpc-ibase -libasync_UNIT= net/fpc-libasync hash_UNIT= security/fpc-hash -httpd_UNIT= www/fpc-httpd +httpd13_UNIT= www/fpc-httpd13 +httpd20_UNIT= www/fpc-httpd20 +httpd22_UNIT= www/fpc-httpd22 mysql_UNIT= databases/fpc-mysql -netdb_UNIT= net/fpc-netdb odbc_UNIT= databases/fpc-odbc oracle_UNIT= databases/fpc-oracle pasjpeg_UNIT= graphics/fpc-pasjpeg @@ -106,54 +107,67 @@ sqlite_UNIT= databases/fpc-sqlite # Extra units +aspell_UNIT= textproc/fpc-aspell bfd_UNIT= devel/fpc-bfd cairo_UNIT= graphics/fpc-cairo +chm_UNIT= misc/fpc-chm +fcl_async_UNIT= devel/fpc-fcl-async fcl_base_UNIT= devel/fpc-fcl-base fcl_db_UNIT= devel/fpc-fcl-db fcl_fpcunit_UNIT= devel/fpc-fcl-fpcunit fcl_image_UNIT= devel/fpc-fcl-image +fcl_json_UNIT= devel/fpc-fcl-json fcl_net_UNIT= devel/fpc-fcl-net fcl_passrc_UNIT= devel/fpc-fcl-passrc +fcl_process_UNIT= devel/fpc-fcl-process fcl_registry_UNIT= devel/fpc-fcl-registry fcl_web_UNIT= devel/fpc-fcl-web fcl_xml_UNIT= devel/fpc-fcl-xml fftw_UNIT= math/fpc-fftw fpmkunit_UNIT= devel/fpc-fpmkunit -forms_UNIT= x11-toolkits/fpc-forms fpgtk_UNIT= graphics/fpc-fpgtk fv_UNIT= devel/fpc-fv -gconf_UNIT= devel/fpc-gconf gdbm_UNIT= databases/fpc-gdbm ggi_UNIT= graphics/fpc-ggi -gnome_UNIT= x11-toolkits/fpc-gnome -gtk_UNIT= x11-toolkits/fpc-gtk +gnome1_UNIT= x11-toolkits/fpc-gnome1 +gtk1_UNIT= x11-toolkits/fpc-gtk1 gtk2_UNIT= x11-toolkits/fpc-gtk2 -httpd_UNIT= www/fpc-httpd +iconvenc_UNIT= converters/fpc-iconvenc +imagemagick_UNIT= graphics/fpc-imagemagick imlib_UNIT= graphics/fpc-imlib libcurl_UNIT= ftp/fpc-libcurl libgd_UNIT= graphics/fpc-libgd libpng_UNIT= graphics/fpc-libpng ncurses_UNIT= graphics/fpc-ncurses +numlib_UNIT= math/fpc-numlib opengl_UNIT= graphics/fpc-opengl openssl_UNIT= security/fpc-openssl pcap_UNIT= net/fpc-pcap +pxlib_UNIT= databases/fpc-pxlib +sdl_UNIT= devel/fpc-sdl svgalib_UNIT= graphics/fpc-svgalib +symbolic_UNIT= devel/fpc-symbolic syslog_UNIT= sysutils/fpc-syslog tcl_UNIT= lang/fpc-tcl unzip_UNIT= archivers/fpc-unzip +users_UNIT= sysutils/fpc-users utmp_UNIT= sysutils/fpc-utmp x11_UNIT= x11/fpc-x11 +xforms_UNIT= x11-toolkits/fpc-xforms zlib_UNIT= devel/fpc-zlib -zvt_UNIT= x11-toolkits/fpc-zvt + +.endif + +.if defined(_POSTMKINCLUDED) && defined(USE_FPC) . for UNITS in ${USE_FPC} . if ${_FPC_ALL_UNITS:M${UNITS}}!="" -BUILD_DEPENDS+= ${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} -RUN_DEPENDS+= ${UNITSDIR}/${UNITS:S/httpd/httpd-1.3/}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} +BUILD_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} +RUN_DEPENDS+= ${UNITSDIR}/${UNITS}/Package.fpc:${PORTSDIR}/${${UNITS:S/-/_/}_UNIT} security-check: fpc-check-install . endif . endfor .endif -.endif +#.endif # End of bsd.fpc.mk file ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#4 (text+ko) ==== @@ -13,17 +13,16 @@ # USE_FORTRAN knob. # # For example: -# USE_GCC= 3.3 # port requires GCC 3.3 to build with. -# USE_GCC= 3.4+ # port requires GCC 3.4 or later to build with. +# USE_GCC= 4.2+ # port requires GCC 4.2 or later to build with. +# USE_GCC= 4.3 # port requires GCC 4.3 to build with. # # If your port needs a Fortran compiler, please specify that with the # USE_FORTRAN= knob. Here is the list of options for that knob: # -# USE_FORTRAN= yes # use gfortran42 (/lang/gcc42) -# USE_FORTRAN= gfortran42 -# USE_FORTRAN= g77 # use g77-34 (lang/gcc34; FreeBSD>=7) -# # or system f77 (/usr/bin/f77; FreeBSD<=6) -# USE_FORTRAN= ifort # use the Intel compiler (lang/ifc) +# USE_FORTRAN= yes # use gfortran43 (/lang/gcc43) +# USE_FORTRAN= g77 # use g77-34 (lang/gcc34; FreeBSD>=7) +# # or system f77 (/usr/bin/f77; FreeBSD<=6) +# USE_FORTRAN= ifort # use the Intel compiler (lang/ifc) # # Due to object file incompatiblity between Fortran compilers, we strongly # recommend to use only one of them on any system. @@ -31,7 +30,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.20 2008/08/17 06:57:17 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.29 2009/03/28 23:57:56 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -40,7 +39,7 @@ # All GCC versions supported by the ports framework. # Please keep them in ascending order. # -GCCVERSIONS= 020801 029500 030301 030402 040100 040200 040300 +GCCVERSIONS= 029500 030402 040200 040300 040400 # # Versions of GCC shipped. @@ -49,13 +48,11 @@ # the base system. # The third field is the version as USE_GCC would use. # -GCCVERSION_020801= 000000 400012 2.8 GCCVERSION_029500= 400012 500035 2.95 -GCCVERSION_030301= 501103 502126 3.3 GCCVERSION_030402= 502126 700042 3.4 -GCCVERSION_040100= 999999 999999 4.1 GCCVERSION_040200= 700042 999999 4.2 GCCVERSION_040300= 999999 999999 4.3 +GCCVERSION_040400= 999999 999999 4.4 # # No configurable parts below this. @@ -67,34 +64,46 @@ # .if defined (USE_FORTRAN) -# gfortran42 from lang/gcc42 is the default for now. -. if ${USE_FORTRAN} == yes || ${USE_FORTRAN} == gfortran42 -BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 -FC:= gfortran42 -F77:= gfortran42 -. endif + +# gfortran43 from lang/gcc43 is the default for now. +. if ${USE_FORTRAN} == yes +BUILD_DEPENDS+= gfortran43:${PORTSDIR}/lang/gcc43 +RUN_DEPENDS+= gfortran43:${PORTSDIR}/lang/gcc43 +FC:= gfortran43 +F77:= gfortran43 +CC:= gcc43 +CXX:= g++43 # Intel Fortran compiler from lang/ifc. -. if ${USE_FORTRAN} == ifort +. elif ${USE_FORTRAN} == ifort BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc +RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc FC:= ${LOCALBASE}/intel_fc_80/bin/ifort F77:= ${LOCALBASE}/intel_fc_80/bin/ifort -. endif # In some case we want to use g77 from lang/gcc34 (FreeBSD>=7) or f77 # (FreeBSD<=6). -. if ${USE_FORTRAN} == g77 -. if (${OSVERSION} > 700000) +. elif ${USE_FORTRAN} == g77 +. if (${OSVERSION} > 700042) BUILD_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34 +RUN_DEPENDS+= g77-34:${PORTSDIR}/lang/gcc34 FC:= g77-34 F77:= g77-34 -.else +CC:= gcc34 +CXX:= g++34 +. else F77:= f77 FC:= f77 +CC:= gcc +CXX:= g++ . endif + +. else +IGNORE= specifies unknown value "${USE_FORTRAN}" for USE_FORTRAN . endif -MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" .endif @@ -220,3 +229,4 @@ @echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS} @echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS} @echo BUILD_DEPENDS=${BUILD_DEPENDS} + @echo RUN_DEPENDS=${RUN_DEPENDS} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#3 (text+ko) ==== @@ -4,8 +4,8 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.4 2008/08/06 16:26:17 mezz Exp $ -# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.8 2008/06/20 22:17:41 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.12 2009/05/04 19:23:41 miwi Exp $ +# $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -32,7 +32,7 @@ .if !defined(Gecko_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gnome@FreeBSD.org +Gecko_Include_MAINTAINER= gecko@FreeBSD.org Gecko_Pre_Include= bsd.gecko.mk # Users should use the following syntax: @@ -79,9 +79,11 @@ # ${WRKSRC}/configure # .endif -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \ + libxul thunderbird_PORTSDIR= mail +libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www @@ -130,9 +132,6 @@ .endif # Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins - GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` @@ -245,11 +244,12 @@ # CONFIGURE_ARGS instead # -MAINTAINER?= gnome@FreeBSD.org +MAINTAINER?= gecko@FreeBSD.org MOZILLA?= ${PORTNAME} MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin +MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes @@ -266,7 +266,6 @@ MASTER_DIR?= ${.CURDIR}/../../www/mozilla KRB5_HOME?= /usr -BROWSER_PLUGINS_DIR?= lib/browser_plugins MOZ_PIS_DIR?= lib/${MOZILLA}/init.d ESD_LIB?= libesd.so.2 @@ -288,10 +287,6 @@ --exclude */package/* \ --exclude mozilla/gc/boehm -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so - MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -403,6 +398,7 @@ --disable-pedantic \ --disable-bidi \ --disable-xterm-updates \ + --disable-xprint \ --enable-xinerama MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} @@ -468,6 +464,11 @@ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} +.if ${ARCH}=="sparc64" +# Work around miscompilation/mislinkage of the sCanonicalVTable hacks. +MOZ_OPTIONS+= --disable-v1-string-abi +.endif + .else # bsd.port.post.mk post-patch: gecko-post-patch gecko-moz-pis-patch @@ -521,8 +522,9 @@ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ @@ -576,10 +578,10 @@ .endfor @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ - ${FAKEDIR}/bin/${MOZILLA}* + ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}* .endif @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${FAKEDIR}/bin/${MOZILLA}* + ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME}* ${RM} -f ${FAKEDIR}/bin/*.bak .endif @@ -592,8 +594,6 @@ .for f in ${GECKO_PLIST_PRE_DIRS} ${ECHO_CMD} "@dirrm ${f}" >> ${PLISTD} .endfor - ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLISTF} - ${ECHO_CMD} "@dirrmtry ${BROWSER_PLUGINS_DIR}" >> ${PLISTD} ${MKDIR} ${FAKEDIR}/libdata ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE} ${RM} -f ${FAKEDIR}/lib/pkgconfig @@ -632,8 +632,6 @@ ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/${pcfile}.pc .endfor - ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} - ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep .endif # !defined(NOGECKO_INSTALL) gecko-moz-pis-pre-install: ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#3 (text+ko) ==== @@ -1,12 +1,19 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.148 2008/06/30 20:16:17 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.155 2009/04/13 19:05:11 marcus Exp $ # $NetBSD: $ -# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.479 2009/03/14 05:55:36 marcus Exp $ # # Please view me with 4 column tabs! +# ======================= USERS ================================= +# +# There are no significant user-definable settings in here. +# This file is a framework to make it easier to create GNOME ports. +# +# ======================= /USERS ================================ + .if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. @@ -57,11 +64,11 @@ oaf orbit pygnome pygtk # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ - gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ - gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ +_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ + gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedesktopsharp20 \ + gnomedocutils gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ - libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \ + libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 libgda4 \ libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \ @@ -103,11 +110,6 @@ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier -.if !defined(WITHOUT_HACK) -gnomeprefix_PREFIX=${LOCALBASE} -.endif - -gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound @@ -254,7 +256,7 @@ _glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 _glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -_glib20_USE_GNOME_IMPL= gnometarget pkgconfig +_glib20_USE_GNOME_IMPL= pkgconfig glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so @@ -309,13 +311,9 @@ gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata -gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail -gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc -gail_USE_GNOME_IMPL= gtk20 - libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc -libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 gail +libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 libartlgpl2_LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc @@ -343,7 +341,7 @@ atspi_LIB_DEPENDS= spi.10:${PORTSDIR}/accessibility/at-spi atspi_DETECT= ${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc -atspi_USE_GNOME_IMPL= gail libbonobo +atspi_USE_GNOME_IMPL= gtk20 libbonobo libgailgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc libgailgnome_RUN_DEPENDS= ${libgailgnome_DETECT}:${PORTSDIR}/x11-toolkits/libgail-gnome @@ -351,13 +349,18 @@ libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc -libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gail +libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 -gnomedesktop_LIB_DEPENDS= gnome-desktop-2.2:${PORTSDIR}/x11/gnome-desktop +gnomedesktop_LIB_DEPENDS= gnome-desktop-2.11:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils gnomedesktop_GNOME_DESKTOP_VERSION=2 +gnomedesktopsharp20_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-sharp-2.0.pc >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 26 00:02:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF2AE1065670; Tue, 26 May 2009 00:02: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 861521065688 for ; Tue, 26 May 2009 00:02:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 71E438FC1C for ; Tue, 26 May 2009 00:02:26 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4Q02QSv056985 for ; Tue, 26 May 2009 00:02:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4Q02Nrl056978 for perforce@freebsd.org; Tue, 26 May 2009 00:02:23 GMT (envelope-from scottl@freebsd.org) Date: Tue, 26 May 2009 00:02:23 GMT Message-Id: <200905260002.n4Q02Nrl056978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 162749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 00:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=162749 Change 162749 by scottl@scottl-y1 on 2009/05/26 00:01:33 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC.hints#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_spi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#10 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/README#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_futex.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_mib.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_misc.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscall.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_syscallnames.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sysent.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.c#5 delete .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.h#3 delete .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#27 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#30 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#18 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#17 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.powerpc#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#15 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#24 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_sony.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/age/if_age.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_linux.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/flash/at45d.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipwvar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lmc/if_lmc.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/malo/if_malo_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_linux.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nge/if_ngereg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_if.m#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/nehemiah.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/spibus/spibus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_freebsd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsec.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ubsec/ubsecreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/usb_wlan.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wavelan_ieee.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wireg.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wivar.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpivar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vfsops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nullfs/null_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_io.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/udf/udf_vfsops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/journal/g_journal.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_plex.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_rm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/apm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC.hints#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/PAE#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_ioctl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_proto.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/syscalls.master#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/apicvar.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/clock.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#1 branch .. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/smp.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/NOTES#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/elf_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/isa/rtc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_acct.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_clock.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mib.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_posix1e.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_kdb.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_pcpu.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_rman.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_socket.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_upgt.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete .. //depot/projects/scottl-camlock/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#26 integrate .. //depot/projects/scottl-camlock/src/sys/modules/bwi/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/linux/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfs4client/Makefile#5 delete .. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/sound/sound/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/wlan/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sys/modules/xfs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_lagg.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_superg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_tdma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netflow/ng_netflow.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw_pfil.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_crc32.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/vinet.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.h#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec6.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netipx/spx_usrreq.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netipx/spx_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netnatm/natm.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4.h#3 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_dev.c#7 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_dev.h#4 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_idmap.c#5 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_idmap.h#3 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_socket.c#6 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_subs.c#5 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs_subs.c#4 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfsops.c#12 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vn.h#3 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vn_subs.c#6 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#13 delete .. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4m_subs.h#3 delete .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_lock.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_nfsiod.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_node.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_socket.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsm_subs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/opencrypto/cryptodev.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#9 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/include/mca.h#1 branch .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/platform_chrp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/platform_bare.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/vm_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#18 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/NOTES#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/cpufunc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/mutex.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/ofw_machdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/platform.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/platformvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/powerpc.h#3 delete .. //depot/projects/scottl-camlock/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/busdma_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/genassym.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/openpic.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/platform.c#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/platform_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/rpcclnt.c#11 delete .. //depot/projects/scottl-camlock/src/sys/rpc/rpcclnt.h#4 delete .. //depot/projects/scottl-camlock/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_atalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_inet.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_inet6.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_net.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_pipe.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_system.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_msg.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_sem.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_sysv_shm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/security/mac/mac_vfs.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/vm_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_null.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/acl.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/buf.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/buf_ring.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/eventhandler.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/filedesc.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ioctl.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ioctl_compat.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/jail.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ktr.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/lockf.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/sys/osd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/sys/termios.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ucred.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/extattr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extattr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_page.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#13 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $ .include @@ -11,7 +11,7 @@ CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.172 2009/04/29 06:54:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $"); #include "opt_cpu.h" @@ -472,6 +472,22 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; + /* + * Clear "Limit CPUID Maxval" bit and get the largest standard CPUID + * function number again if it is set from BIOS. It is necessary + * for probing correct CPU topology later. + * XXX This is only done on the BSP package. + */ + if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high > 0 && cpu_high < 4) { + uint64_t msr; + msr = rdmsr(MSR_IA32_MISC_ENABLE); + if ((msr & 0x400000ULL) != 0) { + wrmsr(MSR_IA32_MISC_ENABLE, msr & ~0x400000ULL); + do_cpuid(0, regs); + cpu_high = regs[0]; + } + } + if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_CENTAUR) { ==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#17 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.55 2009/05/05 01:13:20 mav Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -112,7 +112,7 @@ u_long la_stat_ticks; u_long la_prof_ticks; /* Include IDT_SYSCALL to make indexing easier. */ - u_int la_ioint_irqs[APIC_NUM_IOINTS + 1]; + int la_ioint_irqs[APIC_NUM_IOINTS + 1]; } static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -254,6 +254,8 @@ lapics[apic_id].la_lvts[i] = lvts[i]; lapics[apic_id].la_lvts[i].lvt_active = 0; } + for (i = 0; i <= APIC_NUM_IOINTS; i++) + lapics[apic_id].la_ioint_irqs[i] = -1; lapics[apic_id].la_ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; lapics[apic_id].la_ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] = IRQ_TIMER; @@ -317,7 +319,7 @@ } /* We don't setup the timer during boot on the BSP until later. */ - if (!(boot && PCPU_GET(cpuid) == 0)) { + if (!(boot && PCPU_GET(cpuid) == 0) && lapic_timer_hz != 0) { KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor", lapic_id())); lapic_timer_set_divisor(lapic_timer_divisor); @@ -363,11 +365,15 @@ lapic_setup_clock(void) { u_long value; + int i; /* Can't drive the timer without a local APIC. */ if (lapic == NULL) return (0); + if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0) + return (0); + /* Start off with a divisor of 2 (power on reset default). */ lapic_timer_divisor = 2; @@ -807,7 +813,7 @@ */ mtx_lock_spin(&icu_lock); for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { - if (lapics[apic_id].la_ioint_irqs[vector] != 0) + if (lapics[apic_id].la_ioint_irqs[vector] != -1) continue; lapics[apic_id].la_ioint_irqs[vector] = irq; mtx_unlock_spin(&icu_lock); @@ -847,7 +853,7 @@ for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { /* Vector is in use, end run. */ - if (lapics[apic_id].la_ioint_irqs[vector] != 0) { + if (lapics[apic_id].la_ioint_irqs[vector] != -1) { run = 0; first = 0; continue; @@ -932,7 +938,7 @@ sched_bind(td, apic_cpuid(apic_id)); thread_unlock(td); mtx_lock_spin(&icu_lock); - lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; + lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = -1; mtx_unlock_spin(&icu_lock); thread_lock(td); sched_unbind(td); @@ -944,11 +950,15 @@ u_int apic_idt_to_irq(u_int apic_id, u_int vector) { + int irq; KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - return (lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]); + irq = lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS]; + if (irq < 0) + irq = 0; + return (irq); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 26 03:18:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDEF01065675; Tue, 26 May 2009 03:18:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94C071065674 for ; Tue, 26 May 2009 03:18:46 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68E3F8FC14 for ; Tue, 26 May 2009 03:18:46 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4Q3IkJC087568 for ; Tue, 26 May 2009 03:18:46 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4Q3IktG087566 for perforce@freebsd.org; Tue, 26 May 2009 03:18:46 GMT (envelope-from scottl@freebsd.org) Date: Tue, 26 May 2009 03:18:46 GMT Message-Id: <200905260318.n4Q3IktG087566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 162755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 03:18:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=162755 Change 162755 by scottl@scottl-y1 on 2009/05/26 03:18:34 The devctl device looks like it provides adequate locking for itself, so remove the D_NEEDGIANT flag. Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#19 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#19 (text+ko) ==== @@ -362,7 +362,7 @@ static struct cdevsw dev_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, + .d_flags = 0, .d_open = devopen, .d_close = devclose, .d_read = devread, From owner-p4-projects@FreeBSD.ORG Tue May 26 08:20:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A0961065672; Tue, 26 May 2009 08:20:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E46DB106564A for ; Tue, 26 May 2009 08:20:57 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7CFD8FC1D for ; Tue, 26 May 2009 08:20:57 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4Q8KvJg028882 for ; Tue, 26 May 2009 08:20:57 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4Q8KvNl028880 for perforce@freebsd.org; Tue, 26 May 2009 08:20:57 GMT (envelope-from marinosi@FreeBSD.org) Date: Tue, 26 May 2009 08:20:57 GMT Message-Id: <200905260820.n4Q8KvNl028880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Cc: Subject: PERFORCE change 162761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 08:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=162761 Change 162761 by marinosi@marinosi_redrum on 2009/05/26 08:20:03 Initial Commit.Description: -A private header file containing the structure description of audit slice. -The skeleton for the special device nodes needed. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/appaudit/audit_slice_dev.c#1 add .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/appaudit/audit_slice_private.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 26 09:05:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 332B01065670; Tue, 26 May 2009 09:05: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 E7DA0106566B for ; Tue, 26 May 2009 09:05:43 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBDE38FC22 for ; Tue, 26 May 2009 09:05:43 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4Q95hMY043254 for ; Tue, 26 May 2009 09:05:43 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4Q95hqv043252 for perforce@freebsd.org; Tue, 26 May 2009 09:05:43 GMT (envelope-from dforsyth@FreeBSD.org) Date: Tue, 26 May 2009 09:05:43 GMT Message-Id: <200905260905.n4Q95hqv043252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 162764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 09:05:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=162764 Change 162764 by dforsyth@squirrel on 2009/05/26 09:05:20 First code commit. Does very little. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 26 11:05:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C05BD1065673; Tue, 26 May 2009 11:05:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 802A91065670 for ; Tue, 26 May 2009 11:05:46 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CBC38FC19 for ; Tue, 26 May 2009 11:05:46 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QB5ksH054240 for ; Tue, 26 May 2009 11:05:46 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QB5kFl054238 for perforce@freebsd.org; Tue, 26 May 2009 11:05:46 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 11:05:46 GMT Message-Id: <200905261105.n4QB5kFl054238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 11:05:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=162767 Change 162767 by trasz@trasz_victim on 2009/05/26 11:05:05 Fix license. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#13 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#15 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/acl.h#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#47 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#11 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#5 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_flag.c#6 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#12 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#13 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#15 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#5 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/acl.h#4 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * * $FreeBSD$ */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#47 (text+ko) ==== @@ -11,17 +11,17 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * ALTHOUGH THIS SOFTWARE IS MADE OF WIN AND SCIENCE, IT IS PROVIDED BY THE - * AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ /* From owner-p4-projects@FreeBSD.ORG Tue May 26 12:10:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03F59106593E; Tue, 26 May 2009 12:10: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 2B694106593C for ; Tue, 26 May 2009 12:10:53 +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 10D908FC0C for ; Tue, 26 May 2009 12:10:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QCAqUN060123 for ; Tue, 26 May 2009 12:10:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QCAq1F060121 for perforce@freebsd.org; Tue, 26 May 2009 12:10:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 26 May 2009 12:10:52 GMT Message-Id: <200905261210.n4QCAq1F060121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 162771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 12:11:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=162771 Change 162771 by hselasky@hselasky_laptop001 on 2009/05/26 12:10:17 USB core: Improve clear stall logic. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#17 (text+ko) ==== @@ -109,11 +109,11 @@ pipe_end = udev->pipes + udev->pipes_max; pipe_first = udev->pipes; to = udev->pipes_max; - if (pipe == NULL) { - pipe = pipe_first; - } + switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: + if (pipe == NULL) + goto tr_setup; /* device was unconfigured */ if (pipe->edesc && pipe->is_stalled) { pipe->toggle_next = 0; @@ -126,9 +126,10 @@ case USB_ST_SETUP: tr_setup: - if (pipe == pipe_end) { - pipe = pipe_first; - } + if (to == 0) + break; /* no pipes - nothing to do */ + if ((pipe < pipe_first) || (pipe >= pipe_end)) + pipe = pipe_first; /* pipe wrapped around */ if (pipe->edesc && pipe->is_stalled) { @@ -156,9 +157,8 @@ break; } pipe++; - if (--to) - goto tr_setup; - break; + to--; + goto tr_setup; default: if (xfer->error == USB_ERR_CANCELLED) { From owner-p4-projects@FreeBSD.ORG Tue May 26 13:42:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A1DE106566B; Tue, 26 May 2009 13:42: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 59C241065676 for ; Tue, 26 May 2009 13:42:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 455E58FC14 for ; Tue, 26 May 2009 13:42:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QDgRjv080166 for ; Tue, 26 May 2009 13:42:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QDgQiP080160 for perforce@freebsd.org; Tue, 26 May 2009 13:42:26 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 13:42:26 GMT Message-Id: <200905261342.n4QDgQiP080160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 13:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162774 Change 162774 by trasz@trasz_victim on 2009/05/26 13:41:43 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/arch/i386/_atomic_lock.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/i386/_setjmp.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/e_sqrtf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_lrint.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_lrintf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_remquo.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_remquof.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbn.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbnf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbnl.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceil.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceill.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysign.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysignf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysignl.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_cos.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_finite.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floor.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floorl.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_llrint.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_llrintf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_logb.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_logbf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_lrint.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_lrintf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_remquo.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_remquof.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_rint.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_rintf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbn.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbnf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbnl.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_significand.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_significandf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_sin.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_tan.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_trunc.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_truncl.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/ia64/s_fma.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/ia64/s_fmaf.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/ia64/s_fmal.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/makekey/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/libexec/makekey/makekey.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/libexec/makekey/makekey.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fdisk/fdisk.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/ppp/ppp.linkup.sample#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/uk.iso-ctrl.kbd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/acl.h#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/eventhandler.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/KSE/ksetest/kse_asm.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/KSE/rr/kse_asm.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/kdump/mkioctls#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/nfsstat/nfsstat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sed/sed.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ppp/timer.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_compat.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libc/posix1e/acl_compat.c 192586 2009-05-22 15:56:43Z trasz $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_compat.c,v 1.2 2009/05/26 11:42:06 trasz Exp $"); #include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/arch/amd64/_atomic_lock.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $" + .asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.7 2009/05/25 14:37:10 attilio Exp $" #endif /* LIBC_RCS and not lint */ #include @@ -38,4 +38,5 @@ movl $1, %eax xchgq %rax, (%rdi) ret +END(_atomic_lock) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/arch/i386/_atomic_lock.S#2 (text+ko) ==== @@ -22,7 +22,7 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.5 2001/10/25 01:30:54 peter Exp $" + .asciz "$FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.6 2009/05/25 14:37:10 attilio Exp $" #endif /* LIBC_RCS and not lint */ #include @@ -39,4 +39,5 @@ movl $1, %eax xchg %eax, (%ecx) ret +END(_atomic_lock) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/i386/_setjmp.S#2 (text+ko) ==== @@ -32,7 +32,7 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.6 2007/01/09 01:02:04 imp Exp $" + .asciz "$FreeBSD: src/lib/libstand/i386/_setjmp.S,v 1.7 2009/05/25 14:37:10 attilio Exp $" #endif /* LIBC_RCS and not lint */ /* @@ -58,6 +58,7 @@ movl %edi,20(%eax) xorl %eax,%eax ret +END(_setjmp) ENTRY(_longjmp) movl 4(%esp),%edx @@ -73,3 +74,4 @@ incl %eax 1: movl %ecx,0(%esp) ret +END(_longjmp) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/e_sqrt.S#2 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrt.S,v 1.2 2005/02/04 14:08:32 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrt.S,v 1.3 2009/05/25 14:37:10 attilio Exp $") ENTRY(sqrt) sqrtsd %xmm0, %xmm0 ret +END(sqrt) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/e_sqrtf.S#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrtf.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/e_sqrtf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(sqrtf) sqrtss %xmm0, %xmm0 ret +END(sqrtf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_lrint.S#2 (text+ko) ==== @@ -27,10 +27,11 @@ #include #ifndef fn -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrint.S,v 1.1 2005/01/15 03:32:28 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrint.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") #define fn lrint #endif ENTRY(fn) cvtsd2si %xmm0, %rax ret +END(fn) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_lrintf.S#2 (text+ko) ==== @@ -27,10 +27,11 @@ #include #ifndef fn -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_lrintf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") #define fn lrintf #endif ENTRY(fn) cvtss2si %xmm0, %rax ret +END(fn) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_remquo.S#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquo.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(remquo) movsd %xmm0,-8(%rsp) @@ -63,3 +63,4 @@ fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret +END(remquo) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_remquof.S#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_remquof.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(remquof) movss %xmm0,-4(%rsp) @@ -63,3 +63,4 @@ fstps -4(%rsp) movss -4(%rsp),%xmm0 ret +END(remquof) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbn.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbn.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbn.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(scalbn) movsd %xmm0,-8(%rsp) @@ -37,3 +37,4 @@ fstpl -8(%rsp) movsd -8(%rsp),%xmm0 ret +END(scalbn) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbnf.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnf.S,v 1.2 2005/09/12 20:54:00 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $") ENTRY(scalbnf) movss %xmm0,-8(%rsp) @@ -37,6 +37,7 @@ fstps -8(%rsp) movss -8(%rsp),%xmm0 ret +END(scalbnf) .globl CNAME(ldexpf) .set CNAME(ldexpf),CNAME(scalbnf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/amd64/s_scalbnl.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnl.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/amd64/s_scalbnl.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */ ENTRY(scalbnl) @@ -14,6 +14,7 @@ fscale fstp %st(1) ret +END(scalbnl) .globl CNAME(ldexpl) .set CNAME(ldexpl),CNAME(scalbnl) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_exp.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.11 2005/10/30 12:21:02 bde Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_exp.S,v 1.12 2009/05/25 14:37:10 attilio Exp $") /* e^x = 2^(x * log2(e)) */ ENTRY(exp) @@ -96,3 +96,4 @@ x_not_minus_Inf: fldl 4(%esp) ret +END(exp) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_fmod.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_fmod.S,v 1.8 2005/02/04 14:08:32 das Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_fmod.S,v 1.9 2009/05/25 14:37:10 attilio Exp $") ENTRY(fmod) fldl 12(%esp) @@ -46,3 +46,4 @@ jp 1b fstp %st(1) ret +END(fmod) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log.S#2 (text+ko) ==== @@ -35,10 +35,11 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_log.S,v 1.7 2005/02/04 14:08:32 das Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_log.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(log) fldln2 fldl 4(%esp) fyl2x ret +END(log) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log10.S#2 (text+ko) ==== @@ -35,10 +35,11 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_log10.S,v 1.7 2005/02/04 14:08:32 das Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_log10.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(log10) fldlg2 fldl 4(%esp) fyl2x ret +END(log10) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_log10f.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/e_log10f.S,v 1.2 2005/02/04 14:08:32 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/e_log10f.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: e_log10f.S,v 1.1 1996/07/03 16:50:22 jtc Exp $") */ ENTRY(log10f) @@ -13,3 +13,4 @@ flds 4(%esp) fyl2x ret +END(log10f) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_remainder.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.8 2005/02/04 14:08:32 das Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.9 2009/05/25 14:37:10 attilio Exp $") ENTRY(remainder) fldl 12(%esp) @@ -46,3 +46,4 @@ jp 1b fstp %st(1) ret +END(remainder) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_remainderf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/e_remainderf.S,v 1.2 2005/02/04 14:08:32 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/e_remainderf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $") */ ENTRY(remainderf) @@ -17,3 +17,4 @@ jp 1b fstp %st(1) ret +END(remainderf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_sqrt.S#2 (text+ko) ==== @@ -35,9 +35,10 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/e_sqrt.S,v 1.7 2005/02/04 14:08:32 das Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/e_sqrt.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(sqrt) fldl 4(%esp) fsqrt ret +END(sqrt) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/e_sqrtf.S#2 (text+ko) ==== @@ -5,10 +5,11 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/e_sqrtf.S,v 1.2 2005/02/04 14:08:32 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/e_sqrtf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: e_sqrtf.S,v 1.2 1995/05/08 23:50:14 jtc Exp $") */ ENTRY(sqrtf) flds 4(%esp) fsqrt ret +END(sqrtf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceil.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_ceil.S,v 1.7 1999/08/28 00:06:11 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_ceil.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(ceil) pushl %ebp @@ -56,3 +56,4 @@ leave ret +END(ceil) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceilf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceilf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */ ENTRY(ceilf) @@ -27,3 +27,4 @@ leave ret +END(ceilf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_ceill.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceill.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_ceill.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(ceill) pushl %ebp @@ -25,3 +25,4 @@ leave ret +END(ceill) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysign.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_copysign.S,v 1.6 1999/08/28 00:06:11 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_copysign.S,v 1.7 2009/05/25 14:37:10 attilio Exp $") ENTRY(copysign) movl 16(%esp),%edx @@ -46,3 +46,4 @@ movl %eax,8(%esp) fldl 4(%esp) ret +END(copysign) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysignf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_copysignf.S,v 1.3 1995/05/08 23:53:25 jtc Exp $") */ ENTRY(copysignf) @@ -17,3 +17,4 @@ movl %eax,4(%esp) flds 4(%esp) ret +END(copysignf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_copysignl.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignl.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_copysignl.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(copysignl) movl 24(%esp),%edx @@ -15,3 +15,4 @@ movl %eax,12(%esp) fldt 4(%esp) ret +END(copysignl) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_cos.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_cos.S,v 1.6 1999/08/28 00:06:12 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_cos.S,v 1.7 2009/05/25 14:37:10 attilio Exp $") ENTRY(cos) fldl 4(%esp) @@ -54,3 +54,4 @@ fstp %st(1) fcos ret +END(cos) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_finite.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_finite.S,v 1.7 1999/08/28 00:06:12 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_finite.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(finite) movl 8(%esp),%eax @@ -44,3 +44,4 @@ setneb %al andl $0x000000ff, %eax ret +END(finite) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floor.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_floor.S,v 1.7 1999/08/28 00:06:12 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_floor.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(floor) pushl %ebp @@ -56,3 +56,4 @@ leave ret +END(floor) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floorf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */ ENTRY(floorf) @@ -27,3 +27,4 @@ leave ret +END(floorf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_floorl.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorl.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_floorl.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(floorl) pushl %ebp @@ -25,3 +25,4 @@ leave ret +END(floorl) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_llrint.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrint.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(llrint) fldl 4(%esp) @@ -34,3 +34,4 @@ popl %eax popl %edx ret +END(llrint) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_llrintf.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_llrintf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(llrintf) flds 4(%esp) @@ -34,3 +34,4 @@ popl %eax popl %edx ret +END(llrintf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_logb.S#2 (text+ko) ==== @@ -35,10 +35,11 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_logb.S,v 1.7 2000/06/06 12:12:36 bde Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_logb.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(logb) fldl 4(%esp) fxtract fstp %st ret +END(logb) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_logbf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_logbf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_logbf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_logbf.S,v 1.3 1995/05/09 00:15:12 jtc Exp $") */ ENTRY(logbf) @@ -13,3 +13,4 @@ fxtract fstp %st ret +END(logbf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_lrint.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrint.S,v 1.1 2005/01/11 23:10:53 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrint.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(lrint) fldl 4(%esp) @@ -33,3 +33,4 @@ fistpl (%esp) popl %eax ret +END(lrint) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_lrintf.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrintf.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_lrintf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(lrintf) flds 4(%esp) @@ -33,3 +33,4 @@ fistpl (%esp) popl %eax ret +END(lrintf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_remquo.S#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquo.S,v 1.1 2005/03/25 04:40:44 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquo.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(remquo) fldl 12(%esp) @@ -60,3 +60,4 @@ movl 20(%esp),%ecx movl %eax,(%ecx) ret +END(remquo) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_remquof.S#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquof.S,v 1.1 2005/03/25 04:40:44 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_remquof.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); ENTRY(remquof) flds 8(%esp) @@ -60,3 +60,4 @@ movl 12(%esp),%ecx movl %eax,(%ecx) ret +END(remquof) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_rint.S#2 (text+ko) ==== @@ -35,9 +35,10 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_rint.S,v 1.6 1999/08/28 00:06:13 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_rint.S,v 1.7 2009/05/25 14:37:10 attilio Exp $") ENTRY(rint) fldl 4(%esp) frndint ret +END(rint) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_rintf.S#2 (text+ko) ==== @@ -5,10 +5,11 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_rintf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_rintf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_rintf.S,v 1.3 1995/05/09 00:17:22 jtc Exp $") */ ENTRY(rintf) flds 4(%esp) frndint ret +END(rintf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbn.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_scalbn.S,v 1.7 1999/08/28 00:06:13 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_scalbn.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(scalbn) fildl 12(%esp) @@ -43,3 +43,4 @@ fscale fstp %st(1) ret +END(scalbn) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbnf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnf.S,v 1.2 2005/03/07 04:52:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */ ENTRY(scalbnf) @@ -14,6 +14,7 @@ fscale fstp %st(1) /* bug fix for fp stack overflow */ ret +END(scalbnf) .globl CNAME(ldexpf) .set CNAME(ldexpf),CNAME(scalbnf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_scalbnl.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnl.S,v 1.1 2005/03/07 04:52:57 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_scalbnl.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */ ENTRY(scalbnl) @@ -14,6 +14,7 @@ fscale fstp %st(1) ret +END(scalbnl) .globl CNAME(ldexpl) .set CNAME(ldexpl),CNAME(scalbnl) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_significand.S#2 (text+ko) ==== @@ -35,10 +35,11 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_significand.S,v 1.7 2000/06/06 12:12:36 bde Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_significand.S,v 1.8 2009/05/25 14:37:10 attilio Exp $") ENTRY(significand) fldl 4(%esp) fxtract fstp %st(1) ret +END(significand) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_significandf.S#2 (text+ko) ==== @@ -5,7 +5,7 @@ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_significandf.S,v 1.1 2005/01/13 18:58:25 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/i387/s_significandf.S,v 1.2 2009/05/25 14:37:10 attilio Exp $"); /* RCSID("$NetBSD: s_significandf.S,v 1.3 1995/05/09 00:24:07 jtc Exp $") */ ENTRY(significandf) @@ -13,3 +13,4 @@ fxtract fstp %st(1) ret +END(significandf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_sin.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_sin.S,v 1.6 1999/08/28 00:06:14 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_sin.S,v 1.7 2009/05/25 14:37:10 attilio Exp $") ENTRY(sin) fldl 4(%esp) @@ -54,3 +54,4 @@ fstp %st(1) fsin ret +END(sin) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_tan.S#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include -RCSID("$FreeBSD: src/lib/msun/i387/s_tan.S,v 1.6 1999/08/28 00:06:14 peter Exp $") +RCSID("$FreeBSD: src/lib/msun/i387/s_tan.S,v 1.7 2009/05/25 14:37:10 attilio Exp $") ENTRY(tan) fldl 4(%esp) @@ -56,3 +56,4 @@ fptan fstp %st(0) ret +END(tan) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_trunc.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_trunc.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_trunc.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") ENTRY(trunc) pushl %ebp @@ -24,3 +24,4 @@ leave ret +END(trunc) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_truncf.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.2 2005/05/06 15:44:20 deischen Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncf.S,v 1.3 2009/05/25 14:37:10 attilio Exp $") ENTRY(truncf) pushl %ebp @@ -24,3 +24,4 @@ leave ret +END(truncf) ==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/i387/s_truncl.S#2 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncl.S,v 1.1 2005/04/16 21:12:55 das Exp $") +__FBSDID("$FreeBSD: src/lib/msun/i387/s_truncl.S,v 1.2 2009/05/25 14:37:10 attilio Exp $") >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 26 17:09:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB5871065676; Tue, 26 May 2009 17:09: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 51F871065672 for ; Tue, 26 May 2009 17:09:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36E208FC13 for ; Tue, 26 May 2009 17:09:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QH9x5w011139 for ; Tue, 26 May 2009 17:09:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QH9x06011137 for perforce@freebsd.org; Tue, 26 May 2009 17:09:59 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 17:09:59 GMT Message-Id: <200905261709.n4QH9x06011137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 17:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=162786 Change 162786 by trasz@trasz_victim on 2009/05/26 17:09:23 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/nfscbd.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/nfscbd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/nfsdumpstate.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/nfsdumpstate.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/nfsrevoke.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/nfsrevoke.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/nfsuserd.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/nfsuserd.c#1 branch Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.1 2009/05/04 15:23:58 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.2 2009/05/26 17:01:00 trasz Exp $"); #ifndef APPLEKEXT #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_subr.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.104 2009/05/26 10:03:44 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.105 2009/05/26 14:15:06 lulf Exp $"); #include "opt_ddb.h" @@ -1310,11 +1310,11 @@ db_print_bio_flags(bp); db_printf(" cflags: 0x%hhx\n", bp->bio_cflags); db_printf(" pflags: 0x%hhx\n", bp->bio_pflags); - db_printf(" offset: %lld\n", bp->bio_offset); - db_printf(" length: %lld\n", bp->bio_length); + db_printf(" offset: %jd\n", (intmax_t)bp->bio_offset); + db_printf(" length: %jd\n", (intmax_t)bp->bio_length); db_printf(" bcount: %ld\n", bp->bio_bcount); db_printf(" resid: %ld\n", bp->bio_resid); - db_printf(" completed: %lld\n", bp->bio_completed); + db_printf(" completed: %jd\n", (intmax_t)bp->bio_completed); db_printf(" children: %u\n", bp->bio_children); db_printf(" inbed: %u\n", bp->bio_inbed); db_printf(" error: %d\n", bp->bio_error); ==== //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.411 2009/04/16 14:43:59 rwatson Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.412 2009/05/26 15:19:04 rmacklem Exp $ .include @@ -110,7 +110,11 @@ ${_ndiscvt} \ ${_ndp} \ newsyslog \ + nfscbd \ nfsd \ + nfsdumpstate \ + nfsrevoke \ + nfsuserd \ ${_ngctl} \ ${_nghook} \ nologin \ From owner-p4-projects@FreeBSD.ORG Tue May 26 17:39:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B13941065679; Tue, 26 May 2009 17:39: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 6EFAE106566B for ; Tue, 26 May 2009 17:39:34 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E0078FC32 for ; Tue, 26 May 2009 17:39:34 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QHdYV5013381 for ; Tue, 26 May 2009 17:39:34 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QHdYwm013379 for perforce@freebsd.org; Tue, 26 May 2009 17:39:34 GMT (envelope-from scottl@freebsd.org) Date: Tue, 26 May 2009 17:39:34 GMT Message-Id: <200905261739.n4QHdYwm013379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 162793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 17:39:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=162793 Change 162793 by scottl@scottl-y1 on 2009/05/26 17:38:49 Start locking access to the devclasses global list. Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#20 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#20 (text+ko) ==== @@ -764,6 +764,8 @@ static devclass_list_t devclasses = TAILQ_HEAD_INITIALIZER(devclasses); +static struct mtx devclasses_mtx; +MTX_SYSINIT(devclasses, &devclasses_mtx, "devclass global mtx", MTX_DEF); /** * @internal @@ -781,11 +783,13 @@ * @param create non-zero to create a devclass */ static devclass_t -devclass_find_internal(const char *classname, const char *parentname, - int create) +devclass_find_internal_locked(const char *classname, const char *parentname, + int create) { devclass_t dc; + mtx_assert(&devclasses_mtx, MA_OWNED); + PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -820,13 +824,26 @@ */ if (parentname && dc && !dc->parent && strcmp(classname, parentname) != 0) { - dc->parent = devclass_find_internal(parentname, NULL, TRUE); + dc->parent = devclass_find_internal_locked(parentname, NULL, + TRUE); dc->parent->flags |= DC_HAS_CHILDREN; } return (dc); } +static devclass_t +devclass_find_internal(const char *classname, const char *parentname, + int create) +{ + devclass_t dc; + + mtx_lock(&devclasses_mtx); + dc = devclass_find_internal_locked(classname, parentname, create); + mtx_unlock(&devclasses_mtx); + return (dc); +} + /** * @brief Create a device class * From owner-p4-projects@FreeBSD.ORG Tue May 26 17:40:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E22E10656A3; Tue, 26 May 2009 17:40: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 B61E81065688 for ; Tue, 26 May 2009 17:40:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2E048FC23 for ; Tue, 26 May 2009 17:40:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QHegsu013514 for ; Tue, 26 May 2009 17:40:42 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QHeZWg013510 for perforce@freebsd.org; Tue, 26 May 2009 17:40:35 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 17:40:35 GMT Message-Id: <200905261740.n4QHeZWg013510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 17:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=162794 Change 162794 by trasz@trasz_victim on 2009/05/26 17:40:09 Use the "NFSv4" name consistently. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#54 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#15 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#26 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#18 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#37 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#27 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#54 (text+ko) ==== @@ -14,14 +14,14 @@ - Talk about semantics. Do whatever is needed. -- Figure out whether this thing should be called 'NFS4' or 'NFSv4'. +- Figure out whether this thing should be called 'nfs4' or 'nfsv4'. Use this name consistently. - Review. Things to do, in no particular order: -- Add support for NFS4 ACLs to tar(1). +- Add support for NFSv4 ACLs to tar(1). - Make 'struct acl' variable size. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#3 (text+ko) ==== @@ -182,7 +182,7 @@ } newmode = getmode(set, p->fts_statp->st_mode); /* - * With NFS4 ACLs, it is possible that applying a mode + * With NFSv4 ACLs, it is possible that applying a mode * identical to the one computed from an ACL will change * that ACL. */ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#8 (text+ko) ==== @@ -421,8 +421,8 @@ if (source_type != dest_type) { warnx("ACL brand of source is %s, but destination is %s; " "ACL not copied", - source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX", - dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX"); + source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e", + dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e"); return (0); } @@ -470,8 +470,8 @@ if (source_type != dest_type) { warnx("ACL brand of source is %s, but destination is %s; " "ACL not copied", - source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX", - dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX"); + source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e", + dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e"); return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#7 (text+ko) ==== @@ -61,12 +61,12 @@ access ACL. An error is generated if a default ACL cannot be associated with .Ar file . -This option is not valid for NFS4 ACLs. +This option is not valid for NFSv4 ACLs. .It Fl h If the target of the operation is a symbolic link, return the ACL from the symbolic link itself rather than following the link. .It Fl i -For NFS4 ACLs, append numerical ID at the end of each entry containing +For NFSv4 ACLs, append numerical ID at the end of each entry containing user or group name. .It Fl n Display user and group IDs numerically rather than converting to @@ -77,7 +77,7 @@ This is useful when dealing with filenames with unprintable characters. .It Fl v -For NFS4 ACLs, display access mask and flags in a verbose form. +For NFSv4 ACLs, display access mask and flags in a verbose form. For POSIX.1e ACLs, this option does nothing. .El .Pp ==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#12 (text+ko) ==== @@ -199,7 +199,7 @@ if (pathconf(path, _PC_EXTENDED_SECURITY_NP)) { if (type == ACL_TYPE_DEFAULT) { - warnx("%s: there are no default entries in NFS4 ACLs", + warnx("%s: there are no default entries in NFSv4 ACLs", path); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#6 (text+ko) ==== @@ -482,8 +482,8 @@ if (source_type != dest_type) { warnx("ACL brand of source is %s, but destination is %s; " "ACL not copied", - source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX", - dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX"); + source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e", + dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e"); return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#11 (text+ko) ==== @@ -103,8 +103,8 @@ if (acl_brand != prev_acl_brand) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be merged is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX", - acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX"); + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); return (-1); } @@ -140,7 +140,7 @@ continue; /* - * For NFS4, in addition to "tag" and "id" we also + * For NFSv4, in addition to "tag" and "id" we also * compare "entry_type". */ if (acl_brand == ACL_BRAND_NFS4) { @@ -201,7 +201,7 @@ if (have_entry == 0) { /* - * NFS4 ACL entries must be prepended to the ACL. + * NFSv4 ACL entries must be prepended to the ACL. * Appending them at the end makes no sense, since * in most cases they wouldn't even get evaluated. */ @@ -247,15 +247,15 @@ acl_get_brand_np(*prev_acl, &prev_acl_brand); if (prev_acl_brand != ACL_BRAND_NFS4) { - warnx("%s: the '-a' option is only applicable to NFS4 ACLs", + warnx("%s: the '-a' option is only applicable to NFSv4 ACLs", filename); return (-1); } if (acl_brand != ACL_BRAND_NFS4) { - warnx("%s: branding mismatch; existing ACL is NFS4, " + warnx("%s: branding mismatch; existing ACL is NFSv4, " "entry to be added is %s", filename, - acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX"); + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#7 (text+ko) ==== @@ -56,8 +56,8 @@ if (acl_brand != prev_acl_brand) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be removed is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX", - acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX"); + prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", + acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#5 (text+ko) ==== @@ -59,10 +59,10 @@ starting at position .Ar position , counting from zero. -This option is only applicable to NFS4 ACLs. +This option is only applicable to NFSv4 ACLs. .It Fl b Remove all ACL entries except for the three required entries -(POSIX.1e ACLs) or six "canonical" entries (NFS4 ACLs). +(POSIX.1e ACLs) or six "canonical" entries (NFSv4 ACLs). If the POSIX.1e ACL contains a .Dq Li mask entry, the permissions of the @@ -77,7 +77,7 @@ The operations apply to the default ACL entries instead of access ACL entries. Currently only directories may have -default ACL's. This option is not applicable to NFS4 ACLs. +default ACL's. This option is not applicable to NFSv4 ACLs. .It Fl h If the target of the operation is a symbolic link, perform the operation on the symbolic link itself, rather than following the link. @@ -88,7 +88,7 @@ any default ACL entries. An error will be reported if any of the specified files cannot have a default entry (i.e.\& -non-directories). This option is not applicable to NFS4 ACLs. +non-directories). This option is not applicable to NFSv4 ACLs. .It Fl m Ar entries Modify the ACL entries on the specified files by adding new entries and modifying existing ACL entries with the ACL entries @@ -106,7 +106,7 @@ the input is taken from stdin. .It Fl n Do not recalculate the permissions associated with the ACL -mask entry. This option is not applicable to NFS4 ACLs. +mask entry. This option is not applicable to NFSv4 ACLs. .It Fl x Ar entries | position If .Ar entries @@ -258,8 +258,8 @@ For more details see the examples below. Default ACLs can be created by using .Fl d . -.Sh NFS4 ACL ENTRIES -An NFS4 ACL entry contains four or five colon-separated fields: an ACL tag, +.Sh NFSv4 ACL ENTRIES +An NFSv4 ACL entry contains four or five colon-separated fields: an ACL tag, an ACL qualifier (only for .Dq Li user and @@ -351,7 +351,7 @@ .Ql # is ignored (comments). .Pp -NFS4 ACL entries are evaluated in their visible order. +NFSv4 ACL entries are evaluated in their visible order. .Pp Multiple ACL entries specified on the command line are separated by commas. @@ -376,7 +376,7 @@ .Pp .Dl setfacl -m owner@:rwxp::allow,g:mail:rwp::allow file .Pp -Semantically equal to the example above, but for NFS4 ACL. +Semantically equal to the example above, but for NFSv4 ACL. .Pp .Dl setfacl -M file1 file2 .Pp @@ -393,7 +393,7 @@ .Pp .Dl setfacl -x0 file .Pp -Remove the first entry from the NFS4 ACL from +Remove the first entry from the NFSv4 ACL from .Pa file . .Pp .Dl setfacl -bn file ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#15 (text+ko) ==== @@ -247,7 +247,7 @@ if (pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) { if (acl_type == ACL_TYPE_DEFAULT) { warnx("%s: there are no default entries " - "in NFS4 ACLs", file->filename); + "in NFSv4 ACLs", file->filename); continue; } @@ -281,7 +281,7 @@ break; case OP_REMOVE_DEF: if (acl_type == ACL_TYPE_NFS4) { - warnx("%s: there are no default entries in NFS4 ACLs; " + warnx("%s: there are no default entries in NFSv4 ACLs; " "cannot remove", file->filename); local_error++; break; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#5 (text+ko) ==== @@ -58,7 +58,7 @@ .It ACL_READ Read permission .El .Pp -For NFS4 ACLs, valid values are: +For NFSv4 ACLs, valid values are: .Pp .Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS" .It ACL_READ_DATA Read permission @@ -88,7 +88,7 @@ ACL_ADD_FILE, ACL_APPEND_DATA, ACL_ADD_SUBDIRECTORY, ACL_READ_NAMED_ATTRS, ACL_WRITE_NAMED_ATTRS, ACL_DELETE_CHILD, ACL_READ_ATTRIBUTES, ACL_WRITE_ATTRIBUTES, ACL_DELETE, ACL_READ_ACL, ACL_WRITE_ACL -or ACL_SYNCHRONIZE brands the ACL as NFS4. +or ACL_SYNCHRONIZE brands the ACL as NFSv4. .Sh RETURN VALUES .Rv -std acl_add_perm .Sh ERRORS ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#12 (text+ko) ==== @@ -36,14 +36,14 @@ /* * An ugly detail of the implementation - fortunately not visible * to the API users - is the "branding": libc needs to keep track - * of what "brand" ACL is, wheather it's NFS4, POSIX or unknown. + * of what "brand" ACL is, wheather it's NFSv4, POSIX.1e or unknown. * It happens automatically - for example, during acl_get_file(3) ACL * gets branded according to the "type" argument, during acl_set_permset - * ACL, if its brand is unknown gets branded as NFS4 if any of the - * NFS4 permissions that are not valid for POSIX ACL are set etc. + * ACL, if its brand is unknown gets branded as NFSv4 if any of the + * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc. * Branding information is used for printing out the ACL (acl_to_text(3)), * veryfying acl_set_whatever arguments (checking against setting - * bits that are valid only for NFS4 in ACL branded as POSIX) etc. + * bits that are valid only for NFSv4 in ACL branded as POSIX.1e) etc. */ static acl_t ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#4 (text+ko) ==== @@ -99,7 +99,7 @@ .Bl -column -offset 3n "ACL_TYPE_DEFAULT" .It ACL_TYPE_ACCESS POSIX.1e access ACL .It ACL_TYPE_DEFAULT POSIX.1e default ACL -.It ACL_TYPE_NFS4 NFS4 ACL +.It ACL_TYPE_NFS4 NFSv4 ACL .El .Pp The ACL returned will be branded accordingly. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#5 (text+ko) ==== @@ -50,10 +50,10 @@ .Fa acl . .Pp Branding is an internal mechanism intended to prevent mixing POSIX.1e -and NFS4 entries by mistake. +and NFSv4 entries by mistake. It's also used by the libc to determine how to print out the ACL. -The first call to function that is specific for one particular brand - POSIX -or NFS4 - "brands" the ACL. +The first call to function that is specific for one particular brand - POSIX.1e +or NFSv4 - "brands" the ACL. After that, calling function specific to another brand will result in error. .Sh RETURN VALUES .Rv -std acl_get_brand_np ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm acl_get_entry_type_np -.Nd retrieve the ACL type from an NFS4 ACL entry +.Nd retrieve the ACL type from an NFSv4 ACL entry .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -42,7 +42,7 @@ The .Fn acl_get_entry_type_np function -is a non-portable call that returns the ACL type for the NFS4 ACL entry +is a non-portable call that returns the ACL type for the NFSv4 ACL entry .Fa entry_d . Upon successful completion, the location referred to by the argument .Fa entry_type_p @@ -58,7 +58,7 @@ .It Bq Er EINVAL Argument .Fa entry_d -is not a valid descriptor for an NFS4 ACL entry; +is not a valid descriptor for an NFSv4 ACL entry; .El .Sh SEE ALSO .Xr acl 3 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm acl_get_flagset_np -.Nd retrieve flagset from an NFS4 ACL entry +.Nd retrieve flagset from an NFSv4 ACL entry .Sh LIBRARY .Lb libc .Sh SYNOPSIS ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#5 (text+ko) ==== @@ -56,7 +56,7 @@ any access rules. For POSIX.1e ACLs, ACL is trivial if it has the three required entries, one for owner, one for owning group, and one for other. -For NFS4 ACLs, ACL is trivial if it has the "canonical six" entries. +For NFSv4 ACLs, ACL is trivial if it has the "canonical six" entries. Files that have non-trivial ACL have a plus sign appended after mode bits in "ls -l" output. .Sh RETURN VALUES ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#4 (text+ko) ==== @@ -83,13 +83,13 @@ .Bl -column -offset 3n "ACL_TYPE_DEFAULT" .It ACL_TYPE_ACCESS POSIX.1e access ACL .It ACL_TYPE_DEFAULT POSIX.1e default ACL -.It ACL_TYPE_NFS4 NFS4 ACL +.It ACL_TYPE_NFS4 NFSv4 ACL .El .Pp Trying to set ACL_TYPE_NFS4 with .Va acl -branded as POSIX, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL -branded as NFS4, will result in error. +branded as POSIX.1e, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL +branded as NFSv4, will result in error. .Sh IMPLEMENTATION NOTES .Fx Ns 's support for POSIX.1e interfaces and features is still under ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm acl_set_entry_type_np -.Nd set NFS4 ACL entry type +.Nd set NFSv4 ACL entry type .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -54,7 +54,7 @@ .It ACL_ENTRY_TYPE_DENY "deny" type entry .El .Pp -This call brands the ACL as NFS4. +This call brands the ACL as NFSv4. .Sh RETURN VALUES .Rv -std acl_set_entry_type_np .Sh ERRORS @@ -69,7 +69,7 @@ The value pointed to by .Fa entry_type is not valid. -ACL is already branded as POSIX. +ACL is already branded as POSIX.1e. .It Bq Er ENOMEM The value to be returned requires more memory than is allowed by the hardware or system-imposed memory management constraints. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm acl_set_flagset_np -.Nd set the flags of an NFS4 ACL entry +.Nd set the flags of an NFSv4 ACL entry .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -47,7 +47,7 @@ with the flags contained in .Fa flagset_d . .Pp -This call brands the ACL as NFS4. +This call brands the ACL as NFSv4. .Sh RETURN VALUES .Rv -std acl_set_flagset_np .Sh ERRORS @@ -59,7 +59,7 @@ Argument .Fa entry_d is not a valid descriptor for an ACL entry. -ACL is already branded as POSIX. +ACL is already branded as POSIX.1e. .El .Sh SEE ALSO .Xr acl 3 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#5 (text+ko) ==== @@ -64,8 +64,8 @@ .Fn acl_set_tag_type with .Fa tag_type -equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX. -Calling it with ACL_EVERYONE brands the ACL as NFS4. +equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX.1e. +Calling it with ACL_EVERYONE brands the ACL as NFSv4. .Sh RETURN VALUES .Rv -std acl_set_tag_type .Sh ERRORS ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#9 (text+ko) ==== @@ -426,7 +426,7 @@ /* * Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new" - * counterpart. It's neccessary for the old (pre-NFS4 ACLs) binaries + * counterpart. It's neccessary for the old (pre-NFSv4 ACLs) binaries * to work with new libc and kernel. Fixing 'type' for old binaries with * old libc and new kernel is being done by kern/vfs_acl.c:type_unold(). */ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#4 (text+ko) ==== @@ -56,9 +56,9 @@ is not NULL, then the function shall return the length of the string (not including the NULL terminator) in the location pointed to by .Va len_p . -If the ACL is POSIX, the format of the text string returned by +If the ACL is POSIX.1e, the format of the text string returned by .Fn acl_to_text -shall be the POSIX.1e long ACL form. If the ACL is NFS4, the format +shall be the POSIX.1e long ACL form. If the ACL is NFSv4, the format of the text string shall be the compact form, unless the .Va ACL_TEXT_VERBOSE flag is given. ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#6 (text+ko) ==== @@ -190,7 +190,7 @@ for more information, which cause the multilabel mount flag to be set automatically at mount-time. .It Cm nfs4acls -Enable NFS4 ACLS, which can be customized via the +Enable NFSv4 ACLS, which can be customized via the .Xr setfacl 1 and .Xr getfacl 1 ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#4 (text+ko) ==== @@ -30,7 +30,7 @@ .Dt VACCESS_ACL_NFS4 9 .Sh NAME .Nm vaccess_acl_nfs4 -.Nd generate a NFS4 ACL access control decision using vnode parameters +.Nd generate a NFSv4 ACL access control decision using vnode parameters .Sh SYNOPSIS .In sys/param.h .In sys/vnode.h @@ -49,7 +49,7 @@ This call implements the logic for the .Ux discretionary file security model -with NFS4 ACL extensions. +with NFSv4 ACL extensions. It accepts the vnodes type .Fa type , owning UID @@ -86,7 +86,7 @@ .Pp The algorithm used by .Fn vaccess_acl_nfs4 -is based on the NFS4 ACL evaluation algorithm, as described in +is based on the NFSv4 ACL evaluation algorithm, as described in NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-21.txt. The algorithm selects a .Em matching @@ -125,5 +125,5 @@ was written by .An Edward Tomasz Napierala Aq trasz@FreeBSD.org . .Sh BUGS -This manual page should include a full description of the NFS4 ACL +This manual page should include a full description of the NFSv4 ACL evaluation algorithm, or cross reference another page that does. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#26 (text+ko) ==== @@ -4832,7 +4832,7 @@ return (EINVAL); /* - * With NFS4 ACLs, chmod(2) may need to add additional entries, + * With NFSv4 ACLs, chmod(2) may need to add additional entries, * splitting every entry into two and appending "canonical six" * entries at the end. Don't allow for setting an ACL that would * cause chmod(2) to run out of ACL entries. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#5 (text+ko) ==== @@ -695,7 +695,7 @@ if (nfsrv_useacl == 0 || !NFSHASNFS4ACL(vnode_mount(vp))) return (NFSERR_ATTRNOTSUPP); /* - * With NFS4 ACLs, chmod(2) may need to add additional entries. + * With NFSv4 ACLs, chmod(2) may need to add additional entries. * Make sure it has enough room for that - splitting every entry * into two and appending "canonical six" entries at the end. * Cribbed out of kern/vfs_acl.c - Rick M. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#18 (text+ko) ==== @@ -175,7 +175,7 @@ /* * Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new" - * counterpart. It's required for old (pre-NFS4 ACLs) libc to work + * counterpart. It's required for old (pre-NFSv4 ACLs) libc to work * with new kernel. Fixing 'type' for old binaries with new libc * is being done in lib/libc/posix1e/acl_support.c:_acl_type_unold(). */ @@ -219,7 +219,7 @@ goto out; /* - * With NFS4 ACLs, chmod(2) may need to add additional entries. + * With NFSv4 ACLs, chmod(2) may need to add additional entries. * Make sure it has enough room for that - splitting every entry * into two and appending "canonical six" entries at the end. */ @@ -325,7 +325,7 @@ goto out; /* - * With NFS4 ACLs, chmod(2) may need to add additional entries. + * With NFSv4 ACLs, chmod(2) may need to add additional entries. * Make sure it has enough room for that - splitting every entry * into two and appending "canonical six" entries at the end. */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#37 (text+ko) ==== @@ -134,7 +134,7 @@ * Kernel code should use the "type" argument passed * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls; * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e - * ACL, ACL_TYPE_NFS4 means NFS4 ACL. + * ACL, ACL_TYPE_NFS4 means NFSv4 ACL. */ int ats_brand; }; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#27 (text+ko) ==== @@ -317,7 +317,7 @@ #define VAPPEND 000000040000 /* permission to write/append */ /* * VEXPLICIT_DENY makes VOP_ACCESS(9) return EPERM or EACCES only - * if permission was denied explicitly, by a "deny" rule in NFS4 ACL, + * if permission was denied explicitly, by a "deny" rule in NFSv4 ACL, * and 0 otherwise. This never happens with ordinary unix access rights * or POSIX.1e ACLs. Obviously, VEXPLICIT_DENY must be OR-ed with * some other V* constant. ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -# This is an NFS4 ACL fuzzer. It expects to be run by non-root -# in a scratch directory on a filesystem with NFS4 ACLs support. +# This is an NFSv4 ACL fuzzer. It expects to be run by non-root +# in a scratch directory on a filesystem with NFSv4 ACLs support. # It generates the output that is expected to be fed to # /usr/src/tools/regression/acltools/run script. ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#2 (text+ko) ==== @@ -4,7 +4,7 @@ # /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test # # You need to have three subdirectories, named nfs4, posix and none, -# with filesystems with NFS4 ACLs, POSIX ACLs and no ACLs enabled, +# with filesystems with NFSv4 ACLs, POSIX.1e ACLs and no ACLs enabled, # respectively, mounted on them, in your current directory. # # WARNING: Creates files in unsafe way. @@ -36,7 +36,7 @@ $ ls -l posix/xxx | cut -d' ' -f1 > -r--r-xrw- -# mv with POSIX ACLs. +# mv with POSIX.1e ACLs. $ setfacl -m u:42:x,g:43:w posix/xxx $ rm -f posix/yyy $ mv posix/xxx posix/yyy @@ -48,10 +48,10 @@ > mask::rwx > other::rw- -# mv from POSIX to NFS4. +# mv from POSIX.1e to NFSv4. $ rm -f nfs4/xxx $ mv posix/yyy nfs4/xxx -> mv: ACL brand of source is POSIX, but destination is NFS4; ACL not copied +> mv: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied $ getfacl -nq nfs4/xxx > owner@:-wxp----------:------:deny > owner@:r------A-W-Co-:------:allow @@ -60,7 +60,7 @@ > everyone@:--x----A-W-Co-:------:deny > everyone@:rw-p--a-R-c--s:------:allow -# mv with NFS4 ACLs. +# mv with NFSv4 ACLs. $ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx $ rm -f nfs4/yyy $ mv nfs4/xxx nfs4/yyy @@ -74,20 +74,20 @@ > everyone@:--x----A-W-Co-:------:deny > everyone@:rw-p--a-R-c--s:------:allow -# mv from NFS4 to POSIX. +# mv from NFSv4 to POSIX.1e. $ rm -f posix/xxx $ mv nfs4/yyy posix/xxx -> mv: ACL brand of source is NFS4, but destination is POSIX; ACL not copied +> mv: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied $ ls -l posix/xxx | cut -d' ' -f1 > -r--rwxrw- -# mv from POSIX to none. +# mv from POSIX.1e to none. $ setfacl -m u:42:x,g:43:w posix/xxx $ mv posix/xxx none/xxx $ ls -l none/xxx | cut -d' ' -f1 > -r--rwxrw- -# cp with POSIX ACLs. +# cp with POSIX.1e ACLs. $ rm -f posix/xxx $ touch posix/xxx $ setfacl -m u:42:x,g:43:w posix/xxx @@ -116,14 +116,14 @@ > mask::rwx > other::r-- -# mv from POSIX to NFS4. +# mv from POSIX.1e to NFSv4. $ rm -f nfs4/xxx $ cp -p posix/xxx nfs4/xxx -> cp: ACL brand of source is POSIX, but destination is NFS4; ACL not copied +> cp: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied $ ls -l nfs4/xxx | cut -d' ' -f1 > -rw-rwxr-- -# cp with NFS4 ACLs. +# cp with NFSv4 ACLs. $ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx $ rm -f nfs4/yyy $ cp -p nfs4/xxx nfs4/yyy @@ -137,10 +137,10 @@ > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow -# mv from NFS4 to POSIX. +# mv from NFSv4 to POSIX.1e. $ rm -f posix/xxx $ cp -p nfs4/xxx posix/xxx -> cp: ACL brand of source is NFS4, but destination is POSIX; ACL not copied +> cp: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied $ ls -l posix/xxx | cut -d' ' -f1 > -rw-rwxr-- ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# This is a tools-level test for NFS4 ACL functionality. Run it as root +# This is a tools-level test for NFSv4 ACL functionality. Run it as root # using ACL-enabled kernel: # # /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories" +desc="NFSv4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories" dir=`dirname $0` . ${dir}/../misc.sh ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES" +desc="NFSv4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES" dir=`dirname $0` . ${dir}/../misc.sh ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL" +desc="NFSv4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL" dir=`dirname $0` . ${dir}/../misc.sh ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - DELETE and DELETE_CHILD" +desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD" dir=`dirname $0` . ${dir}/../misc.sh ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - ACL_WRITE_OWNER" +desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER" dir=`dirname $0` . ${dir}/../misc.sh ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -desc="NFS4 granular permissions checking - DELETE and DELETE_CHILD with directories" +desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD with directories" dir=`dirname $0` . ${dir}/../misc.sh From owner-p4-projects@FreeBSD.ORG Tue May 26 19:16:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F10AB10656B3; Tue, 26 May 2009 19:16: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 A98E81065688 for ; Tue, 26 May 2009 19:16:49 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48D7C8FC1E for ; Tue, 26 May 2009 19:16:49 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QJGnOq023114 for ; Tue, 26 May 2009 19:16:49 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QJGnjj023112 for perforce@freebsd.org; Tue, 26 May 2009 19:16:49 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 26 May 2009 19:16:49 GMT Message-Id: <200905261916.n4QJGnjj023112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 19:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=162799 Change 162799 by syl@syl_rincewind on 2009/05/26 19:16:00 at91sam926x doesn't have the rm9200 st controller, but has watchdog and pit controllers (Programmable Interrupt Timer instead). This commit imports a driver for the pit and the wdt. It also adds these two drivers to cpu_devs and enables the dbgu and the 3 uarts controllers. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pit.c#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pitreg.h#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_wdt.c#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_wdtreg.h#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#4 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#4 (text) ==== @@ -4,7 +4,9 @@ arm/at91/at91_machdep.c standard arm/at91/at91.c standard arm/at91/at91_cfata.c optional at91_cfata -arm/at91/at91_st.c standard +arm/at91/at91_st.c optional at91rm9200 +arm/at91/at91_pit.c optional at91sam9261 +arm/at91/at91_wdt.c optional at91sam9261 arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#4 (text+ko) ==== @@ -132,6 +132,16 @@ { /* PIO need to be check */ { + "at91_pit", 0, + AT91SAM9261_BASE, AT91SAM9261_PIT_BASE, AT91SAM9261_PIT_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { + "at91_wdt", 0, + AT91SAM9261_BASE, AT91SAM9261_WDT_BASE, AT91SAM9261_WDT_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { "at91_udp", 0, AT91SAM9261_BASE + AT91SAM9261_UDP_BASE, AT91SAM9261_UDP_SIZE, AT91SAM9261_IRQ_UDP, AT91SAM9261_IRQ_PIOB @@ -141,6 +151,26 @@ AT91SAM9261_OHCI_BASE, AT91SAM9261_OHCI_SIZE, AT91SAM9261_IRQ_UHP }, + { + "uart", 0, + AT91SAM9261_BASE, AT91SAM9261_DBGU_BASE, AT91SAM9261_DBGU_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { + "uart", 1, + AT91SAM9261_BASE, AT91SAM9261_USART0_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_IRQ_USART0 + }, + { + "uart", 2, + AT91SAM9261_BASE, AT91SAM9261_USART1_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_IRQ_USART1 + }, + { + "uart", 3, + AT91SAM9261_BASE, AT91SAM9261_USART2_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_IRQ_USART2 + }, { 0, 0, 0, 0, 0 } }; From owner-p4-projects@FreeBSD.ORG Tue May 26 19:18:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D027E106568A; Tue, 26 May 2009 19:18: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 886681065686 for ; Tue, 26 May 2009 19:18:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 778F68FC25 for ; Tue, 26 May 2009 19:18:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QJIpXV023242 for ; Tue, 26 May 2009 19:18:51 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QJIpnA023240 for perforce@freebsd.org; Tue, 26 May 2009 19:18:51 GMT (envelope-from trasz@freebsd.org) Date: Tue, 26 May 2009 19:18:51 GMT Message-Id: <200905261918.n4QJIpnA023240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 162800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 19:18:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162800 Change 162800 by trasz@trasz_victim on 2009/05/26 19:18:25 Fix typo. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#13 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#13 (text+ko) ==== @@ -36,10 +36,10 @@ /* * An ugly detail of the implementation - fortunately not visible * to the API users - is the "branding": libc needs to keep track - * of what "brand" ACL is, wheather it's NFSv4, POSIX.1e or unknown. - * It happens automatically - for example, during acl_get_file(3) ACL - * gets branded according to the "type" argument, during acl_set_permset - * ACL, if its brand is unknown gets branded as NFSv4 if any of the + * of what "brand" ACL is: NFSv4, POSIX.1e or unknown. It happens + * automatically - for example, during acl_get_file(3) ACL gets + * branded according to the "type" argument; during acl_set_permset + * ACL, if its brand is unknown it gets branded as NFSv4 if any of the * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc. * Branding information is used for printing out the ACL (acl_to_text(3)), * veryfying acl_set_whatever arguments (checking against setting From owner-p4-projects@FreeBSD.ORG Tue May 26 19:28:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D15106567A; Tue, 26 May 2009 19:28:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1013A1065678 for ; Tue, 26 May 2009 19:28:01 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D52638FC1D for ; Tue, 26 May 2009 19:28:00 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QJS0TG023958 for ; Tue, 26 May 2009 19:28:00 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QJS0gL023956 for perforce@freebsd.org; Tue, 26 May 2009 19:28:00 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 26 May 2009 19:28:00 GMT Message-Id: <200905261928.n4QJS0gL023956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 19:28:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=162801 Change 162801 by syl@syl_rincewind on 2009/05/26 19:27:58 Update pio code to be SoC independant. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pio.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pio.c#2 (text) ==== @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include @@ -283,7 +283,7 @@ void at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask, int use_pullup) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_ASR / 4] = periph_a_mask; PIO[PIO_PDR / 4] = periph_a_mask; @@ -296,7 +296,7 @@ void at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask, int use_pullup) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_BSR / 4] = periph_b_mask; PIO[PIO_PDR / 4] = periph_b_mask; @@ -309,7 +309,7 @@ void at91_pio_use_gpio(uint32_t pio, uint32_t gpio_mask) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_PER / 4] = gpio_mask; } @@ -317,7 +317,7 @@ void at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_ODR / 4] = input_enable_mask; } @@ -325,7 +325,7 @@ void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, int use_pullup) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_OER / 4] = output_enable_mask; if (use_pullup) @@ -337,7 +337,7 @@ void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_SODR / 4] = data_mask; } @@ -345,7 +345,7 @@ void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); PIO[PIO_CODR / 4] = data_mask; } @@ -353,7 +353,7 @@ uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); data_mask &= PIO[PIO_PDSR / 4]; @@ -363,7 +363,7 @@ void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); if (use_deglitch) PIO[PIO_IFER / 4] = data_mask; @@ -376,7 +376,7 @@ at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); if (enable_interrupt) PIO[PIO_IER / 4] = data_mask; @@ -388,7 +388,7 @@ uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio) { - uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + uint32_t *PIO = (uint32_t *)(at91_base() + pio); /* reading this register will clear the interrupts */ return (PIO[PIO_ISR / 4]); } From owner-p4-projects@FreeBSD.ORG Tue May 26 19:35:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83EBE106567B; Tue, 26 May 2009 19:35:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 413EB1065672 for ; Tue, 26 May 2009 19:35:08 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 304668FC19 for ; Tue, 26 May 2009 19:35:08 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QJZ8Vl024704 for ; Tue, 26 May 2009 19:35:08 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QJZ85J024702 for perforce@freebsd.org; Tue, 26 May 2009 19:35:08 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 26 May 2009 19:35:08 GMT Message-Id: <200905261935.n4QJZ85J024702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 19:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=162802 Change 162802 by syl@syl_rincewind on 2009/05/26 19:34:31 Add PIOA, PIOB and PIOC controller to cpu_devs. Fix base address bug in cpu_devs. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#5 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#5 (text+ko) ==== @@ -133,12 +133,12 @@ /* PIO need to be check */ { "at91_pit", 0, - AT91SAM9261_BASE, AT91SAM9261_PIT_BASE, AT91SAM9261_PIT_SIZE, + AT91SAM9261_BASE + AT91SAM9261_PIT_BASE, AT91SAM9261_PIT_SIZE, AT91SAM9261_IRQ_SYSTEM }, { "at91_wdt", 0, - AT91SAM9261_BASE, AT91SAM9261_WDT_BASE, AT91SAM9261_WDT_SIZE, + AT91SAM9261_BASE + AT91SAM9261_WDT_BASE, AT91SAM9261_WDT_SIZE, AT91SAM9261_IRQ_SYSTEM }, { @@ -152,23 +152,38 @@ AT91SAM9261_IRQ_UHP }, { - "uart", 0, - AT91SAM9261_BASE, AT91SAM9261_DBGU_BASE, AT91SAM9261_DBGU_SIZE, + "pio", 0, + AT91SAM9261_BASE + AT91SAM9261_PIOA_BASE, AT91SAM9261_PIO_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { + "pio", 1, + AT91SAM9261_BASE + AT91SAM9261_PIOB_BASE, AT91SAM9261_PIO_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { + "pio", 2, + AT91SAM9261_BASE + AT91SAM9261_PIOC_BASE, AT91SAM9261_PIO_SIZE, + AT91SAM9261_IRQ_SYSTEM + }, + { + "uart", 2, + AT91SAM9261_BASE + AT91SAM9261_DBGU_BASE, AT91SAM9261_DBGU_SIZE, AT91SAM9261_IRQ_SYSTEM }, { "uart", 1, - AT91SAM9261_BASE, AT91SAM9261_USART0_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_BASE + AT91SAM9261_USART0_BASE, AT91SAM9261_USART_SIZE, AT91SAM9261_IRQ_USART0 }, { "uart", 2, - AT91SAM9261_BASE, AT91SAM9261_USART1_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_BASE + AT91SAM9261_USART1_BASE, AT91SAM9261_USART_SIZE, AT91SAM9261_IRQ_USART1 }, { "uart", 3, - AT91SAM9261_BASE, AT91SAM9261_USART2_BASE, AT91SAM9261_USART_SIZE, + AT91SAM9261_BASE + AT91SAM9261_USART2_BASE, AT91SAM9261_USART_SIZE, AT91SAM9261_IRQ_USART2 }, { 0, 0, 0, 0, 0 } From owner-p4-projects@FreeBSD.ORG Tue May 26 19:59:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 984641065674; Tue, 26 May 2009 19:59: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 0EC291065670 for ; Tue, 26 May 2009 19:59:34 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F3FE8FC1A for ; Tue, 26 May 2009 19:59:33 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QJxXN0026502 for ; Tue, 26 May 2009 19:59:33 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QJxWYL026500 for perforce@freebsd.org; Tue, 26 May 2009 19:59:32 GMT (envelope-from truncs@FreeBSD.org) Date: Tue, 26 May 2009 19:59:32 GMT Message-Id: <200905261959.n4QJxWYL026500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 162804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 19:59:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=162804 Change 162804 by truncs@aditya on 2009/05/26 19:59:19 Fixed alignment Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#3 (text+ko) ==== @@ -19,7 +19,7 @@ ext2_super.c (in the cvs attic) ext2_vfsops.c (has some GPL'ed code from ext2_super.c) i386-bitops.h - sparc64-bitops.h + sparc64-bitops.h PS. THANKS GODMAR!!! From owner-p4-projects@FreeBSD.ORG Tue May 26 20:02:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEC31106566B; Tue, 26 May 2009 20:02:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BBE71065677 for ; Tue, 26 May 2009 20:02:36 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7059F8FC1A for ; Tue, 26 May 2009 20:02:36 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QK2afU026793 for ; Tue, 26 May 2009 20:02:36 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QK2acU026791 for perforce@freebsd.org; Tue, 26 May 2009 20:02:36 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 26 May 2009 20:02:36 GMT Message-Id: <200905262002.n4QK2acU026791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162805 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 20:02:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=162805 Change 162805 by syl@syl_rincewind on 2009/05/26 20:02:15 Update the usart code to be SoC independant. Rename uart_cpu_at91rm9200usart.c to uart_cpu_at91usart.c Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#4 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#5 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#5 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#6 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91usart.c#1 add .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#4 (text) ==== @@ -70,5 +70,7 @@ uint32_t at91_base(void); uint32_t at91_irq_sys(void); uint32_t at91_sdramc_base(void); +uint32_t at91_dbgu_base(void); +uint32_t at91_usart0_base(void); #endif /* _AT91VAR_H_ */ ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/files.at91#5 (text) ==== @@ -18,7 +18,7 @@ arm/at91/at91_twi.c optional at91_twi arm/at91/if_ate.c optional ate arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91rm9200usart.c optional uart +arm/at91/uart_cpu_at91usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart # # All the SoC we support ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91rm9200.c#5 (text+ko) ==== @@ -319,3 +319,16 @@ { return (AT91RM92_SDRAMC_BASE); } + +uint32_t +at91_usart0_base(void) +{ + return (AT91RM92_USART0_BASE); +} + +uint32_t +at91_dbgu_base(void) +{ + return (AT91RM92_DBGU_BASE); +} + ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#6 (text+ko) ==== @@ -230,3 +230,9 @@ { return (AT91SAM9261_SDRAMC_BASE); } + +uint32_t +at91_dbgu_base(void) +{ + return (AT91SAM9261_DBGU_BASE); +} ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#2 (text) ==== @@ -42,7 +42,6 @@ #include #include -#include #include #include "uart_if.h" ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Tue May 26 20:20:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A08C1065676; Tue, 26 May 2009 20:20: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 D768C1065674 for ; Tue, 26 May 2009 20:20:58 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CCB38FC2B for ; Tue, 26 May 2009 20:20:58 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QKKw3u030690 for ; Tue, 26 May 2009 20:20:58 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QKKwNU030688 for perforce@freebsd.org; Tue, 26 May 2009 20:20:58 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 26 May 2009 20:20:58 GMT Message-Id: <200905262020.n4QKKwNU030688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 20:21:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=162807 Change 162807 by syl@syl_rincewind on 2009/05/26 20:19:49 Remove on at91_mci.c and at91_spi.c to be SoC independant. Add mci spi ssc and twi to AT91SAM9261EK config file. Affected files ... .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_mci.c#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_spi.c#3 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_ssc.c#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_twi.c#2 edit .. //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AT91SAM9261EK#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_spi.c#3 (text) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_ssc.c#2 (text) ==== ==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_twi.c#2 (text) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include ==== //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AT91SAM9261EK#2 (text+ko) ==== @@ -81,6 +81,11 @@ #options DIAGNOSTIC device md +device at91_twi +device at91_spi +device at91_ssc +device at91_mci + device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards # iic From owner-p4-projects@FreeBSD.ORG Tue May 26 20:22:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F39C8106568B; Tue, 26 May 2009 20:22:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A57B51065680 for ; Tue, 26 May 2009 20:22:15 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5A28FC08 for ; Tue, 26 May 2009 20:22:15 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QKMFOt030785 for ; Tue, 26 May 2009 20:22:15 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QKKwmc030693 for perforce@freebsd.org; Tue, 26 May 2009 20:20:58 GMT (envelope-from scottl@freebsd.org) Date: Tue, 26 May 2009 20:20:58 GMT Message-Id: <200905262020.n4QKKwmc030693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 162808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 20:22:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=162808 Change 162808 by scottl@scottl-y1 on 2009/05/26 20:20:55 IFC entire src tree Affected files ... .. //depot/projects/scottl-camlock/src/COPYRIGHT#2 integrate .. //depot/projects/scottl-camlock/src/LOCKS#2 integrate .. //depot/projects/scottl-camlock/src/MAINTAINERS#3 integrate .. //depot/projects/scottl-camlock/src/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#3 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/scottl-camlock/src/UPDATING#4 integrate .. //depot/projects/scottl-camlock/src/bin/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/cat/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/cat/cat.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/chio/chio.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/chmod/chmod.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/cp/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/cp/cp.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/cp/cp.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/cp/utils.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/csh/config.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/csh/config_p.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/dd/dd.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/df/df.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/df/df.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/echo/echo.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ed/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/kenv/kenv.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/ln/ln.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/ln/ln.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/print.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/util.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/mv/mv.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/mv/mv.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/ar_io.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/file_subs.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pax/tables.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/pkill/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.1#1 branch .. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#1 branch .. //depot/projects/scottl-camlock/src/bin/ps/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/ps/keyword.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ps/print.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ps/ps.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/ps/ps.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ps/ps.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/realpath/realpath.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/rm/rm.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/alias.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/arith.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/arith.y#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/cd.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/eval.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/options.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/shell.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/stty/gfmt.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/stty/modes.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/stty/print.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/stty/stty.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/test/test.1#2 integrate .. //depot/projects/scottl-camlock/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/scottl-camlock/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/scottl-camlock/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/cddl/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 26 21:16:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A69106566C; Tue, 26 May 2009 21:16:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57B6E106564A for ; Tue, 26 May 2009 21:16:17 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46BC28FC08 for ; Tue, 26 May 2009 21:16:17 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QLGHLv047665 for ; Tue, 26 May 2009 21:16:17 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QLGHHs047663 for perforce@freebsd.org; Tue, 26 May 2009 21:16:17 GMT (envelope-from truncs@FreeBSD.org) Date: Tue, 26 May 2009 21:16:17 GMT Message-Id: <200905262116.n4QLGHHs047663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 162817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 21:16:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=162817 Change 162817 by truncs@aditya on 2009/05/26 21:15:22 Deny setting of UF_* flags with EOPNOTSUPP. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 (text+ko) ==== @@ -392,6 +392,11 @@ if (vap->va_flags != VNOVAL) { if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); + /* + * Deny setting of UF_* flags + */ + if(vap->va_flags & UF_SETTABLE) + return (EOPNOTSUPP); /* * Callers may only modify the file flags on objects they * have VADMIN rights for. From owner-p4-projects@FreeBSD.ORG Tue May 26 21:39:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FB491065672; Tue, 26 May 2009 21:39: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 B8B471065680 for ; Tue, 26 May 2009 21:39:43 +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 A5A2F8FC20 for ; Tue, 26 May 2009 21:39:43 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QLdgdM050176 for ; Tue, 26 May 2009 21:39:42 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QLdfmj050171 for perforce@freebsd.org; Tue, 26 May 2009 21:39:41 GMT (envelope-from mav@freebsd.org) Date: Tue, 26 May 2009 21:39:41 GMT Message-Id: <200905262139.n4QLdfmj050171@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 Cc: Subject: PERFORCE change 162820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 21:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=162820 Change 162820 by mav@mav_mavbook on 2009/05/26 21:38:43 Most parts of ATAPI support. Error reporting still TBD, Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#3 (text+ko) ==== @@ -694,10 +694,18 @@ /* if request moves data setup and load SG list */ if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - if (bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map, - ccb->ataio.data_ptr, ccb->ataio.dxfer_len, - ahci_dmasetprd, slot, BUS_DMA_NOWAIT)) { - device_printf(dev, "FAILURE - load data\n"); + if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map, + ccb->ataio.data_ptr, ccb->ataio.dxfer_len, + ahci_dmasetprd, slot, BUS_DMA_NOWAIT)) { + device_printf(dev, "FAILURE - load data\n"); + } + } else { + if (bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map, + ccb->csio.data_ptr, ccb->csio.dxfer_len, + ahci_dmasetprd, slot, BUS_DMA_NOWAIT)) { + device_printf(dev, "FAILURE - load data\n"); + } } return; } @@ -772,8 +780,8 @@ clp->prd_length = slot->dma.nsegs; clp->cmd_flags = (slot->ccb->ccb_h.flags & CAM_DIR_OUT ? AHCI_CMD_WRITE : 0) | - /*(request->flags & ATA_R_ATAPI ? - (AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH) : 0) |*/ + (slot->ccb->ccb_h.func_code == XPT_SCSI_IO ? + (AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH) : 0) | (fis_size / sizeof(u_int32_t)) | (port << 12); clp->bytecount = 0; @@ -785,16 +793,17 @@ // ATA_IDX_INL(ch, ATA_SACTIVE) & (1 << slot->slot)); /* set command type bit */ -/* if (request->flags & ATA_R_ATAPI) - ATA_OUTL(ch->r_mem, AHCI_P_CMD, - ATA_INL(ch->r_mem, AHCI_P_CMD) | - AHCI_P_CMD_ATAPI); - else*/ + if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) { + ATA_OUTL(ch->r_mem, AHCI_P_CMD, + ATA_INL(ch->r_mem, AHCI_P_CMD) | AHCI_P_CMD_ATAPI); + } else { ATA_OUTL(ch->r_mem, AHCI_P_CMD, ATA_INL(ch->r_mem, AHCI_P_CMD) & ~AHCI_P_CMD_ATAPI); + } slot->state = AHCI_SLOT_RUNNING; ch->rslots |= (1 << slot->slot); + /* issue command to controller */ ATA_OUTL(ch->r_mem, AHCI_P_CI, (1 << slot->slot)); /* @@ -810,30 +819,30 @@ ATA_INL(ch->r_mem, AHCI_P_TFD), ATA_IDX_INL(ch, ATA_SERROR)); */ -// if (!(request->flags & ATA_R_ATAPI)) { - /* device reset doesn't interrupt */ - if (slot->ccb->ataio.cmd.command == ATA_DEVICE_RESET) { - u_int32_t tf_data; - int timeout = 1000000; + + if (slot->ccb->ccb_h.func_code == XPT_ATA_IO && + slot->ccb->ataio.cmd.command == ATA_DEVICE_RESET) { + /* device reset doesn't interrupt */ + u_int32_t tf_data; + int timeout = 1000000; - do { - DELAY(10); - tf_data = ATA_INL(ch->r_mem, AHCI_P_TFD + (ch->unit<<7)); - } while ((tf_data & ATA_S_BUSY) && timeout--); - if (bootverbose) - device_printf(ch->dev, "device_reset timeout=%dus\n", - (1000000-timeout)*10); - slot->ccb->ataio.status = tf_data; -// if (request->status & ATA_S_ERROR) -// request->error = tf_data >> 8; - slot->ccb->ccb_h.status = CAM_REQ_CMP; - xpt_done(slot->ccb); - return; + do { + DELAY(10); + tf_data = ATA_INL(ch->r_mem, AHCI_P_TFD + (ch->unit<<7)); + } while ((tf_data & ATA_S_BUSY) && timeout--); + if (bootverbose) + device_printf(ch->dev, "device_reset timeout=%dus\n", + (1000000-timeout)*10); + slot->ccb->ataio.status = tf_data; +// if (request->status & ATA_S_ERROR) +// request->error = tf_data >> 8; + slot->ccb->ccb_h.status = CAM_REQ_CMP; + xpt_done(slot->ccb); + return; } -// } - /* start the timeout */ -// callout_reset(&request->callout, request->timeout * hz, + /* start the timeout */ +// callout_reset(&request->callout, request->timeout * hz, // (timeout_t*)ata_timeout, request); return; } @@ -1425,49 +1434,48 @@ ahci_setup_fis(struct ahci_cmd_tab *ctp, union ccb *ccb) { u_int8_t *fis = &ctp->cfis[0]; + bzero(ctp->cfis, 64); -// if (request->flags & ATA_R_ATAPI) { -// bzero(ctp->acmd, 32); -// bcopy(request->u.atapi.ccb, ctp->acmd, 16); -// } -#if 0 - if (request->flags & ATA_R_ATAPI) { - fis[0] = 0x27; /* host to device */ - fis[1] = 0x80 | (atadev->unit & 0x0f); - fis[2] = ATA_PACKET_CMD; - if (request->flags & (ATA_R_READ | ATA_R_WRITE)) - fis[3] = ATA_F_DMA; - else { - fis[5] = request->transfersize; - fis[6] = request->transfersize >> 8; + if (ccb->ccb_h.func_code == XPT_SCSI_IO) { + bzero(ctp->acmd, 32); + bcopy((ccb->ccb_h.flags & CAM_CDB_POINTER) ? + ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes, + ctp->acmd, ccb->csio.cdb_len); + fis[0] = 0x27; /* host to device */ +// fis[1] = 0x80 | (atadev->unit & 0x0f); + fis[1] = 0x80 | (0 & 0x0f); + fis[2] = ATA_PACKET_CMD; + if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) + fis[3] = ATA_F_DMA; + else { + fis[5] = ccb->csio.dxfer_len; + fis[6] = ccb->csio.dxfer_len >> 8; + } + fis[7] = ATA_D_LBA; + fis[15] = ATA_A_4BIT; + return 20; + } else { +// ata_modify_if_48bit(request); + fis[0] = 0x27; /* host to device */ +// fis[1] = 0x80 | (atadev->unit & 0x0f); + fis[1] = 0x80 | (0 & 0x0f); + fis[2] = ccb->ataio.cmd.command; + fis[3] = ccb->ataio.cmd.feature; + fis[4] = ccb->ataio.cmd.lba; + fis[5] = ccb->ataio.cmd.lba >> 8; + fis[6] = ccb->ataio.cmd.lba >> 16; + fis[7] = ATA_D_LBA; +// if (!(atadev->flags & ATA_D_48BIT_ACTIVE)) + fis[7] |= (ATA_D_IBM | (ccb->ataio.cmd.lba >> 24 & 0x0f)); + fis[8] = ccb->ataio.cmd.lba >> 24; + fis[9] = ccb->ataio.cmd.lba >> 32; + fis[10] = ccb->ataio.cmd.lba >> 40; + fis[11] = ccb->ataio.cmd.feature >> 8; + fis[12] = ccb->ataio.cmd.count; + fis[13] = ccb->ataio.cmd.count >> 8; + fis[15] = ATA_A_4BIT; + return 20; } - fis[7] = ATA_D_LBA; - fis[15] = ATA_A_4BIT; - return 20; - } - else { -#endif -// ata_modify_if_48bit(request); - fis[0] = 0x27; /* host to device */ -// fis[1] = 0x80 | (atadev->unit & 0x0f); - fis[1] = 0x80 | (0 & 0x0f); - fis[2] = ccb->ataio.cmd.command; - fis[3] = ccb->ataio.cmd.feature; - fis[4] = ccb->ataio.cmd.lba; - fis[5] = ccb->ataio.cmd.lba >> 8; - fis[6] = ccb->ataio.cmd.lba >> 16; - fis[7] = ATA_D_LBA; -// if (!(atadev->flags & ATA_D_48BIT_ACTIVE)) - fis[7] |= (ATA_D_IBM | (ccb->ataio.cmd.lba >> 24 & 0x0f)); - fis[8] = ccb->ataio.cmd.lba >> 24; - fis[9] = ccb->ataio.cmd.lba >> 32; - fis[10] = ccb->ataio.cmd.lba >> 40; - fis[11] = ccb->ataio.cmd.feature >> 8; - fis[12] = ccb->ataio.cmd.count; - fis[13] = ccb->ataio.cmd.count >> 8; - fis[15] = ATA_A_4BIT; - return 20; -// } } static int @@ -1556,154 +1564,9 @@ switch (ccb->ccb_h.func_code) { /* Common cases first */ case XPT_ATA_IO: /* Execute the requested I/O operation */ + case XPT_SCSI_IO: ahci_begin_transaction(ch->dev, ccb); break; -#if 0 - case XPT_SCSI_IO: /* Execute the requested I/O operation */ - case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */ { - struct aha_ccb *accb; - struct aha_hccb *hccb; - - /* - * Get an accb to use. - */ - if ((accb = ahagetccb(aha)) == NULL) { - s = splcam(); - aha->resource_shortage = TRUE; - splx(s); - xpt_freeze_simq(aha->sim, /*count*/1); - ccb->ccb_h.status = CAM_REQUEUE_REQ; - xpt_done(ccb); - return; - } - hccb = &accb->hccb; - - /* - * So we can find the ACCB when an abort is requested - */ - accb->ccb = ccb; - ccb->ccb_h.ccb_accb_ptr = accb; - ccb->ccb_h.ccb_aha_ptr = aha; - - /* - * Put all the arguments for the xfer in the accb - */ - hccb->target = ccb->ccb_h.target_id; - hccb->lun = ccb->ccb_h.target_lun; - hccb->ahastat = 0; - hccb->sdstat = 0; - - if (ccb->ccb_h.func_code == XPT_SCSI_IO) { - struct ccb_scsiio *csio; - struct ccb_hdr *ccbh; - - csio = &ccb->csio; - ccbh = &csio->ccb_h; - hccb->opcode = aha->ccb_ccb_opcode; - hccb->datain = (ccb->ccb_h.flags & CAM_DIR_IN) != 0; - hccb->dataout = (ccb->ccb_h.flags & CAM_DIR_OUT) != 0; - hccb->cmd_len = csio->cdb_len; - if (hccb->cmd_len > sizeof(hccb->scsi_cdb)) { - ccb->ccb_h.status = CAM_REQ_INVALID; - ahafreeccb(aha, accb); - xpt_done(ccb); - return; - } - hccb->sense_len = csio->sense_len; - if ((ccbh->flags & CAM_CDB_POINTER) != 0) { - if ((ccbh->flags & CAM_CDB_PHYS) == 0) { - bcopy(csio->cdb_io.cdb_ptr, - hccb->scsi_cdb, hccb->cmd_len); - } else { - /* I guess I could map it in... */ - ccbh->status = CAM_REQ_INVALID; - ahafreeccb(aha, accb); - xpt_done(ccb); - return; - } - } else { - bcopy(csio->cdb_io.cdb_bytes, - hccb->scsi_cdb, hccb->cmd_len); - } - /* - * If we have any data to send with this command, - * map it into bus space. - */ - /* Only use S/G if there is a transfer */ - if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE) { - if ((ccbh->flags & CAM_SCATTER_VALID) == 0) { - /* - * We've been given a pointer - * to a single buffer. - */ - if ((ccbh->flags & CAM_DATA_PHYS)==0) { - int error; - - s = splsoftvm(); - error = bus_dmamap_load( - aha->buffer_dmat, - accb->dmamap, - csio->data_ptr, - csio->dxfer_len, - ahaexecuteccb, - accb, - /*flags*/0); - if (error == EINPROGRESS) { - /* - * So as to maintain - * ordering, freeze the - * controller queue - * until our mapping is - * returned. - */ - xpt_freeze_simq(aha->sim, - 1); - csio->ccb_h.status |= - CAM_RELEASE_SIMQ; - } - splx(s); - } else { - struct bus_dma_segment seg; - - /* Pointer to physical buffer */ - seg.ds_addr = - (bus_addr_t)csio->data_ptr; - seg.ds_len = csio->dxfer_len; - ahaexecuteccb(accb, &seg, 1, 0); - } - } else { - struct bus_dma_segment *segs; - - if ((ccbh->flags & CAM_DATA_PHYS) != 0) - panic("ahaaction - Physical " - "segment pointers " - "unsupported"); - - if ((ccbh->flags&CAM_SG_LIST_PHYS)==0) - panic("ahaaction - Virtual " - "segment addresses " - "unsupported"); - - /* Just use the segments provided */ - segs = (struct bus_dma_segment *) - csio->data_ptr; - ahaexecuteccb(accb, segs, - csio->sglist_cnt, 0); - } - } else { - ahaexecuteccb(accb, NULL, 0, 0); - } - } else { - hccb->opcode = INITIATOR_BUS_DEV_RESET; - /* No data transfer */ - hccb->datain = TRUE; - hccb->dataout = TRUE; - hccb->cmd_len = 0; - hccb->sense_len = 0; - ahaexecuteccb(accb, NULL, 0, 0); - } - break; - } case XPT_EN_LUN: /* Enable LUN as a target */ case XPT_TARGET_IO: /* Execute target I/O request */ case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */ @@ -1718,7 +1581,6 @@ ccb->ccb_h.status = CAM_PROVIDE_FAIL; xpt_done(ccb); break; -#endif case XPT_GET_TRAN_SETTINGS: /* Get default/user set transfer settings for the target */ { @@ -1780,7 +1642,8 @@ struct ccb_pathinq *cpi = &ccb->cpi; if (ccb->ccb_h.target_id == CAM_TARGET_WILDCARD || - ((ATA_ATA_MASTER << (ccb->ccb_h.target_id - 1)) & ch->devices)) { + (((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << + (ccb->ccb_h.target_id - 1)) & ch->devices)) { cpi->version_num = 1; /* XXX??? */ cpi->hba_inquiry = PI_SDTR_ABLE; @@ -1796,10 +1659,13 @@ strncpy(cpi->hba_vid, "AHCI", HBA_IDLEN); strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); cpi->unit_number = cam_sim_unit(sim); - cpi->transport = XPORT_ATA; - cpi->transport_version = 2; - cpi->protocol = PROTO_ATA; - cpi->protocol_version = SCSI_REV_2; + cpi->transport = XPORT_ATA; + cpi->transport_version = 2; + if ((ATA_ATA_MASTER << (ccb->ccb_h.target_id - 1)) & ch->devices) + cpi->protocol = PROTO_ATA; + else + cpi->protocol = PROTO_SCSI; + cpi->protocol_version = SCSI_REV_2; cpi->ccb_h.status = CAM_REQ_CMP; } else { ccb->ccb_h.status = CAM_REQ_INVALID; From owner-p4-projects@FreeBSD.ORG Tue May 26 21:40:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 646C010656B9; Tue, 26 May 2009 21:40:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0A5F10656B2 for ; Tue, 26 May 2009 21:40:49 +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 A50E88FC22 for ; Tue, 26 May 2009 21:40:49 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QLekQF050315 for ; Tue, 26 May 2009 21:40:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QLeiti050312 for perforce@freebsd.org; Tue, 26 May 2009 21:40:44 GMT (envelope-from mav@freebsd.org) Date: Tue, 26 May 2009 21:40:44 GMT Message-Id: <200905262140.n4QLeiti050312@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 Cc: Subject: PERFORCE change 162821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 21:40:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162821 Change 162821 by mav@mav_mavbook on 2009/05/26 21:40:39 Some parts of ATAPI support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#3 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#3 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#7 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#3 (text+ko) ==== @@ -46,25 +46,6 @@ #include void -ata_ident(struct ccb_ataio *ataio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int8_t *inq_buf, u_int32_t inq_len, - u_int32_t timeout) -{ - - cam_fill_ataio(ataio, - retries, - cbfcnp, - /*flags*/CAM_DIR_IN, - tag_action, - /*data_ptr*/inq_buf, - /*dxfer_len*/inq_len, - timeout); - - ataio->cmd.command = ATA_ATA_IDENTIFY; -} - -void ata_print_ident(struct ata_params *ident_data) { char product[48], revision[16]; ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#3 (text+ko) ==== @@ -41,12 +41,6 @@ }; void -ata_ident(struct ccb_ataio *ataio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int8_t *inq_buf, u_int32_t inq_len, - u_int32_t timeout); - -void ata_print_ident(struct ata_params *ident_data); void ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#7 (text+ko) ==== @@ -92,11 +92,15 @@ typedef enum { PROBE_IDENTIFY, + PROBE_INQUIRY, + PROBE_FULL_INQUIRY, PROBE_INVALID } probe_action; static char *probe_action_text[] = { "PROBE_IDENTIFY", + "PROBE_INQUIRY", + "PROBE_FULL_INQUIRY", "PROBE_INVALID" }; @@ -308,12 +312,14 @@ { /* Probe the device that our peripheral driver points to */ struct ccb_ataio *ataio; + struct ccb_scsiio *csio; probe_softc *softc; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probestart\n")); softc = (probe_softc *)periph->softc; ataio = &start_ccb->ataio; + csio = &start_ccb->csio; switch (softc->action) { case PROBE_IDENTIFY: @@ -339,12 +345,51 @@ MD5Final(softc->digest, &context); } - ata_ident(ataio, + cam_fill_ataio(ataio, + 4, + probedone, + /*flags*/CAM_DIR_IN, + MSG_SIMPLE_Q_TAG, + /*data_ptr*/(u_int8_t *)ident_buf, + /*dxfer_len*/sizeof(struct ata_params), + 60 * 1000); + + if (periph->path->device->protocol == PROTO_ATA) + ataio->cmd.command = ATA_ATA_IDENTIFY; + else + ataio->cmd.command = ATA_ATAPI_IDENTIFY; + break; + } + case PROBE_INQUIRY: + case PROBE_FULL_INQUIRY: + { + u_int inquiry_len; + struct scsi_inquiry_data *inq_buf; + + inq_buf = &periph->path->device->inq_data; + + if (softc->action == PROBE_INQUIRY) + inquiry_len = SHORT_INQUIRY_LENGTH; + else + inquiry_len = SID_ADDITIONAL_LENGTH(inq_buf); + + /* + * Some parallel SCSI devices fail to send an + * ignore wide residue message when dealing with + * odd length inquiry requests. Round up to be + * safe. + */ + inquiry_len = roundup2(inquiry_len, 2); + + scsi_inquiry(csio, /*retries*/4, probedone, MSG_SIMPLE_Q_TAG, - (u_int8_t *)ident_buf, - sizeof(struct ata_params), + (u_int8_t *)inq_buf, + inquiry_len, + /*evpd*/FALSE, + /*page_code*/0, + SSD_MIN_SIZE, /*timeout*/60 * 1000); break; } @@ -573,16 +618,101 @@ // else // PROBE_SET_ACTION(softc, PROBE_SERIAL_NUM_0); - path->device->flags &= ~CAM_DEV_UNCONFIGURED; +// if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) { + if (path->device->protocol == PROTO_ATA) { + path->device->flags &= ~CAM_DEV_UNCONFIGURED; + done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action(done_ccb); + xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, + done_ccb); + xpt_release_ccb(done_ccb); + break; + } else { + PROBE_SET_ACTION(softc, PROBE_INQUIRY); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + } else if (cam_periph_error(done_ccb, 0, + done_ccb->ccb_h.target_lun > 0 + ? SF_RETRY_UA|SF_QUIET_IR + : SF_RETRY_UA, + &softc->saved_ccb) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + /* Don't wedge the queue */ + xpt_release_devq(done_ccb->ccb_h.path, /*count*/1, + /*run_queue*/TRUE); + } + /* + * If we get to this point, we got an error status back + * from the inquiry and the error status doesn't require + * automatically retrying the command. Therefore, the + * inquiry failed. If we had inquiry information before + * for this device, but this latest inquiry command failed, + * the device has probably gone away. If this device isn't + * already marked unconfigured, notify the peripheral + * drivers that this device is no more. + */ + if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) + /* Send the async notification. */ + xpt_async(AC_LOST_DEVICE, path, NULL); + + xpt_release_ccb(done_ccb); + break; + } + case PROBE_INQUIRY: + case PROBE_FULL_INQUIRY: + { + if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { + struct scsi_inquiry_data *inq_buf; + u_int8_t periph_qual; + + path->device->flags |= CAM_DEV_INQUIRY_DATA_VALID; + inq_buf = &path->device->inq_data; + + periph_qual = SID_QUAL(inq_buf); + + switch(periph_qual) { + case SID_QUAL_LU_CONNECTED: + { + u_int8_t len; + + /* + * We conservatively request only + * SHORT_INQUIRY_LEN bytes of inquiry + * information during our first try + * at sending an INQUIRY. If the device + * has more information to give, + * perform a second request specifying + * the amount of information the device + * is willing to give. + */ + len = inq_buf->additional_length + + offsetof(struct scsi_inquiry_data, + additional_length) + 1; + if (softc->action == PROBE_INQUIRY + && len > SHORT_INQUIRY_LENGTH) { + PROBE_SET_ACTION(softc, PROBE_FULL_INQUIRY); + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + } + + scsi_find_quirk(path->device); -// if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) { +// scsi_devise_transport(path); + path->device->flags &= ~CAM_DEV_UNCONFIGURED; done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb); -// } - xpt_release_ccb(done_ccb); - break; + xpt_release_ccb(done_ccb); + return; + } + default: + break; + } } else if (cam_periph_error(done_ccb, 0, done_ccb->ccb_h.target_lun > 0 ? SF_RETRY_UA|SF_QUIET_IR From owner-p4-projects@FreeBSD.ORG Tue May 26 21:42:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FABC1065672; Tue, 26 May 2009 21:42:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E667B106564A for ; Tue, 26 May 2009 21:42:51 +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 D48018FC1B for ; Tue, 26 May 2009 21:42:51 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QLgpT8050549 for ; Tue, 26 May 2009 21:42:51 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4QLgpjh050547 for perforce@freebsd.org; Tue, 26 May 2009 21:42:51 GMT (envelope-from mav@freebsd.org) Date: Tue, 26 May 2009 21:42:51 GMT Message-Id: <200905262142.n4QLgpjh050547@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 Cc: Subject: PERFORCE change 162822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 21:42:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=162822 Change 162822 by mav@mav_mavbook on 2009/05/26 21:42:47 Set d_maxsize to reasonable value - guarantied value for AHCI controller. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#2 (text+ko) ==== @@ -649,7 +649,7 @@ // softc->disk->d_dump = dadump; softc->disk->d_name = "ada"; softc->disk->d_drv1 = periph; - softc->disk->d_maxsize = 4096;//DFLTPHYS; /* XXX: probably not arbitrary */ + softc->disk->d_maxsize = 256*1024; softc->disk->d_unit = periph->unit_number; softc->disk->d_flags = 0; // if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0) From owner-p4-projects@FreeBSD.ORG Wed May 27 06:09:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 544C6106566C; Wed, 27 May 2009 06:09:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 106A1106564A for ; Wed, 27 May 2009 06:09:35 +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 F31D78FC17 for ; Wed, 27 May 2009 06:09:34 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4R69Yg4020126 for ; Wed, 27 May 2009 06:09:34 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4R69YWs020124 for perforce@freebsd.org; Wed, 27 May 2009 06:09:34 GMT (envelope-from mav@freebsd.org) Date: Wed, 27 May 2009 06:09:34 GMT Message-Id: <200905270609.n4R69YWs020124@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 Cc: Subject: PERFORCE change 162838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 06:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=162838 Change 162838 by mav@mav_mavbook on 2009/05/27 06:08:55 For ATAPI return errors more suitable for SCSI. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#4 (text+ko) ==== @@ -854,20 +854,22 @@ device_t dev = slot->dev; struct ahci_channel *ch = device_get_softc(dev); struct ahci_cmd_list *clp; -// u_int32_t tf_data; + u_int32_t tf_data; //device_printf(dev, "%s slot %d\n", __func__, slot->slot); /* kill the timeout */ // callout_stop(&request->callout); /* get status */ -// tf_data = ATA_INL(ch->r_mem, AHCI_P_TFD); -// slot->ccb->ccb_h.status = tf_data; - - /* if error status get details */ -// if (request->status & ATA_S_ERROR) -// request->error = tf_data >> 8; - + tf_data = ATA_INL(ch->r_mem, AHCI_P_TFD); +#if 0 + if (err && slot->ccb->ccb_h.func_code == XPT_ATA_IO) { + slot->ccb->ataio.status = tf_data; + /* if error status get details */ + if (tf_data & ATA_S_ERROR) + request->error = tf_data >> 8; + } +#endif /* on control commands read back registers to the request struct */ /* if (request->flags & ATA_R_CONTROL) { struct ata_device *atadev = device_get_softc(request->dev); @@ -899,10 +901,19 @@ bus_dmamap_unload(ch->dma.data_tag, slot->dma.data_map); } - if (err == 0) + if (err == 0) { slot->ccb->ccb_h.status = CAM_REQ_CMP; - else - slot->ccb->ccb_h.status = CAM_REQ_CMP_ERR; + if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) + slot->ccb->csio.scsi_status = SCSI_STATUS_OK; + } else { + if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) { + slot->ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR; + slot->ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; + } else { + slot->ccb->ccb_h.status = CAM_REQ_CMP_ERR; + slot->ccb->ataio.status = tf_data; + } + } xpt_done(slot->ccb); ch->rslots &= ~(1 << slot->slot); From owner-p4-projects@FreeBSD.ORG Wed May 27 15:43:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 738291065672; Wed, 27 May 2009 15:43: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 ED67610656D6 for ; Wed, 27 May 2009 15:43:48 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6FD28FC0A for ; Wed, 27 May 2009 15:43:48 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RFhm48039086 for ; Wed, 27 May 2009 15:43:48 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RFhmnU039084 for perforce@freebsd.org; Wed, 27 May 2009 15:43:48 GMT (envelope-from yohanes@FreeBSD.org) Date: Wed, 27 May 2009 15:43:48 GMT Message-Id: <200905271543.n4RFhmnU039084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 162871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 15:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=162871 Change 162871 by yohanes@econa on 2009/05/27 15:43:45 new branch for STR91XX/CNS11XX (Cavium Econa) Affected files ... .. //depot/projects/str91xx/doc/Makefile#1 branch .. //depot/projects/str91xx/doc/README#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/str91xx/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/contributing/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/contributing/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/nanobsd/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/faq/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/faq/book.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/dtrace/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/filesystems/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/flyer/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/flyer/flyer.tex#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/articles.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/books.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/translators.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/urls.ent#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/tools/checkupdate/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cups/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cups/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/geom-class/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/ldap-auth/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/ldap-auth/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-emulation/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-emulation/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-users/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/remote-install/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/dtrace/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/filesystems/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/chapters.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/README#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#1 branch .. //depot/projects/str91xx/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/updating/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/articles.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/str91xx/doc/es_ES.ISO8859-1/share/tools/checkupdate/notify#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/str91xx/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/Makefile#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/Makefile#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/Makefile.inc#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/cups/Makefile#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 27 16:56:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11B621065675; Wed, 27 May 2009 16:56:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E47E106564A for ; Wed, 27 May 2009 16:56:14 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86FB48FC21 for ; Wed, 27 May 2009 16:56:14 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RGuEeg056281 for ; Wed, 27 May 2009 16:56:14 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RGuEgK056279 for perforce@freebsd.org; Wed, 27 May 2009 16:56:14 GMT (envelope-from syl@FreeBSD.org) Date: Wed, 27 May 2009 16:56:14 GMT Message-Id: <200905271656.n4RGuEgK056279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 16:56:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=162889 Change 162889 by syl@syl_rincewind on 2009/05/27 16:55:50 Fix bug spotted by Hans Petter Selasky : - Change (void *) cast by (uint8_t *) - Delete 0 timing check in submit_transfer. - SINGLE_SHORT and SHORT_NOT_OK are not error flags. - Correct the transfer code using libusb_tr_setup_XXX. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#13 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#13 (text+ko) ==== @@ -94,6 +94,8 @@ #define GET_CONTEXT(ctx) \ if (ctx == NULL) ctx = usbi_default_context; +#define MAX(a,b) (((a)>(b))?(a):(b)) + /* Library initialisation / deinitialisation */ struct usb_pollfd { @@ -673,7 +675,7 @@ memset(xfer, 0, len); - xfer = (struct libusb_transfer *) ((void *)xfer + + xfer = (struct libusb_transfer *) ((uint8_t *)xfer + sizeof(struct usb_transfer)); return (xfer); } @@ -709,6 +711,7 @@ struct libusb_context *ctx; struct timespec cur_ts; struct timeval *cur_tv; + int num_frame; int ret; if (xfer == NULL) @@ -717,15 +720,11 @@ ctx = xfer->dev_handle->dev->ctx; pdev = xfer->dev_handle->os_priv; - usb_backend = (struct usb_transfer *) ((void *)xfer - + usb_backend = (struct usb_transfer *) ((uint8_t *)xfer - sizeof(struct usb_transfer)); usb_backend->transferred = 0; usb_backend->flags = 0; - /*calculate_timeout*/ - if (xfer->timeout == 0) - return (LIBUSB_ERROR_OTHER); - ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); cur_ts.tv_sec += xfer->timeout / 1000; cur_ts.tv_nsec += (xfer->timeout % 1000) * 1000000; @@ -764,8 +763,8 @@ GET_XFER(usb20_xfer, xfer->endpoint, pdev); xfer->os_priv = usb20_xfer; - ret = libusb20_tr_open(usb20_xfer, xfer->length, xfer->num_iso_packets, - xfer->endpoint); + ret = libusb20_tr_open(usb20_xfer, xfer->length, + MAX(2, xfer->num_iso_packets), xfer->endpoint); if (ret != 0) { pthread_mutex_lock(&ctx->flying_transfers_lock); @@ -774,6 +773,23 @@ return (LIBUSB_ERROR_OTHER); } + switch (xfer->type) { + case LIBUSB_TRANSFER_TYPE_BULK: + libusb20_tr_setup_intr(usb20_xfer, xfer->buffer, xfer->length, xfer->timeout); + case LIBUSB_TRANSFER_TYPE_INTERRUPT: + libusb20_tr_setup_bulk(usb20_xfer, xfer->buffer, xfer->length, xfer->timeout); + break ; + case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: + /* what means frindex ? */ + libusb20_tr_setup_isoc(usb20_xfer, xfer->buffer, xfer->length, 0); + break ; + case LIBUSB_TRANSFER_TYPE_CONTROL: + libusb20_tr_setup_control(usb20_xfer, xfer->buffer, + (void *)(((uint8_t *) xfer->buffer) + + sizeof(libusb_control_setup)), xfer->timeout); + break ; + } + libusb20_tr_set_timeout(usb20_xfer, xfer->timeout); libusb20_tr_set_buffer(usb20_xfer, xfer->buffer, xfer->num_iso_packets); libusb20_tr_set_length(usb20_xfer, xfer->length, xfer->num_iso_packets); @@ -795,10 +811,6 @@ case LIBUSB20_TRANSFER_STALL: xfer->status = LIBUSB_TRANSFER_STALL; break ; - case LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK: - case LIBUSB20_TRANSFER_MULTI_SHORT_NOT_OK: - xfer->status = LIBUSB_TRANSFER_SHORT_NOT_OK; - break ; case LIBUSB20_TRANSFER_CANCELLED: xfer->status = LIBUSB_TRANSFER_CANCELLED; break ; @@ -1198,6 +1210,9 @@ return (0); } +/* + * Need to fix xfer->type + */ int libusb_interrupt_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, int *transferred, From owner-p4-projects@FreeBSD.ORG Wed May 27 18:25:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 428EE10656E4; Wed, 27 May 2009 18: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 ED8BD10656E0 for ; Wed, 27 May 2009 18:25:46 +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 DB7D48FC15 for ; Wed, 27 May 2009 18:25:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RIPkBr065239 for ; Wed, 27 May 2009 18:25:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RIPkdN065237 for perforce@freebsd.org; Wed, 27 May 2009 18:25:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 27 May 2009 18:25:46 GMT Message-Id: <200905271825.n4RIPkdN065237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 162895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 18:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=162895 Change 162895 by hselasky@hselasky_laptop001 on 2009/05/27 18:24:47 Libusb - update manpage Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#9 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#9 (text+ko) ==== @@ -183,6 +183,10 @@ .Ft int .Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq" .Ft struct libusb20_backend * +.Fn libusb20_be_alloc_default "void" +.Ft struct libusb20_backend * +.Fn libusb20_be_alloc_freebsd "void" +.Ft struct libusb20_backend * .Fn libusb20_be_alloc_linux "void" .Ft struct libusb20_device * .Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev" @@ -829,6 +833,10 @@ If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is returned. . +.Pp +. +.Fn libusb20_be_alloc_default +.Fn libusb20_be_alloc_freebsd .Fn libusb20_be_alloc_linux These functions are used to allocate a specific USB backend or the operating system default USB backend. Allocating a backend is a way to From owner-p4-projects@FreeBSD.ORG Wed May 27 18:44:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2AC41065688; Wed, 27 May 2009 18:44:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81BCF1065670 for ; Wed, 27 May 2009 18:44:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B7FE8FC21 for ; Wed, 27 May 2009 18:44:06 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RIi62I066670 for ; Wed, 27 May 2009 18:44:06 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RIi5fG066664 for perforce@freebsd.org; Wed, 27 May 2009 18:44:05 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 27 May 2009 18:44:05 GMT Message-Id: <200905271844.n4RIi5fG066664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 162897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 18:44:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=162897 Change 162897 by thompsa@thompsa_burger on 2009/05/27 18:43:13 IFC @162896 Affected files ... .. //depot/projects/usb/src/sys/Makefile#11 integrate .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#19 delete .. //depot/projects/usb/src/sys/arm/conf/AVILA#16 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#9 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#9 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#17 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#13 integrate .. //depot/projects/usb/src/sys/conf/NOTES#35 integrate .. //depot/projects/usb/src/sys/conf/files#64 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/usb/src/sys/conf/options#27 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#13 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/usb/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#13 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#8 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/usb/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/usb/src/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/cmi.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#8 delete .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#8 delete .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#9 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_cpuset.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/usb/src/sys/kern/kern_fork.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/usb/src/sys/kern/kern_mib.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#5 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#12 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#12 integrate .. //depot/projects/usb/src/sys/kern/linker_if.m#4 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#5 integrate .. //depot/projects/usb/src/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#10 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#22 integrate .. //depot/projects/usb/src/sys/kern/uipc_debug.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#21 integrate .. //depot/projects/usb/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/usb/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_pci.c#3 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci_pci.c#3 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci_pci.c#3 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/usb/src/sys/mips/mips/pmap.c#10 integrate .. //depot/projects/usb/src/sys/modules/Makefile#32 integrate .. //depot/projects/usb/src/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/usb/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/linux/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/ubt/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#18 integrate .. //depot/projects/usb/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/usb/src/sys/net/bpf.c#18 integrate .. //depot/projects/usb/src/sys/net/if.c#25 integrate .. //depot/projects/usb/src/sys/net/if_clone.c#5 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#19 integrate .. //depot/projects/usb/src/sys/net/if_var.h#17 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#22 integrate .. //depot/projects/usb/src/sys/net/vnet.h#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#10 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/TODO#5 delete .. //depot/projects/usb/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/usb/src/sys/netinet/in.c#25 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#23 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#21 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#23 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#21 integrate .. //depot/projects/usb/src/sys/netinet/udp_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_ipsec.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#18 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.h#13 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec6.h#7 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#16 integrate .. //depot/projects/usb/src/sys/netipsec/vipsec.h#6 integrate .. //depot/projects/usb/src/sys/netipx/spx.h#3 integrate .. //depot/projects/usb/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/usb/src/sys/netipx/spx_usrreq.c#7 integrate .. //depot/projects/usb/src/sys/netipx/spx_var.h#3 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_dev.c#4 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_idmap.c#4 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#5 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_subs.c#4 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfs_subs.c#3 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#10 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vn_subs.c#4 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#11 delete .. //depot/projects/usb/src/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/krpc_subr.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#13 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_lock.c#6 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_node.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_subs.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsm_subs.h#3 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/usb/src/sys/nlm/nlm_advlock.c#5 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#12 integrate .. //depot/projects/usb/src/sys/rpc/rpcclnt.c#9 delete .. //depot/projects/usb/src/sys/rpc/rpcclnt.h#2 delete .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#11 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#14 integrate .. //depot/projects/usb/src/sys/sys/acl.h#4 integrate .. //depot/projects/usb/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/usb/src/sys/sys/eventhandler.h#8 integrate .. //depot/projects/usb/src/sys/sys/fail.h#1 branch .. //depot/projects/usb/src/sys/sys/jail.h#14 integrate .. //depot/projects/usb/src/sys/sys/ksyms.h#1 branch .. //depot/projects/usb/src/sys/sys/lock.h#9 integrate .. //depot/projects/usb/src/sys/sys/lockf.h#5 integrate .. //depot/projects/usb/src/sys/sys/lockstat.h#1 branch .. //depot/projects/usb/src/sys/sys/mutex.h#10 integrate .. //depot/projects/usb/src/sys/sys/namei.h#4 integrate .. //depot/projects/usb/src/sys/sys/param.h#31 integrate .. //depot/projects/usb/src/sys/sys/priv.h#13 integrate .. //depot/projects/usb/src/sys/sys/queue.h#5 integrate .. //depot/projects/usb/src/sys/sys/rwlock.h#11 integrate .. //depot/projects/usb/src/sys/sys/sx.h#9 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/usb/src/sys/sys/systm.h#17 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#11 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#15 integrate Differences ... ==== //depot/projects/usb/src/sys/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $ .include @@ -11,7 +11,7 @@ CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v ==== //depot/projects/usb/src/sys/arm/conf/AVILA#16 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $ ident AVILA @@ -132,15 +132,14 @@ options AH_SUPPORT_AR5416 device ath_ar9160 -makeoptions WITH_LEGACY -device ousb +device usb #options USB_DEBUG -device oohci -device oehci -device oumass +device ohci +device ehci +device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) -#device oural -#device ozyd +#device ural +#device zyd #device wlan_amrr ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#9 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -47,4 +47,3 @@ arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # dev/usb/controller/ehci_ixp4xx.c optional ehci usb -legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.14 2009/03/10 19:35:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -143,6 +143,7 @@ struct npestats *sc_stats; bus_dmamap_t sc_stats_map; bus_addr_t sc_stats_phys; /* phys addr of sc_stats */ + struct npestats sc_totals; /* accumulated sc_stats */ }; /* @@ -374,6 +375,8 @@ CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tickinterval", CTLFLAG_RW, &sc->sc_tickinterval, 0, "periodic work frequency"); + SYSCTL_ADD_STRUCT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "stats", + CTLFLAG_RD, &sc->sc_totals, npestats, "onboard stats"); ether_ifattach(ifp, eaddr); return 0; @@ -867,12 +870,24 @@ static void npe_addstats(struct npe_softc *sc) { -#define MIBADD(x) sc->mibdata.x += be32toh(ns->x) +#define NPEADD(x) sc->sc_totals.x += be32toh(ns->x) +#define MIBADD(x) do { sc->mibdata.x += be32toh(ns->x); NPEADD(x); } while (0) struct ifnet *ifp = sc->sc_ifp; struct npestats *ns = sc->sc_stats; MIBADD(dot3StatsAlignmentErrors); MIBADD(dot3StatsFCSErrors); + MIBADD(dot3StatsInternalMacReceiveErrors); + NPEADD(RxOverrunDiscards); + NPEADD(RxLearnedEntryDiscards); + NPEADD(RxLargeFramesDiscards); + NPEADD(RxSTPBlockedDiscards); + NPEADD(RxVLANTypeFilterDiscards); + NPEADD(RxVLANIdFilterDiscards); + NPEADD(RxInvalidSourceDiscards); + NPEADD(RxBlackListDiscards); + NPEADD(RxWhiteListDiscards); + NPEADD(RxUnderflowEntryDiscards); MIBADD(dot3StatsSingleCollisionFrames); MIBADD(dot3StatsMultipleCollisionFrames); MIBADD(dot3StatsDeferredTransmissions); @@ -880,10 +895,12 @@ MIBADD(dot3StatsExcessiveCollisions); MIBADD(dot3StatsInternalMacTransmitErrors); MIBADD(dot3StatsCarrierSenseErrors); + NPEADD(TxLargeFrameDiscards); + NPEADD(TxVLANIdFilterDiscards); + sc->mibdata.dot3StatsFrameTooLongs += be32toh(ns->RxLargeFramesDiscards) + be32toh(ns->TxLargeFrameDiscards); - MIBADD(dot3StatsInternalMacReceiveErrors); sc->mibdata.dot3StatsMissedFrames += be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards); @@ -902,6 +919,7 @@ be32toh(ns->dot3StatsSingleCollisionFrames) + be32toh(ns->dot3StatsMultipleCollisionFrames) ; +#undef NPEADD #undef MIBADD } ==== //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.3 2009/05/16 10:48:20 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.5 2009/05/23 16:01:58 des Exp $"); static uint64_t zfs_crc64_table[256]; ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $"); #include #include @@ -302,6 +302,14 @@ if (error) return (error); } + /* + * Deny setting setuid if we are not the file owner. + */ + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } return (0); } ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 (text+ko) ==== @@ -424,7 +424,7 @@ #endif } -#ifndef __FreeBSD__ +#if !defined(_KERNEL) acl_t * acl_alloc(enum acl_type type) { @@ -470,7 +470,6 @@ cacl_free(aclp, sizeof (acl_t)); } -#endif static uint32_t access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) @@ -1727,3 +1726,4 @@ return (error); #endif } +#endif /* _KERNEL */ ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 (text+ko) ==== @@ -46,6 +46,7 @@ extern int ace_trivial_common(void *, int, uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *, uint32_t *mask)); +#if !defined(_KERNEL) extern acl_t *acl_alloc(acl_type_t); extern void acl_free(acl_t *aclp); extern int acl_translate(acl_t *aclp, int target_flavor, @@ -53,6 +54,7 @@ void ksort(caddr_t v, int n, int s, int (*f)()); int cmp2acls(void *a, void *b); +#endif /* _KERNEL */ #ifdef __cplusplus } ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $ */ /* @@ -122,6 +122,7 @@ #include #include #include +#include #include #include #include @@ -3168,14 +3169,11 @@ uintptr_t rw; } r; #else + struct thread *lowner; union { - struct mtx *mi; - uintptr_t mx; - } m; - union { - struct sx *si; - uintptr_t sx; - } s; + struct lock_object *li; + uintptr_t lx; + } l; #endif switch (subr) { @@ -3272,75 +3270,83 @@ break; #else - /* - * XXX - The following code works because mutex, rwlocks, & sxlocks - * all have similar data structures in FreeBSD. This may not be - * good if someone changes one of the lock data structures. - * Ideally, it would be nice if all these shared a common lock - * object. - */ case DIF_SUBR_MUTEX_OWNED: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - -#ifdef DOODAD - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); - } else { - regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } -#endif + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); break; case DIF_SUBR_MUTEX_OWNER: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK; - } else { - if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) - regs[rd] = SX_OWNER(m.mi->mtx_lock); - else - regs[rd] = 0; + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (uintptr_t)lowner; break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + /* XXX - should be only LC_SLEEPABLE? */ + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & + (LC_SLEEPLOCK | LC_SLEEPABLE)) != 0; break; case DIF_SUBR_MUTEX_TYPE_SPIN: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & LC_SPINLOCK) != 0; break; case DIF_SUBR_RW_READ_HELD: case DIF_SUBR_SX_SHARED_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED) && - (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner == NULL; break; case DIF_SUBR_RW_WRITE_HELD: case DIF_SUBR_SX_EXCLUSIVE_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (lowner == curthread); break; case DIF_SUBR_RW_ISWRITER: case DIF_SUBR_SX_ISEXCLUSIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) || - !(s.si->sx_lock & SX_LOCK_SHARED)); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner != NULL; break; #endif /* ! defined(sun) */ ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 (text+ko) ==== @@ -188,10 +188,8 @@ #ifdef _KERNEL void zfs_perm_init(struct znode *, struct znode *, int, vattr_t *, dmu_tx_t *, cred_t *, zfs_acl_t *, zfs_fuid_info_t **); -#ifdef TODO int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); -#endif void zfs_acl_rele(void *); void zfs_oldace_byteswap(ace_t *, int); void zfs_ace_byteswap(void *, size_t, boolean_t); ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 (text+ko) ==== @@ -1909,7 +1909,6 @@ zfs_acl_free(aclp); } -#ifdef TODO /* * Retrieve a files ACL */ @@ -2005,7 +2004,6 @@ return (0); } -#endif /* TODO */ int zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_t obj_type, @@ -2062,7 +2060,6 @@ return (0); } -#ifdef TODO /* * Set a files ACL */ @@ -2170,7 +2167,6 @@ return (error); } -#endif /* TODO */ /* * working_mode returns the permissions that were not granted ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include #include #include +#include /* * Programming rules. @@ -3846,7 +3846,6 @@ } } -#ifdef TODO /*ARGSUSED*/ static int zfs_getsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3864,9 +3863,7 @@ return (error); } -#endif /* TODO */ -#ifdef TODO /*ARGSUSED*/ static int zfs_setsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3883,7 +3880,6 @@ ZFS_EXIT(zfsvfs); return (error); } -#endif /* TODO */ static int zfs_freebsd_open(ap) @@ -3963,7 +3959,7 @@ zfs_freebsd_access(ap) struct vop_access_args /* { struct vnode *a_vp; - int a_accmode; + accmode_t a_accmode; struct ucred *a_cred; struct thread *a_td; } */ *ap; @@ -4777,6 +4773,90 @@ return (error); } +int +zfs_freebsd_getacl(ap) + struct vop_getacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; + if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) + return (error); + + error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); + if (vsecattr.vsa_aclentp != NULL) + kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); + + return (error); +} + +int +zfs_freebsd_setacl(ap) + struct vop_setacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + int aclbsize; /* size of acl list in bytes */ + aclent_t *aaclp; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) + return (EINVAL); + + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries, + * splitting every entry into two and appending "canonical six" + * entries at the end. Don't allow for setting an ACL that would + * cause chmod(2) to run out of ACL entries. + */ + if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + return (ENOSPC); + + vsecattr.vsa_mask = VSA_ACE; + aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); + vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); + aaclp = vsecattr.vsa_aclentp; + vsecattr.vsa_aclentsz = aclbsize; + + aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); + error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL); + kmem_free(aaclp, aclbsize); + + return (error); +} + +int +zfs_freebsd_aclcheck(ap) + struct vop_aclcheck_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + + return (EOPNOTSUPP); +} + struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; @@ -4816,6 +4896,11 @@ .vop_deleteextattr = zfs_deleteextattr, .vop_setextattr = zfs_setextattr, .vop_listextattr = zfs_listextattr, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; struct vop_vector zfs_fifoops = { @@ -4829,4 +4914,9 @@ .vop_setattr = zfs_freebsd_setattr, .vop_write = VOP_PANIC, .vop_fid = zfs_freebsd_fid, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 (text+ko) ==== @@ -31,12 +31,22 @@ #include #include +#if defined(_KERNEL) +/* + * When compiling OpenSolaris kernel code, this file is getting + * included instead of FreeBSD one. Pull the original sys/acl.h as well. + */ +#undef _SYS_ACL_H +#include_next +#define _SYS_ACL_H +#endif /* _KERNEL */ + #ifdef __cplusplus extern "C" { #endif #define MAX_ACL_ENTRIES (1024) /* max entries of each type */ -typedef struct acl { +typedef struct { int a_type; /* the type of ACL entry */ uid_t a_id; /* the entry in -uid or gid */ o_mode_t a_perm; /* the permission field */ @@ -49,7 +59,9 @@ uint16_t a_type; /* allow or deny */ } ace_t; +#if !defined(_KERNEL) typedef struct acl_info acl_t; +#endif /* * The following are Defined types for an aclent_t. ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ==== @@ -44,10 +44,10 @@ typedef enum acl_type { ACLENT_T = 0, ACE_T = 1 -} acl_type_t; +} zfs_acl_type_t; struct acl_info { - acl_type_t acl_type; /* style of acl */ + zfs_acl_type_t acl_type; /* style of acl */ int acl_cnt; /* number of acl entries */ int acl_entry_size; /* sizeof acl entry */ int acl_flags; /* special flags about acl */ ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.89 2009/04/29 21:14:15 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.90 2009/05/27 14:11:23 jamie Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -112,8 +112,6 @@ CTASSERT(sizeof(struct stat32) == 96); CTASSERT(sizeof(struct sigaction32) == 24); -extern int jail_max_af_ips; - static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count); static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count); @@ -2044,17 +2042,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 27 19:13:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17739106567A; Wed, 27 May 2009 19:13:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C960F1065670 for ; Wed, 27 May 2009 19:13:36 +0000 (UTC) (envelope-from tsel@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B73668FC1E for ; Wed, 27 May 2009 19:13:36 +0000 (UTC) (envelope-from tsel@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RJDaEh070026 for ; Wed, 27 May 2009 19:13:36 GMT (envelope-from tsel@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RJDa8r070024 for perforce@freebsd.org; Wed, 27 May 2009 19:13:36 GMT (envelope-from tsel@FreeBSD.org) Date: Wed, 27 May 2009 19:13:36 GMT Message-Id: <200905271913.n4RJDa8r070024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tsel@FreeBSD.org using -f From: Tatsiana Elavaya To: Perforce Change Reviews Cc: Subject: PERFORCE change 162900 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 19:13:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=162900 Change 162900 by tsel@tsel_mz on 2009/05/27 19:12:53 Implement rule aliases. Usage: # ./ipfw add 200 alias alias2 allow all from any to any 00200 alias alias2 allow ip from any to any # ./ipfw add 100 alias alias1 skipto alias2 all from any to any 00100 alias alias1 skipto alias2 ip from any to any # ./ipfw show 00100 18 1152 alias alias1 skipto alias2 ip from any to any 00200 585 117328 alias alias2 allow ip from any to any 65535 109 27557 deny ip from any to any Affected files ... .. //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/ipfw2.c#2 edit .. //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/ipfw2.h#2 edit .. //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/main.c#2 edit .. //depot/projects/soc2009/tsel_ipfw/sys/netinet/ip_fw.h#2 edit Differences ... ==== //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/ipfw2.c#2 (text+ko) ==== @@ -449,6 +449,69 @@ return 0; } +static void* +ipfw_get_all(int ocmd, int *nbytes) +{ + void *data = NULL; + int nalloc = 1024; /* start somewhere... */ + + /* get rules or pipes from kernel, resizing array as necessary */ + *nbytes = nalloc; + + while (*nbytes >= nalloc) { + nalloc = nalloc * 2 + 200; + *nbytes = nalloc; + data = safe_realloc(data, *nbytes); + if (do_cmd(ocmd, data, (uintptr_t)nbytes) < 0) + err(EX_OSERR, "getsockopt(IP_%s_GET)", + co.do_pipe ? "DUMMYNET" : "FW"); + } + return data; +} + +static struct ip_fw* +get_rule_cache(int *len) +{ + static struct ip_fw *rules = NULL; + static int rules_len = 0; + + if (rules == NULL) { + rules = (struct ip_fw*) ipfw_get_all(IP_FW_GET, &rules_len); + rules_len = rules_len / sizeof(struct ip_fw); + } + + *len = rules_len; + return rules; +} + +static int +alias_lookup_rulenum(const char *alias) +{ + struct ip_fw *rules; + int len, i; + + rules = get_rule_cache(&len); + for (i = 0; i < len; i++) { + if (!strcmp(rules[i].alias, alias)) + return rules[i].rulenum; + } + return -1; +} + +static char* +alias_lookup(int rulenum) +{ + struct ip_fw *rules; + int len, i; + + rules = get_rule_cache(&len); + for (i = 0; i < len; i++) { + if (rules[i].rulenum == rulenum) + return rules[i].alias[0] ? rules[i].alias : NULL; + } + return NULL; +} + /* * prints one port, symbolic or numeric */ @@ -973,6 +1036,9 @@ } } + if (rule->alias[0]) + printf("alias %s ", rule->alias); + if (co.show_sets) printf("set %d ", rule->set); @@ -1029,9 +1095,14 @@ print_unreach6_code(cmd->arg1); break; - case O_SKIPTO: - PRINT_UINT_ARG("skipto ", cmd->arg1); + case O_SKIPTO: { + char *alias = alias_lookup(cmd->arg1); + if (alias == NULL) + PRINT_UINT_ARG("skipto ", cmd->arg1); + else + printf("skipto %s", alias); break; + } case O_PIPE: PRINT_UINT_ARG("pipe ", cmd->arg1); @@ -1715,6 +1786,20 @@ } } +static void +ipfw_list_aliases(void *data, uint nbytes, int ac, char *av[]) +{ + struct ip_fw *rules; + int len, i; + + rules = (struct ip_fw*) data; + len = nbytes / sizeof(struct ip_fw); + for (i = 0; i < len; i++) { + if (rules[i].alias[0] != '\0') + printf("%-5d %s\n", rules[i].rulenum, rules[i].alias); + } +} + void ipfw_list(int ac, char *av[], int show_counters) { @@ -1723,19 +1808,16 @@ #define NEXT(r) ((struct ip_fw *)((char *)r + RULESIZE(r))) char *lim; - void *data = NULL; int bcwidth, n, nbytes, nstat, ndyn, pcwidth, width; int exitval = EX_OK; int lac; char **lav; + void *data; u_long rnum, last; char *endptr; int seen = 0; uint8_t set; - const int ocmd = co.do_pipe ? IP_DUMMYNET_GET : IP_FW_GET; - int nalloc = 1024; /* start somewhere... */ - last = 0; if (co.test_only) { @@ -1746,20 +1828,16 @@ ac--; av++; - /* get rules or pipes from kernel, resizing array as necessary */ - nbytes = nalloc; + data = ipfw_get_all(co.do_pipe ? IP_DUMMYNET_GET : IP_FW_GET, &nbytes); - while (nbytes >= nalloc) { - nalloc = nalloc * 2 + 200; - nbytes = nalloc; - data = safe_realloc(data, nbytes); - if (do_cmd(ocmd, data, (uintptr_t)&nbytes) < 0) - err(EX_OSERR, "getsockopt(IP_%s_GET)", - co.do_pipe ? "DUMMYNET" : "FW"); + if (co.do_pipe) { + ipfw_list_pipes(data, nbytes, ac, av); + goto done; } - if (co.do_pipe) { - ipfw_list_pipes(data, nbytes, ac, av); + if (ac && !strcmp(*av, "alias")) { + ipfw_list_aliases(data, nbytes, ac, av); + ac--; av++; goto done; } @@ -2610,6 +2688,18 @@ ac--; } + /* [alias ALIAS] */ + if (ac > 1 && _substrcmp(*av, "alias") == 0) { + int alias_rule; + + NEED1("missing alias name"); + alias_rule = alias_lookup_rulenum(av[1]); + if (alias_rule > 0) + errx(EX_DATAERR, "rule %d already has alias %s", alias_rule, av[1]); + strlcpy(rule->alias, av[1], IPFW_ALIAS_NAME_SIZE); + av += 2; ac -= 2; + } + /* [set N] -- set number (0..RESVD_SET), optional */ if (ac > 1 && _substrcmp(*av, "set") == 0) { int set = strtoul(av[1], NULL, 10); @@ -2724,6 +2814,11 @@ action->arg1 = ntohs(s->s_port); else errx(EX_DATAERR, "illegal divert/tee port"); + } else if (i == TOK_SKIPTO) { + action->arg1 = alias_lookup_rulenum(*av); + if (action->arg1 <= 0 || action->arg1 >= IPFW_DEFAULT_RULE) + errx(EX_DATAERR, "illegal argument for %s", + *(av - 1)); } else errx(EX_DATAERR, "illegal argument for %s", *(av - 1)); ac--; av++; ==== //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/ipfw2.h#2 (text+ko) ==== ==== //depot/projects/soc2009/tsel_ipfw/sbin/ipfw/main.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ "ipfw syntax summary (but please do read the ipfw(8) manpage):\n\n" "\tipfw [-abcdefhnNqStTv] \n\n" "where is one of the following:\n\n" -"add [num] [set N] [prob x] RULE-BODY\n" +"add [num] [alias ALIAS] [set N] [prob x] RULE-BODY\n" "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" "nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|reset|\n" ==== //depot/projects/soc2009/tsel_ipfw/sys/netinet/ip_fw.h#2 (text+ko) ==== @@ -421,6 +421,8 @@ */ } ipfw_insn_icmp6; +#define IPFW_ALIAS_NAME_SIZE 32 + /* * Here we have the structure representing an ipfw rule. * @@ -464,6 +466,7 @@ u_int64_t pcnt; /* Packet counter */ u_int64_t bcnt; /* Byte counter */ u_int32_t timestamp; /* tv_sec of last match */ + char alias[IPFW_ALIAS_NAME_SIZE]; ipfw_insn cmd[1]; /* storage for commands */ }; From owner-p4-projects@FreeBSD.ORG Wed May 27 19:39:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AA381065841; Wed, 27 May 2009 19:39: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 26396106583F for ; Wed, 27 May 2009 19:39:43 +0000 (UTC) (envelope-from ccna.syl@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.31]) by mx1.freebsd.org (Postfix) with ESMTP id CB5418FC14 for ; Wed, 27 May 2009 19:39:42 +0000 (UTC) (envelope-from ccna.syl@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so2647029ywe.13 for ; Wed, 27 May 2009 12:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=qRgKiI68uQdOGF2FGCABnhnBdHdCpKRsaQMMsW7wG8A=; b=K8wj8jyTUt5ArD6j1BdKeDW9bdfooTFQBfT0ePOpRVrATdojzcLQbZ+orpKBIaserU emA3FfU9OyB5ICeDe3z+XGV/KQXtg7qyxgNWwbpKRIqRQhkyIIbbIgHv11nv6jdO63/j tCURBSqneshErFx9jlpxAcf9b5f7LCmrGTFRc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=RKiDxKRPCbmQqnPLk4zG/VITSbqAjGC/hQIJPLPbDy5/U53Xoz/jieW/Xhun3ZSDIf XbFbd1nTydHWCly/G68mzdBA6NAEvP4ySlCfjCG4utbhP2OnJv7dAkI355xD3q76cEmc U4I0Si3HYjUIs66RgoMys1hORrBBPKnFIhOIY= MIME-Version: 1.0 Received: by 10.231.34.5 with SMTP id j5mr321850ibd.0.1243453181275; Wed, 27 May 2009 12:39:41 -0700 (PDT) In-Reply-To: <200905272129.39606.hselasky@c2i.net> References: <200905271656.n4RGuEgK056279@repoman.freebsd.org> <200905272129.39606.hselasky@c2i.net> From: Sylvestre Gallon Date: Wed, 27 May 2009 19:39:21 +0000 Message-ID: <164b4c9c0905271239w21e72ad2r14014dfdd11099c9@mail.gmail.com> To: Hans Petter Selasky Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 162889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 19:39:44 -0000 On Wed, May 27, 2009 at 7:29 PM, Hans Petter Selasky wro= te: > On Wednesday 27 May 2009, Sylvestre Gallon wrote: >> +=A0=A0=A0=A0=A0=A0=A0case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0/* what means frindex ? */ >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0libusb20_tr_setup_isoc(usb= 20_xfer, xfer->buffer, >> xfer->length, 0); > > Unlike in the kernel you need to specify the buffer+length pair for all > ISOCHRONOUS frames up to and including "max_frames-1". > > In you code you have only setup one frame [index 0] . > ok, if I understand fr_index arguments in libusb20_tr_setup_isoc refers to the number of isochronous packets ? Cheers, --=20 Sylvestre Gallon (http://devsyl.blogspot.com) Fifth Grade Student @ Epitech & Researcher @ LSE R&D @ Rathaxes (http://www.rathaxes.org) From owner-p4-projects@FreeBSD.ORG Wed May 27 19:56:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24AC106581C; Wed, 27 May 2009 19:56: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 A1684106575F for ; Wed, 27 May 2009 19:56:03 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe08.swip.net [212.247.154.225]) by mx1.freebsd.org (Postfix) with ESMTP id 3318F8FC14 for ; Wed, 27 May 2009 19:56:01 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=jAwUbfdTuR0A:10 a=8kQB0OdkAAAA:8 a=vEyOsxuhjF6HV9CpVaoA:9 a=-qi3r90pPu3Q6fVe8ZuGJRCEJ6oA:4 a=9aOQ2cSd83gA:10 a=6H5-1_0l2zB8xAjc:21 a=kC3q_QdDwJB-WdPr:21 Received: from [62.113.132.61] (account mc467741@c2i.net HELO [10.37.1.92]) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.13) with ESMTPA id 1248525299; Wed, 27 May 2009 21:56:00 +0200 From: Hans Petter Selasky To: Sylvestre Gallon Date: Wed, 27 May 2009 22:00:04 +0200 User-Agent: KMail/1.9.7 References: <200905271656.n4RGuEgK056279@repoman.freebsd.org> <200905272129.39606.hselasky@c2i.net> <164b4c9c0905271239w21e72ad2r14014dfdd11099c9@mail.gmail.com> In-Reply-To: <164b4c9c0905271239w21e72ad2r14014dfdd11099c9@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200905272200.04784.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 162889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 19:56:05 -0000 On Wednesday 27 May 2009, Sylvestre Gallon wrote: > On Wed, May 27, 2009 at 7:29 PM, Hans Petter Selasky =20 wrote: > > On Wednesday 27 May 2009, Sylvestre Gallon wrote: > >> +=A0=A0=A0=A0=A0=A0=A0case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: > >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0/* what means frindex ? = */ > >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0libusb20_tr_setup_isoc(u= sb20_xfer, xfer->buffer, > >> xfer->length, 0); > > > > Unlike in the kernel you need to specify the buffer+length pair for all > > ISOCHRONOUS frames up to and including "max_frames-1". > > > > In you code you have only setup one frame [index 0] . > > ok, > > if I understand fr_index arguments in libusb20_tr_setup_isoc refers to > the number of isochronous packets ? It is the index of the isochronous packet. You setup a transfer of multiple= =20 isochronous packets at a time, and typically initialise like this: for (i =3D 0; i !=3D MAX_FRAMES; i++) { libusb20_tr_setup_isoc(usb20_xfer, buf, MAX_LEN, i); buf +=3D MAX_LEN; } With regard to libusb 1.0 you need to check that structure array extending = the=20 USB transfer for length and pointer information I think. !NOTE! The userland libusb allowes a per-packet pointer. In the kernel the= =20 packets must be back to back, and only one buffer pointer is used. =2D-HPS From owner-p4-projects@FreeBSD.ORG Wed May 27 20:25:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEA8F1065739; Wed, 27 May 2009 20:25: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 88F941065694 for ; Wed, 27 May 2009 20:25:38 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe10.swipnet.se [212.247.155.33]) by mx1.freebsd.org (Postfix) with ESMTP id 210138FC35 for ; Wed, 27 May 2009 20:25:37 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=jAwUbfdTuR0A:10 a=nO3yRLM7ncU1o5ZnqjgA:9 a=JamE-0yGi921FAry5CQEkPpg8CQA:4 a=qMJy3NMwFlOiIXI7:21 a=JTImSdAjsHoZ6L_h:21 Received: from [62.113.132.61] (account mc467741@c2i.net HELO [10.37.1.92]) by mailfe10.swip.net (CommuniGate Pro SMTP 5.2.13) with ESMTPA id 1079035951; Wed, 27 May 2009 21:25:35 +0200 From: Hans Petter Selasky To: Sylvestre Gallon Date: Wed, 27 May 2009 21:29:38 +0200 User-Agent: KMail/1.9.7 References: <200905271656.n4RGuEgK056279@repoman.freebsd.org> In-Reply-To: <200905271656.n4RGuEgK056279@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200905272129.39606.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 162889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 20:25:42 -0000 On Wednesday 27 May 2009, Sylvestre Gallon wrote: > +=A0=A0=A0=A0=A0=A0=A0case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0/* what means frindex ? */ > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0libusb20_tr_setup_isoc(usb2= 0_xfer, xfer->buffer, > xfer->length, 0); Unlike in the kernel you need to specify the buffer+length pair for all=20 ISOCHRONOUS frames up to and including "max_frames-1". In you code you have only setup one frame [index 0] . =2D-HPS From owner-p4-projects@FreeBSD.ORG Wed May 27 20:33:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65A92106572E; Wed, 27 May 2009 20:32: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 1990510656DB for ; Wed, 27 May 2009 20:32:59 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 071338FC12 for ; Wed, 27 May 2009 20:32:59 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RKWwFd077296 for ; Wed, 27 May 2009 20:32:58 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RKWwdT077294 for perforce@freebsd.org; Wed, 27 May 2009 20:32:58 GMT (envelope-from syl@FreeBSD.org) Date: Wed, 27 May 2009 20:32:58 GMT Message-Id: <200905272032.n4RKWwdT077294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 20:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=162907 Change 162907 by syl@syl_rincewind on 2009/05/27 20:32:25 Fix bugs spotted by Hans Petter Selasky. Use libusb20_tr_set_total_frames. Best use of libusb20_tr_setup_isoc. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#14 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#14 (text+ko) ==== @@ -713,6 +713,7 @@ struct timeval *cur_tv; int num_frame; int ret; + int i; if (xfer == NULL) return (LIBUSB_ERROR_NO_MEM); @@ -780,8 +781,10 @@ libusb20_tr_setup_bulk(usb20_xfer, xfer->buffer, xfer->length, xfer->timeout); break ; case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: - /* what means frindex ? */ - libusb20_tr_setup_isoc(usb20_xfer, xfer->buffer, xfer->length, 0); + libusb20_tr_set_total_frames(usb20_xfer, xfer->num_iso_packets); + /* XXX need to check libusb-1.0 for xfer->buffer xfer->length */ + for (i = 0 ; i < xfer->num_iso_packets ; i++) + libusb20_tr_setup_isoc(usb20_xfer, xfer->buffer, xfer->length, i); break ; case LIBUSB_TRANSFER_TYPE_CONTROL: libusb20_tr_setup_control(usb20_xfer, xfer->buffer, @@ -790,9 +793,6 @@ break ; } - libusb20_tr_set_timeout(usb20_xfer, xfer->timeout); - libusb20_tr_set_buffer(usb20_xfer, xfer->buffer, xfer->num_iso_packets); - libusb20_tr_set_length(usb20_xfer, xfer->length, xfer->num_iso_packets); libusb20_tr_set_priv_sc0(usb20_xfer, xfer->callback); libusb20_tr_set_priv_sc1(usb20_xfer, xfer->user_data); libusb20_tr_set_callback(usb20_xfer, libusb10_proxy); From owner-p4-projects@FreeBSD.ORG Wed May 27 20:36:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3BF2106571F; Wed, 27 May 2009 20:36:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A3DA1065713 for ; Wed, 27 May 2009 20:36:02 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78CC38FC1F for ; Wed, 27 May 2009 20:36:02 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RKa23v077622 for ; Wed, 27 May 2009 20:36:02 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RKa2RM077620 for perforce@freebsd.org; Wed, 27 May 2009 20:36:02 GMT (envelope-from syl@FreeBSD.org) Date: Wed, 27 May 2009 20:36:02 GMT Message-Id: <200905272036.n4RKa2RM077620@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2009 20:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=162909 Change 162909 by syl@syl_rincewind on 2009/05/27 20:35:55 Import my own test code for libusb-1.0. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test1/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test1/test1.c#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/test3.c#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test4/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test4/test4.c#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/test5.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 28 00:07:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74C5A1065674; Thu, 28 May 2009 00:07: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 30ABA1065670 for ; Thu, 28 May 2009 00:07:38 +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 1D0258FC22 for ; Thu, 28 May 2009 00:07:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S07bAC007611 for ; Thu, 28 May 2009 00:07:37 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S07bot007609 for perforce@freebsd.org; Thu, 28 May 2009 00:07:37 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 28 May 2009 00:07:37 GMT Message-Id: <200905280007.n4S07bot007609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162913 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, 28 May 2009 00:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162913 Change 162913 by pgj@petymeg on 2009/05/28 00:07:06 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#29 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#28 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/dfr.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/kmoore.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#23 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#23 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/zml.key#1 branch .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#25 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#9 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#8 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#27 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#57 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#29 (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.479 2009/05/22 21:46:28 jilles Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.481 2009/05/27 15:52:12 zml Exp $ --> aaron@FreeBSD.org"> @@ -590,6 +590,8 @@ kmacy@FreeBSD.org"> +kmoore@FreeBSD.org"> + knu@FreeBSD.org"> koitsu@FreeBSD.org"> @@ -1174,5 +1176,7 @@ zec@FreeBSD.org"> +zml@FreeBSD.org"> + znerd@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ + - Key fingerprint = 20 BB E4 38 5D 89 D2 D4 68 A6 2F DC 0A DE 10 3C +pub 1024D/59F57821 2004-02-07 + Key fingerprint = 9451 C4FE 1A7E 117B B95F 1F8F B123 456E 59F5 7821 +uid Doug Rabson +sub 1024g/6207AA32 2004-02-07 ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -756,6 +756,11 @@ &pgpkey.rene; + + &a.zml; + &pgpkey.zml; + + &a.scottl; &pgpkey.scottl; @@ -846,6 +851,11 @@ &pgpkey.marcel; + + &a.kmoore; + &pgpkey.kmoore; + + &a.marck; &pgpkey.marck; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#23 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -146,6 +146,7 @@ + @@ -311,6 +312,7 @@ + ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.32 2009/05/02 16:23:44 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.33 2009/05/27 03:51:04 bmah Exp $ 2000 @@ -141,8 +141,6 @@ Hardware Support - - Multimedia Support @@ -174,7 +172,15 @@ File Systems - + ZFS has been updated from version 6 to version 13. + This update includes numerous new ZFS features, such as + permitting non-root users to perform + some administrative functions, supporting additional disks + for caching or the ZFS Intent Log, and partial &man.chflags.2; + support. It also includes some &os;-specific additions, + such as booting from ZFS file systems, removal of ARC + size limitations, ARC backpressure (which allows ZFS to work + without tunables on &arch.amd64;), and many bugfixes. ==== //depot/projects/docproj_hu/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.221 2009/05/22 22:04:35 jilles Exp $ +$FreeBSD: www/en/developers.sgml,v 1.222 2009/05/27 13:03:56 kmoore Exp $ --> @@ -296,6 +296,7 @@ + ==== //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#9 (text+ko) ==== @@ -10,6 +10,61 @@ + + A Few FreeBSD Core Team Members + + Interview with a few of the FreeBSD Core Team members + at BSDCan 2009: Robert Watson, Brooks Davis, Hiroki + Sato, Philip Paeps, and George V. Neville-Neil. We + talk about the recent 7.2 release, and what is + coming for 8. + + http://bsdtalk.blogspot.com/2009/05/bsdtalk173-few-freebsd-core-team.html + bsdtalk,interview,bsdcan,freebsd core team,robert watson,brooks davis,hiroki sato,philip paeps,george neville-neil + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk173.mp3 + 18 Mb + 38 minutes + MP3 version + mp3 + + + bsdtalk173.ogg + 38 minutes + Ogg version + ogg + + + + + + BSDCan 2009 with Dan Langille + + Interview with Dan Langille. We talk about BSDCan + 2009. More information at http://www.bsdcan.org. + + http://bsdtalk.blogspot.com/2009/04/bsdtalk172-bsdcan-2009-with-dan.html + bsdtalk,interview,bsdcan,dan langille + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk172.mp3 + 6 Mb + 13 minutes + MP3 version + mp3 + + + bsdtalk172.ogg + 13 minutes + Ogg version + ogg + + + + Andrew Doran from the NetBSD Project @@ -3038,6 +3093,195 @@ + + Using BSD in SchmooCon Labs + + DCBSDCon 2009, Ken Caruso +
+ clive URL: http://www.youtube.com/watch?v=9ZhfuP4jghY + ]]> + http://www.youtube.com/watch?v=9ZhfuP4jghY + youtube,presentation,dcbsdcon,dcbsdcon2009,bsd,schmoocon,ken caruso + + + http://www.youtube.com/watch?v=9ZhfuP4jghY + 35:08 + Flash + flash + + + + + + Sleeping Beauty - NetBSD on Modern laptops + + AsiaBSDCon 2008, Jorg Sonnenberger +
+ clive URL: http://www.youtube.com/watch?v=v9ygBFjGR50 + ]]> + http://www.youtube.com/watch?v=v9ygBFjGR50 + youtube,presentation,asiabsdcon2008,asiabsdcon,netbsd,laptops,jorg sonnenberger + + + http://www.youtube.com/watch?v=v9ygBFjGR50 + 1:20:56 + Flash + flash + + + + + + OpenBSD Network Stack Internals + + AsiaBSDCon 2008, Claudio Jeker +
+ clive URL: http://www.youtube.com/watch?v=V85It0dGUF4 + ]]> + http://www.youtube.com/watch?v=V85It0dGUF4 + youtube,presentation,asiabsdcon2008,asiabsdcon,openbsd,claudio jeker + + + http://www.youtube.com/watch?v=V85It0dGUF4 + 53:41 + Flash + flash + + + + + + 25 years with BSD + + AsiaBSDCon 2008, Hideki Sunahara +
+ clive URL: http://www.youtube.com/watch?v=brYdkQ120Do + ]]> + http://www.youtube.com/watch?v=brYdkQ120Do + youtube,keynote,asiabsdcon2008,asiabsdcon,bsd,hideki sunahara + + + http://www.youtube.com/watch?v=brYdkQ120Do + 44:43 + Flash + flash + + + + + + P6A: A Portable iSCSI Initiator + + AsiaBSDCon 2008, Alistair Crooks +
+ clive URL: http://www.youtube.com/watch?v=MiZY7PMu7Ic + ]]> + http://www.youtube.com/watch?v=MiZY7PMu7Ic + youtube,presentation,asiabsdcon2008,asiabsdcon,iscsi,alistair crooks + + + http://www.youtube.com/watch?v=MiZY7PMu7Ic + 40:57 + Flash + flash + + + + + + P3B: BSD Implementations of XCAST6 + + AsiaBSDCon 2008, Yuji Imai +
+ clive URL: http://www.youtube.com/watch?v=g1Ga48smqyI + ]]> + http://www.youtube.com/watch?v=g1Ga48smqyI + youtube,presentation,asiabsdcon2008,asiabsdcon,xcast6,yuji imai + + + http://www.youtube.com/watch?v=g1Ga48smqyI + 55:42 + Flash + flash + + + + + + P5A: Logical Resource Isolation in the NetBSD Kernel + + AsiaBSDCon 2008, Kristaps Dzonsons +
+ clive URL: http://www.youtube.com/watch?v=c63VneyQI-k + ]]> + http://www.youtube.com/watch?v=c63VneyQI-k + youtube,presentation,asiabsdcon2008,asiabsdcon,netbsd,kristaps dzonsons + + + http://www.youtube.com/watch?v=c63VneyQI-k + 56:29 + Flash + flash + + + + + + P4B: Send and Receive of File System Protocols: Userspace Approach With puffs + + AsiaBSDCon 2008, Antti Kantee +
+ clive URL: http://www.youtube.com/watch?v=ziGeB8iRA0c + ]]> + http://www.youtube.com/watch?v=ziGeB8iRA0c + youtube,presentation,asiabsdcon2008,asiabsdcon,puffs,antti kantee + + + http://www.youtube.com/watch?v=ziGeB8iRA0c + 47:29 + Flash + flash + + + + + + P1B: Tracking FreeBSD in a Commercial Setting + + AsiaBSDCon 2008, M. Warner Losh +
+ clive URL: http://www.youtube.com/watch?v=VaZ9Ef04bJg + ]]> + http://www.youtube.com/watch?v=VaZ9Ef04bJg + youtube,presentation,asiabsdcon2008,asiabsdcon,freebsd,warner losh + + + http://www.youtube.com/watch?v=VaZ9Ef04bJg + 33:40 + Flash + flash + + + + A Brief History of the BSD Fast Filesystem, Kirk McKusick + + + + DCBSDCon 2009 - Photos + + Photos of the 2009 DCBSDCon + + http://www.flickr.com/photos/34727619@N03/ + dcbsdcon,dcbsdcon2009,photos + + + + Chris Buechler - Network perimeter redundancy with pfsense + + This session will first provide an introduction and + overview of pfSense and its common uses. It will + then go on to cover means of providing redundancy + for the critical portions of your network perimeter + using pfSense, including redundancy for your Internet + connections, firewalls and DNS. Live configuration + examples will be shown for as many of these topics + as the session's length permits. This session will + cover pfSense 1.2.1, but will also offer an overview + of some of the enhanced capabilities in this area + that pfSense 2.0 will provide in the future. + + http://www.dcbsdcon.org/speakers/buechler.html + dcbsdcon,dcbsdcon2009,slides,pfsense,chris buechler + + + http://www.dcbsdcon.org/speakers/slides/buechler_dcbsdcon2009.pdf + PDF + 6.2 Kb + 30 pages + pdf + + + + + + Richard Bejtlich - Network security monitoring using FreeBSD + + I've been using FreeBSD as my preferred platform + for Network Security Monitoring (NSM) since 2000. + In this presentation I'll discuss my latest thinking + on using FreeBSD to identify normal, suspicious, + and malicious traffic in enterprise networks. FreeBSD + is a powerful platform for network traffic inspection + and log analysis, and I'll share a few ways I use + it in production environments. + + http://www.dcbsdcon.org/speakers/bejtlich.html + dcbsdcon,dcbsdcon2009,slides,freebsd,network security,monitoring,richard bejtlich + + + http://www.dcbsdcon.org/speakers/slides/bejtlich_dcbsdcon2009.pdf + PDF + 972 Kb + 23 pages + pdf + + + + + + Henning Brauer - Faster packets: Performance tuning in the OpenBSD network stack and PF + + n/a + + http://www.dcbsdcon.org/speakers/brauer.html + dcbsdcon,dcbsdcon2009,slides,openbsd,performance,henning brauer + + + http://www.dcbsdcon.org/speakers/slides/brauer_dcbsdcon2009.pdf + PDF + 27 Mb + 69 pages + pdf + + + + + + Kristaps Dzonsons - Process isolation for NetBSD and OpenBSD + + In NetBSD and OpenBSD, user-land process and + process-context isolation is limited to credential + cross-checks, file-system chroot and explicit + systrace/kauth applications. I'll demonstrate a + working mechanism of isolated process trees in + branched OpenBSD-4.4 and NetBSD-5.0-beta kernels + where an isolated process is started by a system + call similar to fork; following that, the child + process and its descendants execute in a context + isolated from the caller. This system is the continued + work of "mult" -- first prototyped in a branched + NetBSD-3.1 kernel and isolating all system resources + -- pared down to a lightweight, auditable patch of + process-only separation for both OpenBSD and NetBSD. + I specifically address solutions to performance + issues and mechanism design with an eye toward more + resources being isolated in the future. + + http://www.dcbsdcon.org/speakers/dzonsons.html + dcbsdcon,dcbsdcon2009,slides,openbsd,netbsd,process isolation,kristaps dzonsons + + + http://www.dcbsdcon.org/speakers/slides/dzonsons_dcbsdcon2009.pdf + PDF + 687 Kb + 27 pages + pdf + + + + + + Robert Luciani - M:N threading in DragonflyBSD + + Ineffective concurrency mechanisms in an operating + system can lead to low performance in both single + and multiprocessor environments. Practical setbacks + involved with attempting overly invasive kernel + changes have made it difficult in the past to + implement new and innovative concurrency systems. + This paper describes the rationale behind interfaces + in the DragonFly BSD operating system intended to + provide high performance and scalability on + multiprocessor architectures. Using a lock-free + processor centric approach, DragonFly BSD has + developed a unique thread system with the potential + for excellent scalability. + + http://www.dcbsdcon.org/speakers/luciani.html + dcbsdcon,dcbsdcon2009,slides,dragonflybsd,concurrency,robert luciani + + + http://www.dcbsdcon.org/speakers/slides/luciani_dcbsdcon2009.pdf + PDF + 1.5 Mb + 23 pages + pdf + + + + + + Ken Caruso - Using BSD in Shmoocon labs + + n/a + + http://www.dcbsdcon.org/speakers/caruso.html + dcbsdcon,dcbsdcon2009,slides,freebsd,scmoocon,ken caruso + + + http://www.dcbsdcon.org/speakers/slides/caruso_dcbsdcon2009.pdf + PDF + 447 Kb + 13 pages + pdf + + + + + + Brooks Davis - Isolating cluster jobs for performance and predictability + + At The Aerospace Corporation, we run a large FreeBSD + based computing cluster to support engineering + applications. These applications come in all shapes, + sizes, and qualities of implementation. To support + them and our diverse userbase we have been searching + for ways to isolate jobs from one another in ways + that are more effective than Unix time sharing and + more fine grained than allocating whole nodes to + jobs. In this paper we discuss the problem space + and our efforts so far. These efforts include + implementation of partial file systems vitalization + and CPU isolation using CPU sets. + + http://www.dcbsdcon.org/speakers/davis.html + dcbsdcon,dcbsdcon2009,slides,freebsd,clusters,brooks davis + + + http://www.dcbsdcon.org/speakers/slides/davis_dcbsdcon2009.pdf + PDF + 952 Kb + 24 pages + pdf + + + + + + Marco Peereboom - Epitome + + Tired of tape and their weaknesses? So am I! +

+ Epitome is the next generation backup mechanism. + It is based on the idea of providing instant available + backup data while removing duplicate files & blocks + from backups (yes really!). It is a disk based WORM + backup system. +

+ This talk will go into the Epitome protocol and its + application. The code is generic enough that it can + address all 3 major (buzzword compliant) technologies + known as: CAS, DEDUP & SIS. +

+ ]]> + http://www.dcbsdcon.org/speakers/peereboom.html + dcbsdcon,dcbsdcon2009,slides,epitome,backup,marco peereboom + + + http://www.dcbsdcon.org/speakers/slides/peereboom_dcbsdcon2009.pdf + PDF + 197 Kb + 34 pages + pdf + + + + + + Kurt Miller - Implementing PIE on OpenBSD + + In this session, Kurt will discuss OpenBSD's PIE + implementation, its impact on existing security + mechanisms such as W^X on i386, and the various + enhancements needed to the runtime linker, kernel + and other system libs. + + http://www.dcbsdcon.org/speakers/miller.html + dcbsdcon,dcbsdcon2009,slides,openbsd,pie,kurt miller + + + http://www.dcbsdcon.org/speakers/slides/miller_dcbsdcon2009.pdf + PDF + 4.1 Mb + 24 pages + pdf + + + + + + Ted Unangst - OpenBSD vs SMP, threading, and concurrency + + I will discuss the current status of kernel SMP + support, the rthreads thread library, and relevant + future developments. Over the years, we have + accumulated several concurrency primitives in the + kernel, causing some confusion amongst developers, + so I will lay out the origin and correct usage for + each. The talk is primarily targeted at the budding + OpenBSD kernel developer, but I will also describe + the end-user effects of each topic. + + http://www.dcbsdcon.org/speakers/unangst.html + dcbsdcon,dcbsdcon2009,slides,openbsd,smp,threading,concurrency,ted unangst + + + http://www.dcbsdcon.org/speakers/slides/unangst_dcbsdcon2009.pdf + PDF + 675 Kb + 32 pages + pdf + + + + + + George Neville-Neil - Performance analysis with (hwpmc) + + FreeBSD has included support for Hardware Performance + Monitoring Counters (hwpmc) for several years now. + The hwpmc system provides access to counters that + are present in all modern Intel and AMD CPUs, as + well as other chipsets, and which give the programmer + the ability to understand the low level performance + issues that may effect their code. This talk will + cover the motivation behind and basic usage of + HWPMC. + + http://www.dcbsdcon.org/speakers/neville-neil.html + dcbsdcon,dcbsdcon2009,slides,freebsd,hwpmc,george neville-neil + + + http://www.dcbsdcon.org/speakers/slides/neville-neil_dcbsdcon2009.pdf + PDF + 469 Kb + 71 pages + pdf + + + + + EuroBSDCon 2008 - Paeps Philip - How-to embed FreeBSD @@ -5483,6 +6028,109 @@ + + AsiaBSDCon 2009 Paper List + + Papers of the AsiaBSDCon 2009 + + http://2009.asiabsdcon.org/papers/ + asiabsdcon,asiabsdcon2009 + + http://2009.asiabsdcon.org/papers/ + + abc2009-P1A-paper.pdf + 351 Kb + 9 pages + PC-BSD - Making FreeBSD on the Desktop a reality by Kris Moore + pdf,paper,freebsd,pcbsd,kris moore + + + abc2009-P1B-paper.pdf + 58 Kb + 3 pages + Crypto Acceleration on FreeBSD by Philip Paeps + pdf,paper,crypto acceleration,freebsd,philip paeps + + + abc2009-P2A-paper.pdf + 401 Kb + 6 pages + OpenBGPD - Bringing full views to OpenBSD since by 2004 Claudio Jeker + pdf,paper,openbgpd,openbsd,claudio jeker + + + abc2009-P2B-paper.pdf + 359 Kb + 12 pages + FreeBSD on high performance multi-core embedded PowerPC systems - Rafal Jaworowski + pdf,paper,freebsd,high performance,rafal jaworowski + + + abc2009-P3A-paper.pdf + 662 Kb + 7 pages + Isolating Cluster Users (and Their Jobs) for Performance and Predictability by Brooks Davis + pdf,paper,clusters,brooks,davis + + + abc2009-P3B-paper.pdf + 245 Kb + 14 pages + OpenBSD Hardware Sensors Framework by Constantine A. Murenin + pdf,paper,openbsd,hardware sensors framework,constantine murenin + + + abc2009-P4A-paper.pdf + 753 Kb + 4 pages + FreeBSD and SOI-Asia Project Mohamad by Dikshie Fauzie + pdf,paper,freebsd,dikshie fauzie + + + abc2009-P4B-paper.pdf + 67 Kb + 8 pages + An Overview of FreeBSD/mips by M. Warner Losh + pdf,paper,freebsd,mips,warner losh + + + abc2009-P5A-paper.pdf + 213 Kb + 10 pages + Environmental Independence: BSD Kernel TCP/IP in Userspace by Antti Kantee + pdf,paper,tcpip,antti kantee + + + abc2009-P5B-paper.pdf + 154 Kb + 20 pages + Active-Active Firewall Cluster Support in OpenBSD by David Gwynne + pdf,paper,firewall cluster,openbsd,david gwynne + + + abc2009-P6A-paper.pdf + 55 Kb + 7 pages + The Locking Infrastructure in the FreeBSD kernel by Attilio Rao + pdf,paper,locking,freebsd,attilio Rao + + + abc2009-P6B-paper.pdf + 114 Kb + 8 pages + Deprecating groff for BSD manual display by Kristaps Dzonsons + pdf,paper,groff,kristaps dzonsons + + + abc2009-P7B-paper.pdf + 150 Kb + 3 pages + Mail system for distributed network by Andrey Zakharchenko + pdf,paper,mail,andrey zakharchenko + + + + AsiaBSDCon 2008 Photos http://www.paeps.cx/gallery/AsiaBSDCon_2008/index.html @@ -8163,6 +8811,40 @@ + + + + OpenBSD 4.5 Release Songs - Games + + [Commentary still being written] +

+ For RSS readers: Please note that the download URL + is an FTP site. +

+ ]]> + http://www.openbsd.org/lyrics.html#45 + openbsd,artwork + + ftp://ftp.openbsd.org/pub/OpenBSD/songs/ + + song45.mp3 + 6.4 Mb + 3:29 minutes + MP3 version + openbsd,artwork + + + song45.ogg + 4.5 Mb + 3:29 minutes + Ogg version + openbsd,artwork + + + + OpenBSD 4.0 Release Songs - OpenVOX + + Chris Buechler and Scott Ullrich - pfSense: 2.0 and beyond + http://www.bsdcan.org/2009/schedule/events/130.en.html + + pfSense: 2.0 and beyond
+ From firewall distribution to appliance building platform +

+ pfSense is a BSD licensed customized distribution + of FreeBSD tailored for use as a firewall and router. + In addition to being a powerful, flexible firewalling + and routing platform, it includes a long list of + related features and a package system allowing + further expandability without adding bloat and + potential security vulnerabilities to the base + distribution. +

+ This session will start with an introduction to the + project and its common uses, which have expanded + considerably beyond firewalling. We will cover much + of the new functionality coming in the 2.0 release, + which contains significant enhancements to nearly + every portion of the system as well as numerous new + features. +

>>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 00:18:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD0961065675; Thu, 28 May 2009 00:18: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 9D457106564A for ; Thu, 28 May 2009 00:18:49 +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 8B3E88FC08 for ; Thu, 28 May 2009 00:18:49 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S0Ino1008525 for ; Thu, 28 May 2009 00:18:49 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S0InIh008523 for perforce@freebsd.org; Thu, 28 May 2009 00:18:49 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 28 May 2009 00:18:49 GMT Message-Id: <200905280018.n4S0InIh008523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162914 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, 28 May 2009 00:18:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=162914 Change 162914 by pgj@petymeg on 2009/05/28 00:17:55 MFen (www): 1.256 -> 1.257 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#28 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#28 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 5 + 27 + + +

Új tag: Kris + Moore (ports)

+ + + + 22 From owner-p4-projects@FreeBSD.ORG Thu May 28 00:26:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C4D41065672; Thu, 28 May 2009 00:26:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C114106564A for ; Thu, 28 May 2009 00:26:58 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2874E8FC0C for ; Thu, 28 May 2009 00:26:58 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S0QvtO009215 for ; Thu, 28 May 2009 00:26:57 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S0QvCT009213 for perforce@freebsd.org; Thu, 28 May 2009 00:26:57 GMT (envelope-from yohanes@FreeBSD.org) Date: Thu, 28 May 2009 00:26:57 GMT Message-Id: <200905280026.n4S0QvCT009213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 162915 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, 28 May 2009 00:26:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=162915 Change 162915 by yohanes@econa on 2009/05/28 00:26:38 Adding files for str91xx Affected files ... .. //depot/projects/str91xx/src/sys/arm/arm/cpufunc.c#2 edit .. //depot/projects/str91xx/src/sys/arm/arm/cpufunc_asm_fa526.S#1 add .. //depot/projects/str91xx/src/sys/arm/arm/elf_trampoline.c#2 edit .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#1 add .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS.hints#1 add .. //depot/projects/str91xx/src/sys/arm/econa/econa.c#1 add .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#1 add .. //depot/projects/str91xx/src/sys/arm/econa/econa_reg.h#1 add .. //depot/projects/str91xx/src/sys/arm/econa/econa_var.h#1 add .. //depot/projects/str91xx/src/sys/arm/econa/files.econa#1 add .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#1 add .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.h#1 add .. //depot/projects/str91xx/src/sys/arm/econa/std.econa#1 add .. //depot/projects/str91xx/src/sys/arm/econa/timer.c#1 add .. //depot/projects/str91xx/src/sys/arm/include/armreg.h#2 edit .. //depot/projects/str91xx/src/sys/arm/include/cpuconf.h#2 edit .. //depot/projects/str91xx/src/sys/arm/include/cpufunc.h#2 edit .. //depot/projects/str91xx/src/sys/conf/Makefile.arm#2 edit .. //depot/projects/str91xx/src/sys/conf/options.arm#2 edit .. //depot/projects/str91xx/src/sys/dev/uart/uart_bus_ec.c#1 add .. //depot/projects/str91xx/src/sys/dev/uart/uart_cpu_ec.c#1 add .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ebus.c#1 add .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci_ec.c#1 add .. //depot/projects/str91xx/src/sys/dev/usb/usb_busdma.c#2 edit .. //depot/projects/str91xx/src/sys/kern/vfs_mount.c#2 edit Differences ... ==== //depot/projects/str91xx/src/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.26 2009/05/05 12:57:16 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.25 2009/01/09 10:45:04 raj Exp $"); #include #include @@ -790,6 +790,73 @@ xscale_setup /* cpu setup */ }; #endif /* CPU_XSCALE_81342 */ + + +#if defined(CPU_FA526) +struct cpu_functions fa526_cpufuncs = { + /* CPU functions */ + + .cf_id = cpufunc_id, + .cf_cpwait = cpufunc_nullop, + + /* MMU functions */ + + .cf_control = cpufunc_control, + .cf_domains = cpufunc_domains, + .cf_setttb = fa526_setttb, + .cf_faultstatus = cpufunc_faultstatus, + .cf_faultaddress = cpufunc_faultaddress, + + /* TLB functions */ + + .cf_tlb_flushID = armv4_tlb_flushID, + .cf_tlb_flushID_SE = fa526_tlb_flushID_SE, + .cf_tlb_flushI = armv4_tlb_flushI, + .cf_tlb_flushI_SE = fa526_tlb_flushI_SE, + .cf_tlb_flushD = armv4_tlb_flushD, + .cf_tlb_flushD_SE = armv4_tlb_flushD_SE, + + /* Cache operations */ + + .cf_icache_sync_all = fa526_icache_sync_all, + .cf_icache_sync_range = fa526_icache_sync_range, + + .cf_dcache_wbinv_all = fa526_dcache_wbinv_all, + .cf_dcache_wbinv_range = fa526_dcache_wbinv_range, + .cf_dcache_inv_range = fa526_dcache_inv_range, + .cf_dcache_wb_range = fa526_dcache_wb_range, + + .cf_idcache_wbinv_all = fa526_idcache_wbinv_all, + .cf_idcache_wbinv_range = fa526_idcache_wbinv_range, + + + .cf_l2cache_wbinv_all = cpufunc_nullop, + .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, + .cf_l2cache_inv_range = (void *)cpufunc_nullop, + .cf_l2cache_wb_range = (void *)cpufunc_nullop, + + + /* Other functions */ + + .cf_flush_prefetchbuf = fa526_flush_prefetchbuf, + .cf_drain_writebuf = armv4_drain_writebuf, + .cf_flush_brnchtgt_C = cpufunc_nullop, + .cf_flush_brnchtgt_E = fa526_flush_brnchtgt_E, + + .cf_sleep = fa526_cpu_sleep, + + /* Soft functions */ + + .cf_dataabt_fixup = cpufunc_null_fixup, + .cf_prefetchabt_fixup = cpufunc_null_fixup, + + .cf_context_switch = fa526_context_switch, + + .cf_setup = fa526_setup +}; +#endif /* CPU_FA526 */ + + /* * Global constants also used by locore.s */ @@ -802,6 +869,7 @@ defined (CPU_ARM9E) || defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -1082,6 +1150,19 @@ goto out; } #endif /* CPU_SA1110 */ +#ifdef CPU_FA526 + if (cputype == CPU_ID_FA526) { + cpufuncs = fa526_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ + get_cachetype_cp15(); + pmap_pte_init_generic(); + + /* Use powersave on this CPU. */ + cpu_do_powersave = 1; + + return 0; + } +#endif /* CPU_FA526 */ #ifdef CPU_IXP12X0 if (cputype == CPU_ID_IXP1200) { cpufuncs = ixp12x0_cpufuncs; @@ -1192,7 +1273,6 @@ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || - (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA27X || (cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA210) { cpufuncs = xscale_cpufuncs; @@ -1231,7 +1311,7 @@ */ panic("No support for this CPU type (%08x) in kernel", cputype); return(ARCHITECTURE_NOT_PRESENT); -out: + uma_set_align(arm_dcache_align_mask); return (0); } @@ -1600,7 +1680,8 @@ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_ARM10) || defined(CPU_ARM11) + defined(CPU_ARM10) || defined(CPU_ARM11) || \ + defined(CPU_FA526) #define IGN 0 #define OR 1 @@ -2066,6 +2147,60 @@ } #endif /* CPU_SA1100 || CPU_SA1110 */ +#if defined(CPU_FA526) +struct cpu_option fa526_options[] = { +#ifdef COMPAT_12 + { "nocache", IGN, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "nowritebuf", IGN, BIC, CPU_CONTROL_WBUF_ENABLE }, +#endif /* COMPAT_12 */ + { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "cpu.writebuf", BIC, OR, CPU_CONTROL_WBUF_ENABLE }, + { "cpu.nowritebuf", OR, BIC, CPU_CONTROL_WBUF_ENABLE }, + { NULL, IGN, IGN, 0 } +}; + +void +fa526_setup(char *args) +{ + int cpuctrl, cpuctrlmask; + + cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE + | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE + | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC; + +#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS + cpuctrl |= CPU_CONTROL_AFLT_ENABLE; +#endif + + cpuctrl = parse_cpu_options(args, fa526_options, cpuctrl); + +#ifdef __ARMEB__ + cpuctrl |= CPU_CONTROL_BEND_ENABLE; +#endif + + if (vector_page == ARM_VECTORS_HIGH) + cpuctrl |= CPU_CONTROL_VECRELOC; + + /* Clear out the cache */ + cpu_idcache_wbinv_all(); + + /* Set the control register */ + //curcpu()->ci_ctrl = cpuctrl; + ctrl = cpuctrl; + cpu_control(0xffffffff, cpuctrl); +} +#endif /* CPU_FA526 */ + + #if defined(CPU_IXP12X0) struct cpu_option ixp12x0_options[] = { { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, ==== //depot/projects/str91xx/src/sys/arm/arm/elf_trampoline.c#2 (text+ko) ==== @@ -57,6 +57,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_FA526) +#define cpu_idcache_wbinv_all fa526_idcache_wbinv_all #elif defined(CPU_ARM9E) #define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) ==== //depot/projects/str91xx/src/sys/arm/include/armreg.h#2 (text+ko) ==== @@ -178,6 +178,8 @@ #define CPU_ID_IXP435 0x69054040 #define CPU_ID_IXP465 0x69054200 +#define CPU_ID_CNS11XX 0x66015261 + /* ARM3-specific coprocessor 15 registers */ #define ARM3_CP15_FLUSH 1 #define ARM3_CP15_CONTROL 2 ==== //depot/projects/str91xx/src/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -61,6 +61,7 @@ defined(CPU_XSCALE_80200) + \ defined(CPU_XSCALE_80321) + \ defined(CPU_XSCALE_PXA2X0) + \ + defined(CPU_FA526) + \ defined(CPU_XSCALE_IXP425)) /* @@ -68,7 +69,7 @@ */ #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ - defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425)) + defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425) || defined(CPU_FA526)) #define ARM_ARCH_4 1 #else #define ARM_ARCH_4 0 @@ -125,7 +126,7 @@ #if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \ defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM9E) || \ - defined(CPU_ARM10) || defined(CPU_ARM11)) + defined(CPU_ARM10) || defined(CPU_ARM11) || defined(CPU_FA526)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 ==== //depot/projects/str91xx/src/sys/arm/include/cpufunc.h#2 (text+ko) ==== @@ -283,6 +283,28 @@ u_int arm8_clock_config (u_int, u_int); #endif + +#ifdef CPU_FA526 +void fa526_setup (char *arg); +void fa526_setttb (u_int ttb); +void fa526_context_switch (void); +void fa526_cpu_sleep (int); +void fa526_tlb_flushI_SE (u_int); +void fa526_tlb_flushID_SE (u_int); +void fa526_flush_prefetchbuf (void); +void fa526_flush_brnchtgt_E (u_int); + +void fa526_icache_sync_all (void); +void fa526_icache_sync_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_wbinv_all (void); +void fa526_dcache_wbinv_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_inv_range (vm_offset_t start, vm_size_t end); +void fa526_dcache_wb_range (vm_offset_t start, vm_size_t end); +void fa526_idcache_wbinv_all(void); +void fa526_idcache_wbinv_range(vm_offset_t start, vm_size_t end); +#endif + + #ifdef CPU_SA110 void sa110_setup (char *string); void sa110_context_switch (void); @@ -445,6 +467,7 @@ #if defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_ARM10) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) ==== //depot/projects/str91xx/src/sys/conf/Makefile.arm#2 (text+ko) ==== @@ -73,7 +73,7 @@ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \ - $S/$M/$M/cpufunc_asm_sheeva.S + $S/$M/$M/cpufunc_asm_sheeva.S $S/$M/$M/cpufunc_asm_fa526.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ==== //depot/projects/str91xx/src/sys/conf/options.arm#2 (text+ko) ==== @@ -35,3 +35,5 @@ AT91_BWCT opt_at91.h AT91_TSC opt_at91.h AT91_KWIKBYTE opt_at91.h +CPU_FA526 opt_global.h + ==== //depot/projects/str91xx/src/sys/dev/usb/usb_busdma.c#2 (text+ko) ==== @@ -660,6 +660,7 @@ } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); + cpu_dcache_wbinv_all(); } /*------------------------------------------------------------------------* @@ -674,6 +675,7 @@ } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); + cpu_dcache_wbinv_all(); } /*------------------------------------------------------------------------* ==== //depot/projects/str91xx/src/sys/kern/vfs_mount.c#2 (text+ko) ==== @@ -1393,6 +1393,8 @@ struct timeval lastfail; int curfail = 0; + pause("WAIT", hz * 10); + for (;;) { DROP_GIANT(); g_waitidle(); From owner-p4-projects@FreeBSD.ORG Thu May 28 06:44:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A6331065675; Thu, 28 May 2009 06:44: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 387181065673 for ; Thu, 28 May 2009 06:44:22 +0000 (UTC) (envelope-from zjriggl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C4778FC12 for ; Thu, 28 May 2009 06:44:22 +0000 (UTC) (envelope-from zjriggl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S6iLq5064786 for ; Thu, 28 May 2009 06:44:21 GMT (envelope-from zjriggl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S6iLbi064784 for perforce@freebsd.org; Thu, 28 May 2009 06:44:21 GMT (envelope-from zjriggl@FreeBSD.org) Date: Thu, 28 May 2009 06:44:21 GMT Message-Id: <200905280644.n4S6iLbi064784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zjriggl@FreeBSD.org using -f From: Zachariah Riggle To: Perforce Change Reviews Cc: Subject: PERFORCE change 162923 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, 28 May 2009 06:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=162923 Change 162923 by zjriggl@zjriggl_tcpregression on 2009/05/28 06:44:02 Interim submit, to prevent data loss. Affected files ... .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/echoServer.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/loggable.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/logging.conf#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/pcsextension/__init__.py#2 edit .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/sniffLocalhost.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpConstructor.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpFilter.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/tcpHandshake.py#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/test.html#2 delete .. //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/testconfig.py#2 delete Differences ... ==== //depot/projects/soc2009/zjriggl_tcpregression/src/tcpregression/pcsextension/__init__.py#2 (text+ko) ==== @@ -2,6 +2,7 @@ import logging.config import struct import socket +import sys from pcs.packets.tcp import tcp from pcs.packets.tcpv6 import tcpv6 @@ -9,7 +10,22 @@ # Configure logging logging.config.fileConfig("logging.conf") +(logging.FIELD_CHANGE, + logging.RESPONSE_GENERATION, + logging.PACKET_TRANSMIT, + logging.PACKET_RECEIVED, + logging.PACKET_SENT, + logging.VALIDATE, + logging.STATE_CHANGE) = range(logging.INFO-7, logging.INFO) +logging.addLevelName(logging.FIELD_CHANGE, "FIELD") +logging.addLevelName(logging.RESPONSE_GENERATION, "RESPONSE") +logging.addLevelName(logging.PACKET_TRANSMIT, "XMIT") +logging.addLevelName(logging.PACKET_RECEIVED, "RECEIVED") +logging.addLevelName(logging.PACKET_SENT, "SENT") +logging.addLevelName(logging.VALIDATE, "VALIDATE") +logging.addLevelName(logging.STATE_CHANGE, "STATE") + # Find the TCP layer in a packet. def findTcpLayer(packet): p = packet @@ -33,5 +49,4 @@ def tcpv4Checksum(t): if not isinstance(t, tcp): - return 0 - + return 0 From owner-p4-projects@FreeBSD.ORG Thu May 28 07:50:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A7151065672; Thu, 28 May 2009 07:50: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 0AD87106564A for ; Thu, 28 May 2009 07:50:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED4CC8FC08 for ; Thu, 28 May 2009 07:50:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S7oTWO070931 for ; Thu, 28 May 2009 07:50:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S7oTMs070929 for perforce@freebsd.org; Thu, 28 May 2009 07:50:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 May 2009 07:50:29 GMT Message-Id: <200905280750.n4S7oTMs070929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 162927 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, 28 May 2009 07:50:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=162927 Change 162927 by hselasky@hselasky_laptop001 on 2009/05/28 07:49:35 LibUSB: Add more manpage details around "libusb20_tr_open". Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#10 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ .\" -.Dd April 5, 2009 +.Dd May 28, 2009 .Dt LIBUSB 3 .Os .Sh NAME @@ -231,7 +231,7 @@ .Pp . .Fn libusb20_tr_open -will allocate kernel resources like +will allocate kernel buffer resources according to .Fa max_buf_size and .Fa max_frame_count @@ -239,6 +239,18 @@ .Fa pxfer and bind the transfer to the specified .Fa ep_no . +.Fa max_buf_size +is the minimum buffer size which the data transport layer has to support. +If +.Fa max_buf_size +is zero, the +.Nm +library will use wMaxPacketSize to compute the buffer size. +This can be useful for isochronous transfers. +The actual buffer size can be greater than +.Fa max_buf_size +and is returned by +.Fn libusb20_tr_get_max_total_length . . This function returns zero upon success. . From owner-p4-projects@FreeBSD.ORG Thu May 28 08:11:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FCC81065677; Thu, 28 May 2009 08:11:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6ECE1065670 for ; Thu, 28 May 2009 08:11:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4E558FC13 for ; Thu, 28 May 2009 08:11:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S8BpKj073440 for ; Thu, 28 May 2009 08:11:51 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S8Bp9e073438 for perforce@freebsd.org; Thu, 28 May 2009 08:11:51 GMT (envelope-from dforsyth@FreeBSD.org) Date: Thu, 28 May 2009 08:11:51 GMT Message-Id: <200905280811.n4S8Bp9e073438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 162929 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, 28 May 2009 08:11:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=162929 Change 162929 by dforsyth@squirrel on 2009/05/28 08:11:31 Added tailq for subdir list. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.c#2 (text+ko) ==== @@ -11,7 +11,6 @@ char *pkg_comment; char *cwd; int pkg_rev; - }; /* Create a new pkg. */ ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#2 (text+ko) ==== @@ -15,8 +15,8 @@ char *db_root; int sd_count; + struct pkgdb_subdir *sd_curr; TAILQ_HEAD(sd_head, pkgdb_subdir) *sd_headp; - struct pkgdb_subdir *sd_curr; /* Callbacks */ /* tuuuummmmbbbllleeewwwweeeedddddd*/ @@ -64,13 +64,14 @@ } strcpy(db->db_root, db_root); - db->sd_headp = malloc(sizeof(struct sd_head)); + db->sd_headp = malloc(sizeof(*db->sd_headp)); if (db->sd_headp == NULL) { pkgdb_free_hierdb(db); return (NULL); } + memset(db->sd_headp, 0, sizeof(*db->sd_headp)); + TAILQ_INIT(db->sd_headp); - db->sd_count = 0; db->dirty = 1; @@ -109,82 +110,61 @@ /* Read in the names of all subdirectories in db->db_root, and add them to * the db's package list. Set the current package to the head of the * list. The packages in db's package list are not verified. Returns the - * number of packages in teh database. */ + * number of subdirectories in the database. */ -struct pkgdb * +int pkgdb_reset(struct pkgdb *db) { + int i; struct pkgdb_subdir *sd; + struct dirent **ents; if (db == NULL) - return (db); + return (-1); if (db->dirty == 0) { /* No changes since the last reset, don't bother walking the * database again. */ db->sd_curr = TAILQ_FIRST(db->sd_headp); - return (db); + return (db->sd_count); } - /* Should there be another function to set this? */ - db->sd_count = pkgdb_subdir_count(db); + db->sd_count = scandir(db->db_root, &ents, subdir_sel, alphasort); - if (db->sd_count == 0) - return (db); - - db->sd_curr = pkgdb_subdir_hash(db); + /* Clear out old list. */ + pkgdb_free_pkgdb_subdir_list(db); - /* - TAILQ_FOREACH(sd, db->sd_headp, next) { - printf("%s\n", sd->name); + TAILQ_INIT(db->sd_headp); + for (i = 0; i < db->sd_count; ++i) { + sd = pkgdb_read_subdir(db, ents[i]->d_name); + if (sd == NULL) { + pkgdb_free_pkgdb_subdir_list(db); + return (-1); + } + TAILQ_INSERT_TAIL(db->sd_headp, sd, next); + free(ents[i]); } - exit(0); - */ db->dirty = 0; - return (db); + + db->sd_curr = TAILQ_FIRST(db->sd_headp); + + return (db->sd_count); } -/* Rebuild dbs pkg_list linked list. */ - -struct pkgdb_subdir * -pkgdb_subdir_hash(struct pkgdb *db) +int +subdir_sel(struct dirent *ent) { - /* Immediate TODO: Sort on insert. */ - DIR *db_root_dirp; - struct dirent *ent; - - struct pkgdb_subdir *sd_head; - struct pkgdb_subdir *sd_ent; - - if (db == NULL) - return (NULL); - - db_root_dirp = opendir(db->db_root); - if (db_root_dirp == NULL) - return (NULL); - - TAILQ_INIT(db->sd_headp); - while ((ent = readdir(db_root_dirp)) != NULL) { - if (strcmp(ent->d_name, ".") == 0 || - strcmp(ent->d_name, "..") == 0) - continue; - sd_ent = pkgdb_read_subdir(db, ent->d_name); - if (sd_ent == NULL) { - pkgdb_free_pkg_list(db); - return (NULL); - } - TAILQ_INSERT_TAIL(db->sd_headp, sd_ent, next); - } - - return (TAILQ_FIRST(db->sd_headp)); + if (strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0) + return (1); + return (0); } struct pkgdb_subdir * pkgdb_read_subdir(struct pkgdb *db, const char *name) { struct pkgdb_subdir *sd; - + sd = malloc(sizeof(*sd)); if (sd == NULL) return (NULL); @@ -199,50 +179,28 @@ return (sd); } -/* Move the current package pointer to the next package in db's package - * list. If there are no more left, return NULL. */ +/* Move the current subdir pointer to the next one in the list. Return + * the previous subdir. Return NULL if there are no more left. */ struct pkg * pkgdb_next_pkg(struct pkgdb *db) { struct pkg *p; struct pkgdb_subdir *sd; - char *pkg_name; if (db == NULL) return (NULL); sd = db->sd_curr; - if (sd == NULL) + if (db->sd_curr == NULL) return (NULL); - - db->sd_curr = TAILQ_NEXT(sd, next); + + db->sd_curr = TAILQ_NEXT(db->sd_curr, next); p = pkg_new(sd->name); - return (p); } -/* Wrapped per advice (non-portable code). Count the number of - * subdirectories in db->db_root by counting the number of hard links to - * it. */ - -int -pkgdb_subdir_count(struct pkgdb *db) -{ - int s; - struct stat sb; - - if (db == NULL) - return (-1); - - s = stat(db->db_root, &sb); - if (s != 0) - return (-1); - - return (sb.st_nlink - 2); -} - /* Free a hierdb. */ void @@ -250,58 +208,47 @@ { if (db == NULL) return; - + free(db->db_root); - pkgdb_free_pkg_list(db); + pkgdb_free_pkgdb_subdir_list(db); free(db); } void -pkgdb_free_pkgdb_subdir(struct pkgdb_subdir *sd) +pkgdb_free_pkgdb_subdir_list(struct pkgdb *db) { - if (sd == NULL) - return; + struct pkgdb_subdir *sd; + struct pkgdb_subdir *sdn; - free(sd->name); - free(sd); + sd = TAILQ_FIRST(db->sd_headp); + while (sd != NULL) { + sdn = TAILQ_NEXT(sd, next); + pkgdb_free_pkgdb_subdir(sd); + sd = sdn; + } + TAILQ_INIT(db->sd_headp); } void -pkgdb_free_pkg_list(struct pkgdb *db) +pkgdb_free_pkgdb_subdir(struct pkgdb_subdir *sd) { - if (db == NULL) + if (sd == NULL) return; - // meh - return; + free(sd->name); + free(sd); } -/* Free the package list in a pkgdb. */ - void -free_cstr_array(char **arr) +free_ptr_array(void **arr, int c) { - char *ent; + int i; if (arr == NULL) return; - while((ent = *arr++) != NULL) - free(ent); + for (i = 0; i < c; ++i) + free(arr[i]); free(arr); } - -/* Comparison function for package list sorting. */ - -int -pkg_strcmp(const void *a, const void *b) -{ - const char *str1; - const char *str2; - - str1 = *(char * const *)a; - str2 = *(char * const *)b; - - return (strcmp(str1, str2)); -} From owner-p4-projects@FreeBSD.ORG Thu May 28 08:29:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B4CD1065674; Thu, 28 May 2009 08:29: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 1B4481065670 for ; Thu, 28 May 2009 08:29:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09A298FC0A for ; Thu, 28 May 2009 08:29:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S8T963074798 for ; Thu, 28 May 2009 08:29:09 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S8T9q4074796 for perforce@freebsd.org; Thu, 28 May 2009 08:29:09 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 28 May 2009 08:29:09 GMT Message-Id: <200905280829.n4S8T9q4074796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162932 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, 28 May 2009 08:29:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=162932 Change 162932 by syl@syl_rincewind on 2009/05/28 08:28:26 Use fprintf(stderr, ...) for error messages. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test1/test1.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test1/test1.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ int ret; int i; - printf("This function will print out all the device" + printf("This program will print out all the device" " descriptors for all the present devices.\n"); ddesc = malloc(sizeof(libusb_device_descriptor)); @@ -23,18 +23,18 @@ } if (libusb_init(&ctx) != 0) { - printf("libusb_init failed\n"); + fprintf(stderr, "libusb_init failed\n"); return (EXIT_FAILURE); } if ((ret = libusb_get_device_list(ctx, &devs_list)) < 0) { - printf("libusb_get_device_list failed with 0x%x error code\n", + fprintf(stderr,"libusb_get_device_list failed with 0x%x error code\n", ret); return (EXIT_FAILURE); } if (ret == 0) { - printf("No device match or lack of permissions.\n"); + fprintf(stderr, "No device match or lack of permissions.\n"); return (EXIT_SUCCESS); } printf("\nThere are %i devices\n\n", ret); From owner-p4-projects@FreeBSD.ORG Thu May 28 08:29:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9A5E1065729; Thu, 28 May 2009 08:29: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 478551065672 for ; Thu, 28 May 2009 08:29:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B1FF8FC12 for ; Thu, 28 May 2009 08:29:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4S8T9tJ074805 for ; Thu, 28 May 2009 08:29:09 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4S8T9RQ074802 for perforce@freebsd.org; Thu, 28 May 2009 08:29:09 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 28 May 2009 08:29:09 GMT Message-Id: <200905280829.n4S8T9RQ074802@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162933 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, 28 May 2009 08:29:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162933 Change 162933 by syl@syl_rincewind on 2009/05/28 08:29:09 test of libusb_get_active_config_desscriptor. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#2 (text+ko) ==== @@ -3,8 +3,58 @@ #include #include +libusb_context *ctx; + int main(int ac, const char *av[]) { + libusb_config_descriptor *cdesc; + libusb_device **devs_list; + int ret; + int i, j; + + printf("This program will dump the device" + " active config descriptor for all the" + " present devices.\n"); + + cdesc = malloc(sizeof(libusb_config_descriptor)); + if (cdesc == NULL) { + perror("test1"); + return (EXIT_FAILURE); + } + + if (libusb_init(&ctx) != 0) { + fprintf(stderr, "libusb_init failed\n"); + return (EXIT_FAILURE); + } + + if ((ret = libusb_get_device_list(ctx, &devs_list)) < 0) { + fprintf(stderr, "libusb_get_device_list failed with 0x%x error code\n", + ret); + return (EXIT_FAILURE); + } + + if (ret == 0) { + fprintf(stderr, "No device match or lack of permissions.\n"); + return (EXIT_SUCCESS); + } + printf("\nThere are %i devices\n\n", ret); + for (i = 0 ; i < ret ; i++) { + printf("|-- device number = %i\n", i); + libusb_get_active_config_descriptor(devs_list[i], &cdesc); + printf("toto\n"); + if (libusb_get_active_config_descriptor == LIBUSB_SUCCESS) { + printf("|----\tbLength : 0x%.2x\n", cdesc->bLength); + printf("|----\tbDescriptorType : 0x%.2x\n", cdesc->bDescriptorType); + printf("|----\twTotalLength : 0x%.2x\n", cdesc->wTotalLength); + printf("|----\tbNumInterfaces : 0x%.2x\n", cdesc->bNumInterfaces); + printf("|----\tbConfigurationValue : 0x%.2x\n", cdesc->bConfigurationValue); + printf("|----\tiConfiguration : 0x%.2x\n", cdesc->iConfiguration); + printf("|----\tbmAttributes : 0x%.2x\n", cdesc->bmAttributes); + printf("|----\tMaxPower : 0x%.2x\n", cdesc->MaxPower); + } else { + fprintf(stderr, "libusb_get_active_config_descriptor failed\n"); + } + } return (EXIT_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Thu May 28 11:09:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96CA61065678; Thu, 28 May 2009 11:09:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55A6A106566B for ; Thu, 28 May 2009 11:09:56 +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 4394D8FC1F for ; Thu, 28 May 2009 11:09:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SB9sL0003498 for ; Thu, 28 May 2009 11:09:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SB9qpR003494 for perforce@freebsd.org; Thu, 28 May 2009 11:09:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 May 2009 11:09:52 GMT Message-Id: <200905281109.n4SB9qpR003494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 162936 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, 28 May 2009 11:09:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=162936 Change 162936 by hselasky@hselasky_laptop001 on 2009/05/28 11:09:46 LibUSB: Add missing function required by isochronous operation. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#11 edit .. //depot/projects/usb/src/lib/libusb/libusb20.c#3 edit .. //depot/projects/usb/src/lib/libusb/libusb20.h#3 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#11 (text+ko) ==== @@ -78,6 +78,8 @@ .Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb" .Ft void .Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags" +.Ft uint32_t +.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index" .Ft void .Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index" .Ft void @@ -383,8 +385,14 @@ . .Pp . +.Fn libusb20_tr_get_length +returns the length of the given USB frame by index. +After an USB transfer is complete the USB frame length will get updated to the actual transferred length. +. +.Pp +. .Fn libusb20_tr_set_length -sets the length of a given USB transfer and frame index. +sets the length of the given USB frame by index. . .Pp . ==== //depot/projects/usb/src/lib/libusb/libusb20.c#3 (text+ko) ==== @@ -319,6 +319,12 @@ return; } +uint32_t +libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex) +{ + return (xfer->pLength[frIndex]); +} + void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex) { ==== //depot/projects/usb/src/lib/libusb/libusb20.h#3 (text+ko) ==== @@ -216,6 +216,7 @@ void libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index); void libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb); void libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags); +uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index); void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index); void libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0); void libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1); From owner-p4-projects@FreeBSD.ORG Thu May 28 12:19:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC0181065677; Thu, 28 May 2009 12:19: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 633281065670 for ; Thu, 28 May 2009 12:19:07 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 371638FC08 for ; Thu, 28 May 2009 12:19:07 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SCJ6K5009678 for ; Thu, 28 May 2009 12:19:06 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SCJ6A3009676 for perforce@freebsd.org; Thu, 28 May 2009 12:19:06 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 12:19:06 GMT Message-Id: <200905281219.n4SCJ6A3009676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162937 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, 28 May 2009 12:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=162937 Change 162937 by zec@zec_amdx4 on 2009/05/28 12:18:33 Unbreak build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#32 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#32 (text+ko) ==== @@ -172,7 +172,6 @@ INIT_VNET_NET(curvnet); V_loif = NULL; - LIST_INIT(&V_lo_list); #ifdef VIMAGE V_lo_cloner = malloc(sizeof(*V_lo_cloner), M_LO_CLONER, From owner-p4-projects@FreeBSD.ORG Thu May 28 12:27:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A5A1065675; Thu, 28 May 2009 12:27:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EEE2106566C for ; Thu, 28 May 2009 12:27:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B3228FC0A for ; Thu, 28 May 2009 12:27:16 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SCRFqA010311 for ; Thu, 28 May 2009 12:27:15 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SCRFaa010305 for perforce@freebsd.org; Thu, 28 May 2009 12:27:15 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 12:27:15 GMT Message-Id: <200905281227.n4SCRFaa010305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162938 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, 28 May 2009 12:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=162938 Change 162938 by zec@zec_amdx4 on 2009/05/28 12:27:15 IFC @ 162935 Affected files ... .. //depot/projects/vimage-commit2/src/sys/arm/at91/ohci_atmelarm.c#3 delete .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#25 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#37 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#18 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cpuset.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_debug.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_pci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohci_pci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhci_pci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#22 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#9 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/TODO#3 delete .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_mcast.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/spx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/spx_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/xdr.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/fail.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ksyms.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/lock.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lockf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lockstat.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/mutex.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/namei.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#39 integrate .. //depot/projects/vimage-commit2/src/sys/sys/queue.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sx.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#64 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/xdr/xdr_mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_xs.c#9 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $ ident AVILA @@ -132,15 +132,14 @@ options AH_SUPPORT_AR5416 device ath_ar9160 -makeoptions WITH_LEGACY -device ousb +device usb #options USB_DEBUG -device oohci -device oehci -device oumass +device ohci +device ehci +device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) -#device oural -#device ozyd +#device ural +#device zyd #device wlan_amrr ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#5 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -47,4 +47,3 @@ arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # dev/usb/controller/ehci_ixp4xx.c optional ehci usb -legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb ==== //depot/projects/vimage-commit2/src/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -44,9 +44,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $"); #include +#include #include #ifdef UFS_SMALL_CGBASE /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase @@ -93,7 +94,7 @@ fsfind(const char *name, ino_t * ino) { char buf[DEV_BSIZE]; - struct dirent *d; + struct direct *d; char *s; ssize_t n; @@ -104,7 +105,7 @@ if (ls) printf("%s ", d->d_name); else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; + *ino = d->d_ino; return d->d_type; } s += d->d_reclen; ==== //depot/projects/vimage-commit2/src/sys/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -27,14 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $"); /* * Ported to PC-9801 by Yoshio Kimura */ #include "boot.h" -#include +#include #if 0 /* #define BUFSIZE 4096 */ @@ -142,7 +142,7 @@ { char *rest, ch; int block, off, loc, ino = ROOTINO; - struct dirent *dp; + struct direct *dp; char list_only; list_only = (path[0] == '?' && path[1] == '\0'); @@ -174,12 +174,12 @@ devread(iobuf, fsbtodb(fs, block_map(block)) + boff, blksize(fs, &inode, block)); } - dp = (struct dirent *)(iobuf + off); + dp = (struct direct *)(iobuf + off); loc += dp->d_reclen; - if (dp->d_fileno && list_only) + if (dp->d_ino && list_only) printf("%s ", dp->d_name); - } while (!dp->d_fileno || strcmp(path, dp->d_name)); - ino = dp->d_fileno; + } while (!dp->d_ino || strcmp(path, dp->d_name)); + ino = dp->d_ino; *(path = rest) = ch; goto loop; } ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $"); #include #include @@ -302,6 +302,14 @@ if (error) return (error); } + /* + * Deny setting setuid if we are not the file owner. + */ + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } return (0); } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 (text+ko) ==== @@ -424,7 +424,7 @@ #endif } -#ifndef __FreeBSD__ +#if !defined(_KERNEL) acl_t * acl_alloc(enum acl_type type) { @@ -470,7 +470,6 @@ cacl_free(aclp, sizeof (acl_t)); } -#endif static uint32_t access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) @@ -1727,3 +1726,4 @@ return (error); #endif } +#endif /* _KERNEL */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 (text+ko) ==== @@ -46,6 +46,7 @@ extern int ace_trivial_common(void *, int, uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *, uint32_t *mask)); +#if !defined(_KERNEL) extern acl_t *acl_alloc(acl_type_t); extern void acl_free(acl_t *aclp); extern int acl_translate(acl_t *aclp, int target_flavor, @@ -53,6 +54,7 @@ void ksort(caddr_t v, int n, int s, int (*f)()); int cmp2acls(void *a, void *b); +#endif /* _KERNEL */ #ifdef __cplusplus } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $ */ /* @@ -122,6 +122,7 @@ #include #include #include +#include #include #include #include @@ -3168,14 +3169,11 @@ uintptr_t rw; } r; #else + struct thread *lowner; union { - struct mtx *mi; - uintptr_t mx; - } m; - union { - struct sx *si; - uintptr_t sx; - } s; + struct lock_object *li; + uintptr_t lx; + } l; #endif switch (subr) { @@ -3272,75 +3270,83 @@ break; #else - /* - * XXX - The following code works because mutex, rwlocks, & sxlocks - * all have similar data structures in FreeBSD. This may not be - * good if someone changes one of the lock data structures. - * Ideally, it would be nice if all these shared a common lock - * object. - */ case DIF_SUBR_MUTEX_OWNED: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - -#ifdef DOODAD - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); - } else { - regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } -#endif + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); break; case DIF_SUBR_MUTEX_OWNER: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK; - } else { - if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) - regs[rd] = SX_OWNER(m.mi->mtx_lock); - else - regs[rd] = 0; + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (uintptr_t)lowner; break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + /* XXX - should be only LC_SLEEPABLE? */ + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & + (LC_SLEEPLOCK | LC_SLEEPABLE)) != 0; break; case DIF_SUBR_MUTEX_TYPE_SPIN: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & LC_SPINLOCK) != 0; break; case DIF_SUBR_RW_READ_HELD: case DIF_SUBR_SX_SHARED_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED) && - (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner == NULL; break; case DIF_SUBR_RW_WRITE_HELD: case DIF_SUBR_SX_EXCLUSIVE_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (lowner == curthread); break; case DIF_SUBR_RW_ISWRITER: case DIF_SUBR_SX_ISEXCLUSIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) || - !(s.si->sx_lock & SX_LOCK_SHARED)); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner != NULL; break; #endif /* ! defined(sun) */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 (text+ko) ==== @@ -188,10 +188,8 @@ #ifdef _KERNEL void zfs_perm_init(struct znode *, struct znode *, int, vattr_t *, dmu_tx_t *, cred_t *, zfs_acl_t *, zfs_fuid_info_t **); -#ifdef TODO int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); -#endif void zfs_acl_rele(void *); void zfs_oldace_byteswap(ace_t *, int); void zfs_ace_byteswap(void *, size_t, boolean_t); ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 (text+ko) ==== @@ -1909,7 +1909,6 @@ zfs_acl_free(aclp); } -#ifdef TODO /* * Retrieve a files ACL */ @@ -2005,7 +2004,6 @@ return (0); } -#endif /* TODO */ int zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_t obj_type, @@ -2062,7 +2060,6 @@ return (0); } -#ifdef TODO /* * Set a files ACL */ @@ -2170,7 +2167,6 @@ return (error); } -#endif /* TODO */ /* * working_mode returns the permissions that were not granted ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include #include #include +#include /* * Programming rules. @@ -3846,7 +3846,6 @@ } } -#ifdef TODO /*ARGSUSED*/ static int zfs_getsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3864,9 +3863,7 @@ return (error); } -#endif /* TODO */ -#ifdef TODO /*ARGSUSED*/ static int zfs_setsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3883,7 +3880,6 @@ ZFS_EXIT(zfsvfs); return (error); } -#endif /* TODO */ static int zfs_freebsd_open(ap) @@ -3963,7 +3959,7 @@ zfs_freebsd_access(ap) struct vop_access_args /* { struct vnode *a_vp; - int a_accmode; + accmode_t a_accmode; struct ucred *a_cred; struct thread *a_td; } */ *ap; @@ -4777,6 +4773,90 @@ return (error); } +int +zfs_freebsd_getacl(ap) + struct vop_getacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; + if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) + return (error); + + error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); + if (vsecattr.vsa_aclentp != NULL) + kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); + + return (error); +} + +int +zfs_freebsd_setacl(ap) + struct vop_setacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + int aclbsize; /* size of acl list in bytes */ + aclent_t *aaclp; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) + return (EINVAL); + + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries, + * splitting every entry into two and appending "canonical six" + * entries at the end. Don't allow for setting an ACL that would + * cause chmod(2) to run out of ACL entries. + */ + if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + return (ENOSPC); + + vsecattr.vsa_mask = VSA_ACE; + aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); + vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); + aaclp = vsecattr.vsa_aclentp; + vsecattr.vsa_aclentsz = aclbsize; + + aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); + error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL); + kmem_free(aaclp, aclbsize); + + return (error); +} + +int +zfs_freebsd_aclcheck(ap) + struct vop_aclcheck_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + + return (EOPNOTSUPP); +} + struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; @@ -4816,6 +4896,11 @@ .vop_deleteextattr = zfs_deleteextattr, .vop_setextattr = zfs_setextattr, .vop_listextattr = zfs_listextattr, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; struct vop_vector zfs_fifoops = { @@ -4829,4 +4914,9 @@ .vop_setattr = zfs_freebsd_setattr, .vop_write = VOP_PANIC, .vop_fid = zfs_freebsd_fid, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 (text+ko) ==== @@ -121,6 +121,7 @@ * Changes must be reviewed by Solaris File Sharing * Changes must be communicated to contract-2003-523@sun.com */ +#ifndef __FreeBSD__ struct xdr_ops { #ifdef __STDC__ #if !defined(_KERNEL) @@ -168,6 +169,28 @@ #endif }; +#else /* FreeBSD */ +struct xdr_ops { + /* get a long from underlying stream */ + bool_t (*x_getint32)(struct XDR *, int32_t *); + /* put a long to " */ + bool_t (*x_putint32)(struct XDR *, const int32_t *); + /* get some bytes from " */ + bool_t (*x_getbytes)(struct XDR *, char *, u_int); + /* put some bytes to " */ + bool_t (*x_putbytes)(struct XDR *, const char *, u_int); + /* returns bytes off from beginning */ + u_int (*x_getpostn)(struct XDR *); + /* lets you reposition the stream */ + bool_t (*x_setpostn)(struct XDR *, u_int); + /* buf quick ptr to buffered data */ + int32_t *(*x_inline)(struct XDR *, u_int); + /* free privates of this xdr_stream */ + void (*x_destroy)(struct XDR *); + bool_t (*x_control)(struct XDR *, int, void *); +}; +#endif + /* * Operations defined on a XDR handle * ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 (text+ko) ==== @@ -31,12 +31,22 @@ #include #include +#if defined(_KERNEL) +/* + * When compiling OpenSolaris kernel code, this file is getting + * included instead of FreeBSD one. Pull the original sys/acl.h as well. + */ +#undef _SYS_ACL_H +#include_next +#define _SYS_ACL_H +#endif /* _KERNEL */ + #ifdef __cplusplus extern "C" { #endif #define MAX_ACL_ENTRIES (1024) /* max entries of each type */ -typedef struct acl { +typedef struct { int a_type; /* the type of ACL entry */ uid_t a_id; /* the entry in -uid or gid */ o_mode_t a_perm; /* the permission field */ @@ -49,7 +59,9 @@ uint16_t a_type; /* allow or deny */ } ace_t; +#if !defined(_KERNEL) typedef struct acl_info acl_t; +#endif /* * The following are Defined types for an aclent_t. ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ==== @@ -44,10 +44,10 @@ typedef enum acl_type { ACLENT_T = 0, ACE_T = 1 -} acl_type_t; +} zfs_acl_type_t; struct acl_info { - acl_type_t acl_type; /* style of acl */ + zfs_acl_type_t acl_type; /* style of acl */ int acl_cnt; /* number of acl entries */ int acl_entry_size; /* sizeof acl entry */ int acl_flags; /* special flags about acl */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.89 2009/04/29 21:14:15 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.90 2009/05/27 14:11:23 jamie Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -112,8 +112,6 @@ CTASSERT(sizeof(struct stat32) == 96); CTASSERT(sizeof(struct sigaction32) == 24); -extern int jail_max_af_ips; - static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count); static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count); @@ -2044,17 +2042,9 @@ int freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap) { - struct iovec optiov[10]; - struct uio opt; - char *u_path, *u_hostname, *u_name; -#ifdef INET - struct in_addr *u_ip4; -#endif -#ifdef INET6 - struct in6_addr *u_ip6; -#endif uint32_t version; int error; + struct jail j; error = copyin(uap->jail, &version, sizeof(uint32_t)); if (error) @@ -2066,45 +2056,14 @@ /* FreeBSD single IPv4 jails. */ struct jail32_v0 j32_v0; + bzero(&j, sizeof(struct jail)); error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0)); if (error) return (error); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 12:52:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B8F21065672; Thu, 28 May 2009 12:52:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED673106564A for ; Thu, 28 May 2009 12:52:41 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D98758FC1D for ; Thu, 28 May 2009 12:52:41 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SCqful022500 for ; Thu, 28 May 2009 12:52:41 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SCqfxY022498 for perforce@freebsd.org; Thu, 28 May 2009 12:52:41 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Thu, 28 May 2009 12:52:41 GMT Message-Id: <200905281252.n4SCqfxY022498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 162939 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, 28 May 2009 12:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=162939 Change 162939 by zhaoshuai@zhaoshuai on 2009/05/28 12:51:57 split pipe code into subr_pipe.c, haven't compiled it Affected files ... .. //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#1 add .. //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#4 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#4 (text+ko) ==== @@ -17,81 +17,7 @@ * are met. */ -/* - * This file contains a high-performance replacement for the socket-based - * pipes scheme originally used in FreeBSD/4.4Lite. It does not support - * all features of sockets, but does do everything that pipes normally - * do. - */ - -/* - * This code has two modes of operation, a small write mode and a large - * write mode. The small write mode acts like conventional pipes with - * a kernel buffer. If the buffer is less than PIPE_MINDIRECT, then the - * "normal" pipe buffering is done. If the buffer is between PIPE_MINDIRECT - * and PIPE_SIZE in size, it is fully mapped and wired into the kernel, and - * the receiving process can copy it directly from the pages in the sending - * process. - * - * If the sending process receives a signal, it is possible that it will - * go away, and certainly its address space can change, because control - * is returned back to the user-mode side. In that case, the pipe code - * arranges to copy the buffer supplied by the user process, to a pageable - * kernel buffer, and the receiving process will grab the data from the - * pageable kernel buffer. Since signals don't happen all that often, - * the copy operation is normally eliminated. - * - * The constant PIPE_MINDIRECT is chosen to make sure that buffering will - * happen for small transfers so that the system will not spend all of - * its time context switching. - * - * In order to limit the resource use of pipes, two sysctls exist: - * - * kern.ipc.maxpipekva - This is a hard limit on the amount of pageable - * address space available to us in pipe_map. This value is normally - * autotuned, but may also be loader tuned. - * - * kern.ipc.pipekva - This read-only sysctl tracks the current amount of - * memory in use by pipes. - * - * Based on how large pipekva is relative to maxpipekva, the following - * will happen: - * - * 0% - 50%: - * New pipes are given 16K of memory backing, pipes may dynamically - * grow to as large as 64K where needed. - * 50% - 75%: - * New pipes are given 4K (or PAGE_SIZE) of memory backing, - * existing pipes may NOT grow. - * 75% - 100%: - * New pipes are given 4K (or PAGE_SIZE) of memory backing, - * existing pipes will be shrunk down to 4K whenever possible. - * - * Resizing may be disabled by setting kern.ipc.piperesizeallowed=0. If - * that is set, the only resize that will occur is the 0 -> SMALL_PIPE_SIZE - * resize which MUST occur for reverse-direction pipes when they are - * first used. - * - * Additional information about the current state of pipes may be obtained - * from kern.ipc.pipes, kern.ipc.pipefragretry, kern.ipc.pipeallocfail, - * and kern.ipc.piperesizefail. - * - * Locking rules: There are two locks present here: A mutex, used via - * PIPE_LOCK, and a flag, used via pipelock(). All locking is done via - * the flag, as mutexes can not persist over uiomove. The mutex - * exists only to guard access to the flag, and is not in itself a - * locking mechanism. Also note that there is only a single mutex for - * both directions of a pipe. - * - * As pipelock() may have to sleep before it can acquire the flag, it - * is important to reread all data after a call to pipelock(); everything - * in the structure may have changed. - */ - #include -__FBSDID("$FreeBSD: src/sys/kern/sys_pipe.c,v 1.201 2009/03/10 21:28:43 jhb Exp $"); - -#include "opt_mac.h" #include #include @@ -101,8 +27,6 @@ #include #include #include -#include -#include #include #include #include @@ -117,33 +41,11 @@ #include #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Use this define if you want to disable *fancy* VM things. Expect an - * approx 30% decrease in transfer rate. This could be useful for - * NetBSD or OpenBSD. - */ -/* #define PIPE_NODIRECT */ - /* * interfaces to the outside world - * pipe_read and pipe_write is no longer static, they are used by FIFO */ -/* -fo_rdwr_t pipe_read; -fo_rdwr_t pipe_write; -*/ +static fo_rdwr_t pipe_read; +static fo_rdwr_t pipe_write; static fo_truncate_t pipe_truncate; static fo_ioctl_t pipe_ioctl; static fo_poll_t pipe_poll; @@ -163,153 +65,7 @@ .fo_flags = DFLAG_PASSABLE }; -static void filt_pipedetach(struct knote *kn); -static int filt_piperead(struct knote *kn, long hint); -static int filt_pipewrite(struct knote *kn, long hint); - -static struct filterops pipe_rfiltops = - { 1, NULL, filt_pipedetach, filt_piperead }; -static struct filterops pipe_wfiltops = - { 1, NULL, filt_pipedetach, filt_pipewrite }; - -/* - * Default pipe buffer size(s), this can be kind-of large now because pipe - * space is pageable. The pipe code will try to maintain locality of - * reference for performance reasons, so small amounts of outstanding I/O - * will not wipe the cache. - */ -#define MINPIPESIZE (PIPE_SIZE/3) -#define MAXPIPESIZE (2*PIPE_SIZE/3) - -static long amountpipekva; -static int pipefragretry; -static int pipeallocfail; -static int piperesizefail; -static int piperesizeallowed = 1; - -SYSCTL_LONG(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN, - &maxpipekva, 0, "Pipe KVA limit"); -SYSCTL_LONG(_kern_ipc, OID_AUTO, pipekva, CTLFLAG_RD, - &amountpipekva, 0, "Pipe KVA usage"); -SYSCTL_INT(_kern_ipc, OID_AUTO, pipefragretry, CTLFLAG_RD, - &pipefragretry, 0, "Pipe allocation retries due to fragmentation"); -SYSCTL_INT(_kern_ipc, OID_AUTO, pipeallocfail, CTLFLAG_RD, - &pipeallocfail, 0, "Pipe allocation failures"); -SYSCTL_INT(_kern_ipc, OID_AUTO, piperesizefail, CTLFLAG_RD, - &piperesizefail, 0, "Pipe resize failures"); -SYSCTL_INT(_kern_ipc, OID_AUTO, piperesizeallowed, CTLFLAG_RW, - &piperesizeallowed, 0, "Pipe resizing allowed"); - -static void pipeinit(void *dummy __unused); /* -static void pipeclose(struct pipe *cpipe); -*/ -static void pipe_free_kmem(struct pipe *cpipe); -static int pipe_create(struct pipe *pipe, int backing); -static __inline int pipelock(struct pipe *cpipe, int catch); -static __inline void pipeunlock(struct pipe *cpipe); -static __inline void pipeselwakeup(struct pipe *cpipe); -#ifndef PIPE_NODIRECT -static int pipe_build_write_buffer(struct pipe *wpipe, struct uio *uio); -static void pipe_destroy_write_buffer(struct pipe *wpipe); -static int pipe_direct_write(struct pipe *wpipe, struct uio *uio); -static void pipe_clone_write_buffer(struct pipe *wpipe); -#endif -static int pipespace(struct pipe *cpipe, int size); -static int pipespace_new(struct pipe *cpipe, int size); - -static int pipe_zone_ctor(void *mem, int size, void *arg, int flags); -static int pipe_zone_init(void *mem, int size, int flags); -static void pipe_zone_fini(void *mem, int size); - -static uma_zone_t pipe_zone; - -SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_ANY, pipeinit, NULL); - -static void -pipeinit(void *dummy __unused) -{ - - pipe_zone = uma_zcreate("pipe", sizeof(struct pipepair), - pipe_zone_ctor, NULL, pipe_zone_init, pipe_zone_fini, - UMA_ALIGN_PTR, 0); - KASSERT(pipe_zone != NULL, ("pipe_zone not initialized")); -} - -static int -pipe_zone_ctor(void *mem, int size, void *arg, int flags) -{ - struct pipepair *pp; - struct pipe *rpipe, *wpipe; - - KASSERT(size == sizeof(*pp), ("pipe_zone_ctor: wrong size")); - - pp = (struct pipepair *)mem; - - /* - * We zero both pipe endpoints to make sure all the kmem pointers - * are NULL, flag fields are zero'd, etc. We timestamp both - * endpoints with the same time. - */ - rpipe = &pp->pp_rpipe; - bzero(rpipe, sizeof(*rpipe)); - vfs_timestamp(&rpipe->pipe_ctime); - rpipe->pipe_atime = rpipe->pipe_mtime = rpipe->pipe_ctime; - - wpipe = &pp->pp_wpipe; - bzero(wpipe, sizeof(*wpipe)); - wpipe->pipe_ctime = rpipe->pipe_ctime; - wpipe->pipe_atime = wpipe->pipe_mtime = rpipe->pipe_ctime; - - rpipe->pipe_peer = wpipe; - rpipe->pipe_pair = pp; - wpipe->pipe_peer = rpipe; - wpipe->pipe_pair = pp; - - /* - * Mark both endpoints as present; they will later get free'd - * one at a time. When both are free'd, then the whole pair - * is released. - */ - rpipe->pipe_present = PIPE_ACTIVE; - wpipe->pipe_present = PIPE_ACTIVE; - - /* - * Eventually, the MAC Framework may initialize the label - * in ctor or init, but for now we do it elswhere to avoid - * blocking in ctor or init. - */ - pp->pp_label = NULL; - - return (0); -} - -static int -pipe_zone_init(void *mem, int size, int flags) -{ - struct pipepair *pp; - - KASSERT(size == sizeof(*pp), ("pipe_zone_init: wrong size")); - - pp = (struct pipepair *)mem; - - mtx_init(&pp->pp_mtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE); - return (0); -} - -static void -pipe_zone_fini(void *mem, int size) -{ - struct pipepair *pp; - - KASSERT(size == sizeof(*pp), ("pipe_zone_fini: wrong size")); - - pp = (struct pipepair *)mem; - - mtx_destroy(&pp->pp_mtx); -} - -/* * The pipe system call for the DTYPE_PIPE type of pipes. If we fail, let * the zone pick up the pieces via pipeclose(). */ @@ -319,42 +75,15 @@ struct filedesc *fdp = td->td_proc->p_fd; struct file *rf, *wf; struct pipepair *pp; - struct pipe *rpipe, *wpipe; int fd, error; - pp = uma_zalloc(pipe_zone, M_WAITOK); -#ifdef MAC - /* - * The MAC label is shared between the connected endpoints. As a - * result mac_pipe_init() and mac_pipe_create() are called once - * for the pair, and not on the endpoints. - */ - mac_pipe_init(pp); - mac_pipe_create(td->td_ucred, pp); -#endif - rpipe = &pp->pp_rpipe; - wpipe = &pp->pp_wpipe; - - knlist_init(&rpipe->pipe_sel.si_note, PIPE_MTX(rpipe), NULL, NULL, - NULL); - knlist_init(&wpipe->pipe_sel.si_note, PIPE_MTX(wpipe), NULL, NULL, - NULL); - - /* Only the forward direction pipe is backed by default */ - if ((error = pipe_create(rpipe, 1)) != 0 || - (error = pipe_create(wpipe, 0)) != 0) { - pipeclose(rpipe); - pipeclose(wpipe); - return (error); - } - - rpipe->pipe_state |= PIPE_DIRECTOK; - wpipe->pipe_state |= PIPE_DIRECTOK; + if ((error = generic_pipe_create(&pp, td)) != 0) + return (error); error = falloc(td, &rf, &fd); if (error) { - pipeclose(rpipe); - pipeclose(wpipe); + pipeclose(&pp->rpipe); + pipeclose(&pp->wpipe); return (error); } /* An extra reference on `rf' has been held for us by falloc(). */ @@ -366,17 +95,17 @@ * to avoid races against processes which manage to dup() the read * side while we are blocked trying to allocate the write side. */ - finit(rf, FREAD | FWRITE, DTYPE_PIPE, rpipe, &pipeops); + finit(rf, FREAD | FWRITE, DTYPE_PIPE, &pp->rpipe, &pipeops); error = falloc(td, &wf, &fd); if (error) { fdclose(fdp, rf, fildes[0], td); fdrop(rf, td); /* rpipe has been closed by fdrop(). */ - pipeclose(wpipe); + pipeclose(&pp->wpipe); return (error); } /* An extra reference on `wf' has been held for us by falloc(). */ - finit(wf, FREAD | FWRITE, DTYPE_PIPE, wpipe, &pipeops); + finit(wf, FREAD | FWRITE, DTYPE_PIPE, &pp->wpipe, &pipeops); fdrop(wf, td); fildes[1] = fd; fdrop(rf, td); @@ -401,1048 +130,53 @@ return (0); } -/* - * Allocate kva for pipe circular buffer, the space is pageable - * This routine will 'realloc' the size of a pipe safely, if it fails - * it will retain the old buffer. - * If it fails it will return ENOMEM. - */ -static int -pipespace_new(cpipe, size) - struct pipe *cpipe; - int size; -{ - caddr_t buffer; - int error, cnt, firstseg; - static int curfail = 0; - static struct timeval lastfail; - - KASSERT(!mtx_owned(PIPE_MTX(cpipe)), ("pipespace: pipe mutex locked")); - KASSERT(!(cpipe->pipe_state & PIPE_DIRECTW), - ("pipespace: resize of direct writes not allowed")); -retry: - cnt = cpipe->pipe_buffer.cnt; - if (cnt > size) - size = cnt; - - size = round_page(size); - buffer = (caddr_t) vm_map_min(pipe_map); - - error = vm_map_find(pipe_map, NULL, 0, - (vm_offset_t *) &buffer, size, 1, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (error != KERN_SUCCESS) { - if ((cpipe->pipe_buffer.buffer == NULL) && - (size > SMALL_PIPE_SIZE)) { - size = SMALL_PIPE_SIZE; - pipefragretry++; - goto retry; - } - if (cpipe->pipe_buffer.buffer == NULL) { - pipeallocfail++; - if (ppsratecheck(&lastfail, &curfail, 1)) - printf("kern.ipc.maxpipekva exceeded; see tuning(7)\n"); - } else { - piperesizefail++; - } - return (ENOMEM); - } - - /* copy data, then free old resources if we're resizing */ - if (cnt > 0) { - if (cpipe->pipe_buffer.in <= cpipe->pipe_buffer.out) { - firstseg = cpipe->pipe_buffer.size - cpipe->pipe_buffer.out; - bcopy(&cpipe->pipe_buffer.buffer[cpipe->pipe_buffer.out], - buffer, firstseg); - if ((cnt - firstseg) > 0) - bcopy(cpipe->pipe_buffer.buffer, &buffer[firstseg], - cpipe->pipe_buffer.in); - } else { - bcopy(&cpipe->pipe_buffer.buffer[cpipe->pipe_buffer.out], - buffer, cnt); - } - } - pipe_free_kmem(cpipe); - cpipe->pipe_buffer.buffer = buffer; - cpipe->pipe_buffer.size = size; - cpipe->pipe_buffer.in = cnt; - cpipe->pipe_buffer.out = 0; - cpipe->pipe_buffer.cnt = cnt; - atomic_add_long(&amountpipekva, cpipe->pipe_buffer.size); - return (0); -} - -/* - * Wrapper for pipespace_new() that performs locking assertions. - */ -static int -pipespace(cpipe, size) - struct pipe *cpipe; - int size; -{ - - KASSERT(cpipe->pipe_state & PIPE_LOCKFL, - ("Unlocked pipe passed to pipespace")); - return (pipespace_new(cpipe, size)); -} - -/* - * lock a pipe for I/O, blocking other access - */ -static __inline int -pipelock(cpipe, catch) - struct pipe *cpipe; - int catch; -{ - int error; - - PIPE_LOCK_ASSERT(cpipe, MA_OWNED); - while (cpipe->pipe_state & PIPE_LOCKFL) { - cpipe->pipe_state |= PIPE_LWANT; - error = msleep(cpipe, PIPE_MTX(cpipe), - catch ? (PRIBIO | PCATCH) : PRIBIO, - "pipelk", 0); - if (error != 0) - return (error); - } - cpipe->pipe_state |= PIPE_LOCKFL; - return (0); -} - -/* - * unlock a pipe I/O lock - */ -static __inline void -pipeunlock(cpipe) - struct pipe *cpipe; -{ - - PIPE_LOCK_ASSERT(cpipe, MA_OWNED); - KASSERT(cpipe->pipe_state & PIPE_LOCKFL, - ("Unlocked pipe passed to pipeunlock")); - cpipe->pipe_state &= ~PIPE_LOCKFL; - if (cpipe->pipe_state & PIPE_LWANT) { - cpipe->pipe_state &= ~PIPE_LWANT; - wakeup(cpipe); - } -} - -static __inline void -pipeselwakeup(cpipe) - struct pipe *cpipe; -{ - - PIPE_LOCK_ASSERT(cpipe, MA_OWNED); - if (cpipe->pipe_state & PIPE_SEL) { - selwakeuppri(&cpipe->pipe_sel, PSOCK); - if (!SEL_WAITING(&cpipe->pipe_sel)) - cpipe->pipe_state &= ~PIPE_SEL; - } - if ((cpipe->pipe_state & PIPE_ASYNC) && cpipe->pipe_sigio) - pgsigio(&cpipe->pipe_sigio, SIGIO, 0); - KNOTE_LOCKED(&cpipe->pipe_sel.si_note, 0); -} - -/* - * Initialize and allocate VM and memory for pipe. The structure - * will start out zero'd from the ctor, so we just manage the kmem. - */ -static int -pipe_create(pipe, backing) - struct pipe *pipe; - int backing; -{ - int error; - - if (backing) { - if (amountpipekva > maxpipekva / 2) - error = pipespace_new(pipe, SMALL_PIPE_SIZE); - else - error = pipespace_new(pipe, PIPE_SIZE); - } else { - /* If we're not backing this pipe, no need to do anything. */ - error = 0; - } - return (error); -} - -/* ARGSUSED */ int -pipe_read(fp, uio, active_cred, flags, td) - struct file *fp; - struct uio *uio; - struct ucred *active_cred; - struct thread *td; - int flags; +pipe_read(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, + struct thread *td) { - struct pipe *rpipe = fp->f_data; - int error; - int nread = 0; - u_int size; - PIPE_LOCK(rpipe); - ++rpipe->pipe_busy; - error = pipelock(rpipe, 1); - if (error) - goto unlocked_error; - -#ifdef MAC - error = mac_pipe_check_read(active_cred, rpipe->pipe_pair); - if (error) - goto locked_error; -#endif - if (amountpipekva > (3 * maxpipekva) / 4) { - if (!(rpipe->pipe_state & PIPE_DIRECTW) && - (rpipe->pipe_buffer.size > SMALL_PIPE_SIZE) && - (rpipe->pipe_buffer.cnt <= SMALL_PIPE_SIZE) && - (piperesizeallowed == 1)) { - PIPE_UNLOCK(rpipe); - pipespace(rpipe, SMALL_PIPE_SIZE); - PIPE_LOCK(rpipe); - } - } - - while (uio->uio_resid) { - /* - * normal pipe buffer receive - */ - if (rpipe->pipe_buffer.cnt > 0) { - size = rpipe->pipe_buffer.size - rpipe->pipe_buffer.out; - if (size > rpipe->pipe_buffer.cnt) - size = rpipe->pipe_buffer.cnt; - if (size > (u_int) uio->uio_resid) - size = (u_int) uio->uio_resid; - - PIPE_UNLOCK(rpipe); - error = uiomove( - &rpipe->pipe_buffer.buffer[rpipe->pipe_buffer.out], - size, uio); - PIPE_LOCK(rpipe); - if (error) - break; - - rpipe->pipe_buffer.out += size; - if (rpipe->pipe_buffer.out >= rpipe->pipe_buffer.size) - rpipe->pipe_buffer.out = 0; - - rpipe->pipe_buffer.cnt -= size; - - /* - * If there is no more to read in the pipe, reset - * its pointers to the beginning. This improves - * cache hit stats. - */ - if (rpipe->pipe_buffer.cnt == 0) { - rpipe->pipe_buffer.in = 0; - rpipe->pipe_buffer.out = 0; - } - nread += size; -#ifndef PIPE_NODIRECT - /* - * Direct copy, bypassing a kernel buffer. - */ - } else if ((size = rpipe->pipe_map.cnt) && - (rpipe->pipe_state & PIPE_DIRECTW)) { - if (size > (u_int) uio->uio_resid) - size = (u_int) uio->uio_resid; - - PIPE_UNLOCK(rpipe); - error = uiomove_fromphys(rpipe->pipe_map.ms, - rpipe->pipe_map.pos, size, uio); - PIPE_LOCK(rpipe); - if (error) - break; - nread += size; - rpipe->pipe_map.pos += size; - rpipe->pipe_map.cnt -= size; - if (rpipe->pipe_map.cnt == 0) { - rpipe->pipe_state &= ~PIPE_DIRECTW; - wakeup(rpipe); - } -#endif - } else { - /* - * detect EOF condition - * read returns 0 on EOF, no need to set error - */ - if (rpipe->pipe_state & PIPE_EOF) - break; - - /* - * If the "write-side" has been blocked, wake it up now. - */ - if (rpipe->pipe_state & PIPE_WANTW) { - rpipe->pipe_state &= ~PIPE_WANTW; - wakeup(rpipe); - } - - /* - * Break if some data was read. - */ - if (nread > 0) - break; - - /* - * Unlock the pipe buffer for our remaining processing. - * We will either break out with an error or we will - * sleep and relock to loop. - */ - pipeunlock(rpipe); - - /* - * Handle non-blocking mode operation or - * wait for more data. - */ - if (fp->f_flag & FNONBLOCK) { - error = EAGAIN; - } else { - rpipe->pipe_state |= PIPE_WANTR; - if ((error = msleep(rpipe, PIPE_MTX(rpipe), - PRIBIO | PCATCH, - "piperd", 0)) == 0) - error = pipelock(rpipe, 1); - } - if (error) - goto unlocked_error; - } - } -#ifdef MAC -locked_error: -#endif - pipeunlock(rpipe); - - /* XXX: should probably do this before getting any locks. */ - if (error == 0) - vfs_timestamp(&rpipe->pipe_atime); -unlocked_error: - --rpipe->pipe_busy; - - /* - * PIPE_WANT processing only makes sense if pipe_busy is 0. - */ - if ((rpipe->pipe_busy == 0) && (rpipe->pipe_state & PIPE_WANT)) { - rpipe->pipe_state &= ~(PIPE_WANT|PIPE_WANTW); - wakeup(rpipe); - } else if (rpipe->pipe_buffer.cnt < MINPIPESIZE) { - /* - * Handle write blocking hysteresis. - */ - if (rpipe->pipe_state & PIPE_WANTW) { - rpipe->pipe_state &= ~PIPE_WANTW; - wakeup(rpipe); - } - } - - if ((rpipe->pipe_buffer.size - rpipe->pipe_buffer.cnt) >= PIPE_BUF) - pipeselwakeup(rpipe); - - PIPE_UNLOCK(rpipe); - return (error); -} - -#ifndef PIPE_NODIRECT -/* - * Map the sending processes' buffer into kernel space and wire it. - * This is similar to a physical write operation. - */ -static int -pipe_build_write_buffer(wpipe, uio) - struct pipe *wpipe; - struct uio *uio; -{ - pmap_t pmap; - u_int size; - int i, j; - vm_offset_t addr, endaddr; - - PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); - KASSERT(wpipe->pipe_state & PIPE_DIRECTW, - ("Clone attempt on non-direct write pipe!")); - - size = (u_int) uio->uio_iov->iov_len; - if (size > wpipe->pipe_buffer.size) - size = wpipe->pipe_buffer.size; - - pmap = vmspace_pmap(curproc->p_vmspace); - endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size); - addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base); - for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) { - /* - * vm_fault_quick() can sleep. Consequently, - * vm_page_lock_queue() and vm_page_unlock_queue() - * should not be performed outside of this loop. - */ - race: - if (vm_fault_quick((caddr_t)addr, VM_PROT_READ) < 0) { - vm_page_lock_queues(); - for (j = 0; j < i; j++) - vm_page_unhold(wpipe->pipe_map.ms[j]); - vm_page_unlock_queues(); - return (EFAULT); - } - wpipe->pipe_map.ms[i] = pmap_extract_and_hold(pmap, addr, - VM_PROT_READ); - if (wpipe->pipe_map.ms[i] == NULL) - goto race; - } - -/* - * set up the control block - */ - wpipe->pipe_map.npages = i; - wpipe->pipe_map.pos = - ((vm_offset_t) uio->uio_iov->iov_base) & PAGE_MASK; - wpipe->pipe_map.cnt = size; - -/* - * and update the uio data - */ - - uio->uio_iov->iov_len -= size; - uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + size; - if (uio->uio_iov->iov_len == 0) - uio->uio_iov++; - uio->uio_resid -= size; - uio->uio_offset += size; - return (0); -} - -/* - * unmap and unwire the process buffer - */ -static void -pipe_destroy_write_buffer(wpipe) - struct pipe *wpipe; -{ - int i; - - PIPE_LOCK_ASSERT(wpipe, MA_OWNED); - vm_page_lock_queues(); - for (i = 0; i < wpipe->pipe_map.npages; i++) { - vm_page_unhold(wpipe->pipe_map.ms[i]); - } - vm_page_unlock_queues(); - wpipe->pipe_map.npages = 0; -} - -/* - * In the case of a signal, the writing process might go away. This - * code copies the data into the circular buffer so that the source - * pages can be freed without loss of data. - */ -static void -pipe_clone_write_buffer(wpipe) - struct pipe *wpipe; -{ - struct uio uio; - struct iovec iov; - int size; - int pos; - - PIPE_LOCK_ASSERT(wpipe, MA_OWNED); - size = wpipe->pipe_map.cnt; - pos = wpipe->pipe_map.pos; - - wpipe->pipe_buffer.in = size; - wpipe->pipe_buffer.out = 0; - wpipe->pipe_buffer.cnt = size; - wpipe->pipe_state &= ~PIPE_DIRECTW; - - PIPE_UNLOCK(wpipe); - iov.iov_base = wpipe->pipe_buffer.buffer; - iov.iov_len = size; - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_offset = 0; - uio.uio_resid = size; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_rw = UIO_READ; - uio.uio_td = curthread; - uiomove_fromphys(wpipe->pipe_map.ms, pos, size, &uio); - PIPE_LOCK(wpipe); - pipe_destroy_write_buffer(wpipe); -} - -/* - * This implements the pipe buffer write mechanism. Note that only - * a direct write OR a normal pipe write can be pending at any given time. - * If there are any characters in the pipe buffer, the direct write will - * be deferred until the receiving process grabs all of the bytes from - * the pipe buffer. Then the direct mapping write is set-up. - */ -static int -pipe_direct_write(wpipe, uio) - struct pipe *wpipe; - struct uio *uio; -{ - int error; - -retry: - PIPE_LOCK_ASSERT(wpipe, MA_OWNED); - error = pipelock(wpipe, 1); - if (wpipe->pipe_state & PIPE_EOF) - error = EPIPE; - if (error) { - pipeunlock(wpipe); - goto error1; - } - while (wpipe->pipe_state & PIPE_DIRECTW) { - if (wpipe->pipe_state & PIPE_WANTR) { - wpipe->pipe_state &= ~PIPE_WANTR; - wakeup(wpipe); - } - pipeselwakeup(wpipe); - wpipe->pipe_state |= PIPE_WANTW; - pipeunlock(wpipe); - error = msleep(wpipe, PIPE_MTX(wpipe), - PRIBIO | PCATCH, "pipdww", 0); - if (error) - goto error1; - else - goto retry; - } - wpipe->pipe_map.cnt = 0; /* transfer not ready yet */ - if (wpipe->pipe_buffer.cnt > 0) { - if (wpipe->pipe_state & PIPE_WANTR) { - wpipe->pipe_state &= ~PIPE_WANTR; - wakeup(wpipe); - } - pipeselwakeup(wpipe); - wpipe->pipe_state |= PIPE_WANTW; - pipeunlock(wpipe); - error = msleep(wpipe, PIPE_MTX(wpipe), - PRIBIO | PCATCH, "pipdwc", 0); - if (error) - goto error1; - else - goto retry; - } - - wpipe->pipe_state |= PIPE_DIRECTW; - - PIPE_UNLOCK(wpipe); - error = pipe_build_write_buffer(wpipe, uio); - PIPE_LOCK(wpipe); - if (error) { - wpipe->pipe_state &= ~PIPE_DIRECTW; - pipeunlock(wpipe); - goto error1; - } - - error = 0; - while (!error && (wpipe->pipe_state & PIPE_DIRECTW)) { - if (wpipe->pipe_state & PIPE_EOF) { - pipe_destroy_write_buffer(wpipe); - pipeselwakeup(wpipe); - pipeunlock(wpipe); - error = EPIPE; - goto error1; - } - if (wpipe->pipe_state & PIPE_WANTR) { - wpipe->pipe_state &= ~PIPE_WANTR; - wakeup(wpipe); - } - pipeselwakeup(wpipe); - pipeunlock(wpipe); - error = msleep(wpipe, PIPE_MTX(wpipe), PRIBIO | PCATCH, - "pipdwt", 0); - pipelock(wpipe, 0); - } - - if (wpipe->pipe_state & PIPE_EOF) - error = EPIPE; - if (wpipe->pipe_state & PIPE_DIRECTW) { - /* - * this bit of trickery substitutes a kernel buffer for - * the process that might be going away. - */ - pipe_clone_write_buffer(wpipe); - } else { - pipe_destroy_write_buffer(wpipe); - } - pipeunlock(wpipe); - return (error); - -error1: - wakeup(wpipe); - return (error); + return generic_pipe_read(fp, uio, active_cred, flags, td); } -#endif int -pipe_write(fp, uio, active_cred, flags, td) - struct file *fp; - struct uio *uio; - struct ucred *active_cred; - struct thread *td; - int flags; +pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, + struct thread *td) { - int error = 0; - int desiredsize, orig_resid; - struct pipe *wpipe, *rpipe; - rpipe = fp->f_data; - wpipe = rpipe->pipe_peer; - - PIPE_LOCK(rpipe); - error = pipelock(wpipe, 1); - if (error) { - PIPE_UNLOCK(rpipe); - return (error); - } - /* - * detect loss of pipe read side, issue SIGPIPE if lost. - */ - if (wpipe->pipe_present != PIPE_ACTIVE || - (wpipe->pipe_state & PIPE_EOF)) { - pipeunlock(wpipe); - PIPE_UNLOCK(rpipe); - return (EPIPE); - } -#ifdef MAC - error = mac_pipe_check_write(active_cred, wpipe->pipe_pair); - if (error) { - pipeunlock(wpipe); - PIPE_UNLOCK(rpipe); - return (error); - } -#endif - ++wpipe->pipe_busy; - - /* Choose a larger size if it's advantageous */ - desiredsize = max(SMALL_PIPE_SIZE, wpipe->pipe_buffer.size); - while (desiredsize < wpipe->pipe_buffer.cnt + uio->uio_resid) { - if (piperesizeallowed != 1) - break; - if (amountpipekva > maxpipekva / 2) - break; - if (desiredsize == BIG_PIPE_SIZE) - break; - desiredsize = desiredsize * 2; - } - - /* Choose a smaller size if we're in a OOM situation */ - if ((amountpipekva > (3 * maxpipekva) / 4) && - (wpipe->pipe_buffer.size > SMALL_PIPE_SIZE) && - (wpipe->pipe_buffer.cnt <= SMALL_PIPE_SIZE) && - (piperesizeallowed == 1)) - desiredsize = SMALL_PIPE_SIZE; - - /* Resize if the above determined that a new size was necessary */ - if ((desiredsize != wpipe->pipe_buffer.size) && >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 15:44:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A9B0106566C; Thu, 28 May 2009 15:44: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 11F2C106566B for ; Thu, 28 May 2009 15:44:40 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F30E58FC15 for ; Thu, 28 May 2009 15:44:39 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SFid4S053710 for ; Thu, 28 May 2009 15:44:39 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SFidQ2053708 for perforce@freebsd.org; Thu, 28 May 2009 15:44:39 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 15:44:39 GMT Message-Id: <200905281544.n4SFidQ2053708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162944 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, 28 May 2009 15:44:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=162944 Change 162944 by zec@zec_tpx32 on 2009/05/28 15:44:10 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2001-2002 Maksim Yevmenkin + * Copyright (c) 2001-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,25 +31,85 @@ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.39 2009/05/27 16:43:40 thompsa Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* + * NOTE: ng_ubt2 driver has a split personality. On one side it is + * a USB device driver and on the other it is a Netgraph node. This + * driver will *NOT* create traditional /dev/ enties, only Netgraph + * node. + * + * NOTE ON LOCKS USED: ng_ubt2 drives uses 2 locks (mutexes) + * + * 1) sc_if_mtx - lock for device's interface #0 and #1. This lock is used + * by USB for any USB request going over device's interface #0 and #1, + * i.e. interrupt, control, bulk and isoc. transfers. + * + * 2) sc_ng_mtx - this lock is used to protect shared (between USB, Netgraph + * and Taskqueue) data, such as outgoing mbuf queues, task flags and hook + * pointer. This lock *SHOULD NOT* be grabbed for a long time. In fact, + * think of it as a spin lock. + * + * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 3 different contexts. + * + * 1) USB context. This is where all the USB related stuff happens. All + * callbacks run in this context. All callbacks are called (by USB) with + * appropriate interface lock held. It is (generally) allowed to grab + * any additional locks. + * + * 2) Netgraph context. This is where all the Netgraph related stuff happens. + * Since we mark node as WRITER, the Netgraph node will be "locked" (from + * Netgraph point of view). Any variable that is only modified from the + * Netgraph context does not require any additonal locking. It is generally + * *NOT* allowed to grab *ANY* additional locks. Whatever you do, *DO NOT* + * grab any lock in the Netgraph context that could cause de-scheduling of + * the Netgraph thread for significant amount of time. In fact, the only + * lock that is allowed in the Netgraph context is the sc_ng_mtx lock. + * Also make sure that any code that is called from the Netgraph context + * follows the rule above. + * + * 3) Taskqueue context. This is where ubt_task runs. Since we are generally + * NOT allowed to grab any lock that could cause de-scheduling in the + * Netgraph context, and, USB requires us to grab interface lock before + * doing things with transfers, it is safer to transition from the Netgraph + * context to the Taskqueue context before we can call into USB subsystem. + * + * So, to put everything together, the rules are as follows. + * It is OK to call from the USB context or the Taskqueue context into + * the Netgraph context (i.e. call NG_SEND_xxx functions). In other words + * it is allowed to call into the Netgraph context with locks held. + * Is it *NOT* OK to call from the Netgraph context into the USB context, + * because USB requires us to grab interface locks, and, it is safer to + * avoid it. So, to make things safer we set task flags to indicate which + * actions we want to perform and schedule ubt_task which would run in the + * Taskqueue context. + * Is is OK to call from the Taskqueue context into the USB context, + * and, ubt_task does just that (i.e. grabs appropriate interface locks + * before calling into USB). + * Access to the outgoing queues, task flags and hook pointer is + * controlled by the sc_ng_mtx lock. It is an unavoidable evil. Again, + * sc_ng_mtx should really be a spin lock (and it is very likely to an + * equivalent of spin lock due to adaptive nature of FreeBSD mutexes). + * All USB callbacks accept softc pointer as a private data. USB ensures + * that this pointer is valid. + */ +#include "usbdevs.h" #include -#include -#include -#include +#include +#include + +#define USB_DEBUG_VAR usb2_debug + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -59,43 +119,17 @@ #include #include -#include "usbdevs.h" +static int ubt_modevent(module_t, int, void *); +static device_probe_t ubt_probe; +static device_attach_t ubt_attach; +static device_detach_t ubt_detach; -/* - * USB methods - */ +static void ubt_task_schedule(ubt_softc_p, int); +static task_fn_t ubt_task; -static device_probe_t ubt_match; -static device_attach_t ubt_attach; -static device_detach_t ubt_detach; +#define ubt_xfer_start(sc, i) usb2_transfer_start((sc)->sc_xfer[(i)]) -static device_method_t ubt_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ubt_match), - DEVMETHOD(device_attach, ubt_attach), - DEVMETHOD(device_detach, ubt_detach), - - { 0, 0 } -}; - -static driver_t ubt_driver = { - "ubt", - ubt_methods, - sizeof(struct ubt_softc) -}; - -static usbd_status ubt_isoc_out_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_out_start (ubt_softc_p); -static void ubt_isoc_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); - -static void ubt_reset (ubt_softc_p); - -/* - * Netgraph methods - */ - +/* Netgraph methods */ static ng_constructor_t ng_ubt_constructor; static ng_shutdown_t ng_ubt_shutdown; static ng_newhook_t ng_ubt_newhook; @@ -111,7 +145,8 @@ { "qlen", &ng_parse_int32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_qlen_type = { +static const struct ng_parse_type ng_ubt_node_qlen_type = +{ &ng_parse_struct_type, &ng_ubt_node_qlen_type_fields }; @@ -127,61 +162,64 @@ { "ierrors", &ng_parse_uint32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_stat_type = { +static const struct ng_parse_type ng_ubt_node_stat_type = +{ &ng_parse_struct_type, &ng_ubt_node_stat_type_fields }; /* Netgraph node command list */ -static const struct ng_cmdlist ng_ubt_cmdlist[] = { +static const struct ng_cmdlist ng_ubt_cmdlist[] = { - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_DEBUG, - "set_debug", - &ng_parse_uint16_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_DEBUG, - "get_debug", - NULL, - &ng_parse_uint16_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_QLEN, - "set_qlen", - &ng_ubt_node_qlen_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_QLEN, - "get_qlen", - &ng_ubt_node_qlen_type, - &ng_ubt_node_qlen_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_STAT, - "get_stat", - NULL, - &ng_ubt_node_stat_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_RESET_STAT, - "reset_stat", - NULL, - NULL -}, -{ 0, } + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_DEBUG, + "set_debug", + &ng_parse_uint16_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_DEBUG, + "get_debug", + NULL, + &ng_parse_uint16_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_QLEN, + "set_qlen", + &ng_ubt_node_qlen_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_QLEN, + "get_qlen", + &ng_ubt_node_qlen_type, + &ng_ubt_node_qlen_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_STAT, + "get_stat", + NULL, + &ng_ubt_node_stat_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_RESET_STAT, + "reset_stat", + NULL, + NULL + }, + { 0, } }; /* Netgraph node type */ -static struct ng_type typestruct = { - .version = NG_ABI_VERSION, +static struct ng_type typestruct = +{ + .version = NG_ABI_VERSION, .name = NG_UBT_NODE_TYPE, .constructor = ng_ubt_constructor, .rcvmsg = ng_ubt_rcvmsg, @@ -190,192 +228,251 @@ .connect = ng_ubt_connect, .rcvdata = ng_ubt_rcvdata, .disconnect = ng_ubt_disconnect, - .cmdlist = ng_ubt_cmdlist + .cmdlist = ng_ubt_cmdlist }; -/* - * Module - */ - -DRIVER_MODULE(ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0); -MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); -MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); -MODULE_DEPEND(ubt, usb, 1, 1, 1); - - /**************************************************************************** **************************************************************************** ** USB specific **************************************************************************** ****************************************************************************/ +/* USB methods */ +static usb2_callback_t ubt_ctrl_write_callback; +static usb2_callback_t ubt_intr_read_callback; +static usb2_callback_t ubt_bulk_read_callback; +static usb2_callback_t ubt_bulk_write_callback; +static usb2_callback_t ubt_isoc_read_callback; +static usb2_callback_t ubt_isoc_write_callback; + +static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); +static int ubt_isoc_read_one_frame(struct usb2_xfer *, int); + /* - * Load/Unload the driver module + * USB config + * + * The following desribes usb transfers that could be submitted on USB device. + * + * Interface 0 on the USB device must present the following endpoints + * 1) Interrupt endpoint to receive HCI events + * 2) Bulk IN endpoint to receive ACL data + * 3) Bulk OUT endpoint to send ACL data + * + * Interface 1 on the USB device must present the following endpoints + * 1) Isochronous IN endpoint to receive SCO data + * 2) Isochronous OUT endpoint to send SCO data */ -static int -ubt_modevent(module_t mod, int event, void *data) +static const struct usb2_config ubt_config[UBT_N_TRANSFER] = { - int error; + /* + * Interface #0 + */ + + /* Outgoing bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 0, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, + }, + /* Incoming bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, + }, + /* Incoming interrupt transfer - HCI events */ + [UBT_IF_0_INTR_DT_RD] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, + }, + /* Outgoing control transfer - HCI commands */ + [UBT_IF_0_CTRL_DT_WR] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* control pipe */ + .direction = UE_DIR_ANY, + .if_index = 0, + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ + }, + + /* + * Interface #1 + */ + + /* Incoming isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Incoming isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Outgoing isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, + /* Outgoing isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, +}; - switch (event) { - case MOD_LOAD: - error = ng_newtype(&typestruct); - if (error != 0) - printf( -"%s: Could not register Netgraph node type, error=%d\n", - NG_UBT_NODE_TYPE, error); - else - error = usbd_driver_load(mod, event, data); - break; +/* + * If for some reason device should not be attached then put + * VendorID/ProductID pair into the list below. The format is + * as follows: + * + * { USB_VPI(VENDOR_ID, PRODUCT_ID, 0) }, + * + * where VENDOR_ID and PRODUCT_ID are hex numbers. + */ - case MOD_UNLOAD: - error = ng_rmtype(&typestruct); - if (error == 0) - error = usbd_driver_load(mod, event, data); - break; +static const struct usb2_device_id ubt_ignore_devs[] = +{ + /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x2200, 0) }, +}; - default: - error = EOPNOTSUPP; - break; - } +/* List of supported bluetooth devices */ +static const struct usb2_device_id ubt_devs[] = +{ + /* Generic Bluetooth class devices */ + { USB_IFACE_CLASS(UDCLASS_WIRELESS), + USB_IFACE_SUBCLASS(UDSUBCLASS_RF), + USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) }, - return (error); -} /* ubt_modevent */ + /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x3800, 0) }, +}; /* - * Probe for a USB Bluetooth device + * Probe for a USB Bluetooth device. + * USB context. */ static int -ubt_match(device_t self) +ubt_probe(device_t dev) { - /* - * If for some reason device should not be attached then put - * VendorID/ProductID pair into the list below. The format is - * as follows: - * - * { VENDOR_ID, PRODUCT_ID }, - * - * where VENDOR_ID and PRODUCT_ID are hex numbers. - */ + struct usb2_attach_arg *uaa = device_get_ivars(dev); - static struct usb_devno const ubt_ignored_devices[] = { - { USB_VENDOR_AVM, 0x2200 }, /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); - /* - * If device violates Bluetooth specification and has bDeviceClass, - * bDeviceSubClass and bDeviceProtocol set to wrong values then you - * could try to put VendorID/ProductID pair into the list below. - * Adding VendorID/ProductID pair into this list forces ng_ubt(4) - * to attach to the broken device. - */ + if (uaa->info.bIfaceIndex != 0) + return (ENXIO); - static struct usb_devno const ubt_broken_devices[] = { - { USB_VENDOR_AVM, 0x3800 }, /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->use_generic == 0) + return (ENXIO); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device); + if (usb2_lookup_id_by_uaa(ubt_ignore_devs, + sizeof(ubt_ignore_devs), uaa) == 0) + return (ENXIO); - if (uaa->iface == NULL || - usb_lookup(ubt_ignored_devices, uaa->vendor, uaa->product)) - return (UMATCH_NONE); - - if (dd->bDeviceClass == UDCLASS_WIRELESS && - dd->bDeviceSubClass == UDSUBCLASS_RF && - dd->bDeviceProtocol == UDPROTO_BLUETOOTH) - return (UMATCH_DEVCLASS_DEVSUBCLASS); - - if (usb_lookup(ubt_broken_devices, uaa->vendor, uaa->product)) - return (UMATCH_VENDOR_PRODUCT); - - return (UMATCH_NONE); -} /* ubt_match */ + return (usb2_lookup_id_by_uaa(ubt_devs, sizeof(ubt_devs), uaa)); +} /* ubt_probe */ /* - * Attach the device + * Attach the device. + * USB context. */ static int -ubt_attach(device_t self) +ubt_attach(device_t dev) { - struct ubt_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_config_descriptor_t *cd = NULL; - usb_interface_descriptor_t *id = NULL; - usb_endpoint_descriptor_t *ed = NULL; - usbd_status error; - int i, ai, alt_no, isoc_in, isoc_out, - isoc_isize, isoc_osize; + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct ubt_softc *sc = device_get_softc(dev); + struct usb2_endpoint_descriptor *ed; + struct usb2_interface_descriptor *id; + uint16_t wMaxPacketSize; + uint8_t alt_index, i, j; + uint8_t iface_index[2] = { 0, 1 }; + + device_set_usb2_desc(dev); - /* Get USB device info */ - sc->sc_dev = self; - sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_debug = NG_UBT_WARN_LEVEL; /* - * Initialize device softc structure + * Create Netgraph node */ - /* State */ - sc->sc_debug = NG_UBT_WARN_LEVEL; - sc->sc_flags = 0; - NG_UBT_STAT_RESET(sc->sc_stat); + if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) { + UBT_ALERT(sc, "could not create Netgraph node\n"); + return (ENXIO); + } + + /* Name Netgraph node */ + if (ng_name_node(sc->sc_node, device_get_nameunit(dev)) != 0) { + UBT_ALERT(sc, "could not name Netgraph node\n"); + NG_NODE_UNREF(sc->sc_node); + return (ENXIO); + } + NG_NODE_SET_PRIVATE(sc->sc_node, sc); + NG_NODE_FORCE_WRITER(sc->sc_node); - /* Interfaces */ - sc->sc_iface0 = sc->sc_iface1 = NULL; + /* + * Initialize device softc structure + */ - /* Interrupt pipe */ - sc->sc_intr_ep = -1; - sc->sc_intr_pipe = NULL; - sc->sc_intr_xfer = NULL; - sc->sc_intr_buffer = NULL; + /* initialize locks */ + mtx_init(&sc->sc_ng_mtx, "ubt ng", NULL, MTX_DEF); + mtx_init(&sc->sc_if_mtx, "ubt if", NULL, MTX_DEF | MTX_RECURSE); - /* Control pipe */ - sc->sc_ctrl_xfer = NULL; - sc->sc_ctrl_buffer = NULL; + /* initialize packet queues */ NG_BT_MBUFQ_INIT(&sc->sc_cmdq, UBT_DEFAULT_QLEN); - - /* Bulk-in pipe */ - sc->sc_bulk_in_ep = -1; - sc->sc_bulk_in_pipe = NULL; - sc->sc_bulk_in_xfer = NULL; - sc->sc_bulk_in_buffer = NULL; - - /* Bulk-out pipe */ - sc->sc_bulk_out_ep = -1; - sc->sc_bulk_out_pipe = NULL; - sc->sc_bulk_out_xfer = NULL; - sc->sc_bulk_out_buffer = NULL; NG_BT_MBUFQ_INIT(&sc->sc_aclq, UBT_DEFAULT_QLEN); - - /* Isoc-in pipe */ - sc->sc_isoc_in_buffer = NULL; - sc->sc_isoc_in_ep = -1; - sc->sc_isoc_in_pipe = NULL; - bzero(&sc->sc_isoc_in, sizeof(sc->sc_isoc_in)); - - /* Isoc-out pipe */ - sc->sc_isoc_out_ep = -1; - sc->sc_isoc_out_pipe = NULL; - bzero(&sc->sc_isoc_out, sizeof(sc->sc_isoc_out)); - - sc->sc_isoc_size = -1; NG_BT_MBUFQ_INIT(&sc->sc_scoq, UBT_DEFAULT_QLEN); - /* Netgraph part */ - sc->sc_node = NULL; - sc->sc_hook = NULL; + /* initialize glue task */ + TASK_INIT(&sc->sc_task, 0, ubt_task, sc); /* - * XXX set configuration? + * Configure Bluetooth USB device. Discover all required USB + * interfaces and endpoints. * - * Configure Bluetooth USB device. Discover all required USB interfaces - * and endpoints. - * * USB device must present two interfaces: * 1) Interface 0 that has 3 endpoints * 1) Interrupt endpoint to receive HCI events @@ -386,1524 +483,804 @@ * 1) Isochronous IN endpoint to receive SCO data * 2) Isochronous OUT endpoint to send SCO data * - * Interface 1 (with isochronous endpoints) has several alternate + * Interface 1 (with isochronous endpoints) has several alternate * configurations with different packet size. */ /* - * Interface 0 + * For interface #1 search alternate settings, and find + * the descriptor with the largest wMaxPacketSize */ - error = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface0); - if (error || sc->sc_iface0 == NULL) { - printf("%s: Could not get interface 0 handle. %s (%d), " \ - "handle=%p\n", device_get_nameunit(sc->sc_dev), - usbd_errstr(error), error, sc->sc_iface0); - goto bad; - } + wMaxPacketSize = 0; + alt_index = 0; + i = 0; + j = 0; + ed = NULL; - id = usbd_get_interface_descriptor(sc->sc_iface0); - if (id == NULL) { - printf("%s: Could not get interface 0 descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - for (i = 0; i < id->bNumEndpoints; i ++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface0, i); - if (ed == NULL) { - printf("%s: Could not read endpoint descriptor for " \ - "interface 0, i=%d\n", device_get_nameunit(sc->sc_dev), - i); - goto bad; - } - - switch (UE_GET_XFERTYPE(ed->bmAttributes)) { - case UE_BULK: - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN) - sc->sc_bulk_in_ep = ed->bEndpointAddress; - else - sc->sc_bulk_out_ep = ed->bEndpointAddress; - break; - - case UE_INTERRUPT: - sc->sc_intr_ep = ed->bEndpointAddress; - break; - } - } - - /* Check if we got everything we wanted on Interface 0 */ - if (sc->sc_intr_ep == -1) { - printf("%s: Could not detect interrupt endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_bulk_in_ep == -1) { - printf("%s: Could not detect bulk-in endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_bulk_out_ep == -1) { - printf("%s: Could not detect bulk-out endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - printf("%s: Interface 0 endpoints: interrupt=%#x, bulk-in=%#x, " \ - "bulk-out=%#x\n", device_get_nameunit(sc->sc_dev), - sc->sc_intr_ep, sc->sc_bulk_in_ep, sc->sc_bulk_out_ep); - - /* - * Interface 1 + /* + * Search through all the descriptors looking for the largest + * packet size: */ + while ((ed = (struct usb2_endpoint_descriptor *)usb2_desc_foreach( + usb2_get_config_descriptor(uaa->device), + (struct usb2_descriptor *)ed))) { - cd = usbd_get_config_descriptor(sc->sc_udev); - if (cd == NULL) { - printf("%s: Could not get device configuration descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - error = usbd_device2interface_handle(sc->sc_udev, 1, &sc->sc_iface1); - if (error || sc->sc_iface1 == NULL) { - printf("%s: Could not get interface 1 handle. %s (%d), " \ - "handle=%p\n", device_get_nameunit(sc->sc_dev), - usbd_errstr(error), error, sc->sc_iface1); - goto bad; - } - - id = usbd_get_interface_descriptor(sc->sc_iface1); - if (id == NULL) { - printf("%s: Could not get interface 1 descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - /* - * Scan all alternate configurations for interface 1 - */ - - alt_no = -1; - - for (ai = 0; ai < usbd_get_no_alts(cd, 1); ai++) { - error = usbd_set_interface(sc->sc_iface1, ai); - if (error) { - printf("%s: [SCAN] Could not set alternate " \ - "configuration %d for interface 1. %s (%d)\n", - device_get_nameunit(sc->sc_dev), ai, usbd_errstr(error), - error); - goto bad; - } - id = usbd_get_interface_descriptor(sc->sc_iface1); - if (id == NULL) { - printf("%s: Could not get interface 1 descriptor for " \ - "alternate configuration %d\n", - device_get_nameunit(sc->sc_dev), ai); - goto bad; + if ((ed->bDescriptorType == UDESC_INTERFACE) && + (ed->bLength >= sizeof(*id))) { + id = (struct usb2_interface_descriptor *)ed; + i = id->bInterfaceNumber; + j = id->bAlternateSetting; } - isoc_in = isoc_out = -1; - isoc_isize = isoc_osize = 0; + if ((ed->bDescriptorType == UDESC_ENDPOINT) && + (ed->bLength >= sizeof(*ed)) && + (i == 1)) { + uint16_t temp; - for (i = 0; i < id->bNumEndpoints; i ++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface1, i); - if (ed == NULL) { - printf("%s: Could not read endpoint " \ - "descriptor for interface 1, " \ - "alternate configuration %d, i=%d\n", - device_get_nameunit(sc->sc_dev), ai, i); - goto bad; + temp = UGETW(ed->wMaxPacketSize); + if (temp > wMaxPacketSize) { + wMaxPacketSize = temp; + alt_index = j; } - - if (UE_GET_XFERTYPE(ed->bmAttributes) != UE_ISOCHRONOUS) - continue; - - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN) { - isoc_in = ed->bEndpointAddress; - isoc_isize = UGETW(ed->wMaxPacketSize); - } else { - isoc_out = ed->bEndpointAddress; - isoc_osize = UGETW(ed->wMaxPacketSize); - } } - - /* - * Make sure that configuration looks sane and if so - * update current settings - */ - - if (isoc_in != -1 && isoc_out != -1 && - isoc_isize > 0 && isoc_osize > 0 && - isoc_isize == isoc_osize && isoc_isize > sc->sc_isoc_size) { - sc->sc_isoc_in_ep = isoc_in; - sc->sc_isoc_out_ep = isoc_out; - sc->sc_isoc_size = isoc_isize; - alt_no = ai; - } } - /* Check if we got everything we wanted on Interface 0 */ - if (sc->sc_isoc_in_ep == -1) { - printf("%s: Could not detect isoc-in endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_isoc_out_ep == -1) { - printf("%s: Could not detect isoc-out endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; + /* Set alt configuration on interface #1 only if we found it */ + if (wMaxPacketSize > 0 && + usb2_set_alt_interface_index(uaa->device, 1, alt_index)) { + UBT_ALERT(sc, "could not set alternate setting %d " \ + "for interface 1!\n", alt_index); + goto detach; } - if (sc->sc_isoc_size <= 0) { - printf("%s: Invalid isoc. packet size=%d\n", - device_get_nameunit(sc->sc_dev), sc->sc_isoc_size); - goto bad; - } - error = usbd_set_interface(sc->sc_iface1, alt_no); - if (error) { - printf("%s: Could not set alternate configuration " \ - "%d for interface 1. %s (%d)\n", - device_get_nameunit(sc->sc_dev), - alt_no, usbd_errstr(error), error); - goto bad; - } - - /* Allocate USB transfer handles and buffers */ - sc->sc_ctrl_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_ctrl_xfer == NULL) { - printf("%s: Could not allocate control xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - sc->sc_ctrl_buffer = usbd_alloc_buffer(sc->sc_ctrl_xfer, - UBT_CTRL_BUFFER_SIZE); - if (sc->sc_ctrl_buffer == NULL) { - printf("%s: Could not allocate control buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_intr_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_intr_xfer == NULL) { - printf("%s: Could not allocate interrupt xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_bulk_in_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_bulk_in_xfer == NULL) { - printf("%s: Could not allocate bulk-in xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_bulk_out_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_bulk_out_xfer == NULL) { - printf("%s: Could not allocate bulk-out xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - sc->sc_bulk_out_buffer = usbd_alloc_buffer(sc->sc_bulk_out_xfer, - UBT_BULK_BUFFER_SIZE); - if (sc->sc_bulk_out_buffer == NULL) { - printf("%s: Could not allocate bulk-out buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - /* - * Allocate buffers for isoc. transfers - */ - - for (i = 0; i < NG_UBT_NXFERS; i++) { - sc->sc_isoc_in[i].xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_isoc_in[i].xfer == NULL) { - printf("%s: Could not allocate isoc-in xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_isoc_in[i].buffer = usbd_alloc_buffer( - sc->sc_isoc_in[i].xfer, - NG_UBT_NFRAMES * sc->sc_isoc_size); - if (sc->sc_isoc_in[i].buffer == NULL) { - printf("%s: Could not allocate isoc-in buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_isoc_in[i].frlen = malloc( - sizeof(uint16_t) * NG_UBT_NFRAMES, - M_USBDEV, M_NOWAIT); - if (sc->sc_isoc_in[i].frlen == NULL) { - printf("%s: Could not allocate isoc-in frame sizes buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - } - - for (i = 0; i < NG_UBT_NXFERS; i++) { - sc->sc_isoc_out[i].xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_isoc_out[i].xfer == NULL) { - printf("%s: Could not allocate isoc-out xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_isoc_out[i].buffer = usbd_alloc_buffer( - sc->sc_isoc_out[i].xfer, - NG_UBT_NFRAMES * sc->sc_isoc_size); - if (sc->sc_isoc_out[i].buffer == NULL) { - printf("%s: Could not allocate isoc-out buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - sc->sc_isoc_out[i].frlen = malloc( >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 17:11:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23A711065692; Thu, 28 May 2009 17:11:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEEBC1065687 for ; Thu, 28 May 2009 17:11:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAD178FC1C for ; Thu, 28 May 2009 17:11:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHB85O072124 for ; Thu, 28 May 2009 17:11:08 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHB7bG072122 for perforce@freebsd.org; Thu, 28 May 2009 17:11:07 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 17:11:07 GMT Message-Id: <200905281711.n4SHB7bG072122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162949 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, 28 May 2009 17:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=162949 Change 162949 by zec@zec_amdx4 on 2009/05/28 17:10:41 IFC @ 162935 ...just out of curiosity why vc2 build breaks in zfs... Affected files ... .. //depot/projects/vimage-commit/src/sys/arm/at91/ohci_atmelarm.c#4 delete .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_mib.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#19 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#27 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#14 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock_hash.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/random/nehemiah.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_subr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/vimage-commit/src/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_main.c#13 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#16 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/linker_if.m#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_debug.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/vimage-commit/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/vimage-commit/src/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#18 integrate .. //depot/projects/vimage-commit/src/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/linux/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#10 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#16 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_monitor.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/TODO#4 delete .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_mcast.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netipx/spx.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/vimage-commit/src/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netipx/spx_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/pmap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/rpc/xdr.h#4 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/cpuset.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/eventhandler.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/fail.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/jail.h#10 integrate .. //depot/projects/vimage-commit/src/sys/sys/ksyms.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/lock.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/lockf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/lockstat.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/mutex.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/namei.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#23 integrate .. //depot/projects/vimage-commit/src/sys/sys/queue.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/rwlock.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/sx.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/systm.h#9 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#28 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_object.c#8 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/vimage-commit/src/sys/xdr/xdr_mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_xs.c#7 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $ ident AVILA @@ -132,15 +132,14 @@ options AH_SUPPORT_AR5416 device ath_ar9160 -makeoptions WITH_LEGACY -device ousb +device usb #options USB_DEBUG -device oohci -device oehci -device oumass +device ohci +device ehci +device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) -#device oural -#device ozyd +#device ural +#device zyd #device wlan_amrr ==== //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -47,4 +47,3 @@ arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # dev/usb/controller/ehci_ixp4xx.c optional ehci usb -legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb ==== //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#4 (text+ko) ==== @@ -44,9 +44,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $"); #include +#include #include #ifdef UFS_SMALL_CGBASE /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase @@ -93,7 +94,7 @@ fsfind(const char *name, ino_t * ino) { char buf[DEV_BSIZE]; - struct dirent *d; + struct direct *d; char *s; ssize_t n; @@ -104,7 +105,7 @@ if (ls) printf("%s ", d->d_name); else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; + *ino = d->d_ino; return d->d_type; } s += d->d_reclen; ==== //depot/projects/vimage-commit/src/sys/boot/pc98/boot2/sys.c#3 (text+ko) ==== @@ -27,14 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $"); /* * Ported to PC-9801 by Yoshio Kimura */ #include "boot.h" -#include +#include #if 0 /* #define BUFSIZE 4096 */ @@ -142,7 +142,7 @@ { char *rest, ch; int block, off, loc, ino = ROOTINO; - struct dirent *dp; + struct direct *dp; char list_only; list_only = (path[0] == '?' && path[1] == '\0'); @@ -174,12 +174,12 @@ devread(iobuf, fsbtodb(fs, block_map(block)) + boff, blksize(fs, &inode, block)); } - dp = (struct dirent *)(iobuf + off); + dp = (struct direct *)(iobuf + off); loc += dp->d_reclen; - if (dp->d_fileno && list_only) + if (dp->d_ino && list_only) printf("%s ", dp->d_name); - } while (!dp->d_fileno || strcmp(path, dp->d_name)); - ino = dp->d_fileno; + } while (!dp->d_ino || strcmp(path, dp->d_name)); + ino = dp->d_ino; *(path = rest) = ch; goto loop; } ==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $"); #include #include @@ -302,6 +302,14 @@ if (error) return (error); } + /* + * Deny setting setuid if we are not the file owner. + */ + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } return (0); } ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#5 (text+ko) ==== @@ -424,7 +424,7 @@ #endif } -#ifndef __FreeBSD__ +#if !defined(_KERNEL) acl_t * acl_alloc(enum acl_type type) { @@ -470,7 +470,6 @@ cacl_free(aclp, sizeof (acl_t)); } -#endif static uint32_t access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) @@ -1727,3 +1726,4 @@ return (error); #endif } +#endif /* _KERNEL */ ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#4 (text+ko) ==== @@ -46,6 +46,7 @@ extern int ace_trivial_common(void *, int, uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *, uint32_t *mask)); +#if !defined(_KERNEL) extern acl_t *acl_alloc(acl_type_t); extern void acl_free(acl_t *aclp); extern int acl_translate(acl_t *aclp, int target_flavor, @@ -53,6 +54,7 @@ void ksort(caddr_t v, int n, int s, int (*f)()); int cmp2acls(void *a, void *b); +#endif /* _KERNEL */ #ifdef __cplusplus } ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $ */ /* @@ -122,6 +122,7 @@ #include #include #include +#include #include #include #include @@ -3168,14 +3169,11 @@ uintptr_t rw; } r; #else + struct thread *lowner; union { - struct mtx *mi; - uintptr_t mx; - } m; - union { - struct sx *si; - uintptr_t sx; - } s; + struct lock_object *li; + uintptr_t lx; + } l; #endif switch (subr) { @@ -3272,75 +3270,83 @@ break; #else - /* - * XXX - The following code works because mutex, rwlocks, & sxlocks - * all have similar data structures in FreeBSD. This may not be - * good if someone changes one of the lock data structures. - * Ideally, it would be nice if all these shared a common lock - * object. - */ case DIF_SUBR_MUTEX_OWNED: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - -#ifdef DOODAD - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); - } else { - regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } -#endif + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); break; case DIF_SUBR_MUTEX_OWNER: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK; - } else { - if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) - regs[rd] = SX_OWNER(m.mi->mtx_lock); - else - regs[rd] = 0; + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (uintptr_t)lowner; break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + /* XXX - should be only LC_SLEEPABLE? */ + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & + (LC_SLEEPLOCK | LC_SLEEPABLE)) != 0; break; case DIF_SUBR_MUTEX_TYPE_SPIN: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - regs[rd] = (LO_CLASSINDEX(&(m.mi->lock_object)) == 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (struct mtx), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = (LOCK_CLASS(l.li)->lc_flags & LC_SPINLOCK) != 0; break; case DIF_SUBR_RW_READ_HELD: case DIF_SUBR_SX_SHARED_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_SHARED) && - (SX_OWNER(s.si->sx_lock) >> SX_SHARERS_SHIFT) != 0); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner == NULL; break; case DIF_SUBR_RW_WRITE_HELD: case DIF_SUBR_SX_EXCLUSIVE_HELD: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = (SX_OWNER(s.si->sx_lock) == (uintptr_t) curthread); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); + regs[rd] = (lowner == curthread); break; case DIF_SUBR_RW_ISWRITER: case DIF_SUBR_SX_ISEXCLUSIVE: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - s.sx = tupregs[0].dttk_value; - regs[rd] = ((s.si->sx_lock & SX_LOCK_EXCLUSIVE_WAITERS) || - !(s.si->sx_lock & SX_LOCK_SHARED)); + if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), + mstate, vstate)) { + regs[rd] = 0; + break; + } + l.lx = dtrace_loadptr(tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner) && + lowner != NULL; break; #endif /* ! defined(sun) */ ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#4 (text+ko) ==== @@ -188,10 +188,8 @@ #ifdef _KERNEL void zfs_perm_init(struct znode *, struct znode *, int, vattr_t *, dmu_tx_t *, cred_t *, zfs_acl_t *, zfs_fuid_info_t **); -#ifdef TODO int zfs_getacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); int zfs_setacl(struct znode *, vsecattr_t *, boolean_t, cred_t *); -#endif void zfs_acl_rele(void *); void zfs_oldace_byteswap(ace_t *, int); void zfs_ace_byteswap(void *, size_t, boolean_t); ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 (text+ko) ==== @@ -1909,7 +1909,6 @@ zfs_acl_free(aclp); } -#ifdef TODO /* * Retrieve a files ACL */ @@ -2005,7 +2004,6 @@ return (0); } -#endif /* TODO */ int zfs_vsec_2_aclp(zfsvfs_t *zfsvfs, vtype_t obj_type, @@ -2062,7 +2060,6 @@ return (0); } -#ifdef TODO /* * Set a files ACL */ @@ -2170,7 +2167,6 @@ return (error); } -#endif /* TODO */ /* * working_mode returns the permissions that were not granted ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include #include #include +#include /* * Programming rules. @@ -3846,7 +3846,6 @@ } } -#ifdef TODO /*ARGSUSED*/ static int zfs_getsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3864,9 +3863,7 @@ return (error); } -#endif /* TODO */ -#ifdef TODO /*ARGSUSED*/ static int zfs_setsecattr(vnode_t *vp, vsecattr_t *vsecp, int flag, cred_t *cr, @@ -3883,7 +3880,6 @@ ZFS_EXIT(zfsvfs); return (error); } -#endif /* TODO */ static int zfs_freebsd_open(ap) @@ -3963,7 +3959,7 @@ zfs_freebsd_access(ap) struct vop_access_args /* { struct vnode *a_vp; - int a_accmode; + accmode_t a_accmode; struct ucred *a_cred; struct thread *a_td; } */ *ap; @@ -4777,6 +4773,90 @@ return (error); } +int +zfs_freebsd_getacl(ap) + struct vop_getacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + vsecattr.vsa_mask = VSA_ACE | VSA_ACECNT; + if (error = zfs_getsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL)) + return (error); + + error = acl_from_aces(ap->a_aclp, vsecattr.vsa_aclentp, vsecattr.vsa_aclcnt); + if (vsecattr.vsa_aclentp != NULL) + kmem_free(vsecattr.vsa_aclentp, vsecattr.vsa_aclentsz); + + return (error); +} + +int +zfs_freebsd_setacl(ap) + struct vop_setacl_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + int error; + vsecattr_t vsecattr; + int aclbsize; /* size of acl list in bytes */ + aclent_t *aaclp; + + if (ap->a_type != ACL_TYPE_NFS4) + return (EOPNOTSUPP); + + if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) + return (EINVAL); + + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries, + * splitting every entry into two and appending "canonical six" + * entries at the end. Don't allow for setting an ACL that would + * cause chmod(2) to run out of ACL entries. + */ + if (ap->a_aclp->acl_cnt * 2 + 6 > ACL_MAX_ENTRIES) + return (ENOSPC); + + vsecattr.vsa_mask = VSA_ACE; + aclbsize = ap->a_aclp->acl_cnt * sizeof(ace_t); + vsecattr.vsa_aclentp = kmem_alloc(aclbsize, KM_SLEEP); + aaclp = vsecattr.vsa_aclentp; + vsecattr.vsa_aclentsz = aclbsize; + + aces_from_acl(vsecattr.vsa_aclentp, &vsecattr.vsa_aclcnt, ap->a_aclp); + error = zfs_setsecattr(ap->a_vp, &vsecattr, 0, ap->a_cred, NULL); + kmem_free(aaclp, aclbsize); + + return (error); +} + +int +zfs_freebsd_aclcheck(ap) + struct vop_aclcheck_args /* { + struct vnode *vp; + acl_type_t type; + struct acl *aclp; + struct ucred *cred; + struct thread *td; + } */ *ap; +{ + + return (EOPNOTSUPP); +} + struct vop_vector zfs_vnodeops; struct vop_vector zfs_fifoops; @@ -4816,6 +4896,11 @@ .vop_deleteextattr = zfs_deleteextattr, .vop_setextattr = zfs_setextattr, .vop_listextattr = zfs_listextattr, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; struct vop_vector zfs_fifoops = { @@ -4829,4 +4914,9 @@ .vop_setattr = zfs_freebsd_setattr, .vop_write = VOP_PANIC, .vop_fid = zfs_freebsd_fid, +#ifdef notyet + .vop_getacl = zfs_freebsd_getacl, + .vop_setacl = zfs_freebsd_setacl, + .vop_aclcheck = zfs_freebsd_aclcheck, +#endif }; ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#4 (text+ko) ==== @@ -121,6 +121,7 @@ * Changes must be reviewed by Solaris File Sharing * Changes must be communicated to contract-2003-523@sun.com */ +#ifndef __FreeBSD__ struct xdr_ops { #ifdef __STDC__ #if !defined(_KERNEL) @@ -168,6 +169,28 @@ #endif }; +#else /* FreeBSD */ +struct xdr_ops { + /* get a long from underlying stream */ + bool_t (*x_getint32)(struct XDR *, int32_t *); + /* put a long to " */ + bool_t (*x_putint32)(struct XDR *, const int32_t *); + /* get some bytes from " */ + bool_t (*x_getbytes)(struct XDR *, char *, u_int); + /* put some bytes to " */ + bool_t (*x_putbytes)(struct XDR *, const char *, u_int); + /* returns bytes off from beginning */ + u_int (*x_getpostn)(struct XDR *); + /* lets you reposition the stream */ + bool_t (*x_setpostn)(struct XDR *, u_int); + /* buf quick ptr to buffered data */ + int32_t *(*x_inline)(struct XDR *, u_int); + /* free privates of this xdr_stream */ + void (*x_destroy)(struct XDR *); + bool_t (*x_control)(struct XDR *, int, void *); +}; +#endif + /* * Operations defined on a XDR handle * ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 (text+ko) ==== @@ -31,12 +31,22 @@ #include #include +#if defined(_KERNEL) +/* + * When compiling OpenSolaris kernel code, this file is getting + * included instead of FreeBSD one. Pull the original sys/acl.h as well. + */ +#undef _SYS_ACL_H +#include_next +#define _SYS_ACL_H +#endif /* _KERNEL */ + #ifdef __cplusplus extern "C" { #endif #define MAX_ACL_ENTRIES (1024) /* max entries of each type */ -typedef struct acl { +typedef struct { int a_type; /* the type of ACL entry */ uid_t a_id; /* the entry in -uid or gid */ o_mode_t a_perm; /* the permission field */ @@ -49,7 +59,9 @@ uint16_t a_type; /* allow or deny */ } ace_t; +#if !defined(_KERNEL) typedef struct acl_info acl_t; +#endif /* * The following are Defined types for an aclent_t. ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 (text+ko) ==== @@ -44,10 +44,10 @@ typedef enum acl_type { ACLENT_T = 0, ACE_T = 1 -} acl_type_t; +} zfs_acl_type_t; struct acl_info { - acl_type_t acl_type; /* style of acl */ + zfs_acl_type_t acl_type; /* style of acl */ int acl_cnt; /* number of acl entries */ int acl_entry_size; /* sizeof acl entry */ int acl_flags; /* special flags about acl */ ==== //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.89 2009/04/29 21:14:15 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.90 2009/05/27 14:11:23 jamie Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -112,8 +112,6 @@ CTASSERT(sizeof(struct stat32) == 96); CTASSERT(sizeof(struct sigaction32) == 24); -extern int jail_max_af_ips; - static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count); static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count); @@ -2044,17 +2042,9 @@ int freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap) { - struct iovec optiov[10]; - struct uio opt; - char *u_path, *u_hostname, *u_name; -#ifdef INET - struct in_addr *u_ip4; -#endif -#ifdef INET6 - struct in6_addr *u_ip6; -#endif uint32_t version; int error; + struct jail j; error = copyin(uap->jail, &version, sizeof(uint32_t)); if (error) @@ -2066,45 +2056,14 @@ /* FreeBSD single IPv4 jails. */ struct jail32_v0 j32_v0; + bzero(&j, sizeof(struct jail)); error = copyin(uap->jail, &j32_v0, sizeof(struct jail32_v0)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 17:13:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51B9810656AA; Thu, 28 May 2009 17:13:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AD0410656A6 for ; Thu, 28 May 2009 17:13:11 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC2018FC16 for ; Thu, 28 May 2009 17:13:10 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHDAOj072245 for ; Thu, 28 May 2009 17:13:10 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHDAg8072243 for perforce@freebsd.org; Thu, 28 May 2009 17:13:10 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 17:13:10 GMT Message-Id: <200905281713.n4SHDAg8072243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162950 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, 28 May 2009 17:13:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162950 Change 162950 by zec@zec_amdx4 on 2009/05/28 17:13:07 Fix mysterious misintergations. Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#5 edit .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2001-2002 Maksim Yevmenkin + * Copyright (c) 2001-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,123 +27,102 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_ubt_var.h,v 1.5 2005/10/31 17:57:44 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.8 2008/07/11 17:13:43 emax Exp $ + * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.10 2009/05/27 16:34:08 thompsa Exp $ */ #ifndef _NG_UBT_VAR_H_ -#define _NG_UBT_VAR_H_ +#define _NG_UBT_VAR_H_ 1 + +/* Debug printf's */ +#define UBT_DEBUG(level, sc, fmt, ...) \ +do { \ + if ((sc)->sc_debug >= (level)) \ + device_printf((sc)->sc_dev, "%s:%d: " fmt, \ + __FUNCTION__, __LINE__,## __VA_ARGS__); \ +} while (0) -/* pullup wrapper */ -#define NG_UBT_M_PULLUP(m, s) \ - do { \ - if ((m)->m_len < (s)) \ - (m) = m_pullup((m), (s)); \ - if ((m) == NULL) \ - NG_UBT_ALERT("%s: %s - m_pullup(%d) failed\n", \ - __func__, device_get_nameunit(sc->sc_dev), (s)); \ - } while (0) +#define UBT_ALERT(...) UBT_DEBUG(NG_UBT_ALERT_LEVEL, __VA_ARGS__) +#define UBT_ERR(...) UBT_DEBUG(NG_UBT_ERR_LEVEL, __VA_ARGS__) +#define UBT_WARN(...) UBT_DEBUG(NG_UBT_WARN_LEVEL, __VA_ARGS__) +#define UBT_INFO(...) UBT_DEBUG(NG_UBT_INFO_LEVEL, __VA_ARGS__) -/* Debug printf's */ -#define NG_UBT_ALERT if (sc->sc_debug >= NG_UBT_ALERT_LEVEL) printf -#define NG_UBT_ERR if (sc->sc_debug >= NG_UBT_ERR_LEVEL) printf -#define NG_UBT_WARN if (sc->sc_debug >= NG_UBT_WARN_LEVEL) printf -#define NG_UBT_INFO if (sc->sc_debug >= NG_UBT_INFO_LEVEL) printf +#define UBT_NG_LOCK(sc) mtx_lock(&(sc)->sc_ng_mtx) +#define UBT_NG_UNLOCK(sc) mtx_unlock(&(sc)->sc_ng_mtx) /* Bluetooth USB control request type */ -#define UBT_HCI_REQUEST 0x20 -#define UBT_DEFAULT_QLEN 12 +#define UBT_HCI_REQUEST 0x20 +#define UBT_DEFAULT_QLEN 64 +#define UBT_ISOC_NFRAMES 32 /* should be factor of 8 */ -/* Isoc transfers */ -#define NG_UBT_NXFERS 3 /* max xfers to queue */ -#define NG_UBT_NFRAMES 10 /* frames per xfer */ +/* Bluetooth USB defines */ +enum { + /* Interface #0 transfers */ + UBT_IF_0_BULK_DT_WR = 0, + UBT_IF_0_BULK_DT_RD, + UBT_IF_0_INTR_DT_RD, + UBT_IF_0_CTRL_DT_WR, + + /* Interface #1 transfers */ + UBT_IF_1_ISOC_DT_RD1, + UBT_IF_1_ISOC_DT_RD2, + UBT_IF_1_ISOC_DT_WR1, + UBT_IF_1_ISOC_DT_WR2, -struct ubt_isoc_xfer { - usbd_xfer_handle xfer; /* isoc xfer */ - void *buffer; /* isoc buffer */ - uint16_t *frlen; /* isoc frame length */ - int active; /* is xfer active */ + UBT_N_TRANSFER, /* total number of transfers */ }; -typedef struct ubt_isoc_xfer ubt_isoc_xfer_t; -typedef struct ubt_isoc_xfer * ubt_isoc_xfer_p; /* USB device softc structure */ struct ubt_softc { + device_t sc_dev; /* for debug printf */ + /* State */ - ng_ubt_node_debug_ep sc_debug; /* debug level */ - uint32_t sc_flags; /* device flags */ -#define UBT_NEED_FRAME_TYPE (1 << 0) /* device required frame type */ -#define UBT_HAVE_FRAME_TYPE UBT_NEED_FRAME_TYPE -#define UBT_CMD_XMIT (1 << 1) /* CMD xmit in progress */ -#define UBT_ACL_XMIT (1 << 2) /* ACL xmit in progress */ -#define UBT_SCO_XMIT (1 << 3) /* SCO xmit in progress */ -#define UBT_EVT_RECV (1 << 4) /* EVN recv in progress */ -#define UBT_ACL_RECV (1 << 5) /* ACL recv in progress */ -#define UBT_SCO_RECV (1 << 6) /* SCO recv in progress */ + ng_ubt_node_debug_ep sc_debug; /* debug level */ - ng_ubt_node_stat_ep sc_stat; /* statistic */ -#define NG_UBT_STAT_PCKTS_SENT(s) (s).pckts_sent ++ -#define NG_UBT_STAT_BYTES_SENT(s, n) (s).bytes_sent += (n) -#define NG_UBT_STAT_PCKTS_RECV(s) (s).pckts_recv ++ -#define NG_UBT_STAT_BYTES_RECV(s, n) (s).bytes_recv += (n) -#define NG_UBT_STAT_OERROR(s) (s).oerrors ++ -#define NG_UBT_STAT_IERROR(s) (s).ierrors ++ -#define NG_UBT_STAT_RESET(s) bzero(&(s), sizeof((s))) + ng_ubt_node_stat_ep sc_stat; /* statistic */ +#define UBT_STAT_PCKTS_SENT(sc) (sc)->sc_stat.pckts_sent ++ +#define UBT_STAT_BYTES_SENT(sc, n) (sc)->sc_stat.bytes_sent += (n) +#define UBT_STAT_PCKTS_RECV(sc) (sc)->sc_stat.pckts_recv ++ +#define UBT_STAT_BYTES_RECV(sc, n) (sc)->sc_stat.bytes_recv += (n) +#define UBT_STAT_OERROR(sc) (sc)->sc_stat.oerrors ++ +#define UBT_STAT_IERROR(sc) (sc)->sc_stat.ierrors ++ +#define UBT_STAT_RESET(sc) bzero(&(sc)->sc_stat, sizeof((sc)->sc_stat)) /* USB device specific */ - device_t sc_dev; /* pointer back to USB device */ - usbd_device_handle sc_udev; /* USB device handle */ + struct mtx sc_if_mtx; /* interfaces lock */ + struct usb2_xfer *sc_xfer[UBT_N_TRANSFER]; - usbd_interface_handle sc_iface0; /* USB interface 0 */ - usbd_interface_handle sc_iface1; /* USB interface 1 */ + struct mtx sc_ng_mtx; /* lock for shared NG data */ - /* Interrupt pipe (HCI events) */ - int sc_intr_ep; /* interrupt endpoint */ - usbd_pipe_handle sc_intr_pipe; /* interrupt pipe handle */ - usbd_xfer_handle sc_intr_xfer; /* intr xfer */ - struct mbuf *sc_intr_buffer; /* interrupt buffer */ + /* HCI commands */ + struct ng_bt_mbufq sc_cmdq; /* HCI command queue */ +#define UBT_CTRL_BUFFER_SIZE (sizeof(struct usb2_device_request) + \ + sizeof(ng_hci_cmd_pkt_t) + NG_HCI_CMD_PKT_SIZE) +#define UBT_INTR_BUFFER_SIZE (MCLBYTES-1) /* reserve 1 byte for ID-tag */ - /* Control pipe (HCI commands) */ - usbd_xfer_handle sc_ctrl_xfer; /* control xfer handle */ - void *sc_ctrl_buffer; /* control buffer */ - struct ng_bt_mbufq sc_cmdq; /* HCI command queue */ -#define UBT_CTRL_BUFFER_SIZE \ - (sizeof(ng_hci_cmd_pkt_t) + NG_HCI_CMD_PKT_SIZE) + /* ACL data */ + struct ng_bt_mbufq sc_aclq; /* ACL data queue */ +#define UBT_BULK_READ_BUFFER_SIZE (MCLBYTES-1) /* reserve 1 byte for ID-tag */ +#define UBT_BULK_WRITE_BUFFER_SIZE (MCLBYTES) - /* Bulk in pipe (ACL data) */ - int sc_bulk_in_ep; /* bulk-in enpoint */ - usbd_pipe_handle sc_bulk_in_pipe; /* bulk-in pipe */ - usbd_xfer_handle sc_bulk_in_xfer; /* bulk-in xfer */ - struct mbuf *sc_bulk_in_buffer; /* bulk-in buffer */ + /* SCO data */ + struct ng_bt_mbufq sc_scoq; /* SCO data queue */ + struct mbuf *sc_isoc_in_buffer; /* SCO reassembly buffer */ - /* Bulk out pipe (ACL data) */ - int sc_bulk_out_ep; /* bulk-out endpoint */ - usbd_pipe_handle sc_bulk_out_pipe; /* bulk-out pipe */ - usbd_xfer_handle sc_bulk_out_xfer; /* bulk-out xfer */ - void *sc_bulk_out_buffer; /* bulk-out buffer */ - struct ng_bt_mbufq sc_aclq; /* ACL data queue */ -#define UBT_BULK_BUFFER_SIZE \ - MCLBYTES /* XXX should be big enough to hold one frame */ + /* Netgraph specific */ + node_p sc_node; /* pointer back to node */ + hook_p sc_hook; /* upstream hook */ - /* Isoc. in pipe (SCO data) */ - struct mbuf *sc_isoc_in_buffer; - int sc_isoc_in_ep; /* isoc-in endpoint */ - usbd_pipe_handle sc_isoc_in_pipe; /* isoc-in pipe */ - ubt_isoc_xfer_t sc_isoc_in[NG_UBT_NXFERS]; /* isoc-in xfers */ + /* Glue */ + int sc_task_flags; /* task flags */ +#define UBT_FLAG_T_PENDING (1 << 0) /* task pending */ +#define UBT_FLAG_T_STOP_ALL (1 << 1) /* stop all xfers */ +#define UBT_FLAG_T_START_ALL (1 << 2) /* start all read and isoc + write xfers */ +#define UBT_FLAG_T_START_CTRL (1 << 3) /* start control xfer (write) */ +#define UBT_FLAG_T_START_BULK (1 << 4) /* start bulk xfer (write) */ - /* Isoc. out pipe (SCO data) */ - int sc_isoc_out_ep; /* isoc-out endpoint */ - usbd_pipe_handle sc_isoc_out_pipe; /* isoc-out pipe */ - ubt_isoc_xfer_t sc_isoc_out[NG_UBT_NXFERS]; /* isoc-out xfers */ - struct ng_bt_mbufq sc_scoq; /* SCO data queue */ - - int sc_isoc_size; /* max. size of isoc. packet */ -#define UBT_ISOC_BUFFER_SIZE \ - (sizeof(ng_hci_scodata_pkt_t) + NG_HCI_SCO_PKT_SIZE) - - /* Netgraph specific */ - node_p sc_node; /* pointer back to node */ - hook_p sc_hook; /* upstream hook */ + struct task sc_task; }; typedef struct ubt_softc ubt_softc_t; typedef struct ubt_softc * ubt_softc_p; ==== //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2003 Maksim Yevmenkin + * Copyright (c) 2003-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,489 +28,394 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.20 2009/04/17 22:13:41 ed Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.22 2009/05/27 16:32:05 thompsa Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "usbdevs.h" +#include +#include +#include +#include -#include -#include -#include +#define USB_DEBUG_VAR usb2_debug -#include "usbdevs.h" +#include +#include +#include +#include +#include +#include +#include +#include /* * Download firmware to BCM2033. */ -#define UBTBCMFW_CONFIG_NO 1 /* Config number */ -#define UBTBCMFW_IFACE_IDX 0 /* Control interface */ -#define UBTBCMFW_INTR_IN_EP 0x81 /* Fixed endpoint */ -#define UBTBCMFW_BULK_OUT_EP 0x02 /* Fixed endpoint */ -#define UBTBCMFW_INTR_IN UE_GET_ADDR(UBTBCMFW_INTR_IN_EP) -#define UBTBCMFW_BULK_OUT UE_GET_ADDR(UBTBCMFW_BULK_OUT_EP) +#define UBTBCMFW_CONFIG_NO 1 /* Config number */ +#define UBTBCMFW_IFACE_IDX 0 /* Control interface */ + +#define UBTBCMFW_BSIZE 1024 +#define UBTBCMFW_IFQ_MAXLEN 2 + +enum { + UBTBCMFW_BULK_DT_WR = 0, + UBTBCMFW_INTR_DT_RD, + UBTBCMFW_N_TRANSFER, +}; struct ubtbcmfw_softc { - device_t sc_dev; /* base device */ - usbd_device_handle sc_udev; /* USB device handle */ - struct cdev *sc_ctrl_dev; /* control device */ - struct cdev *sc_intr_in_dev; /* interrupt device */ - struct cdev *sc_bulk_out_dev; /* bulk device */ - usbd_pipe_handle sc_intr_in_pipe; /* interrupt pipe */ - usbd_pipe_handle sc_bulk_out_pipe; /* bulk out pipe */ - int sc_flags; -#define UBTBCMFW_CTRL_DEV (1 << 0) -#define UBTBCMFW_INTR_IN_DEV (1 << 1) -#define UBTBCMFW_BULK_OUT_DEV (1 << 2) - int sc_refcnt; - int sc_dying; + struct usb2_device *sc_udev; + struct mtx sc_mtx; + struct usb2_xfer *sc_xfer[UBTBCMFW_N_TRANSFER]; + struct usb2_fifo_sc sc_fifo; }; -typedef struct ubtbcmfw_softc *ubtbcmfw_softc_p; +/* + * Prototypes + */ + +static device_probe_t ubtbcmfw_probe; +static device_attach_t ubtbcmfw_attach; +static device_detach_t ubtbcmfw_detach; + +static usb2_callback_t ubtbcmfw_write_callback; +static usb2_callback_t ubtbcmfw_read_callback; + +static usb2_fifo_close_t ubtbcmfw_close; +static usb2_fifo_cmd_t ubtbcmfw_start_read; +static usb2_fifo_cmd_t ubtbcmfw_start_write; +static usb2_fifo_cmd_t ubtbcmfw_stop_read; +static usb2_fifo_cmd_t ubtbcmfw_stop_write; +static usb2_fifo_ioctl_t ubtbcmfw_ioctl; +static usb2_fifo_open_t ubtbcmfw_open; + +static struct usb2_fifo_methods ubtbcmfw_fifo_methods = +{ + .f_close = &ubtbcmfw_close, + .f_ioctl = &ubtbcmfw_ioctl, + .f_open = &ubtbcmfw_open, + .f_start_read = &ubtbcmfw_start_read, + .f_start_write = &ubtbcmfw_start_write, + .f_stop_read = &ubtbcmfw_stop_read, + .f_stop_write = &ubtbcmfw_stop_write, + .basename[0] = "ubtbcmfw", + .basename[1] = "ubtbcmfw", + .basename[2] = "ubtbcmfw", + .postfix[0] = "", + .postfix[1] = ".1", + .postfix[2] = ".2", +}; /* - * Device methods + * Device's config structure */ -#define UBTBCMFW_BSIZE 1024 +static const struct usb2_config ubtbcmfw_config[UBTBCMFW_N_TRANSFER] = +{ + [UBTBCMFW_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = 0x02, /* fixed */ + .direction = UE_DIR_OUT, + .if_index = UBTBCMFW_IFACE_IDX, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, + .proxy_buffer = 1, }, + .callback = &ubtbcmfw_write_callback, + }, -static d_open_t ubtbcmfw_open; -static d_close_t ubtbcmfw_close; -static d_read_t ubtbcmfw_read; -static d_write_t ubtbcmfw_write; -static d_ioctl_t ubtbcmfw_ioctl; -static d_poll_t ubtbcmfw_poll; - -static struct cdevsw ubtbcmfw_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = ubtbcmfw_open, - .d_close = ubtbcmfw_close, - .d_read = ubtbcmfw_read, - .d_write = ubtbcmfw_write, - .d_ioctl = ubtbcmfw_ioctl, - .d_poll = ubtbcmfw_poll, - .d_name = "ubtbcmfw", + [UBTBCMFW_INTR_DT_RD] = { + .type = UE_INTERRUPT, + .endpoint = 0x01, /* fixed */ + .direction = UE_DIR_IN, + .if_index = UBTBCMFW_IFACE_IDX, + .bufsize = UBTBCMFW_BSIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, + .proxy_buffer = 1, }, + .callback = &ubtbcmfw_read_callback, + }, }; /* * Module */ -static device_probe_t ubtbcmfw_match; -static device_attach_t ubtbcmfw_attach; -static device_detach_t ubtbcmfw_detach; +static devclass_t ubtbcmfw_devclass; -static device_method_t ubtbcmfw_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ubtbcmfw_match), - DEVMETHOD(device_attach, ubtbcmfw_attach), - DEVMETHOD(device_detach, ubtbcmfw_detach), - - { 0, 0 } +static device_method_t ubtbcmfw_methods[] = +{ + DEVMETHOD(device_probe, ubtbcmfw_probe), + DEVMETHOD(device_attach, ubtbcmfw_attach), + DEVMETHOD(device_detach, ubtbcmfw_detach), + {0, 0} }; -static driver_t ubtbcmfw_driver = { - "ubtbcmfw", - ubtbcmfw_methods, - sizeof(struct ubtbcmfw_softc) +static driver_t ubtbcmfw_driver = +{ + .name = "ubtbcmfw", + .methods = ubtbcmfw_methods, + .size = sizeof(struct ubtbcmfw_softc), }; -static devclass_t ubtbcmfw_devclass; - +DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0); MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1); -DRIVER_MODULE(ubtbcmfw, uhub, ubtbcmfw_driver, ubtbcmfw_devclass, - usbd_driver_load, 0); /* * Probe for a USB Bluetooth device */ static int -ubtbcmfw_match(device_t self) +ubtbcmfw_probe(device_t dev) { -#define USB_PRODUCT_BROADCOM_BCM2033NF 0x2033 - struct usb_attach_arg *uaa = device_get_ivars(self); + const struct usb2_device_id devs[] = { + /* Broadcom BCM2033 devices only */ + { USB_VPI(USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033, 0) }, + }; + + struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->iface != NULL) - return (UMATCH_NONE); + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); - /* Match the boot device. */ - if (uaa->vendor == USB_VENDOR_BROADCOM && - uaa->product == USB_PRODUCT_BROADCOM_BCM2033NF) - return (UMATCH_VENDOR_PRODUCT); + if (uaa->info.bIfaceIndex != 0) + return (ENXIO); - return (UMATCH_NONE); -} + return (usb2_lookup_id_by_uaa(devs, sizeof(devs), uaa)); +} /* ubtbcmfw_probe */ /* * Attach the device */ static int -ubtbcmfw_attach(device_t self) +ubtbcmfw_attach(device_t dev) { - struct ubtbcmfw_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usbd_interface_handle iface; - usbd_status err; + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct ubtbcmfw_softc *sc = device_get_softc(dev); + uint8_t iface_index; + int error; - sc->sc_dev = self; sc->sc_udev = uaa->device; - sc->sc_ctrl_dev = sc->sc_intr_in_dev = sc->sc_bulk_out_dev = NULL; - sc->sc_intr_in_pipe = sc->sc_bulk_out_pipe = NULL; - sc->sc_flags = sc->sc_refcnt = sc->sc_dying = 0; + device_set_usb2_desc(dev); - err = usbd_set_config_no(sc->sc_udev, UBTBCMFW_CONFIG_NO, 1); - if (err) { - printf("%s: setting config no failed. %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(err)); - goto bad; - } + mtx_init(&sc->sc_mtx, "ubtbcmfw lock", NULL, MTX_DEF | MTX_RECURSE); - err = usbd_device2interface_handle(sc->sc_udev, UBTBCMFW_IFACE_IDX, - &iface); - if (err) { - printf("%s: getting interface handle failed. %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(err)); - goto bad; + iface_index = UBTBCMFW_IFACE_IDX; + error = usb2_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, + ubtbcmfw_config, UBTBCMFW_N_TRANSFER, + sc, &sc->sc_mtx); + if (error != 0) { + device_printf(dev, "allocating USB transfers failed. %s\n", + usb2_errstr(error)); + goto detach; } - /* Will be used as a bulk pipe */ - err = usbd_open_pipe(iface, UBTBCMFW_INTR_IN_EP, 0, - &sc->sc_intr_in_pipe); - if (err) { - printf("%s: open intr in failed. %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(err)); - goto bad; + error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, + &ubtbcmfw_fifo_methods, &sc->sc_fifo, + device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); + if (error != 0) { + device_printf(dev, "could not attach fifo. %s\n", + usb2_errstr(error)); + goto detach; } - err = usbd_open_pipe(iface, UBTBCMFW_BULK_OUT_EP, 0, - &sc->sc_bulk_out_pipe); - if (err) { - printf("%s: open bulk out failed. %s\n", - device_get_nameunit(sc->sc_dev), usbd_errstr(err)); - goto bad; - } + return (0); /* success */ - /* Create device nodes */ - sc->sc_ctrl_dev = make_dev(&ubtbcmfw_cdevsw, - 0, UID_ROOT, GID_OPERATOR, 0644, - "%s", device_get_nameunit(sc->sc_dev)); - sc->sc_ctrl_dev->si_drv1 = sc; +detach: + ubtbcmfw_detach(dev); - sc->sc_intr_in_dev = make_dev(&ubtbcmfw_cdevsw, - UBTBCMFW_INTR_IN, UID_ROOT, GID_OPERATOR, 0644, - "%s.%d", device_get_nameunit(sc->sc_dev), UBTBCMFW_INTR_IN); - sc->sc_intr_in_dev->si_drv1 = sc; - - sc->sc_bulk_out_dev = make_dev(&ubtbcmfw_cdevsw, - UBTBCMFW_BULK_OUT, UID_ROOT, GID_OPERATOR, 0644, - "%s.%d", device_get_nameunit(sc->sc_dev), UBTBCMFW_BULK_OUT); - sc->sc_bulk_out_dev->si_drv1 = sc; - - return 0; -bad: - ubtbcmfw_detach(self); - return ENXIO; -} + return (ENXIO); /* failure */ +} /* ubtbcmfw_attach */ /* * Detach the device */ static int -ubtbcmfw_detach(device_t self) +ubtbcmfw_detach(device_t dev) { - struct ubtbcmfw_softc *sc = device_get_softc(self); + struct ubtbcmfw_softc *sc = device_get_softc(dev); - sc->sc_dying = 1; - if (-- sc->sc_refcnt >= 0) { - if (sc->sc_intr_in_pipe != NULL) - usbd_abort_pipe(sc->sc_intr_in_pipe); + usb2_fifo_detach(&sc->sc_fifo); - if (sc->sc_bulk_out_pipe != NULL) - usbd_abort_pipe(sc->sc_bulk_out_pipe); + usb2_transfer_unsetup(sc->sc_xfer, UBTBCMFW_N_TRANSFER); - usb_detach_wait(sc->sc_dev); - } - - /* Destroy device nodes */ - if (sc->sc_bulk_out_dev != NULL) { - destroy_dev(sc->sc_bulk_out_dev); - sc->sc_bulk_out_dev = NULL; - } - - if (sc->sc_intr_in_dev != NULL) { - destroy_dev(sc->sc_intr_in_dev); - sc->sc_intr_in_dev = NULL; - } - - if (sc->sc_ctrl_dev != NULL) { - destroy_dev(sc->sc_ctrl_dev); - sc->sc_ctrl_dev = NULL; - } - - /* Close pipes */ - if (sc->sc_intr_in_pipe != NULL) { - usbd_close_pipe(sc->sc_intr_in_pipe); - sc->sc_intr_in_pipe = NULL; - } - - if (sc->sc_bulk_out_pipe != NULL) { - usbd_close_pipe(sc->sc_bulk_out_pipe); - sc->sc_intr_in_pipe = NULL; - } + mtx_destroy(&sc->sc_mtx); return (0); -} +} /* ubtbcmfw_detach */ /* - * Open endpoint device - * XXX FIXME softc locking + * USB write callback */ -static int -ubtbcmfw_open(struct cdev *dev, int flag, int mode, struct thread *p) +static void +ubtbcmfw_write_callback(struct usb2_xfer *xfer) { - ubtbcmfw_softc_p sc = dev->si_drv1; - int error = 0; + struct ubtbcmfw_softc *sc = xfer->priv_sc; + struct usb2_fifo *f = sc->sc_fifo.fp[USB_FIFO_TX]; + uint32_t actlen; - if (sc->sc_dying) - return (ENXIO); - - switch (dev2unit(dev)) { - case USB_CONTROL_ENDPOINT: - if (!(sc->sc_flags & UBTBCMFW_CTRL_DEV)) - sc->sc_flags |= UBTBCMFW_CTRL_DEV; - else - error = EBUSY; + switch (USB_GET_STATE(xfer)) { + case USB_ST_SETUP: + case USB_ST_TRANSFERRED: +setup_next: + if (usb2_fifo_get_data(f, xfer->frbuffers, 0, + xfer->max_data_length, &actlen, 0)) { + xfer->frlengths[0] = actlen; + usb2_start_hardware(xfer); + } break; - case UBTBCMFW_INTR_IN: - if (!(sc->sc_flags & UBTBCMFW_INTR_IN_DEV)) { - if (sc->sc_intr_in_pipe != NULL) - sc->sc_flags |= UBTBCMFW_INTR_IN_DEV; - else - error = ENXIO; - } else - error = EBUSY; + default: /* Error */ + if (xfer->error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto setup_next; + } break; - - case UBTBCMFW_BULK_OUT: - if (!(sc->sc_flags & UBTBCMFW_BULK_OUT_DEV)) { - if (sc->sc_bulk_out_pipe != NULL) - sc->sc_flags |= UBTBCMFW_BULK_OUT_DEV; - else - error = ENXIO; - } else - error = EBUSY; - break; - - default: - error = ENXIO; - break; } +} /* ubtbcmfw_write_callback */ - return (error); -} - /* - * Close endpoint device - * XXX FIXME softc locking + * USB read callback */ -static int -ubtbcmfw_close(struct cdev *dev, int flag, int mode, struct thread *p) +static void +ubtbcmfw_read_callback(struct usb2_xfer *xfer) { - ubtbcmfw_softc_p sc = dev->si_drv1; + struct ubtbcmfw_softc *sc = xfer->priv_sc; + struct usb2_fifo *fifo = sc->sc_fifo.fp[USB_FIFO_RX]; - switch (dev2unit(dev)) { - case USB_CONTROL_ENDPOINT: - sc->sc_flags &= ~UBTBCMFW_CTRL_DEV; - break; + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + usb2_fifo_put_data(fifo, xfer->frbuffers, 0, xfer->actlen, 1); + /* FALLTHROUGH */ - case UBTBCMFW_INTR_IN: - if (sc->sc_intr_in_pipe != NULL) - usbd_abort_pipe(sc->sc_intr_in_pipe); - - sc->sc_flags &= ~UBTBCMFW_INTR_IN_DEV; + case USB_ST_SETUP: +setup_next: + if (usb2_fifo_put_bytes_max(fifo) > 0) { + xfer->frlengths[0] = xfer->max_data_length; + usb2_start_hardware(xfer); + } break; - case UBTBCMFW_BULK_OUT: - if (sc->sc_bulk_out_pipe != NULL) - usbd_abort_pipe(sc->sc_bulk_out_pipe); - - sc->sc_flags &= ~UBTBCMFW_BULK_OUT_DEV; + default: /* Error */ + if (xfer->error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + xfer->flags.stall_pipe = 1; + goto setup_next; + } break; } +} /* ubtbcmfw_read_callback */ - return (0); -} - /* - * Read from the endpoint device - * XXX FIXME softc locking + * Called when we about to start read()ing from the device */ -static int -ubtbcmfw_read(struct cdev *dev, struct uio *uio, int flag) +static void +ubtbcmfw_start_read(struct usb2_fifo *fifo) { - ubtbcmfw_softc_p sc = dev->si_drv1; - u_int8_t buf[UBTBCMFW_BSIZE]; - usbd_xfer_handle xfer; - usbd_status err; - int n, tn, error = 0; + struct ubtbcmfw_softc *sc = fifo->priv_sc0; - if (sc->sc_dying) - return (ENXIO); + usb2_transfer_start(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]); +} /* ubtbcmfw_start_read */ - if (dev2unit(dev) != UBTBCMFW_INTR_IN) - return (EOPNOTSUPP); - if (sc->sc_intr_in_pipe == NULL) - return (ENXIO); +/* + * Called when we about to stop reading (i.e. closing fifo) + */ - xfer = usbd_alloc_xfer(sc->sc_udev); - if (xfer == NULL) - return (ENOMEM); +static void +ubtbcmfw_stop_read(struct usb2_fifo *fifo) +{ + struct ubtbcmfw_softc *sc = fifo->priv_sc0; - sc->sc_refcnt ++; + usb2_transfer_stop(sc->sc_xfer[UBTBCMFW_INTR_DT_RD]); +} /* ubtbcmfw_stop_read */ - while ((n = min(sizeof(buf), uio->uio_resid)) != 0) { - tn = n; - err = usbd_bulk_transfer(xfer, sc->sc_intr_in_pipe, - USBD_SHORT_XFER_OK, USBD_DEFAULT_TIMEOUT, - buf, &tn, "bcmrd"); - switch (err) { - case USBD_NORMAL_COMPLETION: - error = uiomove(buf, tn, uio); - break; +/* + * Called when we about to start write()ing to the device, poll()ing + * for write or flushing fifo + */ - case USBD_INTERRUPTED: - error = EINTR; - break; +static void +ubtbcmfw_start_write(struct usb2_fifo *fifo) +{ + struct ubtbcmfw_softc *sc = fifo->priv_sc0; - case USBD_TIMEOUT: - error = ETIMEDOUT; - break; + usb2_transfer_start(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]); +} /* ubtbcmfw_start_write */ - default: - error = EIO; - break; - } +/* + * Called when we about to stop writing (i.e. closing fifo) + */ - if (error != 0 || tn < n) - break; - } +static void +ubtbcmfw_stop_write(struct usb2_fifo *fifo) +{ + struct ubtbcmfw_softc *sc = fifo->priv_sc0; - usbd_free_xfer(xfer); + usb2_transfer_stop(sc->sc_xfer[UBTBCMFW_BULK_DT_WR]); +} /* ubtbcmfw_stop_write */ - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(sc->sc_dev); - - return (error); -} - /* - * Write into the endpoint device - * XXX FIXME softc locking + * Called when fifo is open */ static int -ubtbcmfw_write(struct cdev *dev, struct uio *uio, int flag) +ubtbcmfw_open(struct usb2_fifo *fifo, int fflags) { - ubtbcmfw_softc_p sc = dev->si_drv1; - u_int8_t buf[UBTBCMFW_BSIZE]; - usbd_xfer_handle xfer; - usbd_status err; - int n, error = 0; + struct ubtbcmfw_softc *sc = fifo->priv_sc0; + struct usb2_xfer *xfer; - if (sc->sc_dying) - return (ENXIO); + /* + * f_open fifo method can only be called with either FREAD + * or FWRITE flag set at one time. + */ - if (dev2unit(dev) != UBTBCMFW_BULK_OUT) - return (EOPNOTSUPP); - if (sc->sc_bulk_out_pipe == NULL) - return (ENXIO); + if (fflags & FREAD) + xfer = sc->sc_xfer[UBTBCMFW_INTR_DT_RD]; + else if (fflags & FWRITE) + xfer = sc->sc_xfer[UBTBCMFW_BULK_DT_WR]; + else + return (EINVAL); /* should not happen */ - xfer = usbd_alloc_xfer(sc->sc_udev); - if (xfer == NULL) + if (usb2_fifo_alloc_buffer(fifo, xfer->max_data_length, + UBTBCMFW_IFQ_MAXLEN) != 0) return (ENOMEM); - sc->sc_refcnt ++; + return (0); +} /* ubtbcmfw_open */ - while ((n = min(sizeof(buf), uio->uio_resid)) != 0) { - error = uiomove(buf, n, uio); - if (error != 0) - break; +/* + * Called when fifo is closed + */ - err = usbd_bulk_transfer(xfer, sc->sc_bulk_out_pipe, - 0, USBD_DEFAULT_TIMEOUT, buf, &n, "bcmwr"); - switch (err) { - case USBD_NORMAL_COMPLETION: - break; - - case USBD_INTERRUPTED: - error = EINTR; - break; +static void +ubtbcmfw_close(struct usb2_fifo *fifo, int fflags) +{ + if (fflags & (FREAD | FWRITE)) + usb2_fifo_free_buffer(fifo); +} /* ubtbcmfw_close */ - case USBD_TIMEOUT: - error = ETIMEDOUT; - break; - - default: - error = EIO; - break; - } - - if (error != 0) - break; - } - - usbd_free_xfer(xfer); - - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(sc->sc_dev); - - return (error); -} - /* - * Process ioctl on the endpoint device - * XXX FIXME softc locking + * Process ioctl() on USB device */ static int -ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, - struct thread *p) +ubtbcmfw_ioctl(struct usb2_fifo *fifo, u_long cmd, void *data, + int fflags) { - ubtbcmfw_softc_p sc = dev->si_drv1; + struct ubtbcmfw_softc *sc = fifo->priv_sc0; int error = 0; - if (sc->sc_dying) - return (ENXIO); - - if (dev2unit(dev) != USB_CONTROL_ENDPOINT) - return (EOPNOTSUPP); - - sc->sc_refcnt ++; - switch (cmd) { case USB_GET_DEVICE_DESC: - *(usb_device_descriptor_t *) data = - *usbd_get_device_descriptor(sc->sc_udev); + memcpy(data, usb2_get_device_descriptor(sc->sc_udev), + sizeof(struct usb2_device_descriptor)); break; default: @@ -518,42 +423,5 @@ break; } - if (-- sc->sc_refcnt < 0) - usb_detach_wakeup(sc->sc_dev); - return (error); -} - -/* - * Poll the endpoint device - * XXX FIXME softc locking - */ - -static int -ubtbcmfw_poll(struct cdev *dev, int events, struct thread *p) -{ - ubtbcmfw_softc_p sc = dev->si_drv1; - int revents = 0; - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 17:28:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E3F10656B5; Thu, 28 May 2009 17:28: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 94E2610656A6 for ; Thu, 28 May 2009 17:28:26 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C6388FC26 for ; Thu, 28 May 2009 17:28:26 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHSQwq073403 for ; Thu, 28 May 2009 17:28:26 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHSQ0t073401 for perforce@freebsd.org; Thu, 28 May 2009 17:28:26 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 28 May 2009 17:28:26 GMT Message-Id: <200905281728.n4SHSQ0t073401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162951 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, 28 May 2009 17:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=162951 Change 162951 by syl@syl_rincewind on 2009/05/28 17:27:36 - Finish test2. test2 will dump the active configuration descriptors for each usb device. - Fix libusb_get_active_config_descriptor. - Fix libusb_get_config_descriptor. - use 16*4 instead of 16*2 for transfer_max (spotted by Hans Petter Selasky). Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#3 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#15 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_desc.c#10 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#3 (text+ko) ==== @@ -8,53 +8,80 @@ int main(int ac, const char *av[]) { + libusb_device **devs_list; libusb_config_descriptor *cdesc; - libusb_device **devs_list; + libusb_interface_descriptor *idesc; + libusb_endpoint_descriptor *edesc; + int nb; int ret; - int i, j; + int i, j, k, l; printf("This program will dump the device" " active config descriptor for all the" " present devices.\n"); - cdesc = malloc(sizeof(libusb_config_descriptor)); - if (cdesc == NULL) { - perror("test1"); - return (EXIT_FAILURE); - } - if (libusb_init(&ctx) != 0) { fprintf(stderr, "libusb_init failed\n"); return (EXIT_FAILURE); } - if ((ret = libusb_get_device_list(ctx, &devs_list)) < 0) { + if ((nb = libusb_get_device_list(ctx, &devs_list)) < 0) { fprintf(stderr, "libusb_get_device_list failed with 0x%x error code\n", - ret); + nb); return (EXIT_FAILURE); } - if (ret == 0) { + if (nb == 0) { fprintf(stderr, "No device match or lack of permissions.\n"); return (EXIT_SUCCESS); } printf("\nThere are %i devices\n\n", ret); - for (i = 0 ; i < ret ; i++) { - printf("|-- device number = %i\n", i); - libusb_get_active_config_descriptor(devs_list[i], &cdesc); - printf("toto\n"); - if (libusb_get_active_config_descriptor == LIBUSB_SUCCESS) { - printf("|----\tbLength : 0x%.2x\n", cdesc->bLength); - printf("|----\tbDescriptorType : 0x%.2x\n", cdesc->bDescriptorType); - printf("|----\twTotalLength : 0x%.2x\n", cdesc->wTotalLength); - printf("|----\tbNumInterfaces : 0x%.2x\n", cdesc->bNumInterfaces); - printf("|----\tbConfigurationValue : 0x%.2x\n", cdesc->bConfigurationValue); - printf("|----\tiConfiguration : 0x%.2x\n", cdesc->iConfiguration); - printf("|----\tbmAttributes : 0x%.2x\n", cdesc->bmAttributes); - printf("|----\tMaxPower : 0x%.2x\n", cdesc->MaxPower); + for (i = 0 ; i < nb ; i++) { + printf("|-- device number = %i\n|\n", i); + ret = libusb_get_active_config_descriptor(devs_list[i], &cdesc); + if (ret == LIBUSB_SUCCESS) { + printf("|---- CONFIG :\n"); + printf("|---- bLength : 0x%.2x\n", cdesc->bLength); + printf("|---- bDescriptorType : 0x%.2x\n", cdesc->bDescriptorType); + printf("|---- wTotalLength : 0x%.2x\n", cdesc->wTotalLength); + printf("|---- bNumInterfaces : 0x%.2x\n", cdesc->bNumInterfaces); + printf("|---- bConfigurationValue : 0x%.2x\n", cdesc->bConfigurationValue); + printf("|---- iConfiguration : 0x%.2x\n", cdesc->iConfiguration); + printf("|---- bmAttributes : 0x%.2x\n", cdesc->bmAttributes); + printf("|---- MaxPower : 0x%.2x\n|\n", cdesc->MaxPower); + for (j = 0 ; j < cdesc->bNumInterfaces ; j++) { + for (k = 0 ; k < cdesc->interface[j].num_altsetting ; k++) { + idesc = &cdesc->interface[j].altsetting[k]; + printf("|------ INTERFACE :\n"); + printf("|------ Interface %i%i\n", j, k); + printf("|------ bLength 0x%.2x\n", idesc->bLength); + printf("|------ bDescriptorType 0x%.2x\n", idesc->bDescriptorType); + printf("|------ bInterfaceNumber 0x%.2x\n", idesc->bInterfaceNumber); + printf("|------ bAlternateSetting 0x%.2x\n", idesc->bAlternateSetting); + printf("|------ bNumEndpoints 0x%.2x\n", idesc->bNumEndpoints); + printf("|------ bInterfaceClass 0x%.2x\n", idesc->bInterfaceClass); + printf("|------ bInterfaceSubClass 0x%.2x\n", idesc->bInterfaceSubClass); + printf("|------ bInterfaceProtocol 0x%.2x\n", idesc->bInterfaceProtocol); + printf("|------ iInterface 0x%.2x\n|\n", idesc->iInterface); + for (l = 0 ; l < idesc->bNumEndpoints ; l++) { + edesc = &idesc->endpoint[l]; + printf("|-------- DESCRIPTOR :\n"); + printf("|-------- bLength 0x%.2x\n", edesc->bLength); + printf("|-------- bDescriptorType 0x%.2x\n", edesc->bDescriptorType); + printf("|-------- bEndpointAddress 0x%.2x\n", edesc->bEndpointAddress); + printf("|-------- bmAttributes 0x%.2x\n", edesc->bmAttributes); + printf("|-------- wMaxPacketSize 0x%.4x\n", edesc->wMaxPacketSize); + printf("|-------- bInterval 0x%.2x\n", edesc->bInterval); + printf("|-------- bRefresh 0x%.2x\n", edesc->bRefresh); + printf("|-------- bSynchAddress 0x%.2x\n|\n", edesc->bSynchAddress); + } + } + } } else { fprintf(stderr, "libusb_get_active_config_descriptor failed\n"); + return (EXIT_FAILURE); } + libusb_free_config_descriptor(cdesc); } return (EXIT_SUCCESS); } ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#15 (text+ko) ==== @@ -420,7 +420,7 @@ if (hdl == NULL) return (LIBUSB_ERROR_NO_MEM); - err = libusb20_dev_open(pdev, 16 * 2 /* number of endpoints */ ); + err = libusb20_dev_open(pdev, 16 * 4 /* number of endpoints */ ); if (err) { free(hdl); return (LIBUSB_ERROR_NO_MEM); ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_desc.c#10 (text+ko) ==== @@ -73,6 +73,7 @@ struct libusb20_device *pdev; uint8_t idx; + pdev = dev->os_priv; idx = libusb20_dev_get_config_index(pdev); return (libusb_get_config_descriptor(dev, idx, config)); @@ -92,7 +93,8 @@ struct libusb20_endpoint *pend; libusb_interface_descriptor *ifd; libusb_endpoint_descriptor *endd; - uint8_t nif, nend, nalt, i, j; + uint8_t nif, nend, nalt, i, j, k; + uint32_t if_idx, endp_idx; if (dev == NULL || config == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -125,6 +127,35 @@ return (LIBUSB_ERROR_NO_MEM); } + (*config)->interface = (libusb_interface *)(*config + + sizeof(libusb_config_descriptor)); + for ( i = if_idx = endp_idx = 0 ; i < nif ; if_idx, i++) { + (*config)->interface[i].altsetting = (libusb_interface_descriptor *) + (*config + sizeof(libusb_config_descriptor) + + (nif * sizeof(libusb_interface)) + + (if_idx * sizeof(libusb_interface_descriptor))); + (*config)->interface[i].altsetting[0].endpoint = + (libusb_endpoint_descriptor *) (*config + + sizeof(libusb_config_descriptor) + + (nif * sizeof(libusb_interface)) + + (nalt * sizeof(libusb_interface_descriptor)) + + (endp_idx * sizeof(libusb_endpoint_descriptor))); + endp_idx += pconf->interface[i].num_endpoints; + + if (pconf->interface[i].num_altsetting > 0) + { + for ( j = 0 ; j < pconf->interface[i].num_altsetting ; j++, if_idx++) { + (*config)->interface[i].altsetting[j + 1].endpoint = + (libusb_endpoint_descriptor *) (*config + + sizeof(libusb_config_descriptor) + + (nif * sizeof(libusb_interface)) + + (nalt * sizeof(libusb_interface_descriptor)) + + (endp_idx * sizeof(libusb_endpoint_descriptor))); + endp_idx += pconf->interface[i].altsetting[j].num_endpoints; + } + } + } + (*config)->bLength = pconf->desc.bLength; (*config)->bDescriptorType = pconf->desc.bDescriptorType; (*config)->wTotalLength = pconf->desc.wTotalLength; From owner-p4-projects@FreeBSD.ORG Thu May 28 17:39:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 441B2106566B; Thu, 28 May 2009 17:39: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 0318E1065670 for ; Thu, 28 May 2009 17:39:38 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5B6B8FC1A for ; Thu, 28 May 2009 17:39:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHdbxI075349 for ; Thu, 28 May 2009 17:39:37 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHdbPc075347 for perforce@freebsd.org; Thu, 28 May 2009 17:39:37 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 17:39:37 GMT Message-Id: <200905281739.n4SHdbPc075347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162952 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, 28 May 2009 17:39:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=162952 Change 162952 by zec@zec_amdx4 on 2009/05/28 17:39:27 IFC @ 162948 ... using the "-d" flag in p4 integ Affected files ... .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/acl.h#3 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#4 delete .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#5 delete .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 delete Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu May 28 17:42:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98D9C10656C6; Thu, 28 May 2009 17:42:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5371010656C0 for ; Thu, 28 May 2009 17:42:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 27B6F8FC08 for ; Thu, 28 May 2009 17:42:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHgfNU075582 for ; Thu, 28 May 2009 17:42:41 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHgftQ075580 for perforce@freebsd.org; Thu, 28 May 2009 17:42:41 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 17:42:41 GMT Message-Id: <200905281742.n4SHgftQ075580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162953 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, 28 May 2009 17:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=162953 Change 162953 by zec@zec_amdx4 on 2009/05/28 17:41:41 Add the -d flag to p4 integrate Affected files ... .. //depot/projects/vimage-commit/update.sh#3 edit Differences ... ==== //depot/projects/vimage-commit/update.sh#3 (text+ko) ==== @@ -19,7 +19,7 @@ echo "=============================================" echo -n "select the change number we want to sync to: " read CHNUM -p4 integ -i -b ${BRANCH} @${CHNUM} +p4 integ -d -i -b ${BRANCH} @${CHNUM} echo echo "=======================================================================" echo "===== Preparing to resolve simple integrations.. stand bye =====" From owner-p4-projects@FreeBSD.ORG Thu May 28 17:42:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 187991065760; Thu, 28 May 2009 17:42:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EB9710656C3 for ; Thu, 28 May 2009 17:42:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52B4C8FC15 for ; Thu, 28 May 2009 17:42:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHgfPi075587 for ; Thu, 28 May 2009 17:42:41 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHgf27075585 for perforce@freebsd.org; Thu, 28 May 2009 17:42:41 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 17:42:41 GMT Message-Id: <200905281742.n4SHgf27075585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162954 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, 28 May 2009 17:42:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=162954 Change 162954 by zec@zec_amdx4 on 2009/05/28 17:42:30 IFC @ 162948 Affected files ... .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/acl.h#4 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#6 delete .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#6 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_if.m#6 delete .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#6 delete .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 28 17:50:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABCE1065679; Thu, 28 May 2009 17:50:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AF5C1065677 for ; Thu, 28 May 2009 17:50:50 +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 196088FC22 for ; Thu, 28 May 2009 17:50:50 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SHonZU076924 for ; Thu, 28 May 2009 17:50:49 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SHonOX076922 for perforce@freebsd.org; Thu, 28 May 2009 17:50:49 GMT (envelope-from mav@freebsd.org) Date: Thu, 28 May 2009 17:50:49 GMT Message-Id: <200905281750.n4SHonOX076922@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 Cc: Subject: PERFORCE change 162956 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, 28 May 2009 17:50:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=162956 Change 162956 by mav@mav_mavbook on 2009/05/28 17:50:23 Fix bug in ATAPI device INQUIRY. Now ATAPI works for me. I am able to detect my SATA Sony DVD-RW drive, record disk with growisofs via pass0 and read it back via cd0. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#8 (text+ko) ==== @@ -673,9 +673,7 @@ periph_qual = SID_QUAL(inq_buf); - switch(periph_qual) { - case SID_QUAL_LU_CONNECTED: - { + if (periph_qual == SID_QUAL_LU_CONNECTED) { u_int8_t len; /* @@ -708,9 +706,6 @@ xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb); xpt_release_ccb(done_ccb); - return; - } - default: break; } } else if (cam_periph_error(done_ccb, 0, From owner-p4-projects@FreeBSD.ORG Thu May 28 18:10:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC341065673; Thu, 28 May 2009 18:10: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 E223A106566C for ; Thu, 28 May 2009 18:10:09 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B66798FC1B for ; Thu, 28 May 2009 18:10:09 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SIA9RS079289 for ; Thu, 28 May 2009 18:10:09 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SIA9cr079287 for perforce@freebsd.org; Thu, 28 May 2009 18:10:09 GMT (envelope-from zec@fer.hr) Date: Thu, 28 May 2009 18:10:09 GMT Message-Id: <200905281810.n4SIA9cr079287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 162957 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, 28 May 2009 18:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=162957 Change 162957 by zec@zec_amdx4 on 2009/05/28 18:09:21 unbreak the build Affected files ... .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#7 add .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#7 add .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_if.m#7 add .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#7 add .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 28 18:13:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 730E51065674; Thu, 28 May 2009 18:13: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 303F1106566C for ; Thu, 28 May 2009 18:13:13 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED8A88FC1F for ; Thu, 28 May 2009 18:13:12 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SIDCsm079655 for ; Thu, 28 May 2009 18:13:12 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SIDChX079653 for perforce@freebsd.org; Thu, 28 May 2009 18:13:12 GMT (envelope-from antab@FreeBSD.org) Date: Thu, 28 May 2009 18:13:12 GMT Message-Id: <200905281813.n4SIDChX079653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162958 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, 28 May 2009 18:13:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=162958 Change 162958 by antab@antab_farm on 2009/05/28 18:12:20 Try to get dynamic linked executables to work, however binutils is broken and does not generate working shared exectuables and libraries. All RELA entries and GOT are zeroed. Affected files ... .. //depot/projects/avr32/src/lib/csu/avr32/crt1.c#5 edit .. //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_start.S#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/elf_machdep.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#10 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#14 edit .. //depot/projects/avr32/src/sys/avr32/include/signal.h#5 edit .. //depot/projects/avr32/src/usr.bin/elfdump/elfdump.c#2 edit Differences ... ==== //depot/projects/avr32/src/lib/csu/avr32/crt1.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ extern void _fini(void); extern void _init(void); extern int main(int, char **, char **); -extern void _start(char **ap, struct ps_strings *, fptr cleanup); +extern void _start(char **ap, struct ps_strings *, fptr cleanup) __attribute__((naked)); #ifdef GCRT extern void _mcleanup(void); @@ -77,6 +77,14 @@ char **env; const char *s; + /* + * _start has no prolog and the first 2 arguments ar passed in r6-r5 + */ + __asm __volatile( + "mov r12, r6\n" + "mov r11, r5\n" + ); + argc = *(long *)(void *)ap; argv = ap + 1; env = ap + 2 + argc; ==== //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_start.S#2 (text+ko) ==== @@ -27,11 +27,39 @@ #include __FBSDID("$FreeBSD: $"); - .text - .align 0 - .globl .rtld_start - .type .rtld_start,%function +.text +.extern _GLOBAL_OFFSET_TABLE_ +.extern _DYNAMIC + +/* + * r5 stack + * r4 ps_strings + */ ENTRY(.rtld_start) + lddpc r12, 1f + lddpc r11, 2f + rjmp 3f +1: .word _DYNAMIC - (. + 8) +2: .word _GLOBAL_OFFSET_TABLE_ - (. + 8) +3: add r12, pc + nop + add r11, pc + rcall _C_LABEL(_rtld_relocate_nonplt_self) + + breakpoint + mov r12, r6 /* Stack is first argument */ + sub r11, sp, 4 /* &exit_proc (cleanup) */ + sub r10, sp, 8 /* &objp */ + sub sp, 8 /* Make room for arguments */ + rcall _C_LABEL(_rtld) /* _rtld(sp, &exit_proc, &objp) */ + breakpoint + + /* + * Load cleanup argument and jump to entry, first 2 arguments + * to _start() are stored in r7-r6 + */ + ldm sp++, r10,pc /* Load cleanup argument and jump to entry */ + breakpoint END(.rtld_start) ==== //depot/projects/avr32/src/sys/avr32/avr32/elf_machdep.c#4 (text+ko) ==== @@ -85,7 +85,11 @@ .emul_path = NULL, .interp_path = "/libexec/ld-elf.so.1", .sysvec = &elf32_freebsd_sysvec, - .interp_newpath = NULL, + /* + * toolchain sets PT_INTERP to "--relax", and i have no idea why, + * this will force the right loader + */ + .interp_newpath = "/libexec/ld-elf.so.1", .brand_note = &elf32_freebsd_brandnote, .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE }; ==== //depot/projects/avr32/src/sys/avr32/avr32/pm_machdep.c#10 (text+ko) ==== @@ -81,9 +81,8 @@ { /* Clear frame and set init register values, SP must be word aligned */ bzero((char *)td->td_frame, sizeof(struct trapframe)); - td->td_frame->regs.r10 = 0; - td->td_frame->regs.r11 = ps_strings; - td->td_frame->regs.r12 = stack; + td->td_frame->regs.r5 = ps_strings; + td->td_frame->regs.r6 = stack; td->td_frame->regs.sp = ((register_t)stack) & ~(sizeof(register_t) - 1); td->td_frame->regs.pc = entry; ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#14 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/include/signal.h#5 (text+ko) ==== @@ -41,6 +41,7 @@ #if __BSD_VISIBLE +#include #include struct sigcontext { ==== //depot/projects/avr32/src/usr.bin/elfdump/elfdump.c#2 (text+ko) ==== @@ -233,6 +233,7 @@ case 0x6ffffff0: return "DT_GNU_VERSYM"; /* 0x70000000 - 0x7fffffff processor-specific semantics */ case 0x70000000: return "DT_IA_64_PLT_RESERVE"; + case 0x70000001: return "DT_AVR32_GOTSZ"; case 0x7ffffffd: return "DT_SUNW_AUXILIARY"; case 0x7ffffffe: return "DT_SUNW_USED"; case 0x7fffffff: return "DT_SUNW_FILTER"; @@ -257,6 +258,7 @@ case EM_PPC: return "EM_PPC"; case EM_ARM: return "EM_ARM"; case EM_ALPHA: return "EM_ALPHA (legacy)"; + case EM_AVR32: return "EM_AVR32"; case EM_SPARCV9:return "EM_SPARCV9"; case EM_IA_64: return "EM_IA_64"; case EM_X86_64: return "EM_X86_64"; @@ -772,6 +774,7 @@ case DT_RELSZ: case DT_RELENT: case DT_PLTREL: + case DT_AVR32_GOTSZ: fprintf(out, "\td_val: %jd\n", (intmax_t)val); break; case DT_PLTGOT: From owner-p4-projects@FreeBSD.ORG Thu May 28 19:40:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67D1910656CC; Thu, 28 May 2009 19:40:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05F0410656C9 for ; Thu, 28 May 2009 19:40:48 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD5658FC0C for ; Thu, 28 May 2009 19:40:47 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SJelvG087481 for ; Thu, 28 May 2009 19:40:47 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SJelvi087479 for perforce@freebsd.org; Thu, 28 May 2009 19:40:47 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 28 May 2009 19:40:47 GMT Message-Id: <200905281940.n4SJelvi087479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 162964 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, 28 May 2009 19:40:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=162964 Change 162964 by syl@syl_rincewind on 2009/05/28 19:40:06 Add test for libusb_get_config_descriptor. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/test3.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/test3.c#2 (text+ko) ==== @@ -3,8 +3,95 @@ #include #include +libusb_context *ctx; + int main(int ac, const char *av[]) { + libusb_device **devs_list; + libusb_device_descriptor *ddesc; + libusb_config_descriptor *cdesc; + libusb_interface_descriptor *idesc; + libusb_endpoint_descriptor *edesc; + int nb; + int ret; + int i, j, k, l, m; + + printf("This program will dump all the device" + " configurations descriptor for all the" + " present devices.\n"); + + ddesc = malloc(sizeof(libusb_device_descriptor)); + if (ddesc == NULL) { + perror("test1"); + return (EXIT_FAILURE); + } + + if (libusb_init(&ctx) != 0) { + fprintf(stderr, "libusb_init failed\n"); + return (EXIT_FAILURE); + } + + if ((nb = libusb_get_device_list(ctx, &devs_list)) < 0) { + fprintf(stderr, "libusb_get_device_list failed with 0x%x error code\n", + nb); + return (EXIT_FAILURE); + } + + if (nb == 0) { + fprintf(stderr, "No device match or lack of permissions.\n"); + return (EXIT_SUCCESS); + } + printf("\nThere are %i devices\n\n", ret); + for (i = 0 ; i < nb ; i++) { + libusb_get_device_descriptor(devs_list[i], ddesc); + for (m = 0 ; m < ddesc->bNumConfigurations ; m++) { + printf("|-- device number = %i config %i\n|\n", i, m); + ret = libusb_get_config_descriptor(devs_list[i], m, &cdesc); + if (ret == LIBUSB_SUCCESS) { + printf("|---- CONFIG :\n"); + printf("|---- bLength : 0x%.2x\n", cdesc->bLength); + printf("|---- bDescriptorType : 0x%.2x\n", cdesc->bDescriptorType); + printf("|---- wTotalLength : 0x%.2x\n", cdesc->wTotalLength); + printf("|---- bNumInterfaces : 0x%.2x\n", cdesc->bNumInterfaces); + printf("|---- bConfigurationValue : 0x%.2x\n", cdesc->bConfigurationValue); + printf("|---- iConfiguration : 0x%.2x\n", cdesc->iConfiguration); + printf("|---- bmAttributes : 0x%.2x\n", cdesc->bmAttributes); + printf("|---- MaxPower : 0x%.2x\n|\n", cdesc->MaxPower); + for (j = 0 ; j < cdesc->bNumInterfaces ; j++) { + for (k = 0 ; k < cdesc->interface[j].num_altsetting ; k++) { + idesc = &cdesc->interface[j].altsetting[k]; + printf("|------ INTERFACE :\n"); + printf("|------ Interface %i%i\n", j, k); + printf("|------ bLength 0x%.2x\n", idesc->bLength); + printf("|------ bDescriptorType 0x%.2x\n", idesc->bDescriptorType); + printf("|------ bInterfaceNumber 0x%.2x\n", idesc->bInterfaceNumber); + printf("|------ bAlternateSetting 0x%.2x\n", idesc->bAlternateSetting); + printf("|------ bNumEndpoints 0x%.2x\n", idesc->bNumEndpoints); + printf("|------ bInterfaceClass 0x%.2x\n", idesc->bInterfaceClass); + printf("|------ bInterfaceSubClass 0x%.2x\n", idesc->bInterfaceSubClass); + printf("|------ bInterfaceProtocol 0x%.2x\n", idesc->bInterfaceProtocol); + printf("|------ iInterface 0x%.2x\n|\n", idesc->iInterface); + for (l = 0 ; l < idesc->bNumEndpoints ; l++) { + edesc = &idesc->endpoint[l]; + printf("|-------- DESCRIPTOR :\n"); + printf("|-------- bLength 0x%.2x\n", edesc->bLength); + printf("|-------- bDescriptorType 0x%.2x\n", edesc->bDescriptorType); + printf("|-------- bEndpointAddress 0x%.2x\n", edesc->bEndpointAddress); + printf("|-------- bmAttributes 0x%.2x\n", edesc->bmAttributes); + printf("|-------- wMaxPacketSize 0x%.4x\n", edesc->wMaxPacketSize); + printf("|-------- bInterval 0x%.2x\n", edesc->bInterval); + printf("|-------- bRefresh 0x%.2x\n", edesc->bRefresh); + printf("|-------- bSynchAddress 0x%.2x\n|\n", edesc->bSynchAddress); + } + } + } + } else { + fprintf(stderr, "libusb_get_active_config_descriptor failed\n"); + return (EXIT_FAILURE); + } + libusb_free_config_descriptor(cdesc); + } + } return (EXIT_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Thu May 28 20:08:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68F7D1065B40; Thu, 28 May 2009 20:08: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 0AF691065B37 for ; Thu, 28 May 2009 20:08:16 +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 ED28B8FC08 for ; Thu, 28 May 2009 20:08:15 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SK8Fh7090618 for ; Thu, 28 May 2009 20:08:15 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SK8FQm090616 for perforce@freebsd.org; Thu, 28 May 2009 20:08:15 GMT (envelope-from mav@freebsd.org) Date: Thu, 28 May 2009 20:08:15 GMT Message-Id: <200905282008.n4SK8FQm090616@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 Cc: Subject: PERFORCE change 162966 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, 28 May 2009 20:08:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=162966 Change 162966 by mav@mav_mavbook on 2009/05/28 20:08:04 Improve error reporting. Add request timeout handling. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#5 (text+ko) ==== @@ -66,7 +66,8 @@ static void ahci_begin_transaction(device_t dev, union ccb *ccb); static void ahci_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error); static void ahci_execute_command(struct ahci_slot *slot); -static void ahci_end_transaction(struct ahci_slot *slot, int err); +static void ahci_timeout(struct ahci_slot *slot); +static void ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et); //static int ahci_pm_read(device_t dev, int port, int reg, u_int32_t *result); //static int ahci_pm_write(device_t dev, int port, int reg, u_int32_t result); static int ahci_hardreset(device_t dev, int port, uint32_t *signature); @@ -621,7 +622,8 @@ device_t dev = (device_t)data; struct ahci_channel *ch = device_get_softc(dev); uint32_t istatus, cstatus, res, err; - int i; + enum ahci_err_type et; + int i, ccs; mtx_lock(&ch->mtx); /* Read interrupt and command statuses. */ @@ -641,12 +643,15 @@ if ((istatus & AHCI_STATBITS) && (cstatus & ch->rslots)) { device_printf(dev, "%s ERROR is %08x cs %08x rs %08x\n", __func__, istatus, cstatus, ch->rslots); + ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK) + >> AHCI_P_CMD_CCS_SHIFT; /* kick controller into sane state */ ahci_stop(dev); ahci_start(dev); res = ch->rslots; err = ch->rslots & cstatus; } else { + ccs = 0; res = ch->rslots & ~cstatus; err = 0; } @@ -662,7 +667,14 @@ continue; } /* Process request completion. */ - ahci_end_transaction(&ch->slot[i], err & (1 << i)); + et = AHCI_ERR_NONE; + if ((err >> i) & 1) { + if (i == ccs) + et = AHCI_ERR_REAL; + else + et = AHCI_ERR_BTW; + } + ahci_end_transaction(&ch->slot[i], et); } mtx_unlock(&ch->mtx); } @@ -842,14 +854,38 @@ } /* start the timeout */ -// callout_reset(&request->callout, request->timeout * hz, -// (timeout_t*)ata_timeout, request); + callout_reset(&slot->timeout, (int)slot->ccb->ccb_h.timeout * hz / 1000, + (timeout_t*)ahci_timeout, slot); return; } -/* must be called with ATA channel locked and state_mtx held */ +/* Locked by callout mechanism. */ +static void +ahci_timeout(struct ahci_slot *slot) +{ + device_t dev = slot->dev; + struct ahci_channel *ch = device_get_softc(dev); + enum ahci_err_type et; + int i; + +device_printf(dev, "Timeout on slot %d\n", slot->slot); + ahci_stop(dev); + for (i = 0; i < AHCI_MAX_SLOTS; i++) { + /* Do we have a running request on slot? */ + if (ch->slot[i].state < AHCI_SLOT_RUNNING) + continue; + if (i == slot->slot) + et = AHCI_ERR_TIMEOUT; + else + et = AHCI_ERR_RESET; + ahci_end_transaction(&ch->slot[i], et); + } + ahci_reset(dev); +} + +/* Must be called with channel locked. */ static void -ahci_end_transaction(struct ahci_slot *slot, int err) +ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et) { device_t dev = slot->dev; struct ahci_channel *ch = device_get_softc(dev); @@ -858,7 +894,7 @@ //device_printf(dev, "%s slot %d\n", __func__, slot->slot); /* kill the timeout */ -// callout_stop(&request->callout); + callout_stop(&slot->timeout); /* get status */ tf_data = ATA_INL(ch->r_mem, AHCI_P_TFD); @@ -901,11 +937,13 @@ bus_dmamap_unload(ch->dma.data_tag, slot->dma.data_map); } - if (err == 0) { + switch (et) { + case AHCI_ERR_NONE: slot->ccb->ccb_h.status = CAM_REQ_CMP; if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) slot->ccb->csio.scsi_status = SCSI_STATUS_OK; - } else { + break; + case AHCI_ERR_REAL: if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) { slot->ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR; slot->ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; @@ -913,6 +951,18 @@ slot->ccb->ccb_h.status = CAM_REQ_CMP_ERR; slot->ccb->ataio.status = tf_data; } + break; + case AHCI_ERR_BTW: + slot->ccb->ccb_h.status = CAM_REQUEUE_REQ; + break; + case AHCI_ERR_RESET: + slot->ccb->ccb_h.status = CAM_SCSI_BUS_RESET; + break; + case AHCI_ERR_TIMEOUT: + slot->ccb->ccb_h.status = CAM_CMD_TIMEOUT; + break; + default: + slot->ccb->ccb_h.status = CAM_REQ_CMP_ERR; } xpt_done(slot->ccb); @@ -1387,7 +1437,7 @@ slot->slot = i; slot->state = AHCI_SLOT_EMPTY; slot->ccb = NULL; - callout_init(&slot->timeout, 1); + callout_init_mtx(&slot->timeout, &ch->mtx, 0); if (bus_dma_tag_create(ch->dma.dmatag, PAGE_SIZE, PAGE_SIZE, ch->dma.max_address, BUS_SPACE_MAXADDR, ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#2 (text+ko) ==== @@ -206,6 +206,7 @@ #define AHCI_P_CMD_CLO 0x00000008 #define AHCI_P_CMD_FRE 0x00000010 #define AHCI_P_CMD_CCS_MASK 0x00001f00 +#define AHCI_P_CMD_CCS_SHIFT 8 #define AHCI_P_CMD_ISS 0x00002000 #define AHCI_P_CMD_FR 0x00004000 #define AHCI_P_CMD_CR 0x00008000 @@ -450,6 +451,14 @@ } interrupt[AHCI_MAX_PORTS]; }; +enum ahci_err_type { + AHCI_ERR_NONE, + AHCI_ERR_REAL, + AHCI_ERR_BTW, + AHCI_ERR_RESET, + AHCI_ERR_TIMEOUT +}; + /* disk bay/enclosure related */ #define ATA_LED_OFF 0x00 #define ATA_LED_RED 0x01 From owner-p4-projects@FreeBSD.ORG Thu May 28 20:14:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99C15106578E; Thu, 28 May 2009 20:14: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 561EC1065788 for ; Thu, 28 May 2009 20:14: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 449338FC0A for ; Thu, 28 May 2009 20:14:22 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SKEMRK091116 for ; Thu, 28 May 2009 20:14:22 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SKEMbC091114 for perforce@freebsd.org; Thu, 28 May 2009 20:14:22 GMT (envelope-from mav@freebsd.org) Date: Thu, 28 May 2009 20:14:22 GMT Message-Id: <200905282014.n4SKEMbC091114@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 Cc: Subject: PERFORCE change 162967 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, 28 May 2009 20:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=162967 Change 162967 by mav@mav_mavbook on 2009/05/28 20:14:15 Reduce timeouts to ATA default. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#3 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#3 (text+ko) ==== @@ -155,7 +155,7 @@ static void dashutdown(void *arg, int howto); #ifndef DA_DEFAULT_TIMEOUT -#define DA_DEFAULT_TIMEOUT 60 /* Timeout in seconds */ +#define DA_DEFAULT_TIMEOUT 30 /* Timeout in seconds */ #endif #ifndef DA_DEFAULT_RETRY ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#9 (text+ko) ==== @@ -352,7 +352,7 @@ MSG_SIMPLE_Q_TAG, /*data_ptr*/(u_int8_t *)ident_buf, /*dxfer_len*/sizeof(struct ata_params), - 60 * 1000); + 30 * 1000); if (periph->path->device->protocol == PROTO_ATA) ataio->cmd.command = ATA_ATA_IDENTIFY; From owner-p4-projects@FreeBSD.ORG Thu May 28 21:03:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C34931065832; Thu, 28 May 2009 21:03: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 7C2F7106582E for ; Thu, 28 May 2009 21:03:12 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6836C8FC45 for ; Thu, 28 May 2009 21:03:12 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SL3C0v007517 for ; Thu, 28 May 2009 21:03:12 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SL3BOw007515 for perforce@freebsd.org; Thu, 28 May 2009 21:03:11 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 28 May 2009 21:03:11 GMT Message-Id: <200905282103.n4SL3BOw007515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 162970 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, 28 May 2009 21:03:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=162970 Change 162970 by thompsa@thompsa_burger on 2009/05/28 21:02:18 IFC @162969 Affected files ... .. //depot/projects/usb/src/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#12 integrate .. //depot/projects/usb/src/sys/conf/NOTES#36 integrate .. //depot/projects/usb/src/sys/conf/files#65 integrate .. //depot/projects/usb/src/sys/conf/files.i386#25 integrate .. //depot/projects/usb/src/sys/conf/options#28 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#43 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#18 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#18 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#13 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#44 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#40 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#22 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_parse.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#151 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#10 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#10 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/usb/src/sys/modules/Makefile#33 integrate .. //depot/projects/usb/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/zfs/Makefile#9 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/in6.h#8 integrate .. //depot/projects/usb/src/sys/netinet6/in6_mcast.c#3 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#16 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/usb/src/sys/rpc/xdr.h#3 integrate .. //depot/projects/usb/src/sys/sys/queue.h#6 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/usb/src/sys/xdr/xdr_mem.c#3 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_xs.c#6 integrate Differences ... ==== //depot/projects/usb/src/sys/boot/common/ufsread.c#4 (text+ko) ==== @@ -44,9 +44,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $"); #include +#include #include #ifdef UFS_SMALL_CGBASE /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase @@ -93,7 +94,7 @@ fsfind(const char *name, ino_t * ino) { char buf[DEV_BSIZE]; - struct dirent *d; + struct direct *d; char *s; ssize_t n; @@ -104,7 +105,7 @@ if (ls) printf("%s ", d->d_name); else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; + *ino = d->d_ino; return d->d_type; } s += d->d_reclen; ==== //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -27,14 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $"); /* * Ported to PC-9801 by Yoshio Kimura */ #include "boot.h" -#include +#include #if 0 /* #define BUFSIZE 4096 */ @@ -142,7 +142,7 @@ { char *rest, ch; int block, off, loc, ino = ROOTINO; - struct dirent *dp; + struct direct *dp; char list_only; list_only = (path[0] == '?' && path[1] == '\0'); @@ -174,12 +174,12 @@ devread(iobuf, fsbtodb(fs, block_map(block)) + boff, blksize(fs, &inode, block)); } - dp = (struct dirent *)(iobuf + off); + dp = (struct direct *)(iobuf + off); loc += dp->d_reclen; - if (dp->d_fileno && list_only) + if (dp->d_ino && list_only) printf("%s ", dp->d_name); - } while (!dp->d_fileno || strcmp(path, dp->d_name)); - ino = dp->d_fileno; + } while (!dp->d_ino || strcmp(path, dp->d_name)); + ino = dp->d_ino; *(path = rest) = ch; goto loop; } ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 (text+ko) ==== @@ -121,6 +121,7 @@ * Changes must be reviewed by Solaris File Sharing * Changes must be communicated to contract-2003-523@sun.com */ +#ifndef __FreeBSD__ struct xdr_ops { #ifdef __STDC__ #if !defined(_KERNEL) @@ -168,6 +169,28 @@ #endif }; +#else /* FreeBSD */ +struct xdr_ops { + /* get a long from underlying stream */ + bool_t (*x_getint32)(struct XDR *, int32_t *); + /* put a long to " */ + bool_t (*x_putint32)(struct XDR *, const int32_t *); + /* get some bytes from " */ + bool_t (*x_getbytes)(struct XDR *, char *, u_int); + /* put some bytes to " */ + bool_t (*x_putbytes)(struct XDR *, const char *, u_int); + /* returns bytes off from beginning */ + u_int (*x_getpostn)(struct XDR *); + /* lets you reposition the stream */ + bool_t (*x_setpostn)(struct XDR *, u_int); + /* buf quick ptr to buffered data */ + int32_t *(*x_inline)(struct XDR *, u_int); + /* free privates of this xdr_stream */ + void (*x_destroy)(struct XDR *); + bool_t (*x_control)(struct XDR *, int, void *); +}; +#endif + /* * Operations defined on a XDR handle * ==== //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.13 2009/05/28 17:36:36 thompsa Exp $"); #include #include @@ -84,10 +84,10 @@ #define USBD_CTRL_MAX_PIPE 2 #define USBD_CTRL_READ_BUFFER_SP 256 #define USBD_CTRL_READ_BUFFER_SIZE \ - (sizeof(struct usb2_device_request) + USBD_CTRL_READ_BUFFER_SP) + (sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP) #define USBD_CTRL_WRITE_BUFFER_SIZE \ - (sizeof(struct usb2_device_request)) -static struct usb2_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { + (sizeof(struct usb_device_request)) +static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { [USBD_CTRL_READ_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ @@ -115,10 +115,10 @@ static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, - struct usb2_endpoint_descriptor *); + struct usb_endpoint_descriptor *); static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, - struct ndisusb_ep *, struct usb2_config *); + struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *); @@ -519,8 +519,8 @@ device_t dev = IRP_NDIS_DEV(ip); int i, j; struct ndis_softc *sc = device_get_softc(dev); - struct usb2_device *udev = sc->ndisusb_dev; - struct usb2_pipe *p = NULL; + struct usb_device *udev = sc->ndisusb_dev; + struct usb_pipe *p = NULL; struct usbd_interface_information *intf; struct usbd_pipe_information *pipe; struct usbd_urb_select_configuration *selconf; @@ -597,11 +597,11 @@ irp *ip; uint8_t ifidx; struct ndisusb_ep *ne; - struct usb2_config *epconf; + struct usb_config *epconf; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - struct usb2_xfer *xfer; + struct usb_xfer *xfer; usb2_error_t status; InitializeListHead(&ne->ne_active); @@ -647,13 +647,13 @@ usbd_setup_endpoint(ip, ifidx, ep) irp *ip; uint8_t ifidx; - struct usb2_endpoint_descriptor *ep; + struct usb_endpoint_descriptor *ep; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); struct ndisusb_ep *ne; - struct usb2_config cfg; - struct usb2_xfer *xfer; + struct usb_config cfg; + struct usb_xfer *xfer; usb2_error_t status; /* check for non-supported transfer types */ @@ -670,7 +670,7 @@ KeInitializeSpinLock(&ne->ne_lock); ne->ne_dirin = UE_GET_DIR(ep->bEndpointAddress) >> 7; - memset(&cfg, 0, sizeof(struct usb2_config)); + memset(&cfg, 0, sizeof(struct usb_config)); cfg.type = UE_GET_XFERTYPE(ep->bmAttributes); cfg.endpoint = UE_GET_ADDR(ep->bEndpointAddress); cfg.direction = UE_GET_DIR(ep->bEndpointAddress); @@ -853,7 +853,7 @@ } static void -usbd_non_isoc_callback(struct usb2_xfer *xfer) +usbd_non_isoc_callback(struct usb_xfer *xfer) { irp *ip; struct ndis_softc *sc = xfer->priv_sc; @@ -951,7 +951,7 @@ } static void -usbd_ctrl_callback(struct usb2_xfer *xfer) +usbd_ctrl_callback(struct usb_xfer *xfer) { irp *ip; struct ndis_softc *sc = xfer->priv_sc; @@ -961,7 +961,7 @@ union usbd_urb *urb; struct usbd_urb_vendor_or_class_request *vcreq; uint8_t type = 0; - struct usb2_device_request req; + struct usb_device_request req; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -1434,7 +1434,7 @@ int32_t intfsubclass; int32_t intfproto; { - struct usb2_descriptor *next = NULL; + struct usb_descriptor *next = NULL; usb_interface_descriptor_t *desc; while ((next = usb2_desc_foreach(conf, next)) != NULL) { ==== //depot/projects/usb/src/sys/conf/NOTES#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1540 2009/05/26 21:39:09 sson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1541 2009/05/28 19:45:11 rmacklem Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -964,6 +964,8 @@ options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server options NFSLOCKD #Network Lock Manager +options NFSCL #experimental NFS client with NFSv4 +options NFSD #experimental NFS server with NFSv4 # NT File System. Read-mostly, see mount_ntfs(8) for details. # For a full read-write NTFS support consider sysutils/fusefs-ntfs ==== //depot/projects/usb/src/sys/conf/files#65 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1408 2009/05/27 16:43:40 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1409 2009/05/28 19:45:11 rmacklem Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1672,6 +1672,29 @@ fs/msdosfs/msdosfs_lookup.c optional msdosfs fs/msdosfs/msdosfs_vfsops.c optional msdosfs fs/msdosfs/msdosfs_vnops.c optional msdosfs +fs/nfs/nfs_commonkrpc.c optional nfscl | nfsd +fs/nfs/nfs_commonsubs.c optional nfscl | nfsd +fs/nfs/nfs_commonport.c optional nfscl | nfsd +fs/nfs/nfs_commonacl.c optional nfscl | nfsd +fs/nfsclient/nfs_clcomsubs.c optional nfscl +fs/nfsclient/nfs_clsubs.c optional nfscl +fs/nfsclient/nfs_clstate.c optional nfscl +fs/nfsclient/nfs_clkrpc.c optional nfscl +fs/nfsclient/nfs_clrpcops.c optional nfscl +fs/nfsclient/nfs_clvnops.c optional nfscl +fs/nfsclient/nfs_clnode.c optional nfscl +fs/nfsclient/nfs_clvfsops.c optional nfscl +fs/nfsclient/nfs_cllock.c optional nfscl +fs/nfsclient/nfs_clport.c optional nfscl +fs/nfsclient/nfs_clbio.c optional nfscl +fs/nfsclient/nfs_clnfsiod.c optional nfscl +fs/nfsserver/nfs_nfsdsocket.c optional nfsd +fs/nfsserver/nfs_nfsdsubs.c optional nfsd +fs/nfsserver/nfs_nfsdstate.c optional nfsd +fs/nfsserver/nfs_nfsdkrpc.c optional nfsd +fs/nfsserver/nfs_nfsdserv.c optional nfsd +fs/nfsserver/nfs_nfsdport.c optional nfsd +fs/nfsserver/nfs_nfsdcache.c optional nfsd fs/ntfs/ntfs_compr.c optional ntfs fs/ntfs/ntfs_iconv.c optional ntfs_iconv fs/ntfs/ntfs_ihash.c optional ntfs @@ -2420,14 +2443,14 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver -nfs/nfs_nfssvc.c optional nfsserver -nlm/nlm_advlock.c optional nfslockd nfsclient -nlm/nlm_prot_clnt.c optional nfslockd -nlm/nlm_prot_impl.c optional nfslockd -nlm/nlm_prot_server.c optional nfslockd -nlm/nlm_prot_svc.c optional nfslockd -nlm/nlm_prot_xdr.c optional nfslockd -nlm/sm_inter_xdr.c optional nfslockd +nfs/nfs_nfssvc.c optional nfsserver | nfscl | nfsd +nlm/nlm_advlock.c optional nfslockd nfsclient | nfsd nfsclient +nlm/nlm_prot_clnt.c optional nfslockd | nfsd +nlm/nlm_prot_impl.c optional nfslockd | nfsd +nlm/nlm_prot_server.c optional nfslockd | nfsd +nlm/nlm_prot_svc.c optional nfslockd | nfsd +nlm/nlm_prot_xdr.c optional nfslockd | nfsd +nlm/sm_inter_xdr.c optional nfslockd | nfsd # crypto support opencrypto/cast.c optional crypto | ipsec opencrypto/criov.c optional crypto @@ -2447,32 +2470,32 @@ pci/ncr.c optional ncr pci pci/nfsmb.c optional nfsmb pci pci/viapm.c optional viapm pci -rpc/auth_none.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/auth_unix.c optional krpc | nfslockd | nfsclient -rpc/authunix_prot.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/clnt_dg.c optional krpc | nfslockd | nfsclient -rpc/clnt_rc.c optional krpc | nfslockd | nfsclient -rpc/clnt_vc.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/getnetconfig.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/inet_ntop.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/inet_pton.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/replay.c optional krpc | nfslockd | nfsserver -rpc/rpc_callmsg.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/rpc_generic.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/rpc_prot.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/rpcb_clnt.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/rpcb_prot.c optional krpc | nfslockd | nfsclient | nfsserver -rpc/svc.c optional krpc | nfslockd | nfsserver -rpc/svc_auth.c optional krpc | nfslockd | nfsserver -rpc/svc_auth_unix.c optional krpc | nfslockd | nfsserver -rpc/svc_dg.c optional krpc | nfslockd | nfsserver -rpc/svc_generic.c optional krpc | nfslockd | nfsserver -rpc/svc_vc.c optional krpc | nfslockd | nfsserver -rpc/rpcsec_gss/rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi -rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi -rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi -rpc/rpcsec_gss/rpcsec_gss_prot.c optional krpc kgssapi | nfslockd kgssapi -rpc/rpcsec_gss/svc_rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi +rpc/auth_none.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/auth_unix.c optional krpc | nfslockd | nfsclient | nfscl | nfsd +rpc/authunix_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/clnt_dg.c optional krpc | nfslockd | nfsclient | nfscl | nfsd +rpc/clnt_rc.c optional krpc | nfslockd | nfsclient | nfscl | nfsd +rpc/clnt_vc.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/getnetconfig.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/inet_ntop.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/inet_pton.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/replay.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/rpc_callmsg.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/rpc_generic.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/rpc_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/rpcb_clnt.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/rpcb_prot.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd +rpc/svc.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/svc_auth.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/svc_auth_unix.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/svc_dg.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/svc_generic.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/svc_vc.c optional krpc | nfslockd | nfsserver | nfscl | nfsd +rpc/rpcsec_gss/rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi +rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi +rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi +rpc/rpcsec_gss/rpcsec_gss_prot.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi +rpc/rpcsec_gss/svc_rpcsec_gss.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi security/audit/audit.c optional audit security/audit/audit_arg.c optional audit security/audit/audit_bsm.c optional audit ==== //depot/projects/usb/src/sys/conf/files.i386#25 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.622 2009/05/13 17:53:04 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.623 2009/05/28 04:17:05 adrian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -327,6 +327,7 @@ #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen +i386/xen/xen_rtc.c optional xen i386/isa/dpms.c optional dpms i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie ==== //depot/projects/usb/src/sys/conf/options#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.669 2009/05/22 12:35:12 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.670 2009/05/28 19:45:11 rmacklem Exp $ # # On the handling of kernel options # @@ -232,6 +232,13 @@ # supports modern features such as RPCSEC_GSS NFS_LEGACYRPC opt_nfs.h +# Use these options to compile the experimental nfs client and/or +# server that supports NFSv4 into a kernel. +# NFSCL - client +# NFSD - server +NFSCL opt_nfs.h +NFSD opt_nfs.h + # filesystems and libiconv bridge CD9660_ICONV opt_dontuse.h MSDOSFS_ICONV opt_dontuse.h ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#43 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.15 2009/05/21 02:09:12 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.16 2009/05/28 17:36:36 thompsa Exp $"); #include "usbdevs.h" #include @@ -108,7 +108,7 @@ #define ATAUSB_T_MAX ATAUSB_T_BBB_MAX - struct usb2_xfer *xfer[ATAUSB_T_MAX]; + struct usb_xfer *xfer[ATAUSB_T_MAX]; caddr_t ata_data; device_t dev; @@ -145,7 +145,7 @@ static void atausb2_cancel_request(struct atausb2_softc *sc); static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no); -static void atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static void atausb2_t_bbb_data_clear_stall_callback(struct usb_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); static int ata_usbchannel_begin_transaction(struct ata_request *request); static int ata_usbchannel_end_transaction(struct ata_request *request); @@ -160,13 +160,13 @@ * USB frontend part */ -struct usb2_config atausb2_config[ATAUSB_T_BBB_MAX] = { +struct usb_config atausb2_config[ATAUSB_T_BBB_MAX] = { [ATAUSB_T_BBB_RESET1] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), + .mh.bufsize = sizeof(struct usb_device_request), .mh.flags = {}, .mh.callback = &atausb2_t_bbb_reset1_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -177,7 +177,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), + .mh.bufsize = sizeof(struct usb_device_request), .mh.flags = {}, .mh.callback = &atausb2_t_bbb_reset2_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -188,7 +188,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), + .mh.bufsize = sizeof(struct usb_device_request), .mh.flags = {}, .mh.callback = &atausb2_t_bbb_reset3_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -219,7 +219,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), + .mh.bufsize = sizeof(struct usb_device_request), .mh.flags = {}, .mh.callback = &atausb2_t_bbb_data_rd_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -239,7 +239,7 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb2_device_request), + .mh.bufsize = sizeof(struct usb_device_request), .mh.flags = {}, .mh.callback = &atausb2_t_bbb_data_wr_cs_callback, .mh.timeout = 5000, /* 5 seconds */ @@ -278,8 +278,8 @@ static int atausb2_probe(device_t dev) { - struct usb2_attach_arg *uaa = device_get_ivars(dev); - struct usb2_interface_descriptor *id; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct usb_interface_descriptor *id; if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); @@ -318,10 +318,10 @@ atausb2_attach(device_t dev) { struct atausb2_softc *sc = device_get_softc(dev); - struct usb2_attach_arg *uaa = device_get_ivars(dev); - struct usb2_interface_descriptor *id; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct usb_interface_descriptor *id; const char *proto, *subclass; - struct usb2_device_request request; + struct usb_device_request request; device_t child; uint16_t i; uint8_t maxlun; @@ -467,10 +467,10 @@ } static void -atausb2_t_bbb_reset1_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_reset1_callback(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; - struct usb2_device_request req; + struct usb_device_request req; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -500,21 +500,21 @@ } static void -atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_reset2_callback(struct usb_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, ATAUSB_T_BBB_DATA_READ); } static void -atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_reset3_callback(struct usb_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, ATAUSB_T_BBB_DATA_WRITE); } static void -atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, +atausb2_t_bbb_data_clear_stall_callback(struct usb_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer) { @@ -540,7 +540,7 @@ } static void -atausb2_t_bbb_command_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_command_callback(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; struct ata_request *request = sc->ata_request; @@ -590,7 +590,7 @@ } static void -atausb2_t_bbb_data_read_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_data_read_callback(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; uint32_t max_bulk = xfer->max_data_length; @@ -640,14 +640,14 @@ } static void -atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_data_rd_cs_callback(struct usb_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, ATAUSB_T_BBB_DATA_READ); } static void -atausb2_t_bbb_data_write_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_data_write_callback(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; uint32_t max_bulk = xfer->max_data_length; @@ -693,14 +693,14 @@ } static void -atausb2_t_bbb_data_wr_cs_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_data_wr_cs_callback(struct usb_xfer *xfer) { atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, ATAUSB_T_BBB_DATA_WRITE); } static void -atausb2_t_bbb_status_callback(struct usb2_xfer *xfer) +atausb2_t_bbb_status_callback(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; struct ata_request *request = sc->ata_request; @@ -820,7 +820,7 @@ } static void -atausb2_tr_error(struct usb2_xfer *xfer) +atausb2_tr_error(struct usb_xfer *xfer) { struct atausb2_softc *sc = xfer->priv_sc; ==== //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#18 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.86 2009/05/22 18:26:47 gnn Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.87 2009/05/27 20:13:36 gnn Exp $"); #include #include @@ -82,8 +82,8 @@ #include #endif -static int cxgb_setup_msix(adapter_t *, int); -static void cxgb_teardown_msix(adapter_t *); +static int cxgb_setup_interrupts(adapter_t *); +static void cxgb_teardown_interrupts(adapter_t *); static void cxgb_init(void *); static void cxgb_init_locked(struct port_info *); static void cxgb_stop_locked(struct port_info *); @@ -175,8 +175,6 @@ static devclass_t cxgb_port_devclass; DRIVER_MODULE(cxgb, cxgbc, cxgb_port_driver, cxgb_port_devclass, 0, 0); -#define SGE_MSIX_COUNT (SGE_QSETS + 1) - /* * The driver uses the best interrupt scheme available on a platform in the * order MSI-X, MSI, legacy pin interrupts. This parameter determines which @@ -517,46 +515,52 @@ (sc->msix_regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->msix_regs_rid, RF_ACTIVE)) != NULL) { - msi_needed = sc->msi_count = SGE_MSIX_COUNT; + if (multiq) + port_qsets = min(SGE_QSETS/sc->params.nports, mp_ncpus); + msi_needed = sc->msi_count = sc->params.nports * port_qsets + 1; - if (((error = pci_alloc_msix(dev, &sc->msi_count)) != 0) || - (sc->msi_count != msi_needed)) { - device_printf(dev, "msix allocation failed - msi_count = %d" - " msi_needed=%d will try msi err=%d\n", sc->msi_count, - msi_needed, error); + if (pci_msix_count(dev) == 0 || + (error = pci_alloc_msix(dev, &sc->msi_count)) != 0 || + sc->msi_count != msi_needed) { + device_printf(dev, "alloc msix failed - " + "msi_count=%d, msi_needed=%d, err=%d; " + "will try MSI\n", sc->msi_count, + msi_needed, error); sc->msi_count = 0; + port_qsets = 1; pci_release_msi(dev); bus_release_resource(dev, SYS_RES_MEMORY, sc->msix_regs_rid, sc->msix_regs_res); sc->msix_regs_res = NULL; } else { sc->flags |= USING_MSIX; - sc->cxgb_intr = t3_intr_msix; + sc->cxgb_intr = cxgb_async_intr; + device_printf(dev, + "using MSI-X interrupts (%u vectors)\n", + sc->msi_count); } } if ((msi_allowed >= 1) && (sc->msi_count == 0)) { sc->msi_count = 1; - if (pci_alloc_msi(dev, &sc->msi_count)) { - device_printf(dev, "alloc msi failed - will try INTx\n"); + if ((error = pci_alloc_msi(dev, &sc->msi_count)) != 0) { + device_printf(dev, "alloc msi failed - " + "err=%d; will try INTx\n", error); sc->msi_count = 0; + port_qsets = 1; pci_release_msi(dev); } else { sc->flags |= USING_MSI; - sc->irq_rid = 1; sc->cxgb_intr = t3_intr_msi; + device_printf(dev, "using MSI interrupts\n"); } } #endif if (sc->msi_count == 0) { device_printf(dev, "using line interrupts\n"); - sc->irq_rid = 0; sc->cxgb_intr = t3b_intr; } - if ((sc->flags & USING_MSIX) && multiq) - port_qsets = min((SGE_QSETS/(sc)->params.nports), mp_ncpus); - /* Create a private taskqueue thread for handling driver events */ #ifdef TASKQUEUE_CURRENT sc->tq = taskqueue_create("cxgb_taskq", M_NOWAIT, @@ -695,7 +699,7 @@ * 3. Detaching all of the port devices created during the * cxgb_controller_attach() routine. * 4. Removing the device children created via cxgb_controller_attach(). - * 5. Releaseing PCI resources associated with the device. + * 5. Releasing PCI resources associated with the device. * 6. Turning off the offload support, iff it was turned on. * 7. Destroying the mutexes created in cxgb_controller_attach(). * @@ -730,6 +734,8 @@ device_printf(sc->dev, "failed to delete child port\n"); } + cxgb_teardown_interrupts(sc); + #ifdef MSI_SUPPORTED if (sc->flags & (USING_MSI | USING_MSIX)) { device_printf(sc->dev, "releasing msi message(s)\n"); @@ -737,11 +743,12 @@ } else { device_printf(sc->dev, "no msi message to release\n"); } -#endif + if (sc->msix_regs_res != NULL) { bus_release_resource(sc->dev, SYS_RES_MEMORY, sc->msix_regs_rid, sc->msix_regs_res); } +#endif if (sc->tq != NULL) { taskqueue_free(sc->tq); @@ -821,91 +828,116 @@ } static void -cxgb_teardown_msix(adapter_t *sc) +cxgb_teardown_interrupts(adapter_t *sc) { - int i, nqsets; - - for (nqsets = i = 0; i < (sc)->params.nports; i++) - nqsets += sc->port[i].nqsets; + int i; + + for (i = 0; i < SGE_QSETS; i++) { + if (sc->msix_intr_tag[i] == NULL) { + + /* Should have been setup fully or not at all */ + KASSERT(sc->msix_irq_res[i] == NULL && + sc->msix_irq_rid[i] == 0, + ("%s: half-done interrupt (%d).", __func__, i)); - for (i = 0; i < nqsets; i++) { - if (sc->msix_intr_tag[i] != NULL) { - bus_teardown_intr(sc->dev, sc->msix_irq_res[i], - sc->msix_intr_tag[i]); - sc->msix_intr_tag[i] = NULL; + continue; } - if (sc->msix_irq_res[i] != NULL) { - bus_release_resource(sc->dev, SYS_RES_IRQ, - sc->msix_irq_rid[i], sc->msix_irq_res[i]); - sc->msix_irq_res[i] = NULL; - } + + bus_teardown_intr(sc->dev, sc->msix_irq_res[i], + sc->msix_intr_tag[i]); + bus_release_resource(sc->dev, SYS_RES_IRQ, sc->msix_irq_rid[i], + sc->msix_irq_res[i]); + + sc->msix_irq_res[i] = sc->msix_intr_tag[i] = NULL; + sc->msix_irq_rid[i] = 0; + } + + if (sc->intr_tag) { + KASSERT(sc->irq_res != NULL, + ("%s: half-done interrupt.", __func__)); + + bus_teardown_intr(sc->dev, sc->irq_res, sc->intr_tag); + bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irq_rid, + sc->irq_res); + + sc->irq_res = sc->intr_tag = NULL; + sc->irq_rid = 0; } } static int -cxgb_setup_msix(adapter_t *sc, int msix_count) +cxgb_setup_interrupts(adapter_t *sc) { - int i, j, k, nqsets, rid; + struct resource *res; + void *tag; + int i, rid, err, intr_flag = sc->flags & (USING_MSI | USING_MSIX); - /* The first message indicates link changes and error conditions */ - sc->irq_rid = 1; - if ((sc->irq_res = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, - &sc->irq_rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { - device_printf(sc->dev, "Cannot allocate msix interrupt\n"); - return (EINVAL); - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 21:14:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85B8C1065802; Thu, 28 May 2009 21:14:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41A6510657BE for ; Thu, 28 May 2009 21:14:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D9D58FC1C for ; Thu, 28 May 2009 21:14:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SLEP21008354 for ; Thu, 28 May 2009 21:14:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SLENBr008352 for perforce@freebsd.org; Thu, 28 May 2009 21:14:23 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 28 May 2009 21:14:23 GMT Message-Id: <200905282114.n4SLENBr008352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 162971 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, 28 May 2009 21:14:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=162971 Change 162971 by thompsa@thompsa_burger on 2009/05/28 21:13:43 Integrate from usb. Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.3#3 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/usb_buf/src/sys/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/usb_buf/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/usb_buf/src/sys/conf/NOTES#2 integrate .. //depot/projects/usb_buf/src/sys/conf/files#4 integrate .. //depot/projects/usb_buf/src/sys/conf/files.i386#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/usb_buf/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/usb_buf/src/sys/conf/options#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/usb_buf/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/usb_buf/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/usb_buf/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudioreg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ng_ubt.c#4 delete .. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs.h#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/usb_buf/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/init_main.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/usb_buf/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/usb_buf/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/tty.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/usb_buf/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/usb_buf/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/usb_buf/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/usb_buf/src/sys/modules/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/usb_buf/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/usb_buf/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/net/bpf.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/if.c#2 integrate .. //depot/projects/usb_buf/src/sys/net/if_clone.c#2 integrate .. //depot/projects/usb_buf/src/sys/net/if_loop.c#2 integrate .. //depot/projects/usb_buf/src/sys/net/if_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/net/rtsock.c#2 integrate .. //depot/projects/usb_buf/src/sys/net/vnet.h#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/usb_buf/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/in.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/mld6.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/key.c#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/usb_buf/src/sys/netipx/spx.h#2 integrate .. //depot/projects/usb_buf/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/usb_buf/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/usb_buf/src/sys/netipx/spx_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_dev.c#3 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_idmap.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_socket.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_subs.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfs_subs.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfsops.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vn_subs.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vnops.c#2 delete .. //depot/projects/usb_buf/src/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/usb_buf/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_krpc.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/usb_buf/src/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/usb_buf/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/include/mutex.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/usb_buf/src/sys/rpc/rpcclnt.c#2 delete .. //depot/projects/usb_buf/src/sys/rpc/rpcclnt.h#2 delete .. //depot/projects/usb_buf/src/sys/rpc/xdr.h#2 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/usb_buf/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/usb_buf/src/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/sys/acl.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/fail.h#1 branch .. //depot/projects/usb_buf/src/sys/sys/jail.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/ksyms.h#1 branch .. //depot/projects/usb_buf/src/sys/sys/lock.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/lockf.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/lockstat.h#1 branch .. //depot/projects/usb_buf/src/sys/sys/mutex.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/namei.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/priv.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/queue.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/sx.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/systm.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/vimage.h#3 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/usb_buf/src/sys/xdr/xdr_mem.c#2 integrate .. //depot/projects/usb_buf/src/sys/xen/xenbus/xenbus_xs.c#2 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.3#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" .\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ .\" -.Dd April 5, 2009 +.Dd May 28, 2009 .Dt LIBUSB 3 .Os .Sh NAME @@ -78,6 +78,8 @@ .Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb" .Ft void .Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags" +.Ft uint32_t +.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index" .Ft void .Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index" .Ft void @@ -183,6 +185,10 @@ .Ft int .Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq" .Ft struct libusb20_backend * +.Fn libusb20_be_alloc_default "void" +.Ft struct libusb20_backend * +.Fn libusb20_be_alloc_freebsd "void" +.Ft struct libusb20_backend * .Fn libusb20_be_alloc_linux "void" .Ft struct libusb20_device * .Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev" @@ -227,7 +233,7 @@ .Pp . .Fn libusb20_tr_open -will allocate kernel resources like +will allocate kernel buffer resources according to .Fa max_buf_size and .Fa max_frame_count @@ -235,6 +241,18 @@ .Fa pxfer and bind the transfer to the specified .Fa ep_no . +.Fa max_buf_size +is the minimum buffer size which the data transport layer has to support. +If +.Fa max_buf_size +is zero, the +.Nm +library will use wMaxPacketSize to compute the buffer size. +This can be useful for isochronous transfers. +The actual buffer size can be greater than +.Fa max_buf_size +and is returned by +.Fn libusb20_tr_get_max_total_length . . This function returns zero upon success. . @@ -367,8 +385,14 @@ . .Pp . +.Fn libusb20_tr_get_length +returns the length of the given USB frame by index. +After an USB transfer is complete the USB frame length will get updated to the actual transferred length. +. +.Pp +. .Fn libusb20_tr_set_length -sets the length of a given USB transfer and frame index. +sets the length of the given USB frame by index. . .Pp . @@ -829,6 +853,10 @@ If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is returned. . +.Pp +. +.Fn libusb20_be_alloc_default +.Fn libusb20_be_alloc_freebsd .Fn libusb20_be_alloc_linux These functions are used to allocate a specific USB backend or the operating system default USB backend. Allocating a backend is a way to ==== //depot/projects/usb_buf/src/lib/libusb/libusb20.c#2 (text+ko) ==== @@ -319,6 +319,12 @@ return; } +uint32_t +libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex) +{ + return (xfer->pLength[frIndex]); +} + void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex) { ==== //depot/projects/usb_buf/src/lib/libusb/libusb20.h#2 (text+ko) ==== @@ -216,6 +216,7 @@ void libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index); void libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb); void libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags); +uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index); void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index); void libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0); void libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1); ==== //depot/projects/usb_buf/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $ .include @@ -11,7 +11,7 @@ CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v ==== //depot/projects/usb_buf/src/sys/arm/conf/AVILA#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $ ident AVILA @@ -132,15 +132,14 @@ options AH_SUPPORT_AR5416 device ath_ar9160 -makeoptions WITH_LEGACY -device ousb +device usb #options USB_DEBUG -device oohci -device oehci -device oumass +device ohci +device ehci +device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) -#device oural -#device ozyd +#device ural +#device zyd #device wlan_amrr ==== //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -47,4 +47,3 @@ arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # dev/usb/controller/ehci_ixp4xx.c optional ehci usb -legacy/dev/usb/ehci_ixp4xx.c optional oehci ousb ==== //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.14 2009/03/10 19:35:37 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -143,6 +143,7 @@ struct npestats *sc_stats; bus_dmamap_t sc_stats_map; bus_addr_t sc_stats_phys; /* phys addr of sc_stats */ + struct npestats sc_totals; /* accumulated sc_stats */ }; /* @@ -374,6 +375,8 @@ CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tickinterval", CTLFLAG_RW, &sc->sc_tickinterval, 0, "periodic work frequency"); + SYSCTL_ADD_STRUCT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "stats", + CTLFLAG_RD, &sc->sc_totals, npestats, "onboard stats"); ether_ifattach(ifp, eaddr); return 0; @@ -867,12 +870,24 @@ static void npe_addstats(struct npe_softc *sc) { -#define MIBADD(x) sc->mibdata.x += be32toh(ns->x) +#define NPEADD(x) sc->sc_totals.x += be32toh(ns->x) +#define MIBADD(x) do { sc->mibdata.x += be32toh(ns->x); NPEADD(x); } while (0) struct ifnet *ifp = sc->sc_ifp; struct npestats *ns = sc->sc_stats; MIBADD(dot3StatsAlignmentErrors); MIBADD(dot3StatsFCSErrors); + MIBADD(dot3StatsInternalMacReceiveErrors); + NPEADD(RxOverrunDiscards); + NPEADD(RxLearnedEntryDiscards); + NPEADD(RxLargeFramesDiscards); + NPEADD(RxSTPBlockedDiscards); + NPEADD(RxVLANTypeFilterDiscards); + NPEADD(RxVLANIdFilterDiscards); + NPEADD(RxInvalidSourceDiscards); + NPEADD(RxBlackListDiscards); + NPEADD(RxWhiteListDiscards); + NPEADD(RxUnderflowEntryDiscards); MIBADD(dot3StatsSingleCollisionFrames); MIBADD(dot3StatsMultipleCollisionFrames); MIBADD(dot3StatsDeferredTransmissions); @@ -880,10 +895,12 @@ MIBADD(dot3StatsExcessiveCollisions); MIBADD(dot3StatsInternalMacTransmitErrors); MIBADD(dot3StatsCarrierSenseErrors); + NPEADD(TxLargeFrameDiscards); + NPEADD(TxVLANIdFilterDiscards); + sc->mibdata.dot3StatsFrameTooLongs += be32toh(ns->RxLargeFramesDiscards) + be32toh(ns->TxLargeFrameDiscards); - MIBADD(dot3StatsInternalMacReceiveErrors); sc->mibdata.dot3StatsMissedFrames += be32toh(ns->RxOverrunDiscards) + be32toh(ns->RxUnderflowEntryDiscards); @@ -902,6 +919,7 @@ be32toh(ns->dot3StatsSingleCollisionFrames) + be32toh(ns->dot3StatsMultipleCollisionFrames) ; +#undef NPEADD #undef MIBADD } ==== //depot/projects/usb_buf/src/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -44,9 +44,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $"); #include +#include #include #ifdef UFS_SMALL_CGBASE /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase @@ -93,7 +94,7 @@ fsfind(const char *name, ino_t * ino) { char buf[DEV_BSIZE]; - struct dirent *d; + struct direct *d; char *s; ssize_t n; @@ -104,7 +105,7 @@ if (ls) printf("%s ", d->d_name); else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; + *ino = d->d_ino; return d->d_type; } s += d->d_reclen; ==== //depot/projects/usb_buf/src/sys/boot/pc98/boot2/sys.c#2 (text+ko) ==== @@ -27,14 +27,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $"); /* * Ported to PC-9801 by Yoshio Kimura */ #include "boot.h" -#include +#include #if 0 /* #define BUFSIZE 4096 */ @@ -142,7 +142,7 @@ { char *rest, ch; int block, off, loc, ino = ROOTINO; - struct dirent *dp; + struct direct *dp; char list_only; list_only = (path[0] == '?' && path[1] == '\0'); @@ -174,12 +174,12 @@ devread(iobuf, fsbtodb(fs, block_map(block)) + boff, blksize(fs, &inode, block)); } - dp = (struct dirent *)(iobuf + off); + dp = (struct direct *)(iobuf + off); loc += dp->d_reclen; - if (dp->d_fileno && list_only) + if (dp->d_ino && list_only) printf("%s ", dp->d_name); - } while (!dp->d_fileno || strcmp(path, dp->d_name)); - ino = dp->d_fileno; + } while (!dp->d_ino || strcmp(path, dp->d_name)); + ino = dp->d_ino; *(path = rest) = ch; goto loop; } ==== //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfssubr.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.3 2009/05/16 10:48:20 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.5 2009/05/23 16:01:58 des Exp $"); static uint64_t zfs_crc64_table[256]; ==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $"); #include #include @@ -302,6 +302,14 @@ if (error) return (error); } + /* + * Deny setting setuid if we are not the file owner. + */ + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } return (0); } ==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 (text+ko) ==== @@ -424,7 +424,7 @@ #endif } -#ifndef __FreeBSD__ +#if !defined(_KERNEL) acl_t * acl_alloc(enum acl_type type) { @@ -470,7 +470,6 @@ cacl_free(aclp, sizeof (acl_t)); } -#endif static uint32_t access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) @@ -1727,3 +1726,4 @@ return (error); #endif } +#endif /* _KERNEL */ ==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 (text+ko) ==== @@ -46,6 +46,7 @@ extern int ace_trivial_common(void *, int, uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *, uint32_t *mask)); +#if !defined(_KERNEL) extern acl_t *acl_alloc(acl_type_t); extern void acl_free(acl_t *aclp); extern int acl_translate(acl_t *aclp, int target_flavor, @@ -53,6 +54,7 @@ void ksort(caddr_t v, int n, int s, int (*f)()); int cmp2acls(void *a, void *b); +#endif /* _KERNEL */ #ifdef __cplusplus } ==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $ */ /* @@ -122,6 +122,7 @@ #include #include #include +#include #include #include #include @@ -3168,14 +3169,11 @@ uintptr_t rw; } r; #else + struct thread *lowner; union { - struct mtx *mi; - uintptr_t mx; - } m; - union { - struct sx *si; - uintptr_t sx; - } s; + struct lock_object *li; + uintptr_t lx; + } l; #endif switch (subr) { @@ -3272,75 +3270,83 @@ break; #else - /* - * XXX - The following code works because mutex, rwlocks, & sxlocks - * all have similar data structures in FreeBSD. This may not be - * good if someone changes one of the lock data structures. - * Ideally, it would be nice if all these shared a common lock - * object. - */ case DIF_SUBR_MUTEX_OWNED: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - -#ifdef DOODAD - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); - } else { - regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } -#endif + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); + regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner); break; case DIF_SUBR_MUTEX_OWNER: - /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ - m.mx = tupregs[0].dttk_value; - - if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { - regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK; - } else { - if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) - regs[rd] = SX_OWNER(m.mi->mtx_lock); - else - regs[rd] = 0; + if (!dtrace_canload(tupregs[0].dttk_value, + sizeof (struct lock_object), mstate, vstate)) { + regs[rd] = 0; + break; } + l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 21:25:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA7BD106566C; Thu, 28 May 2009 21:25: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 8340E106564A for ; Thu, 28 May 2009 21:25:39 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6F0AC8FC23 for ; Thu, 28 May 2009 21:25:39 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SLPdQR009336 for ; Thu, 28 May 2009 21:25:39 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SLPaZA009330 for perforce@freebsd.org; Thu, 28 May 2009 21:25:36 GMT (envelope-from antab@FreeBSD.org) Date: Thu, 28 May 2009 21:25:36 GMT Message-Id: <200905282125.n4SLPaZA009330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162973 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, 28 May 2009 21:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=162973 Change 162973 by antab@antab_farm on 2009/05/28 21:24:50 IFC @ 162955 Affected files ... .. //depot/projects/avr32/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/avr32/src/UPDATING#8 integrate .. //depot/projects/avr32/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/avr32/src/bin/cp/Makefile#2 integrate .. //depot/projects/avr32/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/avr32/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/avr32/src/bin/ps/print.c#3 integrate .. //depot/projects/avr32/src/bin/ps/ps.1#2 integrate .. //depot/projects/avr32/src/bin/ps/ps.c#2 integrate .. //depot/projects/avr32/src/bin/ps/ps.h#2 integrate .. //depot/projects/avr32/src/bin/test/TEST.sh#2 integrate .. //depot/projects/avr32/src/bin/test/test.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/avr32/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/avr32/src/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/avr32/src/contrib/ee/Changes#1 branch .. //depot/projects/avr32/src/contrib/ee/Makefile#1 branch .. //depot/projects/avr32/src/contrib/ee/README.ee#1 branch .. //depot/projects/avr32/src/contrib/ee/create.make#1 branch .. //depot/projects/avr32/src/contrib/ee/ee.1#1 branch .. //depot/projects/avr32/src/contrib/ee/ee.c#1 branch .. //depot/projects/avr32/src/contrib/ee/ee.i18n.guide#1 branch .. //depot/projects/avr32/src/contrib/ee/ee.msg#1 branch .. //depot/projects/avr32/src/contrib/ee/ee_version.h#1 branch .. //depot/projects/avr32/src/contrib/ee/genstr#1 branch .. //depot/projects/avr32/src/contrib/ee/make.default#1 branch .. //depot/projects/avr32/src/contrib/ee/new_curse.c#1 branch .. //depot/projects/avr32/src/contrib/ee/new_curse.h#1 branch .. //depot/projects/avr32/src/contrib/file/ChangeLog#3 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/cafebabe#3 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/compress#3 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/database#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/erlang#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/kml#1 branch .. //depot/projects/avr32/src/contrib/file/Magdir/linux#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/python#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/troff#2 integrate .. //depot/projects/avr32/src/contrib/file/Magdir/windows#2 integrate .. //depot/projects/avr32/src/contrib/file/Makefile.am#3 integrate .. //depot/projects/avr32/src/contrib/file/Makefile.in#3 integrate .. //depot/projects/avr32/src/contrib/file/README#3 integrate .. //depot/projects/avr32/src/contrib/file/acinclude.m4#2 integrate .. //depot/projects/avr32/src/contrib/file/aclocal.m4#2 integrate .. //depot/projects/avr32/src/contrib/file/apprentice.c#3 integrate .. //depot/projects/avr32/src/contrib/file/apptype.c#3 integrate .. //depot/projects/avr32/src/contrib/file/cdf.c#2 integrate .. //depot/projects/avr32/src/contrib/file/cdf.h#2 integrate .. //depot/projects/avr32/src/contrib/file/cdf_time.c#2 integrate .. //depot/projects/avr32/src/contrib/file/compress.c#3 integrate .. //depot/projects/avr32/src/contrib/file/config.guess#2 delete .. //depot/projects/avr32/src/contrib/file/config.h.in#3 integrate .. //depot/projects/avr32/src/contrib/file/config.sub#2 delete .. //depot/projects/avr32/src/contrib/file/configure#3 integrate .. //depot/projects/avr32/src/contrib/file/configure.ac#3 integrate .. //depot/projects/avr32/src/contrib/file/file.c#3 integrate .. //depot/projects/avr32/src/contrib/file/file.h#3 integrate .. //depot/projects/avr32/src/contrib/file/funcs.c#3 integrate .. //depot/projects/avr32/src/contrib/file/getopt_long.c#3 integrate .. //depot/projects/avr32/src/contrib/file/magic.c#3 integrate .. //depot/projects/avr32/src/contrib/file/patchlevel.h#3 integrate .. //depot/projects/avr32/src/contrib/file/readcdf.c#2 integrate .. //depot/projects/avr32/src/contrib/file/softmagic.c#3 integrate .. //depot/projects/avr32/src/contrib/file/strlcat.c#1 branch .. //depot/projects/avr32/src/contrib/file/strlcpy.c#1 branch .. //depot/projects/avr32/src/contrib/file/tests/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/avr32/src/crypto/openssh/PROTOCOL#2 integrate .. //depot/projects/avr32/src/crypto/openssh/README#2 integrate .. //depot/projects/avr32/src/crypto/openssh/addrmatch.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/auth2-jpake.c#1 branch .. //depot/projects/avr32/src/crypto/openssh/auth2.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/canohost.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/canohost.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/channels.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/channels.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/cipher.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/cipher.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/compat.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/compat.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/config.guess#2 integrate .. //depot/projects/avr32/src/crypto/openssh/config.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/config.h.in#2 integrate .. //depot/projects/avr32/src/crypto/openssh/defines.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/jpake.c#1 branch .. //depot/projects/avr32/src/crypto/openssh/jpake.h#1 branch .. //depot/projects/avr32/src/crypto/openssh/kex.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/key.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/misc.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/monitor.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/monitor.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/nchan.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/openbsd-compat/bsd-poll.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/packet.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/readconf.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/readconf.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/schnorr.c#1 branch .. //depot/projects/avr32/src/crypto/openssh/scp.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/servconf.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/servconf.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/session.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sftp-server-main.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sftp.1#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sftp.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh.1#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh_config#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshd.8#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshd.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshd_config#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/avr32/src/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/avr32/src/crypto/openssh/version.h#2 integrate .. //depot/projects/avr32/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/avr32/src/etc/devd.conf#3 integrate .. //depot/projects/avr32/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/avr32/src/etc/namedb/named.conf#2 integrate .. //depot/projects/avr32/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/avr32/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/avr32/src/etc/rc.d/idmapd#2 delete .. //depot/projects/avr32/src/etc/rc.d/named#3 integrate .. //depot/projects/avr32/src/etc/rc.d/tmp#2 integrate .. //depot/projects/avr32/src/include/Makefile#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/avr32/src/lib/libbluetooth/hci.c#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/getcap.c#3 integrate .. //depot/projects/avr32/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/avr32/src/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/avr32/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_compat.c#1 branch .. //depot/projects/avr32/src/lib/libc/posix1e/acl_delete.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_entry.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_init.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_set.3#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_set.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/acl_valid.c#2 integrate .. //depot/projects/avr32/src/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/avr32/src/lib/libc/rpc/svc_dg.c#2 integrate .. //depot/projects/avr32/src/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/private.h#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/time2posix.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/tzfile.5#2 integrate .. //depot/projects/avr32/src/lib/libc/stdtime/tzfile.h#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/jail.2#3 integrate .. //depot/projects/avr32/src/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate .. //depot/projects/avr32/src/lib/libc_r/arch/i386/_atomic_lock.S#2 integrate .. //depot/projects/avr32/src/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/avr32/src/lib/libgeom/Makefile#2 integrate .. //depot/projects/avr32/src/lib/libmemstat/memstat_malloc.c#2 integrate .. //depot/projects/avr32/src/lib/libstand/i386/_setjmp.S#2 integrate .. //depot/projects/avr32/src/lib/libstand/stand.h#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb.3#3 integrate .. //depot/projects/avr32/src/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/e_sqrtf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_lrint.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_lrintf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_remquo.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_remquof.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_scalbn.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_scalbnf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/amd64/s_scalbnl.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_ceil.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_ceill.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_copysign.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_copysignf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_copysignl.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_cos.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_finite.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_floor.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_floorl.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_llrint.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_llrintf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_logb.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_logbf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_lrint.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_lrintf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_remquo.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_remquof.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_rint.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_rintf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_scalbn.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_scalbnf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_scalbnl.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_significand.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_significandf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_sin.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_tan.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_trunc.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/i387/s_truncl.S#2 integrate .. //depot/projects/avr32/src/lib/msun/ia64/s_fma.S#2 integrate .. //depot/projects/avr32/src/lib/msun/ia64/s_fmaf.S#2 integrate .. //depot/projects/avr32/src/lib/msun/ia64/s_fmal.S#2 integrate .. //depot/projects/avr32/src/libexec/Makefile#2 integrate .. //depot/projects/avr32/src/libexec/makekey/Makefile#2 delete .. //depot/projects/avr32/src/libexec/makekey/makekey.8#2 delete .. //depot/projects/avr32/src/libexec/makekey/makekey.c#2 delete .. //depot/projects/avr32/src/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/avr32/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/avr32/src/rescue/rescue/Makefile#5 integrate .. //depot/projects/avr32/src/sbin/Makefile#3 integrate .. //depot/projects/avr32/src/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/avr32/src/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/avr32/src/sbin/geom/class/journal/gjournal.8#4 integrate .. //depot/projects/avr32/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/avr32/src/sbin/idmapd/Makefile#2 delete .. //depot/projects/avr32/src/sbin/idmapd/idmapd.8#2 delete .. //depot/projects/avr32/src/sbin/idmapd/idmapd.c#2 delete .. //depot/projects/avr32/src/sbin/mount/mount.c#3 integrate .. //depot/projects/avr32/src/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/avr32/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/avr32/src/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/avr32/src/sbin/restore/Makefile#2 integrate .. //depot/projects/avr32/src/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/avr32/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/avr32/src/share/examples/ppp/ppp.linkup.sample#2 integrate .. //depot/projects/avr32/src/share/man/man3/Makefile#2 integrate .. //depot/projects/avr32/src/share/man/man3/queue.3#2 integrate .. //depot/projects/avr32/src/share/man/man4/Makefile#6 integrate .. //depot/projects/avr32/src/share/man/man4/altq.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/ath.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/bge.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/bwi.4#1 branch .. //depot/projects/avr32/src/share/man/man4/geom.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/hifn.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ipsec.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/ksyms.4#1 branch .. //depot/projects/avr32/src/share/man/man4/md.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/mld.4#1 branch .. //depot/projects/avr32/src/share/man/man4/msk.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/multicast.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/nge.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/ubsec.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/uchcom.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/urtw.4#2 integrate .. //depot/projects/avr32/src/share/man/man4/usb.4#3 integrate .. //depot/projects/avr32/src/share/man/man4/usb2_core.4#3 delete .. //depot/projects/avr32/src/share/man/man4/wlan.4#3 integrate .. //depot/projects/avr32/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/avr32/src/share/man/man9/Makefile#5 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/acl.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/atomic.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/fail.9#1 branch .. //depot/projects/avr32/src/share/man/man9/sbuf.9#2 integrate .. //depot/projects/avr32/src/share/misc/committers-ports.dot#5 integrate .. //depot/projects/avr32/src/share/misc/committers-src.dot#5 integrate .. //depot/projects/avr32/src/share/misc/iso639#2 integrate .. //depot/projects/avr32/src/share/syscons/keymaps/uk.iso-ctrl.kbd#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/africa#4 integrate .. //depot/projects/avr32/src/share/zoneinfo/antarctica#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/asia#6 integrate .. //depot/projects/avr32/src/share/zoneinfo/australasia#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/backward#3 integrate .. //depot/projects/avr32/src/share/zoneinfo/etcetera#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/europe#3 integrate .. //depot/projects/avr32/src/share/zoneinfo/factory#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/northamerica#4 integrate .. //depot/projects/avr32/src/share/zoneinfo/pacificnew#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/avr32/src/share/zoneinfo/systemv#2 integrate .. //depot/projects/avr32/src/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/avr32/src/sys/Makefile#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/avr32/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/avr32/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/avr32/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/avr32/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/avr32/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/avr32/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/avr32/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/avr32/src/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/avr32/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/avr32/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/avr32/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/avr32/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/avr32/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/avr32/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/boot/zfs/README#2 integrate .. //depot/projects/avr32/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/avr32/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/avr32/src/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/avr32/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/avr32/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/avr32/src/sys/conf/NOTES#7 integrate .. //depot/projects/avr32/src/sys/conf/files#10 integrate .. //depot/projects/avr32/src/sys/conf/files.amd64#6 integrate .. //depot/projects/avr32/src/sys/conf/files.i386#6 integrate .. //depot/projects/avr32/src/sys/conf/files.pc98#6 integrate .. //depot/projects/avr32/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/avr32/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/avr32/src/sys/conf/options#6 integrate .. //depot/projects/avr32/src/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/avr32/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/avr32/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/avr32/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/avr32/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/avr32/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/avr32/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/avr32/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/avr32/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-acard.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/avr32/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/avr32/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/avr32/src/sys/dev/bwi/bwiphy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/avr32/src/sys/dev/bwi/if_bwi_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/bwi/if_bwireg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/avr32/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/avr32/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/avr32/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/avr32/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/avr32/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/avr32/src/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/avr32/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/avr32/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/avr32/src/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/avr32/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/md/md.c#4 integrate .. //depot/projects/avr32/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/avr32/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/avr32/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/avr32/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/avr32/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/avr32/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/avr32/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ral/rt2661var.h#3 integrate .. //depot/projects/avr32/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/avr32/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/avr32/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/avr32/src/sys/dev/spibus/spibus.c#3 integrate .. //depot/projects/avr32/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/avr32/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/avr32/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ng_ubt.c#4 delete .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ubtbcmfw.c#5 delete .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_controller.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/avr32/src/sys/dev/wpi/if_wpivar.h#3 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/avr32/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/avr32/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfsdport.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfsproto.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs.h#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nfsserver/nfs_nfsdsubs.c#2 integrate .. //depot/projects/avr32/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/avr32/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/avr32/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/avr32/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/avr32/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/avr32/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/avr32/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/avr32/src/sys/i386/i386/mca.c#1 branch .. //depot/projects/avr32/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/avr32/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/avr32/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/avr32/src/sys/i386/include/mca.h#1 branch .. //depot/projects/avr32/src/sys/i386/include/param.h#4 integrate .. //depot/projects/avr32/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/avr32/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/avr32/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/avr32/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/avr32/src/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/avr32/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/avr32/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/avr32/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/avr32/src/sys/kern/init_main.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/avr32/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/avr32/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/avr32/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/avr32/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/avr32/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/avr32/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/avr32/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/avr32/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/avr32/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/avr32/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/avr32/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#7 integrate .. //depot/projects/avr32/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/avr32/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/avr32/src/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/avr32/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/avr32/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/avr32/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/avr32/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/avr32/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehci_pci.c#3 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_upgt.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ohci_pci.c#3 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhci_pci.c#3 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/avr32/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/avr32/src/sys/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#7 integrate .. //depot/projects/avr32/src/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/avr32/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/avr32/src/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/avr32/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/avr32/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/avr32/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/avr32/src/sys/net/bpf.c#4 integrate .. //depot/projects/avr32/src/sys/net/if.c#8 integrate .. //depot/projects/avr32/src/sys/net/if_clone.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/avr32/src/sys/net/if_loop.c#7 integrate .. //depot/projects/avr32/src/sys/net/if_var.h#5 integrate .. //depot/projects/avr32/src/sys/net/netisr.c#3 integrate .. //depot/projects/avr32/src/sys/net/netisr.h#3 integrate .. //depot/projects/avr32/src/sys/net/rtsock.c#5 integrate .. //depot/projects/avr32/src/sys/net/vnet.h#7 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_sta.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_tdma.h#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/avr32/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/avr32/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/in.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/avr32/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/udp_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/vinet.h#7 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/mld6.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/avr32/src/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/avr32/src/sys/netipsec/key.c#6 integrate .. //depot/projects/avr32/src/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/avr32/src/sys/netipx/spx.h#2 integrate .. //depot/projects/avr32/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/avr32/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/avr32/src/sys/netipx/spx_var.h#2 integrate .. //depot/projects/avr32/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/avr32/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/avr32/src/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_dev.c#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_idmap.c#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_socket.c#3 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_subs.c#3 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vfs_subs.c#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vfsops.c#3 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vn_subs.c#2 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4_vnops.c#4 delete .. //depot/projects/avr32/src/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfsnode.h#4 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvkrpc.c#4 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/avr32/src/sys/nlm/nlm.h#2 integrate .. //depot/projects/avr32/src/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/avr32/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/avr32/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/avr32/src/sys/pc98/include/mca.h#1 branch .. //depot/projects/avr32/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/mp_cpudep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/platform_chrp.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/clock.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/locore.S#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/booke/platform_bare.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/mutex.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/platform.h#1 branch .. //depot/projects/avr32/src/sys/powerpc/include/platformvar.h#1 branch .. //depot/projects/avr32/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/include/powerpc.h#2 delete .. //depot/projects/avr32/src/sys/powerpc/include/smp.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/platform.c#1 branch .. //depot/projects/avr32/src/sys/powerpc/powerpc/platform_if.m#1 branch .. //depot/projects/avr32/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/avr32/src/sys/rpc/rpcclnt.c#2 delete .. //depot/projects/avr32/src/sys/rpc/rpcclnt.h#2 delete .. //depot/projects/avr32/src/sys/rpc/xdr.h#2 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_internal.h#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 28 21:27:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0362C106566C; Thu, 28 May 2009 21:27:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7D80106564A for ; Thu, 28 May 2009 21:27:41 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A65F08FC08 for ; Thu, 28 May 2009 21:27:41 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SLRfmt009456 for ; Thu, 28 May 2009 21:27:41 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4SLRfBd009454 for perforce@freebsd.org; Thu, 28 May 2009 21:27:41 GMT (envelope-from antab@FreeBSD.org) Date: Thu, 28 May 2009 21:27:41 GMT Message-Id: <200905282127.n4SLRfBd009454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 162974 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, 28 May 2009 21:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=162974 Change 162974 by antab@antab_farm on 2009/05/28 21:27:21 Add cpu_flush_dcache Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#11 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#11 (text+ko) ==== @@ -110,6 +110,16 @@ ocdreg_write(DC, bit_offset(OCD, DC, RES)); } +/* + * Flush the D-cache for non-DMA I/O so that the I-cache can + * be made coherent later. + */ +void +cpu_flush_dcache(void *ptr, size_t len) +{ + /* XXX: Todo */ +} + /** * Debugging code for avr32, this is here so i can do writes to usart1 without going thru all the * tty code From owner-p4-projects@FreeBSD.ORG Thu May 28 23:01:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E973D1065672; Thu, 28 May 2009 23:01:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A856E106566C for ; Thu, 28 May 2009 23:01:10 +0000 (UTC) (envelope-from ulf.lilleengen@gmail.com) Received: from mail-ew0-f164.google.com (mail-ew0-f164.google.com [209.85.219.164]) by mx1.freebsd.org (Postfix) with ESMTP id 314738FC16 for ; Thu, 28 May 2009 23:01:09 +0000 (UTC) (envelope-from ulf.lilleengen@gmail.com) Received: by ewy8 with SMTP id 8so2390757ewy.43 for ; Thu, 28 May 2009 16:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type:content-transfer-encoding; bh=X8Cs0s8KKBC/JuGY51yCGLy6HjG8/HgaAORUb6EG9Sg=; b=xH+ZhlzZgSxp53PZzUDYvNkKYPPKSRiKGe1M99OX9j4j5zAT5ELeD4NUnCzDV48fZ/ kIR3PrQtaqvFzxUrLeYG/zvb2s3gecXzV5t0ztqJ8qZfSpLS7jpISk3VZE1taopBTXFW kdUyrpPqXViFl6y2oaBWAIKjNTgjfTxVzyX/8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=m3ANlyc6e4RyVACQIane5LQncP9VuEOZuwteq0BOZGZQWPmdQAE+XOwq1WhQuKKdWy UW0qTqQ0gM6H0Brm+GNWv0i5NTcZ5rwJ7xe7JsPxnfqm/+yo7/oJLJzzfA/8BqhsKEky wHD/nKdiuXGByrwYS9uc/jHcPPDLT4aBZw3+k= Received: by 10.210.18.8 with SMTP id 8mr3405185ebr.53.1243550318696; Thu, 28 May 2009 15:38:38 -0700 (PDT) Received: from carrot.geeknest.org (z032069.its-s.tudelft.nl [145.94.32.69]) by mx.google.com with ESMTPS id 10sm1225821eyz.11.2009.05.28.15.38.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 28 May 2009 15:38:37 -0700 (PDT) Message-ID: <4A1F126C.6020506@FreeBSD.org> Date: Fri, 29 May 2009 00:38:36 +0200 From: Ulf Lilleengen User-Agent: Thunderbird 2.0.0.21 (X11/20090411) MIME-Version: 1.0 To: Arnar Mar Sig References: <200905282127.n4SLRfBd009454@repoman.freebsd.org> In-Reply-To: <200905282127.n4SLRfBd009454@repoman.freebsd.org> X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 162974 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, 28 May 2009 23:01:12 -0000 Arnar Mar Sig wrote: > http://perforce.freebsd.org/chv.cgi?CH=162974 > > Change 162974 by antab@antab_farm on 2009/05/28 21:27:21 > > Add cpu_flush_dcache > > Affected files ... > > .. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#11 edit > > Differences ... > > ==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#11 (text+ko) ==== > > @@ -110,6 +110,16 @@ > ocdreg_write(DC, bit_offset(OCD, DC, RES)); > } > > +/* > + * Flush the D-cache for non-DMA I/O so that the I-cache can > + * be made coherent later. > + */ > +void > +cpu_flush_dcache(void *ptr, size_t len) > +{ > + /* XXX: Todo */ > +} > + > /** Btw, I have added support for cache operations like this in avr32/avr32/cache.c for busdma. -- Ulf Lilleengen From owner-p4-projects@FreeBSD.ORG Fri May 29 00:00:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D0E11065674; Fri, 29 May 2009 00:00: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 4D101106566C for ; Fri, 29 May 2009 00:00:22 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A5998FC0A for ; Fri, 29 May 2009 00:00:22 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T00JXW024513 for ; Fri, 29 May 2009 00:00:19 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T00I0b024511 for perforce@freebsd.org; Fri, 29 May 2009 00:00:18 GMT (envelope-from dforsyth@FreeBSD.org) Date: Fri, 29 May 2009 00:00:18 GMT Message-Id: <200905290000.n4T00I0b024511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 162982 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, 29 May 2009 00:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=162982 Change 162982 by dforsyth@squirrel on 2009/05/28 23:59:32 Modified read_subdir routine. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#3 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.c#3 (text+ko) ==== @@ -28,12 +28,11 @@ return (p); memset(p, 0, sizeof(*p)); - p->ident = malloc(strlen(ident) + 1); + p->ident = strdup(ident); if (p->ident == NULL) { pkg_free(p); return (NULL); } - strcpy(p->ident, ident); return (p); } ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ /* pkgdb. */ struct pkgdb; struct pkgdb_subdir; -struct sd_head; +struct subdir_head; struct dirent; struct pkgdb *pkgdb_new_hierdb(const char *db_root); ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#3 (text+ko) ==== @@ -16,7 +16,7 @@ int sd_count; struct pkgdb_subdir *sd_curr; - TAILQ_HEAD(sd_head, pkgdb_subdir) *sd_headp; + TAILQ_HEAD(subdir_head, pkgdb_subdir) sd_head; /* Callbacks */ /* tuuuummmmbbbllleeewwwweeeedddddd*/ @@ -26,8 +26,9 @@ TAILQ_ENTRY(pkgdb_subdir) next; char *name; + char *path; + int file_count; char **file_list; - int num_files; int dirty; }; @@ -42,36 +43,29 @@ int s; struct stat sb; struct pkgdb *db; + char *new_db_root; + struct sd_head *new_sd_headp; if (db_root == NULL) return (NULL); - + s = stat(db_root, &sb); - if (s != 0) + if (s != 0 || !S_ISDIR(sb.st_mode)) return (NULL); - if (!S_ISDIR(sb.st_mode)) + + db = calloc(1, sizeof(*db)); + new_db_root = strdup(db_root); + // new_sd_headp = calloc(1, sizeof(*db->sd_headp)); + if (db == NULL || new_db_root == NULL/* || new_sd_headp == NULL*/) { + free(db); + free(new_db_root); + // free(new_sd_headp); return (NULL); - - db = malloc(sizeof(*db)); - if (db == NULL) - return (db); - memset(db, 0, sizeof(*db)); - - db->db_root = malloc(strlen(db_root) + 1); - if (db->db_root == NULL) { - pkgdb_free_hierdb(db); - return (NULL); } - strcpy(db->db_root, db_root); + db->db_root = new_db_root; + // db->sd_headp = new_sd_headp; + TAILQ_INIT(&db->sd_head); - db->sd_headp = malloc(sizeof(*db->sd_headp)); - if (db->sd_headp == NULL) { - pkgdb_free_hierdb(db); - return (NULL); - } - memset(db->sd_headp, 0, sizeof(*db->sd_headp)); - TAILQ_INIT(db->sd_headp); - db->sd_count = 0; db->dirty = 1; @@ -125,7 +119,7 @@ if (db->dirty == 0) { /* No changes since the last reset, don't bother walking the * database again. */ - db->sd_curr = TAILQ_FIRST(db->sd_headp); + db->sd_curr = TAILQ_FIRST(&db->sd_head); return (db->sd_count); } @@ -133,22 +127,24 @@ /* Clear out old list. */ pkgdb_free_pkgdb_subdir_list(db); - - TAILQ_INIT(db->sd_headp); + /* Later on I should look into inserting changes into the existing + * list, rather than just bombing the whole thing. */ + + TAILQ_INIT(&db->sd_head); for (i = 0; i < db->sd_count; ++i) { sd = pkgdb_read_subdir(db, ents[i]->d_name); if (sd == NULL) { pkgdb_free_pkgdb_subdir_list(db); + free(ents); return (-1); } - TAILQ_INSERT_TAIL(db->sd_headp, sd, next); + TAILQ_INSERT_TAIL(&db->sd_head, sd, next); free(ents[i]); } - + free(ents); + db->sd_curr = TAILQ_FIRST(&db->sd_head); db->dirty = 0; - db->sd_curr = TAILQ_FIRST(db->sd_headp); - return (db->sd_count); } @@ -163,18 +159,56 @@ struct pkgdb_subdir * pkgdb_read_subdir(struct pkgdb *db, const char *name) { + int i; + int s; + int slash; + struct stat sb; struct pkgdb_subdir *sd; + char *new_name; + char *new_path; + DIR *sd_dirp; + struct dirent **ents; + + slash = (db->db_root[strlen(db->db_root) - 1] == '/' ? 0 : 1); + + sd = calloc(1, sizeof(*sd)); + new_name = strdup(name); + new_path = malloc(strlen(db->db_root) + slash + strlen(name) + 1); + if (sd == NULL || new_name == NULL || new_path == NULL) { + free(sd); + free(new_name); + free(new_path); + } + strcpy(new_path, db->db_root); + strcat(new_path, "/"); + strcat(new_path, name); - sd = malloc(sizeof(*sd)); - if (sd == NULL) + sd->name = new_name; + sd->path = new_path; + + s = lstat(sd->path, &sb); + if (s < 0 || S_ISLNK(sb.st_mode) || !S_ISDIR(sb.st_mode)) { + pkgdb_free_pkgdb_subdir(sd); return (NULL); + } - sd->name = malloc(strlen(name) + 1); - if (sd->name == NULL) { - free(sd); + sd->file_count = scandir(sd->path, &ents, subdir_sel, alphasort); + sd->file_list = calloc(sd->file_count, sizeof(char *)); + if (sd->file_list == NULL) { + pkgdb_free_pkgdb_subdir(sd); return (NULL); } - strcpy(sd->name, name); + for (i = 0; i < sd->file_count; ++i) { + sd->file_list[i] = strdup(ents[i]->d_name); + if (sd->file_list[i] == NULL) { + sd->file_count = i; /* free up to */ + pkgdb_free_pkgdb_subdir(sd); + free(ents); + return (NULL); + } + free(ents[i]); + } + free(ents); return (sd); } @@ -182,25 +216,42 @@ /* Move the current subdir pointer to the next one in the list. Return * the previous subdir. Return NULL if there are no more left. */ -struct pkg * -pkgdb_next_pkg(struct pkgdb *db) +struct pkgdb_subdir * +pkgdb_next_pkgdb_subdir(struct pkgdb *db) { - struct pkg *p; struct pkgdb_subdir *sd; if (db == NULL) return (NULL); sd = db->sd_curr; - if (db->sd_curr == NULL) + if (sd == NULL) return (NULL); db->sd_curr = TAILQ_NEXT(db->sd_curr, next); + return (sd); +} + +struct pkg * +pkgdb_next_pkg(struct pkgdb *db) +{ + struct pkgdb_subdir *sd; + struct pkg *p; + + + if (db == NULL) + return (NULL); + + sd = pkgdb_next_pkgdb_subdir(db); + if (sd == NULL) + return (NULL); p = pkg_new(sd->name); return (p); } + + /* Free a hierdb. */ void @@ -220,35 +271,27 @@ struct pkgdb_subdir *sd; struct pkgdb_subdir *sdn; - sd = TAILQ_FIRST(db->sd_headp); + sd = TAILQ_FIRST(&db->sd_head); while (sd != NULL) { sdn = TAILQ_NEXT(sd, next); pkgdb_free_pkgdb_subdir(sd); sd = sdn; } - TAILQ_INIT(db->sd_headp); + TAILQ_INIT(&db->sd_head); } void pkgdb_free_pkgdb_subdir(struct pkgdb_subdir *sd) { + int i; + if (sd == NULL) return; free(sd->name); + free(sd->path); + for (i = 0; i < sd->file_count; ++i) + free(sd->file_list[i]); + free(sd->file_list); free(sd); } - -void -free_ptr_array(void **arr, int c) -{ - int i; - - if (arr == NULL) - return; - - for (i = 0; i < c; ++i) - free(arr[i]); - - free(arr); -} From owner-p4-projects@FreeBSD.ORG Fri May 29 03:22:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C48E106566B; Fri, 29 May 2009 03:22:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38CE21065674 for ; Fri, 29 May 2009 03:22:48 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 259F08FC1A for ; Fri, 29 May 2009 03:22:48 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T3Mli9054298 for ; Fri, 29 May 2009 03:22:47 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T3Mlu0054296 for perforce@freebsd.org; Fri, 29 May 2009 03:22:47 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 May 2009 03:22:47 GMT Message-Id: <200905290322.n4T3Mlu0054296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 162985 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, 29 May 2009 03:22:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=162985 Change 162985 by thompsa@thompsa_burger on 2009/05/29 03:22:30 Sync files to SVN. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#6 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#31 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#13 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/avr32dci.c $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/controller/avr32dci.c 192984 2009-05-28 17:36:36Z thompsa $"); /*- * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. @@ -74,23 +74,23 @@ /* prototypes */ -struct usb2_bus_methods avr32dci_bus_methods; -struct usb2_pipe_methods avr32dci_device_non_isoc_methods; -struct usb2_pipe_methods avr32dci_device_isoc_fs_methods; +struct usb_bus_methods avr32dci_bus_methods; +struct usb_pipe_methods avr32dci_device_non_isoc_methods; +struct usb_pipe_methods avr32dci_device_isoc_fs_methods; static avr32dci_cmd_t avr32dci_setup_rx; static avr32dci_cmd_t avr32dci_data_rx; static avr32dci_cmd_t avr32dci_data_tx; static avr32dci_cmd_t avr32dci_data_tx_sync; -static void avr32dci_device_done(struct usb2_xfer *, usb2_error_t); -static void avr32dci_do_poll(struct usb2_bus *); -static void avr32dci_standard_done(struct usb2_xfer *); +static void avr32dci_device_done(struct usb_xfer *, usb2_error_t); +static void avr32dci_do_poll(struct usb_bus *); +static void avr32dci_standard_done(struct usb_xfer *); static void avr32dci_root_intr(struct avr32dci_softc *sc); /* * Here is a list of what the chip supports: */ -static const struct usb2_hw_ep_profile +static const struct usb_hw_ep_profile avr32dci_ep_profile[4] = { [0] = { @@ -134,8 +134,8 @@ }; static void -avr32dci_get_hw_ep_profile(struct usb2_device *udev, - const struct usb2_hw_ep_profile **ppf, uint8_t ep_addr) +avr32dci_get_hw_ep_profile(struct usb_device *udev, + const struct usb_hw_ep_profile **ppf, uint8_t ep_addr) { if (ep_addr == 0) *ppf = avr32dci_ep_profile; @@ -254,7 +254,7 @@ avr32dci_setup_rx(struct avr32dci_td *td) { struct avr32dci_softc *sc; - struct usb2_device_request req; + struct usb_device_request req; uint16_t count; uint32_t temp; @@ -329,7 +329,7 @@ avr32dci_data_rx(struct avr32dci_td *td) { struct avr32dci_softc *sc; - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint16_t count; uint32_t temp; uint8_t to; @@ -429,7 +429,7 @@ avr32dci_data_tx(struct avr32dci_td *td) { struct avr32dci_softc *sc; - struct usb2_page_search buf_res; + struct usb_page_search buf_res; uint16_t count; uint8_t to; uint32_t temp; @@ -538,7 +538,7 @@ } static uint8_t -avr32dci_xfer_do_fifo(struct usb2_xfer *xfer) +avr32dci_xfer_do_fifo(struct usb_xfer *xfer) { struct avr32dci_td *td; @@ -583,7 +583,7 @@ static void avr32dci_interrupt_poll(struct avr32dci_softc *sc) { - struct usb2_xfer *xfer; + struct usb_xfer *xfer; repeat: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { @@ -727,7 +727,7 @@ } static void -avr32dci_setup_standard_chain(struct usb2_xfer *xfer) +avr32dci_setup_standard_chain(struct usb_xfer *xfer) { struct avr32dci_std_temp temp; struct avr32dci_softc *sc; @@ -878,7 +878,7 @@ static void avr32dci_timeout(void *arg) { - struct usb2_xfer *xfer = arg; + struct usb_xfer *xfer = arg; DPRINTF("xfer=%p\n", xfer); @@ -889,7 +889,7 @@ } static void -avr32dci_start_standard_chain(struct usb2_xfer *xfer) +avr32dci_start_standard_chain(struct usb_xfer *xfer) { DPRINTFN(9, "\n"); @@ -925,7 +925,7 @@ } static usb2_error_t -avr32dci_standard_done_sub(struct usb2_xfer *xfer) +avr32dci_standard_done_sub(struct usb_xfer *xfer) { struct avr32dci_td *td; uint32_t len; @@ -989,7 +989,7 @@ } static void -avr32dci_standard_done(struct usb2_xfer *xfer) +avr32dci_standard_done(struct usb_xfer *xfer) { usb2_error_t err = 0; @@ -1038,7 +1038,7 @@ * same USB transfer! *------------------------------------------------------------------------*/ static void -avr32dci_device_done(struct usb2_xfer *xfer, usb2_error_t error) +avr32dci_device_done(struct usb_xfer *xfer, usb2_error_t error) { struct avr32dci_softc *sc = AVR32_BUS2SC(xfer->xroot->bus); uint8_t ep_no; @@ -1061,8 +1061,8 @@ } static void -avr32dci_set_stall(struct usb2_device *udev, struct usb2_xfer *xfer, - struct usb2_pipe *pipe) +avr32dci_set_stall(struct usb_device *udev, struct usb_xfer *xfer, + struct usb_pipe *pipe) { struct avr32dci_softc *sc; uint8_t ep_no; @@ -1086,7 +1086,7 @@ avr32dci_clear_stall_sub(struct avr32dci_softc *sc, uint8_t ep_no, uint8_t ep_type, uint8_t ep_dir) { - const struct usb2_hw_ep_profile *pf; + const struct usb_hw_ep_profile *pf; uint32_t temp; uint32_t epsize; uint8_t n; @@ -1148,10 +1148,10 @@ } static void -avr32dci_clear_stall(struct usb2_device *udev, struct usb2_pipe *pipe) +avr32dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) { struct avr32dci_softc *sc; - struct usb2_endpoint_descriptor *ed; + struct usb_endpoint_descriptor *ed; DPRINTFN(5, "pipe=%p\n", pipe); @@ -1279,7 +1279,7 @@ } static void -avr32dci_do_poll(struct usb2_bus *bus) +avr32dci_do_poll(struct usb_bus *bus) { struct avr32dci_softc *sc = AVR32_BUS2SC(bus); @@ -1294,32 +1294,32 @@ * at91dci interrupt support *------------------------------------------------------------------------*/ static void -avr32dci_device_non_isoc_open(struct usb2_xfer *xfer) +avr32dci_device_non_isoc_open(struct usb_xfer *xfer) { return; } static void -avr32dci_device_non_isoc_close(struct usb2_xfer *xfer) +avr32dci_device_non_isoc_close(struct usb_xfer *xfer) { avr32dci_device_done(xfer, USB_ERR_CANCELLED); } static void -avr32dci_device_non_isoc_enter(struct usb2_xfer *xfer) +avr32dci_device_non_isoc_enter(struct usb_xfer *xfer) { return; } static void -avr32dci_device_non_isoc_start(struct usb2_xfer *xfer) +avr32dci_device_non_isoc_start(struct usb_xfer *xfer) { /* setup TDs */ avr32dci_setup_standard_chain(xfer); avr32dci_start_standard_chain(xfer); } -struct usb2_pipe_methods avr32dci_device_non_isoc_methods = +struct usb_pipe_methods avr32dci_device_non_isoc_methods = { .open = avr32dci_device_non_isoc_open, .close = avr32dci_device_non_isoc_close, @@ -1331,19 +1331,19 @@ * at91dci full speed isochronous support *------------------------------------------------------------------------*/ static void -avr32dci_device_isoc_fs_open(struct usb2_xfer *xfer) +avr32dci_device_isoc_fs_open(struct usb_xfer *xfer) { return; } static void -avr32dci_device_isoc_fs_close(struct usb2_xfer *xfer) +avr32dci_device_isoc_fs_close(struct usb_xfer *xfer) { avr32dci_device_done(xfer, USB_ERR_CANCELLED); } static void -avr32dci_device_isoc_fs_enter(struct usb2_xfer *xfer) +avr32dci_device_isoc_fs_enter(struct usb_xfer *xfer) { struct avr32dci_softc *sc = AVR32_BUS2SC(xfer->xroot->bus); uint32_t temp; @@ -1398,13 +1398,13 @@ } static void -avr32dci_device_isoc_fs_start(struct usb2_xfer *xfer) +avr32dci_device_isoc_fs_start(struct usb_xfer *xfer) { /* start TD chain */ avr32dci_start_standard_chain(xfer); } -struct usb2_pipe_methods avr32dci_device_isoc_fs_methods = +struct usb_pipe_methods avr32dci_device_isoc_fs_methods = { .open = avr32dci_device_isoc_fs_open, .close = avr32dci_device_isoc_fs_close, @@ -1418,8 +1418,8 @@ * Simulate a hardware HUB by handling all the necessary requests. *------------------------------------------------------------------------*/ -static const struct usb2_device_descriptor avr32dci_devd = { - .bLength = sizeof(struct usb2_device_descriptor), +static const struct usb_device_descriptor avr32dci_devd = { + .bLength = sizeof(struct usb_device_descriptor), .bDescriptorType = UDESC_DEVICE, .bcdUSB = {0x00, 0x02}, .bDeviceClass = UDCLASS_HUB, @@ -1432,8 +1432,8 @@ .bNumConfigurations = 1, }; -static const struct usb2_device_qualifier avr32dci_odevd = { - .bLength = sizeof(struct usb2_device_qualifier), +static const struct usb_device_qualifier avr32dci_odevd = { + .bLength = sizeof(struct usb_device_qualifier), .bDescriptorType = UDESC_DEVICE_QUALIFIER, .bcdUSB = {0x00, 0x02}, .bDeviceClass = UDCLASS_HUB, @@ -1445,7 +1445,7 @@ static const struct avr32dci_config_desc avr32dci_confd = { .confd = { - .bLength = sizeof(struct usb2_config_descriptor), + .bLength = sizeof(struct usb_config_descriptor), .bDescriptorType = UDESC_CONFIG, .wTotalLength[0] = sizeof(avr32dci_confd), .bNumInterface = 1, @@ -1455,7 +1455,7 @@ .bMaxPower = 0, }, .ifcd = { - .bLength = sizeof(struct usb2_interface_descriptor), + .bLength = sizeof(struct usb_interface_descriptor), .bDescriptorType = UDESC_INTERFACE, .bNumEndpoints = 1, .bInterfaceClass = UICLASS_HUB, @@ -1463,7 +1463,7 @@ .bInterfaceProtocol = UIPROTO_HSHUBSTT, }, .endpd = { - .bLength = sizeof(struct usb2_endpoint_descriptor), + .bLength = sizeof(struct usb_endpoint_descriptor), .bDescriptorType = UDESC_ENDPOINT, .bEndpointAddress = (UE_DIR_IN | AVR32_INTR_ENDPT), .bmAttributes = UE_INTERRUPT, @@ -1472,7 +1472,7 @@ }, }; -static const struct usb2_hub_descriptor_min avr32dci_hubd = { +static const struct usb_hub_descriptor_min avr32dci_hubd = { .bDescLength = sizeof(avr32dci_hubd), .bDescriptorType = UDESC_HUB, .bNbrPorts = 1, @@ -1501,8 +1501,8 @@ USB_MAKE_STRING_DESC(STRING_PRODUCT, avr32dci_product); static usb2_error_t -avr32dci_roothub_exec(struct usb2_device *udev, - struct usb2_device_request *req, const void **pptr, uint16_t *plength) +avr32dci_roothub_exec(struct usb_device *udev, + struct usb_device_request *req, const void **pptr, uint16_t *plength) { struct avr32dci_softc *sc = AVR32_BUS2SC(udev->bus); const void *ptr; @@ -1928,11 +1928,11 @@ } static void -avr32dci_xfer_setup(struct usb2_setup_params *parm) +avr32dci_xfer_setup(struct usb_setup_params *parm) { - const struct usb2_hw_ep_profile *pf; + const struct usb_hw_ep_profile *pf; struct avr32dci_softc *sc; - struct usb2_xfer *xfer; + struct usb_xfer *xfer; void *last_obj; uint32_t ntd; uint32_t n; @@ -2019,14 +2019,14 @@ } static void -avr32dci_xfer_unsetup(struct usb2_xfer *xfer) +avr32dci_xfer_unsetup(struct usb_xfer *xfer) { return; } static void -avr32dci_pipe_init(struct usb2_device *udev, struct usb2_endpoint_descriptor *edesc, - struct usb2_pipe *pipe) +avr32dci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, + struct usb_pipe *pipe) { struct avr32dci_softc *sc = AVR32_BUS2SC(udev->bus); @@ -2053,7 +2053,7 @@ } } -struct usb2_bus_methods avr32dci_bus_methods = +struct usb_bus_methods avr32dci_bus_methods = { .pipe_init = &avr32dci_pipe_init, .xfer_setup = &avr32dci_xfer_setup, ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/avr32dci.h $ */ +/* $FreeBSD: head/sys/dev/usb/controller/avr32dci.h 192984 2009-05-28 17:36:36Z thompsa $ */ /*- * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. * @@ -157,12 +157,12 @@ struct avr32dci_td; typedef uint8_t (avr32dci_cmd_t)(struct avr32dci_td *td); -typedef void (avr32dci_clocks_t)(struct usb2_bus *); +typedef void (avr32dci_clocks_t)(struct usb_bus *); struct avr32dci_td { struct avr32dci_td *obj_next; avr32dci_cmd_t *func; - struct usb2_page_cache *pc; + struct usb_page_cache *pc; uint32_t offset; uint32_t remainder; uint16_t max_packet_size; @@ -176,7 +176,7 @@ struct avr32dci_std_temp { avr32dci_cmd_t *func; - struct usb2_page_cache *pc; + struct usb_page_cache *pc; struct avr32dci_td *td; struct avr32dci_td *td_next; uint32_t len; @@ -193,14 +193,14 @@ }; struct avr32dci_config_desc { - struct usb2_config_descriptor confd; - struct usb2_interface_descriptor ifcd; - struct usb2_endpoint_descriptor endpd; + struct usb_config_descriptor confd; + struct usb_interface_descriptor ifcd; + struct usb_endpoint_descriptor endpd; } __packed; union avr32dci_hub_temp { uWord wValue; - struct usb2_port_status ps; + struct usb_port_status ps; }; struct avr32dci_flags { @@ -218,14 +218,14 @@ }; struct avr32dci_softc { - struct usb2_bus sc_bus; + struct usb_bus sc_bus; union avr32dci_hub_temp sc_hub_temp; /* must be set by by the bus interface layer */ avr32dci_clocks_t *sc_clocks_on; avr32dci_clocks_t *sc_clocks_off; - struct usb2_device *sc_devices[AVR32_MAX_DEVICES]; + struct usb_device *sc_devices[AVR32_MAX_DEVICES]; struct resource *sc_irq_res; void *sc_intr_hdl; struct resource *sc_io_res; ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#31 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2001-2002 Maksim Yevmenkin + * Copyright (c) 2001-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,29 +27,89 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_ubt.c,v 1.22 2005/10/31 17:57:44 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.36 2008/10/03 22:40:42 emax Exp $ + * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ + * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c 192984 2009-05-28 17:36:36Z thompsa $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* + * NOTE: ng_ubt2 driver has a split personality. On one side it is + * a USB device driver and on the other it is a Netgraph node. This + * driver will *NOT* create traditional /dev/ enties, only Netgraph + * node. + * + * NOTE ON LOCKS USED: ng_ubt2 drives uses 2 locks (mutexes) + * + * 1) sc_if_mtx - lock for device's interface #0 and #1. This lock is used + * by USB for any USB request going over device's interface #0 and #1, + * i.e. interrupt, control, bulk and isoc. transfers. + * + * 2) sc_ng_mtx - this lock is used to protect shared (between USB, Netgraph + * and Taskqueue) data, such as outgoing mbuf queues, task flags and hook + * pointer. This lock *SHOULD NOT* be grabbed for a long time. In fact, + * think of it as a spin lock. + * + * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 3 different contexts. + * + * 1) USB context. This is where all the USB related stuff happens. All + * callbacks run in this context. All callbacks are called (by USB) with + * appropriate interface lock held. It is (generally) allowed to grab + * any additional locks. + * + * 2) Netgraph context. This is where all the Netgraph related stuff happens. + * Since we mark node as WRITER, the Netgraph node will be "locked" (from + * Netgraph point of view). Any variable that is only modified from the + * Netgraph context does not require any additonal locking. It is generally + * *NOT* allowed to grab *ANY* additional locks. Whatever you do, *DO NOT* + * grab any lock in the Netgraph context that could cause de-scheduling of + * the Netgraph thread for significant amount of time. In fact, the only + * lock that is allowed in the Netgraph context is the sc_ng_mtx lock. + * Also make sure that any code that is called from the Netgraph context + * follows the rule above. + * + * 3) Taskqueue context. This is where ubt_task runs. Since we are generally + * NOT allowed to grab any lock that could cause de-scheduling in the + * Netgraph context, and, USB requires us to grab interface lock before + * doing things with transfers, it is safer to transition from the Netgraph + * context to the Taskqueue context before we can call into USB subsystem. + * + * So, to put everything together, the rules are as follows. + * It is OK to call from the USB context or the Taskqueue context into + * the Netgraph context (i.e. call NG_SEND_xxx functions). In other words + * it is allowed to call into the Netgraph context with locks held. + * Is it *NOT* OK to call from the Netgraph context into the USB context, + * because USB requires us to grab interface locks, and, it is safer to + * avoid it. So, to make things safer we set task flags to indicate which + * actions we want to perform and schedule ubt_task which would run in the + * Taskqueue context. + * Is is OK to call from the Taskqueue context into the USB context, + * and, ubt_task does just that (i.e. grabs appropriate interface locks + * before calling into USB). + * Access to the outgoing queues, task flags and hook pointer is + * controlled by the sc_ng_mtx lock. It is an unavoidable evil. Again, + * sc_ng_mtx should really be a spin lock (and it is very likely to an + * equivalent of spin lock due to adaptive nature of FreeBSD mutexes). + * All USB callbacks accept softc pointer as a private data. USB ensures + * that this pointer is valid. + */ +#include "usbdevs.h" #include -#include -#include -#include +#include +#include + +#define USB_DEBUG_VAR usb2_debug + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -59,73 +119,17 @@ #include #include -#include "usbdevs.h" +static int ubt_modevent(module_t, int, void *); +static device_probe_t ubt_probe; +static device_attach_t ubt_attach; +static device_detach_t ubt_detach; -/* - * USB methods - */ +static void ubt_task_schedule(ubt_softc_p, int); +static task_fn_t ubt_task; -static device_probe_t ubt_match; -static device_attach_t ubt_attach; -static device_detach_t ubt_detach; +#define ubt_xfer_start(sc, i) usb2_transfer_start((sc)->sc_xfer[(i)]) -static device_method_t ubt_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ubt_match), - DEVMETHOD(device_attach, ubt_attach), - DEVMETHOD(device_detach, ubt_detach), - - { 0, 0 } -}; - -static driver_t ubt_driver = { - "ubt", - ubt_methods, - sizeof(struct ubt_softc) -}; - -static devclass_t ubt_devclass; - -static int ubt_modevent (module_t, int, void *); - -static usbd_status ubt_request_start (ubt_softc_p); -static void ubt_request_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_request_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_intr_start (ubt_softc_p); -static void ubt_intr_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_intr_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_in_start (ubt_softc_p); -static void ubt_bulk_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_out_start (ubt_softc_p); -static void ubt_bulk_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_out_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_in_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_in_start (ubt_softc_p); -static void ubt_isoc_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_out_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_out_start (ubt_softc_p); -static void ubt_isoc_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); - -static void ubt_reset (ubt_softc_p); - -/* - * Netgraph methods - */ - +/* Netgraph methods */ static ng_constructor_t ng_ubt_constructor; static ng_shutdown_t ng_ubt_shutdown; static ng_newhook_t ng_ubt_newhook; @@ -141,7 +145,8 @@ { "qlen", &ng_parse_int32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_qlen_type = { +static const struct ng_parse_type ng_ubt_node_qlen_type = +{ &ng_parse_struct_type, &ng_ubt_node_qlen_type_fields }; @@ -157,61 +162,64 @@ { "ierrors", &ng_parse_uint32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_stat_type = { +static const struct ng_parse_type ng_ubt_node_stat_type = +{ &ng_parse_struct_type, &ng_ubt_node_stat_type_fields }; /* Netgraph node command list */ -static const struct ng_cmdlist ng_ubt_cmdlist[] = { +static const struct ng_cmdlist ng_ubt_cmdlist[] = { - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_DEBUG, - "set_debug", - &ng_parse_uint16_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_DEBUG, - "get_debug", - NULL, - &ng_parse_uint16_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_QLEN, - "set_qlen", - &ng_ubt_node_qlen_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_QLEN, - "get_qlen", - &ng_ubt_node_qlen_type, - &ng_ubt_node_qlen_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_STAT, - "get_stat", - NULL, - &ng_ubt_node_stat_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_RESET_STAT, - "reset_stat", - NULL, - NULL -}, -{ 0, } + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_DEBUG, + "set_debug", + &ng_parse_uint16_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_DEBUG, + "get_debug", + NULL, + &ng_parse_uint16_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_QLEN, + "set_qlen", + &ng_ubt_node_qlen_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_QLEN, + "get_qlen", + &ng_ubt_node_qlen_type, + &ng_ubt_node_qlen_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_STAT, + "get_stat", + NULL, + &ng_ubt_node_stat_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_RESET_STAT, + "reset_stat", + NULL, + NULL + }, + { 0, } }; /* Netgraph node type */ -static struct ng_type typestruct = { - .version = NG_ABI_VERSION, +static struct ng_type typestruct = +{ + .version = NG_ABI_VERSION, .name = NG_UBT_NODE_TYPE, .constructor = ng_ubt_constructor, .rcvmsg = ng_ubt_rcvmsg, @@ -220,192 +228,251 @@ .connect = ng_ubt_connect, .rcvdata = ng_ubt_rcvdata, .disconnect = ng_ubt_disconnect, - .cmdlist = ng_ubt_cmdlist + .cmdlist = ng_ubt_cmdlist }; -/* - * Module - */ - -DRIVER_MODULE(ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0); -MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); -MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); -MODULE_DEPEND(ubt, usb, 1, 1, 1); - - /**************************************************************************** **************************************************************************** ** USB specific **************************************************************************** ****************************************************************************/ +/* USB methods */ +static usb2_callback_t ubt_ctrl_write_callback; +static usb2_callback_t ubt_intr_read_callback; +static usb2_callback_t ubt_bulk_read_callback; +static usb2_callback_t ubt_bulk_write_callback; +static usb2_callback_t ubt_isoc_read_callback; +static usb2_callback_t ubt_isoc_write_callback; + +static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); +static int ubt_isoc_read_one_frame(struct usb_xfer *, int); + /* - * Load/Unload the driver module + * USB config + * + * The following desribes usb transfers that could be submitted on USB device. + * + * Interface 0 on the USB device must present the following endpoints + * 1) Interrupt endpoint to receive HCI events + * 2) Bulk IN endpoint to receive ACL data + * 3) Bulk OUT endpoint to send ACL data + * + * Interface 1 on the USB device must present the following endpoints + * 1) Isochronous IN endpoint to receive SCO data + * 2) Isochronous OUT endpoint to send SCO data */ -static int -ubt_modevent(module_t mod, int event, void *data) +static const struct usb_config ubt_config[UBT_N_TRANSFER] = { - int error; + /* + * Interface #0 + */ + + /* Outgoing bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 0, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, + }, + /* Incoming bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, + }, + /* Incoming interrupt transfer - HCI events */ + [UBT_IF_0_INTR_DT_RD] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, + }, + /* Outgoing control transfer - HCI commands */ + [UBT_IF_0_CTRL_DT_WR] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* control pipe */ + .direction = UE_DIR_ANY, + .if_index = 0, + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ + }, + + /* + * Interface #1 + */ + + /* Incoming isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Incoming isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Outgoing isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, + /* Outgoing isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, +}; - switch (event) { - case MOD_LOAD: - error = ng_newtype(&typestruct); - if (error != 0) - printf( -"%s: Could not register Netgraph node type, error=%d\n", - NG_UBT_NODE_TYPE, error); - else - error = usbd_driver_load(mod, event, data); - break; +/* + * If for some reason device should not be attached then put + * VendorID/ProductID pair into the list below. The format is + * as follows: + * + * { USB_VPI(VENDOR_ID, PRODUCT_ID, 0) }, + * + * where VENDOR_ID and PRODUCT_ID are hex numbers. + */ - case MOD_UNLOAD: - error = ng_rmtype(&typestruct); - if (error == 0) - error = usbd_driver_load(mod, event, data); - break; +static const struct usb_device_id ubt_ignore_devs[] = +{ + /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x2200, 0) }, +}; - default: - error = EOPNOTSUPP; - break; - } +/* List of supported bluetooth devices */ +static const struct usb_device_id ubt_devs[] = +{ + /* Generic Bluetooth class devices */ + { USB_IFACE_CLASS(UDCLASS_WIRELESS), + USB_IFACE_SUBCLASS(UDSUBCLASS_RF), + USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) }, - return (error); -} /* ubt_modevent */ + /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x3800, 0) }, +}; /* - * Probe for a USB Bluetooth device + * Probe for a USB Bluetooth device. + * USB context. */ static int -ubt_match(device_t self) +ubt_probe(device_t dev) { - /* - * If for some reason device should not be attached then put - * VendorID/ProductID pair into the list below. The format is >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 29 04:33:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B18B91065678; Fri, 29 May 2009 04:32: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 4C2D71065670 for ; Fri, 29 May 2009 04:32:59 +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 39B118FC08 for ; Fri, 29 May 2009 04:32:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T4Wx19060752 for ; Fri, 29 May 2009 04:32:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T4Wx0S060750 for perforce@freebsd.org; Fri, 29 May 2009 04:32:59 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 29 May 2009 04:32:59 GMT Message-Id: <200905290432.n4T4Wx0S060750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162986 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, 29 May 2009 04:33:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=162986 Change 162986 by pgj@petymeg on 2009/05/29 04:32:33 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#30 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/avl.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#24 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#24 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#26 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#29 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#58 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#30 (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.481 2009/05/27 15:52:12 zml Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.482 2009/05/28 15:31:46 avl Exp $ --> aaron@FreeBSD.org"> @@ -96,6 +96,8 @@ avg@FreeBSD.org"> +avl@FreeBSD.org"> + awebster@pubnix.net"> az@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#24 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -761,6 +761,11 @@ &pgpkey.zml; + + &a.avl; + &pgpkey.avl; + + &a.scottl; &pgpkey.scottl; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#24 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -23,6 +23,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#26 (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.222 2009/05/27 13:03:56 kmoore Exp $ +$FreeBSD: www/en/developers.sgml,v 1.223 2009/05/28 15:34:18 avl Exp $ --> @@ -51,6 +51,7 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#29 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.9 2009/05/24 11:27:09 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.10 2009/05/28 00:42:55 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#58 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.257 2009/05/27 13:07:03 kmoore Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.258 2009/05/28 15:34:18 avl Exp $ @@ -34,7 +34,17 @@ 5 - + + + 28 + + +

New committer: Alexander + Logvinov + (ports)

+ + + 27 From owner-p4-projects@FreeBSD.ORG Fri May 29 04:44:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39E631065670; Fri, 29 May 2009 04:44:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8657106564A for ; Fri, 29 May 2009 04:44:10 +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 A6E2B8FC1D for ; Fri, 29 May 2009 04:44:10 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T4iAkJ061720 for ; Fri, 29 May 2009 04:44:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T4iASG061718 for perforce@freebsd.org; Fri, 29 May 2009 04:44:10 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 29 May 2009 04:44:10 GMT Message-Id: <200905290444.n4T4iASG061718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 162987 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, 29 May 2009 04:44:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=162987 Change 162987 by pgj@petymeg on 2009/05/29 04:43:48 MFen (www): 1.257 -> 1.258 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#30 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#30 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 5 + 28 + + +

Új tag: Alexander + Logvinov (ports)

+ + + + 27 From owner-p4-projects@FreeBSD.ORG Fri May 29 06:15:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D9071065673; Fri, 29 May 2009 06:15: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 F12901065670 for ; Fri, 29 May 2009 06:15:48 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEA4B8FC14 for ; Fri, 29 May 2009 06:15:48 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T6Fmjs080627 for ; Fri, 29 May 2009 06:15:48 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T6Fmpd080625 for perforce@freebsd.org; Fri, 29 May 2009 06:15:48 GMT (envelope-from dforsyth@FreeBSD.org) Date: Fri, 29 May 2009 06:15:48 GMT Message-Id: <200905290615.n4T6Fmpd080625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 162993 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, 29 May 2009 06:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=162993 Change 162993 by dforsyth@squirrel on 2009/05/29 06:15:32 Started removing subdir mess. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#4 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.c#4 (text+ko) ==== @@ -5,12 +5,21 @@ #include "pkg.h" struct pkg { + TAILQ_ENTRY(pkg) next; + char *ident; /* User given name for this pkg. */ char *pkg_name; /* name taken from contents file. */ char *pkg_comment; char *cwd; int pkg_rev; + + int has_comment; + int has_contents; + int has_display; + int has_mtree_dirs; + int has_desc; + int has_required_by; }; /* Create a new pkg. */ ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.h#3 (text+ko) ==== @@ -1,20 +1,24 @@ +#ifndef __PKG_H__ +#define __PKG_H__ +#define COMMENT_FILE "+COMMENT" +#define CONTENTS_FILE "+CONTENTS" +#define DESC_FILE "+DESC" +#define DISPLAY_FILE "+DISPLAY" +#define MTREE_DIRS_FILE "+MTREE_DIRS" + /* pkgdb. */ struct pkgdb; -struct pkgdb_subdir; -struct subdir_head; +struct pkg_head; struct dirent; struct pkgdb *pkgdb_new_hierdb(const char *db_root); int pkgdb_reset(struct pkgdb *db); -struct pkgdb_subdir *pkgdb_subdir_hash(struct pkgdb *db); -struct pkgdb_subdir *pkgdb_read_subdir(struct pkgdb *db, const char *name); +struct pkgdb_subdir *pkgdb_read_pkg(struct pkgdb *db, const char *name); struct pkg *pkgdb_next_pkg(struct pkgdb *db); void pkgdb_free_hierdb(struct pkgdb *db); -void pkgdb_free_pkgdb_subdir(struct pkgdb_subdir *sd); -void pkgdb_free_pkgdb_subdir_list(struct pkgdb *db); int subdir_sel(struct dirent *ent); void free_ptr_array(void **arr, int c); @@ -32,3 +36,5 @@ char *pkg_comment(struct pkg *p); void pkg_free(struct pkg *p); + +#endif ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#4 (text+ko) ==== @@ -14,16 +14,16 @@ char *db_root; - int sd_count; - struct pkgdb_subdir *sd_curr; - TAILQ_HEAD(subdir_head, pkgdb_subdir) sd_head; + int p_count; + struct pkg *p_curr; + TAILQ_HEAD(pkg_head, pkg) p_head; /* Callbacks */ /* tuuuummmmbbbllleeewwwweeeedddddd*/ }; -struct pkgdb_subdir { - TAILQ_ENTRY(pkgdb_subdir) next; +struct pkg { + TAILQ_ENTRY(pkg) next; char *name; char *path; @@ -44,7 +44,7 @@ struct stat sb; struct pkgdb *db; char *new_db_root; - struct sd_head *new_sd_headp; + struct p_head *new_p_headp; if (db_root == NULL) return (NULL); @@ -55,16 +55,16 @@ db = calloc(1, sizeof(*db)); new_db_root = strdup(db_root); - // new_sd_headp = calloc(1, sizeof(*db->sd_headp)); - if (db == NULL || new_db_root == NULL/* || new_sd_headp == NULL*/) { + // new_p_headp = calloc(1, sizeof(*db->p_headp)); + if (db == NULL || new_db_root == NULL/* || new_p_headp == NULL*/) { free(db); free(new_db_root); - // free(new_sd_headp); + // free(new_p_headp); return (NULL); } db->db_root = new_db_root; - // db->sd_headp = new_sd_headp; - TAILQ_INIT(&db->sd_head); + // db->p_headp = new_p_headp; + TAILQ_INIT(&db->p_head); db->sd_count = 0; db->dirty = 1; @@ -110,7 +110,7 @@ pkgdb_reset(struct pkgdb *db) { int i; - struct pkgdb_subdir *sd; + struct pkg *sd; struct dirent **ents; if (db == NULL) @@ -119,30 +119,30 @@ if (db->dirty == 0) { /* No changes since the last reset, don't bother walking the * database again. */ - db->sd_curr = TAILQ_FIRST(&db->sd_head); + db->p_curr = TAILQ_FIRST(&db->p_head); return (db->sd_count); } db->sd_count = scandir(db->db_root, &ents, subdir_sel, alphasort); /* Clear out old list. */ - pkgdb_free_pkgdb_subdir_list(db); + pkgdb_free_pkg_list(db); /* Later on I should look into inserting changes into the existing * list, rather than just bombing the whole thing. */ - TAILQ_INIT(&db->sd_head); + TAILQ_INIT(&db->p_head); for (i = 0; i < db->sd_count; ++i) { - sd = pkgdb_read_subdir(db, ents[i]->d_name); + sd = pkgdb_read_pkg(db, ents[i]->d_name); if (sd == NULL) { - pkgdb_free_pkgdb_subdir_list(db); + pkgdb_free_pkg_list(db); free(ents); return (-1); } - TAILQ_INSERT_TAIL(&db->sd_head, sd, next); + TAILQ_INSERT_TAIL(&db->p_head, sd, next); free(ents[i]); } free(ents); - db->sd_curr = TAILQ_FIRST(&db->sd_head); + db->p_curr = TAILQ_FIRST(&db->p_head); db->dirty = 0; return (db->sd_count); @@ -156,102 +156,62 @@ return (0); } -struct pkgdb_subdir * -pkgdb_read_subdir(struct pkgdb *db, const char *name) +struct pkg * +pkgdb_read_pkg(struct pkgdb *db, const char *ident) { int i; - int s; - int slash; + int c; + int s; /* My var names are so descriptive. */ + char *path; struct stat sb; - struct pkgdb_subdir *sd; - char *new_name; - char *new_path; - DIR *sd_dirp; + struct pkg *p; struct dirent **ents; - slash = (db->db_root[strlen(db->db_root) - 1] == '/' ? 0 : 1); - - sd = calloc(1, sizeof(*sd)); - new_name = strdup(name); - new_path = malloc(strlen(db->db_root) + slash + strlen(name) + 1); - if (sd == NULL || new_name == NULL || new_path == NULL) { - free(sd); - free(new_name); - free(new_path); + p = pkg_new(name); + path = pkgdb_path(db, p); + if (p == NULL || path == NULL) { + pkg_free(p); + free(path); } - strcpy(new_path, db->db_root); - strcat(new_path, "/"); - strcat(new_path, name); - sd->name = new_name; - sd->path = new_path; - - s = lstat(sd->path, &sb); + s = lstat(path, &sb); if (s < 0 || S_ISLNK(sb.st_mode) || !S_ISDIR(sb.st_mode)) { - pkgdb_free_pkgdb_subdir(sd); + pkg_free(p); + free(path); return (NULL); } - sd->file_count = scandir(sd->path, &ents, subdir_sel, alphasort); - sd->file_list = calloc(sd->file_count, sizeof(char *)); - if (sd->file_list == NULL) { - pkgdb_free_pkgdb_subdir(sd); - return (NULL); - } - for (i = 0; i < sd->file_count; ++i) { - sd->file_list[i] = strdup(ents[i]->d_name); - if (sd->file_list[i] == NULL) { - sd->file_count = i; /* free up to */ - pkgdb_free_pkgdb_subdir(sd); - free(ents); - return (NULL); - } + c = scandir(path, &ents, subdir_sel, alphasort); + for (i = 0; i < c; ++i) { + /* Check file names and set values in p. */ + free(ents[i]); } + free(ents); - - return (sd); + free(path); + return (p); } /* Move the current subdir pointer to the next one in the list. Return * the previous subdir. Return NULL if there are no more left. */ -struct pkgdb_subdir * -pkgdb_next_pkgdb_subdir(struct pkgdb *db) +struct pkg * +pkgdb_next_pkg(struct pkgdb *db) { - struct pkgdb_subdir *sd; + struct pkg *sd; if (db == NULL) return (NULL); - sd = db->sd_curr; + sd = db->p_curr; if (sd == NULL) return (NULL); - db->sd_curr = TAILQ_NEXT(db->sd_curr, next); + db->p_curr = TAILQ_NEXT(db->p_curr, next); return (sd); } -struct pkg * -pkgdb_next_pkg(struct pkgdb *db) -{ - struct pkgdb_subdir *sd; - struct pkg *p; - - - if (db == NULL) - return (NULL); - - sd = pkgdb_next_pkgdb_subdir(db); - if (sd == NULL) - return (NULL); - - p = pkg_new(sd->name); - return (p); -} - - - /* Free a hierdb. */ void @@ -261,37 +221,21 @@ return; free(db->db_root); - pkgdb_free_pkgdb_subdir_list(db); + pkgdb_free_pkg_list(db); free(db); } void -pkgdb_free_pkgdb_subdir_list(struct pkgdb *db) +pkgdb_free_pkg_list(struct pkgdb *db) { - struct pkgdb_subdir *sd; - struct pkgdb_subdir *sdn; + struct pkg *sd; + struct pkg *sdn; - sd = TAILQ_FIRST(&db->sd_head); + sd = TAILQ_FIRST(&db->p_head); while (sd != NULL) { sdn = TAILQ_NEXT(sd, next); - pkgdb_free_pkgdb_subdir(sd); + pkg_free(sd); sd = sdn; } - TAILQ_INIT(&db->sd_head); -} - -void -pkgdb_free_pkgdb_subdir(struct pkgdb_subdir *sd) -{ - int i; - - if (sd == NULL) - return; - - free(sd->name); - free(sd->path); - for (i = 0; i < sd->file_count; ++i) - free(sd->file_list[i]); - free(sd->file_list); - free(sd); + TAILQ_INIT(&db->p_head); } From owner-p4-projects@FreeBSD.ORG Fri May 29 08:26:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235D01065677; Fri, 29 May 2009 08:26:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D726F106564A for ; Fri, 29 May 2009 08:26:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C58B88FC08 for ; Fri, 29 May 2009 08:26:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T8Q11K092555 for ; Fri, 29 May 2009 08:26:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T8Q1Cr092553 for perforce@freebsd.org; Fri, 29 May 2009 08:26:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 May 2009 08:26:01 GMT Message-Id: <200905290826.n4T8Q1Cr092553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 163001 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, 29 May 2009 08:26:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=163001 Change 163001 by hselasky@hselasky_laptop001 on 2009/05/29 08:25:54 USB CORE: - add missing #if #endif for linux compat layer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#24 (text+ko) ==== @@ -105,6 +105,7 @@ uint8_t alt_index; uint8_t parent_iface_index; +#if USB_HAVE_COMPAT_LINUX /* Linux compat */ struct usb_host_interface *altsetting; struct usb_host_interface *cur_altsetting; @@ -112,6 +113,7 @@ void *bsd_priv_sc; /* device specific information */ uint8_t num_altsetting; /* number of alternate settings */ uint8_t bsd_iface_index; +#endif }; /* From owner-p4-projects@FreeBSD.ORG Fri May 29 08:59:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1745C1065672; Fri, 29 May 2009 08:59: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 CA176106566B for ; Fri, 29 May 2009 08:59:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B23408FC22 for ; Fri, 29 May 2009 08:59:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4T8xBLi004911 for ; Fri, 29 May 2009 08:59:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4T8xBXe004909 for perforce@freebsd.org; Fri, 29 May 2009 08:59:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 May 2009 08:59:11 GMT Message-Id: <200905290859.n4T8xBXe004909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 163003 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, 29 May 2009 08:59:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=163003 Change 163003 by hselasky@hselasky_laptop001 on 2009/05/29 08:58:41 USB CORE: - fix a memory leak after recent change. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#35 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#35 (text+ko) ==== @@ -1992,6 +1992,13 @@ #if USB_HAVE_UGEN KASSERT(LIST_FIRST(&udev->pd_list) == NULL, ("leaked cdev entries")); #endif + /* free all allocated strings */ + if (udev->serial) + free(udev->serial, M_USB); + if (udev->manufacturer) + free(udev->manufacturer, M_USB); + if (udev->product) + free(udev->product, M_USB); /* free device */ free(udev, M_USB); From owner-p4-projects@FreeBSD.ORG Fri May 29 10:39:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CD421065672; Fri, 29 May 2009 10:39: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 3D392106566C for ; Fri, 29 May 2009 10:39:54 +0000 (UTC) (envelope-from sathya@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B8298FC1E for ; Fri, 29 May 2009 10:39:54 +0000 (UTC) (envelope-from sathya@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TAds4t014613 for ; Fri, 29 May 2009 10:39:54 GMT (envelope-from sathya@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TAdsj7014611 for perforce@freebsd.org; Fri, 29 May 2009 10:39:54 GMT (envelope-from sathya@FreeBSD.org) Date: Fri, 29 May 2009 10:39:54 GMT Message-Id: <200905291039.n4TAdsj7014611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sathya@FreeBSD.org using -f From: Satish Srinivasan To: Perforce Change Reviews Cc: Subject: PERFORCE change 163007 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, 29 May 2009 10:39:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163007 Change 163007 by sathya@sathya-fbsd on 2009/05/29 10:39:31 Basic stuff like option parsing Affected files ... .. //depot/projects/soc2009/trailconv/Makefile#1 add .. //depot/projects/soc2009/trailconv/Milestones#3 edit .. //depot/projects/soc2009/trailconv/log2bsm.c#1 add Differences ... ==== //depot/projects/soc2009/trailconv/Milestones#3 (text+ko) ==== @@ -35,4 +35,4 @@ August - Preparing back converters, i.e bsm to other formats if time permits or other work required to satisfactorily complete my primary objectives.+ Preparing back converters, i.e bsm to other formats if time permits or other work required to satisfactorily complete my primary objectives. From owner-p4-projects@FreeBSD.ORG Fri May 29 12:12:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5601065912; Fri, 29 May 2009 12:12: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 EAF251065901 for ; Fri, 29 May 2009 12:12:30 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D77B98FC1B for ; Fri, 29 May 2009 12:12:30 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TCCU3g026329 for ; Fri, 29 May 2009 12:12:30 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TCCU7u026327 for perforce@freebsd.org; Fri, 29 May 2009 12:12:30 GMT (envelope-from syl@FreeBSD.org) Date: Fri, 29 May 2009 12:12:30 GMT Message-Id: <200905291212.n4TCCU7u026327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163010 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, 29 May 2009 12:12:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=163010 Change 163010 by syl@syl_rincewind on 2009/05/29 12:11:59 Fix perror string in test3. Implement test5 that dump string descroptors. Implement get_next_timeout, handle_timeouts, handle_events helpers. Add usb_devs list management in libusb_get_device_list. Update libusb_close and libusb_open for handling io and poll. Implement libusb_handle_events_locked. Implement libusb_handle_events_timeout. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#4 edit .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/test3.c#3 edit .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/test5.c#2 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#16 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test2/test2.c#4 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test3/test3.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ ddesc = malloc(sizeof(libusb_device_descriptor)); if (ddesc == NULL) { - perror("test1"); + perror("test3"); return (EXIT_FAILURE); } ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/test5.c#2 (text+ko) ==== @@ -3,8 +3,53 @@ #include #include +libusb_context *ctx; + int main(int ac, const char *av[]) { + libusb_device_handle *devh; + libusb_device **devs_list; + char buff[512]; + int ret; + int ret2; + int i; + + printf("This program will print out all the device" + " strings descriptors for all the present devices.\n"); + + if (libusb_init(&ctx) != 0) { + fprintf(stderr, "libusb_init failed\n"); + return (EXIT_FAILURE); + } + + if ((ret = libusb_get_device_list(ctx, &devs_list)) < 0) { + fprintf(stderr,"libusb_get_device_list failed with 0x%x error code\n", + ret); + return (EXIT_FAILURE); + } + + if (ret == 0) { + fprintf(stderr, "No device match or lack of permissions.\n"); + return (EXIT_SUCCESS); + } + printf("\nThere are %i devices\n\n", ret); + for (i = 0 ; i < ret ; i++) { + printf("device number = %i\n", i); + + ret2 = libusb_open(devs_list[i], &devh); + if (ret2 != 0) { + fprintf(stderr, "libusb open error.\n"); + return (EXIT_SUCCESS); + } + + ret2 = libusb_get_string_descriptor_ascii(devh, 0, buff, 512); + if (ret2 > 0) { + fprintf(stderr, "libusb open error.\n"); + return (EXIT_SUCCESS); + } else { + printf("string desc size : %i\n", ret2); + } + } return (EXIT_SUCCESS); } ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#16 (text+ko) ==== @@ -86,6 +86,9 @@ return (LIBUSB_ERROR_OTHER); +static int get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out); +static int handle_timeouts(struct libusb_context *ctx); +static int handle_events(struct libusb_context *ctx, struct timeval *tv); struct libusb_context *usbi_default_context = NULL; static pthread_mutex_t default_context_lock = PTHREAD_MUTEX_INITIALIZER; @@ -95,6 +98,7 @@ if (ctx == NULL) ctx = usbi_default_context; #define MAX(a,b) (((a)>(b))?(a):(b)) +#define USB_TIMED_OUT (1<<0) /* Library initialisation / deinitialisation */ @@ -297,6 +301,10 @@ /* link together the two structures */ dev->os_priv = pdev; + pthread_mutex_lock(&ctx->usb_devs_lock); + LIST_ADD(&dev->list, &ctx->usb_devs); + pthread_mutex_unlock(&ctx->usb_devs_lock); + (*list)[i] = libusb_ref_device(dev); i++; } @@ -400,6 +408,10 @@ pthread_mutex_unlock(&dev->lock); if (dev->refcnt == 0) { + pthread_mutex_lock(&dev->ctx->usb_devs_lock); + LIST_DEL(&dev->list); + pthread_mutex_unlock(&dev->ctx->usb_devs_lock); + libusb20_dev_free(dev->os_priv); free(dev); } @@ -411,6 +423,7 @@ libusb_context *ctx = dev->ctx; struct libusb20_device *pdev = dev->os_priv; libusb_device_handle *hdl; + unsigned char dummy = 1; int err; if (devh == NULL) @@ -438,9 +451,25 @@ *devh = hdl; - /* - * XXX Some poll things to implement. - */ + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify++; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + + err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); + if (err <= 0) { + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify--; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + return 0; + } + + libusb_lock_events(ctx); + err = read(ctx->ctrl_pipe[0], &dummy, sizeof(dummy)); + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify--; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + libusb_unlock_events; + return (0); } @@ -474,17 +503,46 @@ { libusb_context *ctx; struct libusb20_device *pdev; + unsigned char dummy = 1; int err; ctx = devh->dev->ctx; pdev = devh->os_priv; - pthread_mutex_lock(&(ctx->open_devs_lock)); - err = libusb20_dev_close(pdev); - LIST_DEL(&(devh->list)); - pthread_mutex_unlock(&(ctx->open_devs_lock)); + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify++; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + + err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); + + if (err <= 0) { + pthread_mutex_lock(&ctx->open_devs_lock); + LIST_DEL(&devh->list); + pthread_mutex_unlock(&ctx->open_devs_lock); + libusb_unref_device(devh->dev); + libusb20_dev_close(pdev); + free(devh); + + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify--; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + return ; + } + libusb_lock_events(ctx); + + err = read(ctx->ctrl_pipe[0], &dummy, sizeof(dummy)); + pthread_mutex_lock(&ctx->open_devs_lock); + LIST_DEL(&devh->list); + pthread_mutex_unlock(&ctx->open_devs_lock); libusb_unref_device(devh->dev); + libusb20_dev_close(pdev); free(devh); + + pthread_mutex_lock(&ctx->pollfd_modify_lock); + ctx->pollfd_modify--; + pthread_mutex_unlock(&ctx->pollfd_modify_lock); + + libusb_unlock_events(ctx); } libusb_device * @@ -956,10 +1014,176 @@ return (0); } +static int +get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out) +{ + struct timeval timeout; + int ret; + + ret = libusb_get_next_timeout(ctx, &timeout); + + if (ret) { + if (timerisset(&timeout) == 0) + return 1; + if (timercmp(&timeout, tv, <) != 0) + *out = timeout; + else + *out = *tv; + } else { + *out = *tv; + } + + return (0); +} + +static int +handle_timeouts(struct libusb_context *ctx) +{ + struct timespec sys_ts; + struct timeval sys_tv; + struct timeval *cur_tv; + struct usb_transfer *xfer; + struct libusb_transfer *uxfer; + int ret; + + GET_CONTEXT(ctx); + ret = 0; + + pthread_mutex_lock(&ctx->flying_transfers_lock); + if (USB_LIST_EMPTY(&ctx->flying_transfers)); + goto out; + + ret = clock_gettime(CLOCK_MONOTONIC, &sys_ts); + TIMESPEC_TO_TIMEVAL(&sys_tv, &sys_ts); + + LIST_FOREACH_ENTRY(xfer, &ctx->flying_transfers, list) { + cur_tv = &xfer->timeout; + + if (timerisset(cur_tv) == 0) + goto out; + + if (xfer->flags & USB_TIMED_OUT) + continue; + + if ((cur_tv->tv_sec > sys_tv.tv_sec) || (cur_tv->tv_sec == sys_tv.tv_sec && + cur_tv->tv_usec > sys_tv.tv_usec)) + goto out; + + xfer->flags |= USB_TIMED_OUT; + uxfer = (libusb_transfer *) (((uint8_t *)xfer) + + sizeof(struct usb_transfer)); + ret = libusb_cancel_transfer(uxfer); + } +out: + pthread_mutex_unlock(&ctx->flying_transfers_lock); + return (ret); +} + +static int +handle_events(struct libusb_context *ctx, struct timeval *tv) +{ + struct usb_pollfd *ipollfd; + struct libusb_pollfd *tmppollfd; + struct pollfd *fds; + int tmpfd; + int ret; + int timeout; + nfds_t nfds; + int i; + + nfds = 0; + i = -1; + + pthread_mutex_lock(&ctx->pollfds_lock); + LIST_FOREACH_ENTRY(ipollfd, &ctx->pollfds, list) + nfds++; + + fds = malloc(sizeof(*fds) * nfds); + if (fds == NULL) + return (LIBUSB_ERROR_NO_MEM); + + LIST_FOREACH_ENTRY(ipollfd, &ctx->pollfds, list) { + tmppollfd = &ipollfd->pollfd; + tmpfd = tmppollfd->fd; + i++; + fds[i].fd = tmpfd; + fds[i].events = tmppollfd->events; + fds[i].revents = 0; + } + + pthread_mutex_unlock(&ctx->pollfds_lock); + + timeout = (tv->tv_sec * 1000) + (tv->tv_usec / 1000); + if (tv->tv_usec % 1000) + timeout++; + + ret = poll(fds, nfds, timeout); + if (ret == 0) { + free(fds); + return(handle_timeouts(ctx)); + } else if (ret == -1 && errno == EINTR) { + free(fds); + return LIBUSB_ERROR_INTERRUPTED; + } else if (ret < 0) { + free(fds); + return (LIBUSB_ERROR_IO); + } + + if (fds[0].revents) { + if (ret == 1){ + ret = 0; + goto handled; + } else { + fds[0].revents = 0; + ret--; + } + } + + ret = /*unknown*/0; +handled: + free(fds); + return ret; +} + int libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv) { + struct timeval timeout; + struct timeval poll_timeout; + int ret; + GET_CONTEXT(ctx); + ret = libusb_get_next_timeout(ctx, &timeout); + if (ret != 0) { + if (timerisset(&timeout) == 0) + return (handle_timeouts(ctx)); + if (timercmp(&timeout, tv, <)) + poll_timeout = timeout; + else + poll_timeout = *tv; + } else { + poll_timeout = *tv; + } +retry: + if (libusb_try_lock_events(ctx) == 0) { + ret = handle_events(ctx, &poll_timeout); + libusb_unlock_events(ctx); + return ret; + } + + libusb_lock_event_waiters(ctx); + if (libusb_event_handler_active(ctx) == 0) { + libusb_unlock_event_waiters(ctx); + goto retry; + } + + ret = libusb_wait_for_event(ctx, &poll_timeout); + libusb_unlock_event_waiters(ctx); + + if (ret < 0) + return ret; + else if (ret == 1) + return (handle_timeouts(ctx)); return (0); } @@ -976,8 +1200,23 @@ int libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv) { + int ret; + struct timeval timeout; + struct timeval poll_tv; + GET_CONTEXT(ctx); - return (0); + ret = libusb_get_next_timeout(ctx, &timeout); + if (ret) { + if (timerisset(&timeout) == 0) + return handle_timeouts(ctx); + if (timercmp(&timeout, tv, <) != 0) + poll_tv = timeout; + else + poll_tv = *tv; + } else { + poll_tv = *tv; + } + return (handle_events(ctx, &poll_tv)); } int From owner-p4-projects@FreeBSD.ORG Fri May 29 13:44:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 220A31065675; Fri, 29 May 2009 13:44: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 CB97F106564A for ; Fri, 29 May 2009 13:44:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A07AB8FC0A for ; Fri, 29 May 2009 13:44:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TDi4tk046495 for ; Fri, 29 May 2009 13:44:04 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TDi4bb046493 for perforce@freebsd.org; Fri, 29 May 2009 13:44:04 GMT (envelope-from zec@fer.hr) Date: Fri, 29 May 2009 13:44:04 GMT Message-Id: <200905291344.n4TDi4bb046493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163012 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, 29 May 2009 13:44:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=163012 Change 163012 by zec@zec_amdx4 on 2009/05/29 13:43:42 Unbreak build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#5 add .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#5 add .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#5 add .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#6 add .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#7 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri May 29 14:16:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D62DC10656F4; Fri, 29 May 2009 14:16:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91C6610656F2 for ; Fri, 29 May 2009 14:16:41 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 804EC8FC08 for ; Fri, 29 May 2009 14:16:41 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEGfxI050934 for ; Fri, 29 May 2009 14:16:41 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TEGfGO050932 for perforce@freebsd.org; Fri, 29 May 2009 14:16:41 GMT (envelope-from scottl@freebsd.org) Date: Fri, 29 May 2009 14:16:41 GMT Message-Id: <200905291416.n4TEGfGO050932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 163017 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, 29 May 2009 14:16:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=163017 Change 163017 by scottl@scottl-y1 on 2009/05/29 14:15:56 Take care of some simple devclasses locking cases. Affected files ... .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#21 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#21 (text+ko) ==== @@ -4188,9 +4188,11 @@ devclass_t dc; printf("Short listing of devclasses, drivers & devices:\n"); + mtx_lock(&devclasses_mtx); TAILQ_FOREACH(dc, &devclasses, link) { print_devclass_short(dc, 0); } + mtx_unlock(&devclasses_mtx); } void @@ -4199,9 +4201,11 @@ devclass_t dc; printf("Full listing of devclasses, drivers & devices:\n"); + mtx_lock(&devclasses_mtx); TAILQ_FOREACH(dc, &devclasses, link) { print_devclass(dc, 0); } + mtx_unlock(&devclasses_mtx); } #endif From owner-p4-projects@FreeBSD.ORG Fri May 29 14:36:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49F931065679; Fri, 29 May 2009 14:36: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 E0FD2106566C for ; Fri, 29 May 2009 14:36:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD0A48FC0C for ; Fri, 29 May 2009 14:36:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEa20W052579 for ; Fri, 29 May 2009 14:36:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TEa1Cf052577 for perforce@freebsd.org; Fri, 29 May 2009 14:36:01 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 May 2009 14:36:01 GMT Message-Id: <200905291436.n4TEa1Cf052577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163020 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, 29 May 2009 14:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=163020 Change 163020 by jhb@jhb_jhbbsd on 2009/05/29 14:35:29 IFC @163016 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/smpng/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/smpng/share/man/man9/acl.9#2 integrate .. //depot/projects/smpng/share/man/man9/atomic.9#2 integrate .. //depot/projects/smpng/share/man/man9/fail.9#1 branch .. //depot/projects/smpng/share/man/man9/rmlock.9#2 integrate .. //depot/projects/smpng/share/man/man9/sx.9#2 integrate .. //depot/projects/smpng/sys/Makefile#23 integrate .. //depot/projects/smpng/sys/arm/at91/ohci_atmelarm.c#5 delete .. //depot/projects/smpng/sys/arm/conf/AVILA#18 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#11 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#12 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#7 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/zfssubr.c#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/smpng/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#59 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#57 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#20 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#44 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#29 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#65 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#21 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#45 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysconfig.h#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#168 integrate .. //depot/projects/smpng/sys/conf/files#240 integrate .. //depot/projects/smpng/sys/conf/files.i386#125 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#52 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#64 integrate .. //depot/projects/smpng/sys/conf/options#167 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#19 integrate .. //depot/projects/smpng/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#65 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#113 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#49 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#5 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#97 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#12 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#76 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#47 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#30 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/smpng/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#61 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#12 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#21 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#17 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#18 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#58 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#9 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#25 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#15 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#22 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipwvar.h#9 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#33 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwivar.h#13 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/smpng/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/smpng/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo.h#3 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#26 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_linux.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#19 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phyreg.h#6 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#35 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#15 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#17 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#9 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#16 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#55 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#14 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#35 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#31 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#108 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#40 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_if.m#8 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#15 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560var.h#7 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#11 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661var.h#6 integrate .. //depot/projects/smpng/sys/dev/random/nehemiah.c#5 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#16 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#26 integrate .. //depot/projects/smpng/sys/dev/si/si.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#38 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#42 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#35 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#6 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#72 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#18 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#13 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#28 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/README.TXT#2 delete .. //depot/projects/smpng/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#5 delete .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#5 delete .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#137 integrate .. //depot/projects/smpng/sys/dev/usb/usbhid.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#4 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#17 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#93 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#24 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#29 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#11 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpivar.h#5 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#9 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#9 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs.h#4 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#25 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#29 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#57 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#33 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#59 integrate .. //depot/projects/smpng/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/smpng/sys/i386/xen/clock.c#8 integrate .. //depot/projects/smpng/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/smpng/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#41 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#21 integrate .. //depot/projects/smpng/sys/kern/init_main.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#125 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#139 integrate .. //depot/projects/smpng/sys/kern/kern_fail.c#1 branch .. //depot/projects/smpng/sys/kern/kern_fork.c#119 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/smpng/sys/kern/kern_mib.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#155 integrate .. //depot/projects/smpng/sys/kern/kern_osd.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#5 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#49 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#23 integrate .. //depot/projects/smpng/sys/kern/linker_if.m#7 integrate .. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#7 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#38 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#51 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#42 integrate .. //depot/projects/smpng/sys/kern/tty.c#91 integrate .. //depot/projects/smpng/sys/kern/tty_inq.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_debug.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_acl.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#122 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#59 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#93 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#166 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#147 integrate .. //depot/projects/smpng/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/smpng/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#3 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#3 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#3 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/smpng/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/smpng/sys/mips/mips/pmap.c#10 integrate .. //depot/projects/smpng/sys/modules/Makefile#161 integrate .. //depot/projects/smpng/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/smpng/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#24 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/nfs4client/Makefile#6 delete .. //depot/projects/smpng/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfsclient/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/Makefile#17 integrate .. //depot/projects/smpng/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wlan/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#9 integrate .. //depot/projects/smpng/sys/net/bpf.c#85 integrate .. //depot/projects/smpng/sys/net/if.c#118 integrate .. //depot/projects/smpng/sys/net/if_clone.c#13 integrate .. //depot/projects/smpng/sys/net/if_llatbl.c#4 integrate .. //depot/projects/smpng/sys/net/if_llatbl.h#3 integrate .. //depot/projects/smpng/sys/net/if_loop.c#56 integrate .. //depot/projects/smpng/sys/net/if_var.h#62 integrate .. //depot/projects/smpng/sys/net/pfil.h#12 integrate .. //depot/projects/smpng/sys/net/rtsock.c#71 integrate .. //depot/projects/smpng/sys/net/vnet.h#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#40 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ddb.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#20 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#46 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#48 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#43 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#35 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/TODO#4 delete .. //depot/projects/smpng/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/smpng/sys/netinet/in.c#54 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#95 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#99 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#107 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#125 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#113 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#92 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#13 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#9 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#53 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#55 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#24 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#33 integrate .. //depot/projects/smpng/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#61 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#62 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#8 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#30 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#57 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#35 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#19 integrate .. //depot/projects/smpng/sys/netipsec/ipsec6.h#8 integrate .. //depot/projects/smpng/sys/netipsec/key.c#35 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#7 integrate .. //depot/projects/smpng/sys/netipx/spx.h#6 integrate .. //depot/projects/smpng/sys/netipx/spx_reass.c#1 branch .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#32 integrate .. //depot/projects/smpng/sys/netipx/spx_var.h#4 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4.h#3 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#11 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.h#4 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#9 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.h#3 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#8 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#7 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vfs.h#3 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vfs_subs.c#5 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#26 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vn.h#3 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#7 delete .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#33 delete .. //depot/projects/smpng/sys/nfs4client/nfs4m_subs.h#3 delete .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#40 integrate .. //depot/projects/smpng/sys/nfsclient/krpc_subr.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#37 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#57 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#38 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#32 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#60 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#39 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#71 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#88 integrate .. //depot/projects/smpng/sys/nfsclient/nfsm_subs.h#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#24 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#37 integrate .. //depot/projects/smpng/sys/nlm/nlm.h#4 integrate .. //depot/projects/smpng/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#27 integrate .. //depot/projects/smpng/sys/powerpc/booke/clock.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/locore.S#6 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#11 integrate .. //depot/projects/smpng/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#10 integrate .. //depot/projects/smpng/sys/powerpc/booke/trap_subr.S#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/vm_machdep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/mutex.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#14 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#15 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#7 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#22 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#34 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#15 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#19 delete .. //depot/projects/smpng/sys/rpc/rpcclnt.h#6 delete .. //depot/projects/smpng/sys/rpc/xdr.h#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#21 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#35 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#93 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#9 integrate .. //depot/projects/smpng/sys/sys/acl.h#14 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#5 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#31 integrate .. //depot/projects/smpng/sys/sys/fail.h#1 branch .. //depot/projects/smpng/sys/sys/interrupt.h#28 integrate .. //depot/projects/smpng/sys/sys/jail.h#26 integrate .. //depot/projects/smpng/sys/sys/ksyms.h#1 branch .. //depot/projects/smpng/sys/sys/lock.h#53 integrate .. //depot/projects/smpng/sys/sys/lockf.h#10 integrate .. //depot/projects/smpng/sys/sys/lockstat.h#1 branch .. //depot/projects/smpng/sys/sys/mutex.h#76 integrate .. //depot/projects/smpng/sys/sys/namei.h#21 integrate .. //depot/projects/smpng/sys/sys/param.h#145 integrate .. //depot/projects/smpng/sys/sys/priv.h#17 integrate .. //depot/projects/smpng/sys/sys/proc.h#198 integrate .. //depot/projects/smpng/sys/sys/queue.h#21 integrate .. //depot/projects/smpng/sys/sys/rmlock.h#2 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#17 integrate .. //depot/projects/smpng/sys/sys/sx.h#32 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#60 integrate .. //depot/projects/smpng/sys/sys/systm.h#95 integrate .. //depot/projects/smpng/sys/sys/tty.h#30 integrate .. //depot/projects/smpng/sys/sys/vimage.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#75 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#107 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#72 integrate .. //depot/projects/smpng/sys/xdr/xdr_mem.c#3 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_xs.c#6 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.349 2009/04/10 10:59:48 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.350 2009/05/27 16:36:54 zml Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -99,6 +99,7 @@ DRIVER_MODULE.9 \ EVENTHANDLER.9 \ extattr.9 \ + fail.9 \ fetch.9 \ firmware.9 \ g_access.9 \ ==== //depot/projects/smpng/share/man/man9/VFS_MOUNT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_MOUNT.9,v 1.14 2005/01/07 10:57:33 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.15 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_MOUNT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_MOUNT "struct mount *mp" "struct thread *td" +.Fn VFS_MOUNT "struct mount *mp" .Sh DESCRIPTION The .Fn VFS_MOUNT @@ -50,8 +50,6 @@ .Bl -tag -width data .It Fa mp Structure representing the file system. -.It Fa td -Thread which is mounting the file system. .El .Pp The ==== //depot/projects/smpng/share/man/man9/VFS_QUOTACTL.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_QUOTACTL.9,v 1.10 2003/10/23 06:24:55 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.11 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd July 24, 1996 +.Dd May 23, 2009 .Os .Dt VFS_QUOTACTL 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" "struct thread *td" +.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" .Sh DESCRIPTION Implement file system quotas. See ==== //depot/projects/smpng/share/man/man9/VFS_ROOT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_ROOT.9,v 1.12 2006/09/18 15:24:20 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd August 26, 2006 +.Dd May 23, 2009 .Os .Dt VFS_ROOT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" "struct thread *td" +.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" .Sh DESCRIPTION Return a locked vnode for the root directory of the file system. .Pp @@ -58,8 +58,6 @@ argument and instead acquire an exclusive lock. .It Fa vpp Return parameter for the root vnode. -.It Fa td -The calling thread. .El .Sh SEE ALSO .Xr VFS 9 , ==== //depot/projects/smpng/share/man/man9/VFS_STATFS.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_STATFS.9,v 1.12 2005/01/13 09:33:06 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_STATFS 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" "struct thread *td" +.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" .Sh DESCRIPTION The .Fn VFS_STATFS @@ -56,8 +56,6 @@ structure, as defined by .In sys/mount.h , into which information is placed about the file system. -.It Fa td -The thread which is querying the file system. .El .Pp The fields of ==== //depot/projects/smpng/share/man/man9/VFS_SYNC.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.17 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_SYNC 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct thread *td" +.Fn VFS_SYNC "struct mount *mp" "int waitfor" .Sh DESCRIPTION The .Fn VFS_SYNC @@ -61,8 +61,6 @@ .It Dv MNT_LAZY push data not written by file system syncer .El -.It Fa td -The calling thread. .El .Pp The ==== //depot/projects/smpng/share/man/man9/VFS_UNMOUNT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (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/share/man/man9/VFS_UNMOUNT.9,v 1.11 2005/01/07 11:45:11 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_UNMOUNT.9,v 1.12 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_UNMOUNT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_UNMOUNT "struct mount *mp" "int mntflags" "struct thread *td" +.Fn VFS_UNMOUNT "struct mount *mp" "int mntflags" .Sh DESCRIPTION The .Fn VFS_UNMOUNT @@ -58,8 +58,6 @@ .It Dv MNT_FORCE Open files are forcibly closed before the file system is unmounted. .El -.It Fa td -Thread which is unmounting the file system. .El .Sh SEE ALSO .Xr vflush 9 , ==== //depot/projects/smpng/share/man/man9/acl.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/acl.9,v 1.16 2009/04/11 10:37:04 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/acl.9,v 1.19 2009/05/24 20:34:29 trasz Exp $ .\" .Dd December 23, 1999 .Os @@ -59,7 +59,9 @@ structure, defined as follows: .Bd -literal -offset indent struct acl { - int acl_cnt; + unsigned int acl_maxcnt; + unsigned int acl_cnt; + int acl_spare[4]; struct acl_entry acl_entry[ACL_MAX_ENTRIES]; }; .Ed @@ -67,6 +69,10 @@ An ACL is constructed from a fixed size array of ACL entries, each of which consists of a set of permissions, principal namespace, and principal identifier. +In this implementation, the +.Vt acl_maxcnt +field is always set to +.Dv ACL_MAX_ENTRIES . .Pp Each individual ACL entry is of the type .Vt acl_entry_t , @@ -97,13 +103,20 @@ .It Dv ACL_MASK The maximum discretionary access rights that can be granted to a process in the file group class. +This is only valid for POSIX.1e ACLs. .It Dv ACL_OTHER Discretionary access rights for processes not covered by any other ACL entry. +This is only valid for POSIX.1e ACLs. .It Dv ACL_OTHER_OBJ Same as .Dv ACL_OTHER . -Each ACL entry must contain exactly one +.It Dv ACL_EVERYONE +Discretionary access rights for all users. +This is only valid for NFSv4 ACLs. +.El +.Pp +Each POSIX.1e ACL must contain exactly one .Dv ACL_USER_OBJ , one .Dv ACL_GROUP_OBJ , @@ -117,13 +130,19 @@ are present, then exactly one .Dv ACL_MASK entry should be present. -.El .It Vt uid_t Va ae_id The ID of user for whom this ACL describes access permissions. +For entries other than +.Dv ACL_USER +and +.Dv ACL_GROUP , +this field should be set to +.Dv ACL_UNDEFINED_ID . .It Vt acl_perm_t Va ae_perm This field defines what kind of access the process matching this ACL has for accessing the associated file. -.Bl -tag -width ".Dv ACL_POSIX1E_BITS" +For POSIX.1e ACLs, the following are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" .It Dv ACL_EXECUTE The process may execute the associated file. .It Dv ACL_WRITE @@ -134,6 +153,57 @@ The process has no read, write or execute permissions to the associated file. .El +.Pp +For NFSv4 ACLs, the following are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" +.It Dv ACL_READ_DATA +The process may read from the associated file. +.It Dv ACL_LIST_DIRECTORY +Same as +.Dv ACL_READ_DATA . +.It Dv ACL_WRITE_DATA +The process may write to the associated file. +.It Dv ACL_ADD_FILE +Same as +.Dv ACL_ACL_WRITE_DATA . +.It Dv ACL_APPEND_DATA +.It Dv ACL_ADD_SUBDIRECTORY +Same as +.Dv ACL_APPEND_DATA . +.It Dv ACL_READ_NAMED_ATTRS +Ignored. +.It Dv ACL_WRITE_NAMED_ATTRS +Ignored. +.It Dv ACL_EXECUTE +The process may execute the associated file. +.It Dv ACL_DELETE_CHILD +.It Dv ACL_READ_ATTRIBUTES +.It Dv ACL_WRITE_ATTRIBUTES +.It Dv ACL_DELETE +.It Dv ACL_READ_ACL +.It Dv ACL_WRITE_ACL +.It Dv ACL_WRITE_OWNER +.It Dv ACL_SYNCHRONIZE +Ignored. +.El +.It Vt acl_entry_type_t Va ae_entry_type +This field defines the type of NFSv4 ACL entry. +It is not used with POSIX.1e ACLs. +The following values are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" +.It Dv ACL_ENTRY_TYPE_ALLOW +.It Dv ACL_ENTRY_TYPE_DENY +.El +.It Vt acl_flag_t Va ae_flags +This field defines the inheritance flags of NFSv4 ACL entry. +It is not used with POSIX.1e ACLs. +The following values are valid: +.Bl -tag -width ".Dv ACL_ENTRY_DIRECTORY_INHERIT" +.It Dv ACL_ENTRY_FILE_INHERIT +.It Dv ACL_ENTRY_DIRECTORY_INHERIT +.It Dv ACL_ENTRY_NO_PROPAGATE_INHERIT +.It Dv ACL_ENTRY_INHERIT_ONLY +.El .El .Sh SEE ALSO .Xr acl 3 , ==== //depot/projects/smpng/share/man/man9/atomic.9#2 (text+ko) ==== @@ -21,7 +21,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/share/man/man9/atomic.9,v 1.14 2008/03/16 21:20:50 pjd Exp $ +.\" $FreeBSD: src/share/man/man9/atomic.9,v 1.15 2009/05/21 13:39:46 jhb Exp $ .\" .Dd September 27, 2005 .Os @@ -225,7 +225,7 @@ .Pp The .Fn atomic_load -functions always have acquire semantics. +functions are only provided with acquire memory barriers. .Bl -hang .It Fn atomic_readandclear addr .Bd -literal -compact @@ -263,7 +263,7 @@ .Pp The .Fn atomic_store -functions always have release semantics. +functions are only provided with release memory barriers. .Pp The type .Dq Li 64 ==== //depot/projects/smpng/share/man/man9/rmlock.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rmlock.9,v 1.4 2007/11/11 19:40:46 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/rmlock.9,v 1.5 2009/05/29 10:52:37 rwatson Exp $ .\" .\" Based on rwlock.9 man page .Dd November 10, 2007 @@ -32,6 +32,7 @@ .Sh NAME .Nm rmlock , .Nm rm_init , +.Nm rm_init_flags , .Nm rm_destroy , .Nm rm_rlock , .Nm rm_wlock , @@ -45,7 +46,9 @@ .In sys/lock.h .In sys/rmlock.h .Ft void -.Fn rm_init "struct rmlock *rm" "const char *name" "int opts" +.Fn rm_init "struct rmlock *rm" "const char *name" +.Ft void +.Fn rm_init_flags "struct rmlock *rm" "const char *name" "int opts" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 29 14:45:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D635D10656C7; Fri, 29 May 2009 14:45: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 8684B10656A9 for ; Fri, 29 May 2009 14:45:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62A2F8FC35 for ; Fri, 29 May 2009 14:45:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEjC6i053275 for ; Fri, 29 May 2009 14:45:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TEjC8P053273 for perforce@freebsd.org; Fri, 29 May 2009 14:45:12 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 May 2009 14:45:12 GMT Message-Id: <200905291445.n4TEjC8P053273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163021 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, 29 May 2009 14:45:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163021 Change 163021 by jhb@jhb_jhbbsd on 2009/05/29 14:44:24 IFC @163019 Affected files ... .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/acl.h#4 branch .. //depot/projects/smpng/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#24 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_rmlock.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rmlock.c,v 1.7 2009/05/29 10:52:37 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rmlock.c,v 1.9 2009/05/29 14:25:51 rwatson Exp $"); #include "opt_ddb.h" #include "opt_kdtrace.h" @@ -327,7 +327,7 @@ rm_tracker_add(pc, tracker); - td->td_pinned++; /* sched_pin(); */ + sched_pin(); compiler_memory_barrier(); @@ -387,7 +387,7 @@ pc = cpuid_to_pcpu[td->td_oncpu]; /* pcpu_find(td->td_oncpu); */ rm_tracker_remove(pc, tracker); td->td_critnest--; - td->td_pinned--; /* sched_unpin(); */ + sched_unpin(); if (0 == (td->td_owepreempt | tracker->rmp_flags)) return; @@ -527,7 +527,8 @@ void _rm_runlock_debug(struct rmlock *rm, struct rm_priotracker *tracker, - const char *file, int line) { + const char *file, int line) +{ _rm_runlock(rm, tracker); } ==== //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#24 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2001-2002 Maksim Yevmenkin + * Copyright (c) 2001-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,29 +27,89 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_ubt.c,v 1.22 2005/10/31 17:57:44 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.36 2008/10/03 22:40:42 emax Exp $ + * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.40 2009/05/28 17:36:36 thompsa Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* + * NOTE: ng_ubt2 driver has a split personality. On one side it is + * a USB device driver and on the other it is a Netgraph node. This + * driver will *NOT* create traditional /dev/ enties, only Netgraph + * node. + * + * NOTE ON LOCKS USED: ng_ubt2 drives uses 2 locks (mutexes) + * + * 1) sc_if_mtx - lock for device's interface #0 and #1. This lock is used + * by USB for any USB request going over device's interface #0 and #1, + * i.e. interrupt, control, bulk and isoc. transfers. + * + * 2) sc_ng_mtx - this lock is used to protect shared (between USB, Netgraph + * and Taskqueue) data, such as outgoing mbuf queues, task flags and hook + * pointer. This lock *SHOULD NOT* be grabbed for a long time. In fact, + * think of it as a spin lock. + * + * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 3 different contexts. + * + * 1) USB context. This is where all the USB related stuff happens. All + * callbacks run in this context. All callbacks are called (by USB) with + * appropriate interface lock held. It is (generally) allowed to grab + * any additional locks. + * + * 2) Netgraph context. This is where all the Netgraph related stuff happens. + * Since we mark node as WRITER, the Netgraph node will be "locked" (from + * Netgraph point of view). Any variable that is only modified from the + * Netgraph context does not require any additonal locking. It is generally + * *NOT* allowed to grab *ANY* additional locks. Whatever you do, *DO NOT* + * grab any lock in the Netgraph context that could cause de-scheduling of + * the Netgraph thread for significant amount of time. In fact, the only + * lock that is allowed in the Netgraph context is the sc_ng_mtx lock. + * Also make sure that any code that is called from the Netgraph context + * follows the rule above. + * + * 3) Taskqueue context. This is where ubt_task runs. Since we are generally + * NOT allowed to grab any lock that could cause de-scheduling in the + * Netgraph context, and, USB requires us to grab interface lock before + * doing things with transfers, it is safer to transition from the Netgraph + * context to the Taskqueue context before we can call into USB subsystem. + * + * So, to put everything together, the rules are as follows. + * It is OK to call from the USB context or the Taskqueue context into + * the Netgraph context (i.e. call NG_SEND_xxx functions). In other words + * it is allowed to call into the Netgraph context with locks held. + * Is it *NOT* OK to call from the Netgraph context into the USB context, + * because USB requires us to grab interface locks, and, it is safer to + * avoid it. So, to make things safer we set task flags to indicate which + * actions we want to perform and schedule ubt_task which would run in the + * Taskqueue context. + * Is is OK to call from the Taskqueue context into the USB context, + * and, ubt_task does just that (i.e. grabs appropriate interface locks + * before calling into USB). + * Access to the outgoing queues, task flags and hook pointer is + * controlled by the sc_ng_mtx lock. It is an unavoidable evil. Again, + * sc_ng_mtx should really be a spin lock (and it is very likely to an + * equivalent of spin lock due to adaptive nature of FreeBSD mutexes). + * All USB callbacks accept softc pointer as a private data. USB ensures + * that this pointer is valid. + */ +#include "usbdevs.h" #include -#include -#include -#include +#include +#include + +#define USB_DEBUG_VAR usb2_debug + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -59,73 +119,17 @@ #include #include -#include "usbdevs.h" +static int ubt_modevent(module_t, int, void *); +static device_probe_t ubt_probe; +static device_attach_t ubt_attach; +static device_detach_t ubt_detach; -/* - * USB methods - */ +static void ubt_task_schedule(ubt_softc_p, int); +static task_fn_t ubt_task; -static device_probe_t ubt_match; -static device_attach_t ubt_attach; -static device_detach_t ubt_detach; +#define ubt_xfer_start(sc, i) usb2_transfer_start((sc)->sc_xfer[(i)]) -static device_method_t ubt_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ubt_match), - DEVMETHOD(device_attach, ubt_attach), - DEVMETHOD(device_detach, ubt_detach), - - { 0, 0 } -}; - -static driver_t ubt_driver = { - "ubt", - ubt_methods, - sizeof(struct ubt_softc) -}; - -static devclass_t ubt_devclass; - -static int ubt_modevent (module_t, int, void *); - -static usbd_status ubt_request_start (ubt_softc_p); -static void ubt_request_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_request_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_intr_start (ubt_softc_p); -static void ubt_intr_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_intr_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_in_start (ubt_softc_p); -static void ubt_bulk_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_out_start (ubt_softc_p); -static void ubt_bulk_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_out_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_in_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_in_start (ubt_softc_p); -static void ubt_isoc_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_out_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_out_start (ubt_softc_p); -static void ubt_isoc_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); - -static void ubt_reset (ubt_softc_p); - -/* - * Netgraph methods - */ - +/* Netgraph methods */ static ng_constructor_t ng_ubt_constructor; static ng_shutdown_t ng_ubt_shutdown; static ng_newhook_t ng_ubt_newhook; @@ -141,7 +145,8 @@ { "qlen", &ng_parse_int32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_qlen_type = { +static const struct ng_parse_type ng_ubt_node_qlen_type = +{ &ng_parse_struct_type, &ng_ubt_node_qlen_type_fields }; @@ -157,61 +162,64 @@ { "ierrors", &ng_parse_uint32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_stat_type = { +static const struct ng_parse_type ng_ubt_node_stat_type = +{ &ng_parse_struct_type, &ng_ubt_node_stat_type_fields }; /* Netgraph node command list */ -static const struct ng_cmdlist ng_ubt_cmdlist[] = { +static const struct ng_cmdlist ng_ubt_cmdlist[] = { - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_DEBUG, - "set_debug", - &ng_parse_uint16_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_DEBUG, - "get_debug", - NULL, - &ng_parse_uint16_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_QLEN, - "set_qlen", - &ng_ubt_node_qlen_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_QLEN, - "get_qlen", - &ng_ubt_node_qlen_type, - &ng_ubt_node_qlen_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_STAT, - "get_stat", - NULL, - &ng_ubt_node_stat_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_RESET_STAT, - "reset_stat", - NULL, - NULL -}, -{ 0, } + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_DEBUG, + "set_debug", + &ng_parse_uint16_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_DEBUG, + "get_debug", + NULL, + &ng_parse_uint16_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_QLEN, + "set_qlen", + &ng_ubt_node_qlen_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_QLEN, + "get_qlen", + &ng_ubt_node_qlen_type, + &ng_ubt_node_qlen_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_STAT, + "get_stat", + NULL, + &ng_ubt_node_stat_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_RESET_STAT, + "reset_stat", + NULL, + NULL + }, + { 0, } }; /* Netgraph node type */ -static struct ng_type typestruct = { - .version = NG_ABI_VERSION, +static struct ng_type typestruct = +{ + .version = NG_ABI_VERSION, .name = NG_UBT_NODE_TYPE, .constructor = ng_ubt_constructor, .rcvmsg = ng_ubt_rcvmsg, @@ -220,192 +228,251 @@ .connect = ng_ubt_connect, .rcvdata = ng_ubt_rcvdata, .disconnect = ng_ubt_disconnect, - .cmdlist = ng_ubt_cmdlist + .cmdlist = ng_ubt_cmdlist }; -/* - * Module - */ - -DRIVER_MODULE(ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0); -MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); -MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); -MODULE_DEPEND(ubt, usb, 1, 1, 1); - - /**************************************************************************** **************************************************************************** ** USB specific **************************************************************************** ****************************************************************************/ +/* USB methods */ +static usb2_callback_t ubt_ctrl_write_callback; +static usb2_callback_t ubt_intr_read_callback; +static usb2_callback_t ubt_bulk_read_callback; +static usb2_callback_t ubt_bulk_write_callback; +static usb2_callback_t ubt_isoc_read_callback; +static usb2_callback_t ubt_isoc_write_callback; + +static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); +static int ubt_isoc_read_one_frame(struct usb_xfer *, int); + /* - * Load/Unload the driver module + * USB config + * + * The following desribes usb transfers that could be submitted on USB device. + * + * Interface 0 on the USB device must present the following endpoints + * 1) Interrupt endpoint to receive HCI events + * 2) Bulk IN endpoint to receive ACL data + * 3) Bulk OUT endpoint to send ACL data + * + * Interface 1 on the USB device must present the following endpoints + * 1) Isochronous IN endpoint to receive SCO data + * 2) Isochronous OUT endpoint to send SCO data */ -static int -ubt_modevent(module_t mod, int event, void *data) +static const struct usb_config ubt_config[UBT_N_TRANSFER] = { - int error; + /* + * Interface #0 + */ + + /* Outgoing bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 0, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, + }, + /* Incoming bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, + }, + /* Incoming interrupt transfer - HCI events */ + [UBT_IF_0_INTR_DT_RD] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, + }, + /* Outgoing control transfer - HCI commands */ + [UBT_IF_0_CTRL_DT_WR] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* control pipe */ + .direction = UE_DIR_ANY, + .if_index = 0, + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ + }, + + /* + * Interface #1 + */ + + /* Incoming isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Incoming isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Outgoing isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, + /* Outgoing isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, +}; - switch (event) { - case MOD_LOAD: - error = ng_newtype(&typestruct); - if (error != 0) - printf( -"%s: Could not register Netgraph node type, error=%d\n", - NG_UBT_NODE_TYPE, error); - else - error = usbd_driver_load(mod, event, data); - break; +/* + * If for some reason device should not be attached then put + * VendorID/ProductID pair into the list below. The format is + * as follows: + * + * { USB_VPI(VENDOR_ID, PRODUCT_ID, 0) }, + * + * where VENDOR_ID and PRODUCT_ID are hex numbers. + */ - case MOD_UNLOAD: - error = ng_rmtype(&typestruct); - if (error == 0) - error = usbd_driver_load(mod, event, data); - break; +static const struct usb_device_id ubt_ignore_devs[] = +{ + /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x2200, 0) }, +}; - default: - error = EOPNOTSUPP; - break; - } +/* List of supported bluetooth devices */ +static const struct usb_device_id ubt_devs[] = +{ + /* Generic Bluetooth class devices */ + { USB_IFACE_CLASS(UDCLASS_WIRELESS), + USB_IFACE_SUBCLASS(UDSUBCLASS_RF), + USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) }, - return (error); -} /* ubt_modevent */ + /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x3800, 0) }, +}; /* - * Probe for a USB Bluetooth device + * Probe for a USB Bluetooth device. + * USB context. */ static int -ubt_match(device_t self) +ubt_probe(device_t dev) { - /* - * If for some reason device should not be attached then put - * VendorID/ProductID pair into the list below. The format is - * as follows: - * - * { VENDOR_ID, PRODUCT_ID }, - * - * where VENDOR_ID and PRODUCT_ID are hex numbers. - */ + struct usb_attach_arg *uaa = device_get_ivars(dev); - static struct usb_devno const ubt_ignored_devices[] = { - { USB_VENDOR_AVM, 0x2200 }, /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); - /* - * If device violates Bluetooth specification and has bDeviceClass, - * bDeviceSubClass and bDeviceProtocol set to wrong values then you - * could try to put VendorID/ProductID pair into the list below. - * Adding VendorID/ProductID pair into this list forces ng_ubt(4) - * to attach to the broken device. - */ + if (uaa->info.bIfaceIndex != 0) + return (ENXIO); - static struct usb_devno const ubt_broken_devices[] = { - { USB_VENDOR_AVM, 0x3800 }, /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->use_generic == 0) + return (ENXIO); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device); + if (usb2_lookup_id_by_uaa(ubt_ignore_devs, + sizeof(ubt_ignore_devs), uaa) == 0) + return (ENXIO); - if (uaa->iface == NULL || - usb_lookup(ubt_ignored_devices, uaa->vendor, uaa->product)) - return (UMATCH_NONE); - - if (dd->bDeviceClass == UDCLASS_WIRELESS && - dd->bDeviceSubClass == UDSUBCLASS_RF && - dd->bDeviceProtocol == UDPROTO_BLUETOOTH) - return (UMATCH_DEVCLASS_DEVSUBCLASS); - - if (usb_lookup(ubt_broken_devices, uaa->vendor, uaa->product)) - return (UMATCH_VENDOR_PRODUCT); - - return (UMATCH_NONE); -} /* ubt_match */ + return (usb2_lookup_id_by_uaa(ubt_devs, sizeof(ubt_devs), uaa)); +} /* ubt_probe */ /* - * Attach the device + * Attach the device. + * USB context. */ static int -ubt_attach(device_t self) +ubt_attach(device_t dev) { - struct ubt_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_config_descriptor_t *cd = NULL; - usb_interface_descriptor_t *id = NULL; - usb_endpoint_descriptor_t *ed = NULL; - usbd_status error; - int i, ai, alt_no, isoc_in, isoc_out, - isoc_isize, isoc_osize; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ubt_softc *sc = device_get_softc(dev); + struct usb_endpoint_descriptor *ed; + struct usb_interface_descriptor *id; + uint16_t wMaxPacketSize; + uint8_t alt_index, i, j; + uint8_t iface_index[2] = { 0, 1 }; + + device_set_usb2_desc(dev); - /* Get USB device info */ - sc->sc_dev = self; - sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_debug = NG_UBT_WARN_LEVEL; /* - * Initialize device softc structure + * Create Netgraph node */ - /* State */ - sc->sc_debug = NG_UBT_WARN_LEVEL; - sc->sc_flags = 0; - NG_UBT_STAT_RESET(sc->sc_stat); + if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) { + UBT_ALERT(sc, "could not create Netgraph node\n"); + return (ENXIO); + } + + /* Name Netgraph node */ + if (ng_name_node(sc->sc_node, device_get_nameunit(dev)) != 0) { + UBT_ALERT(sc, "could not name Netgraph node\n"); + NG_NODE_UNREF(sc->sc_node); + return (ENXIO); + } + NG_NODE_SET_PRIVATE(sc->sc_node, sc); + NG_NODE_FORCE_WRITER(sc->sc_node); - /* Interfaces */ - sc->sc_iface0 = sc->sc_iface1 = NULL; + /* + * Initialize device softc structure + */ - /* Interrupt pipe */ - sc->sc_intr_ep = -1; - sc->sc_intr_pipe = NULL; - sc->sc_intr_xfer = NULL; - sc->sc_intr_buffer = NULL; + /* initialize locks */ + mtx_init(&sc->sc_ng_mtx, "ubt ng", NULL, MTX_DEF); + mtx_init(&sc->sc_if_mtx, "ubt if", NULL, MTX_DEF | MTX_RECURSE); - /* Control pipe */ - sc->sc_ctrl_xfer = NULL; - sc->sc_ctrl_buffer = NULL; + /* initialize packet queues */ NG_BT_MBUFQ_INIT(&sc->sc_cmdq, UBT_DEFAULT_QLEN); - - /* Bulk-in pipe */ - sc->sc_bulk_in_ep = -1; - sc->sc_bulk_in_pipe = NULL; - sc->sc_bulk_in_xfer = NULL; - sc->sc_bulk_in_buffer = NULL; - - /* Bulk-out pipe */ - sc->sc_bulk_out_ep = -1; - sc->sc_bulk_out_pipe = NULL; - sc->sc_bulk_out_xfer = NULL; - sc->sc_bulk_out_buffer = NULL; NG_BT_MBUFQ_INIT(&sc->sc_aclq, UBT_DEFAULT_QLEN); - - /* Isoc-in pipe */ - sc->sc_isoc_in_buffer = NULL; - sc->sc_isoc_in_ep = -1; - sc->sc_isoc_in_pipe = NULL; - bzero(&sc->sc_isoc_in, sizeof(sc->sc_isoc_in)); - - /* Isoc-out pipe */ - sc->sc_isoc_out_ep = -1; - sc->sc_isoc_out_pipe = NULL; - bzero(&sc->sc_isoc_out, sizeof(sc->sc_isoc_out)); - - sc->sc_isoc_size = -1; NG_BT_MBUFQ_INIT(&sc->sc_scoq, UBT_DEFAULT_QLEN); - /* Netgraph part */ - sc->sc_node = NULL; - sc->sc_hook = NULL; + /* initialize glue task */ + TASK_INIT(&sc->sc_task, 0, ubt_task, sc); /* - * XXX set configuration? + * Configure Bluetooth USB device. Discover all required USB + * interfaces and endpoints. * - * Configure Bluetooth USB device. Discover all required USB interfaces - * and endpoints. - * * USB device must present two interfaces: * 1) Interface 0 that has 3 endpoints * 1) Interrupt endpoint to receive HCI events @@ -416,1524 +483,804 @@ * 1) Isochronous IN endpoint to receive SCO data * 2) Isochronous OUT endpoint to send SCO data * - * Interface 1 (with isochronous endpoints) has several alternate + * Interface 1 (with isochronous endpoints) has several alternate * configurations with different packet size. */ /* - * Interface 0 + * For interface #1 search alternate settings, and find + * the descriptor with the largest wMaxPacketSize */ - error = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface0); - if (error || sc->sc_iface0 == NULL) { - printf("%s: Could not get interface 0 handle. %s (%d), " \ - "handle=%p\n", device_get_nameunit(sc->sc_dev), - usbd_errstr(error), error, sc->sc_iface0); - goto bad; - } + wMaxPacketSize = 0; + alt_index = 0; + i = 0; + j = 0; + ed = NULL; - id = usbd_get_interface_descriptor(sc->sc_iface0); - if (id == NULL) { - printf("%s: Could not get interface 0 descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - for (i = 0; i < id->bNumEndpoints; i ++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface0, i); - if (ed == NULL) { - printf("%s: Could not read endpoint descriptor for " \ - "interface 0, i=%d\n", device_get_nameunit(sc->sc_dev), - i); - goto bad; - } - - switch (UE_GET_XFERTYPE(ed->bmAttributes)) { - case UE_BULK: - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN) - sc->sc_bulk_in_ep = ed->bEndpointAddress; - else - sc->sc_bulk_out_ep = ed->bEndpointAddress; - break; - - case UE_INTERRUPT: - sc->sc_intr_ep = ed->bEndpointAddress; - break; - } - } - - /* Check if we got everything we wanted on Interface 0 */ - if (sc->sc_intr_ep == -1) { - printf("%s: Could not detect interrupt endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_bulk_in_ep == -1) { - printf("%s: Could not detect bulk-in endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_bulk_out_ep == -1) { - printf("%s: Could not detect bulk-out endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - printf("%s: Interface 0 endpoints: interrupt=%#x, bulk-in=%#x, " \ - "bulk-out=%#x\n", device_get_nameunit(sc->sc_dev), - sc->sc_intr_ep, sc->sc_bulk_in_ep, sc->sc_bulk_out_ep); - - /* - * Interface 1 + /* + * Search through all the descriptors looking for the largest + * packet size: */ + while ((ed = (struct usb_endpoint_descriptor *)usb2_desc_foreach( + usb2_get_config_descriptor(uaa->device), + (struct usb_descriptor *)ed))) { - cd = usbd_get_config_descriptor(sc->sc_udev); - if (cd == NULL) { - printf("%s: Could not get device configuration descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - error = usbd_device2interface_handle(sc->sc_udev, 1, &sc->sc_iface1); - if (error || sc->sc_iface1 == NULL) { - printf("%s: Could not get interface 1 handle. %s (%d), " \ - "handle=%p\n", device_get_nameunit(sc->sc_dev), - usbd_errstr(error), error, sc->sc_iface1); - goto bad; - } - - id = usbd_get_interface_descriptor(sc->sc_iface1); - if (id == NULL) { - printf("%s: Could not get interface 1 descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - - /* - * Scan all alternate configurations for interface 1 - */ - - alt_no = -1; - - for (ai = 0; ai < usbd_get_no_alts(cd, 1); ai++) { - error = usbd_set_interface(sc->sc_iface1, ai); - if (error) { - printf("%s: [SCAN] Could not set alternate " \ - "configuration %d for interface 1. %s (%d)\n", - device_get_nameunit(sc->sc_dev), ai, usbd_errstr(error), - error); - goto bad; - } - id = usbd_get_interface_descriptor(sc->sc_iface1); - if (id == NULL) { - printf("%s: Could not get interface 1 descriptor for " \ - "alternate configuration %d\n", - device_get_nameunit(sc->sc_dev), ai); - goto bad; + if ((ed->bDescriptorType == UDESC_INTERFACE) && + (ed->bLength >= sizeof(*id))) { + id = (struct usb_interface_descriptor *)ed; + i = id->bInterfaceNumber; + j = id->bAlternateSetting; } - isoc_in = isoc_out = -1; - isoc_isize = isoc_osize = 0; + if ((ed->bDescriptorType == UDESC_ENDPOINT) && + (ed->bLength >= sizeof(*ed)) && + (i == 1)) { + uint16_t temp; - for (i = 0; i < id->bNumEndpoints; i ++) { - ed = usbd_interface2endpoint_descriptor(sc->sc_iface1, i); - if (ed == NULL) { - printf("%s: Could not read endpoint " \ - "descriptor for interface 1, " \ - "alternate configuration %d, i=%d\n", - device_get_nameunit(sc->sc_dev), ai, i); - goto bad; - } - - if (UE_GET_XFERTYPE(ed->bmAttributes) != UE_ISOCHRONOUS) - continue; - - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN) { - isoc_in = ed->bEndpointAddress; - isoc_isize = UGETW(ed->wMaxPacketSize); - } else { - isoc_out = ed->bEndpointAddress; - isoc_osize = UGETW(ed->wMaxPacketSize); + temp = UGETW(ed->wMaxPacketSize); + if (temp > wMaxPacketSize) { + wMaxPacketSize = temp; + alt_index = j; } } - - /* - * Make sure that configuration looks sane and if so - * update current settings - */ - - if (isoc_in != -1 && isoc_out != -1 && - isoc_isize > 0 && isoc_osize > 0 && - isoc_isize == isoc_osize && isoc_isize > sc->sc_isoc_size) { - sc->sc_isoc_in_ep = isoc_in; - sc->sc_isoc_out_ep = isoc_out; - sc->sc_isoc_size = isoc_isize; - alt_no = ai; - } } - /* Check if we got everything we wanted on Interface 0 */ - if (sc->sc_isoc_in_ep == -1) { - printf("%s: Could not detect isoc-in endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; + /* Set alt configuration on interface #1 only if we found it */ + if (wMaxPacketSize > 0 && + usb2_set_alt_interface_index(uaa->device, 1, alt_index)) { + UBT_ALERT(sc, "could not set alternate setting %d " \ + "for interface 1!\n", alt_index); + goto detach; } - if (sc->sc_isoc_out_ep == -1) { - printf("%s: Could not detect isoc-out endpoint\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - if (sc->sc_isoc_size <= 0) { - printf("%s: Invalid isoc. packet size=%d\n", - device_get_nameunit(sc->sc_dev), sc->sc_isoc_size); - goto bad; - } - error = usbd_set_interface(sc->sc_iface1, alt_no); - if (error) { - printf("%s: Could not set alternate configuration " \ - "%d for interface 1. %s (%d)\n", - device_get_nameunit(sc->sc_dev), - alt_no, usbd_errstr(error), error); - goto bad; - } - - /* Allocate USB transfer handles and buffers */ - sc->sc_ctrl_xfer = usbd_alloc_xfer(sc->sc_udev); - if (sc->sc_ctrl_xfer == NULL) { - printf("%s: Could not allocate control xfer handle\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } - sc->sc_ctrl_buffer = usbd_alloc_buffer(sc->sc_ctrl_xfer, - UBT_CTRL_BUFFER_SIZE); - if (sc->sc_ctrl_buffer == NULL) { - printf("%s: Could not allocate control buffer\n", - device_get_nameunit(sc->sc_dev)); - goto bad; - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 29 14:50:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC55D10656E0; Fri, 29 May 2009 14:50:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 652B510656FF for ; Fri, 29 May 2009 14:50:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 542498FC0C for ; Fri, 29 May 2009 14:50:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEoI3l053652 for ; Fri, 29 May 2009 14:50:18 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TEoHEd053649 for perforce@freebsd.org; Fri, 29 May 2009 14:50:17 GMT (envelope-from zec@fer.hr) Date: Fri, 29 May 2009 14:50:17 GMT Message-Id: <200905291450.n4TEoHEd053649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163022 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, 29 May 2009 14:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163022 Change 163022 by zec@zec_tpx32 on 2009/05/29 14:49:17 Add an XXX note about a temporary check that enforces "isolation" between process view between vimages. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#11 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#11 (text+ko) ==== @@ -1749,7 +1749,7 @@ KASSERT(td == curthread, ("%s: td not curthread", __func__)); PROC_LOCK_ASSERT(p, MA_OWNED); if ( -#ifdef VIMAGE +#ifdef VIMAGE /* XXX temporary until struct vimage goes away */ !vi_child_of(TD_TO_VIMAGE(td), P_TO_VIMAGE(p)) && #endif (error = prison_check(td->td_ucred, p->p_ucred))) From owner-p4-projects@FreeBSD.ORG Fri May 29 14:56:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2914106567A; Fri, 29 May 2009 14:56: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 B2797106566C for ; Fri, 29 May 2009 14:56:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A18F48FC24 for ; Fri, 29 May 2009 14:56:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TEuQu9054073 for ; Fri, 29 May 2009 14:56:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TEuQQE054071 for perforce@freebsd.org; Fri, 29 May 2009 14:56:26 GMT (envelope-from zec@fer.hr) Date: Fri, 29 May 2009 14:56:26 GMT Message-Id: <200905291456.n4TEuQQE054071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163023 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, 29 May 2009 14:56:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=163023 Change 163023 by zec@zec_tpx32 on 2009/05/29 14:56:02 Reduce diff against head by trimming out WS changes and some other debugging / leftover noise. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#66 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#12 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#38 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#66 (text+ko) ==== @@ -1024,7 +1024,6 @@ } ifp->if_afdata_initialized = 0; IF_AFDATA_UNLOCK(ifp); - ifp->if_afdata_initialized = 0; if (!vmove) ifq_detach(&ifp->if_snd); ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#12 (text+ko) ==== @@ -344,7 +344,6 @@ static void if_clone_free(struct if_clone *ifc) { - for (int bytoff = 0; bytoff < ifc->ifc_bmlen; bytoff++) { KASSERT(ifc->ifc_units[bytoff] == 0x00, ("ifc_units[%d] is not empty", bytoff)); @@ -504,6 +503,7 @@ { int bytoff, bitoff; + /* * Compute offset in the bitmap and deallocate the unit. */ ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#27 (text+ko) ==== @@ -731,6 +731,7 @@ * to call ifnet_byindex() instead if ifnet_byindex_ref(). */ struct ifnet *ifnet_byindex(u_short idx); +struct ifnet *ifnet_byindex_locked(u_short idx); struct ifnet *ifnet_byindex_ref(u_short idx); /* ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#38 (text+ko) ==== @@ -609,7 +609,6 @@ IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; - KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); if (igi->igi_version == IGMP_VERSION_3) { IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { From owner-p4-projects@FreeBSD.ORG Fri May 29 15:12:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEAC61065673; Fri, 29 May 2009 15:12: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 55A7C1065670 for ; Fri, 29 May 2009 15:12:43 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4353C8FC17 for ; Fri, 29 May 2009 15:12:43 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TFChLm056453 for ; Fri, 29 May 2009 15:12:43 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TFChUx056451 for perforce@freebsd.org; Fri, 29 May 2009 15:12:43 GMT (envelope-from syl@FreeBSD.org) Date: Fri, 29 May 2009 15:12:43 GMT Message-Id: <200905291512.n4TFChUx056451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163025 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, 29 May 2009 15:12:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=163025 Change 163025 by syl@syl_rincewind on 2009/05/29 15:12:12 Split libusb10.c (more than 1400 lines) into 2 files. libusb10_io.c contains now io operations. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/Makefile#3 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#17 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#1 add .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#1 add Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/Makefile#3 (text+ko) ==== @@ -26,6 +26,7 @@ # libusb 1.0 compat SRCS+= libusb10.c SRCS+= libusb10_desc.c +SRCS+= libusb10_io.c INCS+= libusb.h MAN+= libusb10.3 ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#17 (text+ko) ==== @@ -36,6 +36,7 @@ #include "libusb20_desc.h" #include "libusb20_int.h" #include "libusb.h" +#include "libusb10.h" /* * XXX TODO @@ -43,78 +44,11 @@ * - implement last io funcs. */ -/* - * The two following macros were taken from the original LibUSB v1.0 - * for sake of compatibility: - */ -#define USB_LIST_INIT(entry) \ - (entry)->prev = (entry)->next = entry; -#define USB_LIST_EMPTY(entry) \ - ((entry)->next = (entry)) - -#define LIST_ADD(entry, head) \ - (entry)->next = (head)->next; \ - (entry)->prev = (head); \ - (head)->next->prev = (entry); \ - (head)->next = (entry); -#define LIST_ADD_TAIL(entry, head) \ - (entry)->next = (head); \ - (entry)->prev = (head)->prev; \ - (head)->prev->next = (entry); \ - (head)->prev = (entry); -#define LIST_DEL(entry) \ - (entry)->next->prev = (entry)->prev; \ - (entry)->prev->next = (entry)->next; - -#define LIST_ENT(ptr, type, member) \ - ((type *)((char *)(ptr) - (unsigned long) (&((type*)0L)->member))) -#define LIST_FOREACH_ENTRY(pos, head, member) \ - for (pos = LIST_ENT((head)->next, typeof(*pos), member) ; \ - &pos->member != head ; \ - pos = LIST_ENT(pos->member.next, typeof(*pos), member)) -#define LIST_FOREACH_ENTRY_SAFE(pos, n, head, member) \ - for (pos = LIST_ENT((head)->next, typeof(*pos), member), \ - n = LIST_ENT(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ - pos = n, n = LIST_ENT(n->member.next, typeof(*n), member)) - -/* fetch libusb20_transfer from libusb20_device */ -#define GET_XFER(xfer, endpoint, pdev)\ - xfer = libusb20_tr_get_pointer(pdev, \ - (2 *endpoint)|(endpoint/0x80)); \ - if (xfer == NULL) \ - return (LIBUSB_ERROR_OTHER); - - -static int get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out); -static int handle_timeouts(struct libusb_context *ctx); -static int handle_events(struct libusb_context *ctx, struct timeval *tv); +static pthread_mutex_t default_context_lock = PTHREAD_MUTEX_INITIALIZER; struct libusb_context *usbi_default_context = NULL; -static pthread_mutex_t default_context_lock = PTHREAD_MUTEX_INITIALIZER; - -/* if ctx is NULL use default context*/ - -#define GET_CONTEXT(ctx) \ - if (ctx == NULL) ctx = usbi_default_context; - -#define MAX(a,b) (((a)>(b))?(a):(b)) -#define USB_TIMED_OUT (1<<0) /* Library initialisation / deinitialisation */ -struct usb_pollfd { - struct libusb_pollfd pollfd; - struct list_head list; -}; - -struct usb_transfer { - int num_iso_packets; - struct list_head list; - struct timeval timeout; - int transferred; - uint8_t flags; -}; - void libusb_set_debug(libusb_context * ctx, int level) { @@ -892,571 +826,3 @@ return (0); } -/* Polling and timing */ - -int -libusb_try_lock_events(libusb_context * ctx) -{ - int ret; - - GET_CONTEXT(ctx); - pthread_mutex_lock(&ctx->pollfd_modify_lock); - ret = ctx->pollfd_modify; - pthread_mutex_unlock(&ctx->pollfd_modify_lock); - - if (ret != 0) - return (1); - - ret = pthread_mutex_trylock(&ctx->events_lock); - - if (ret != 0) - return (1); - - ctx->event_handler_active = 1; - return (0); -} - -void -libusb_lock_events(libusb_context * ctx) -{ - GET_CONTEXT(ctx); - pthread_mutex_lock(&ctx->events_lock); - ctx->event_handler_active = 1; -} - -void -libusb_unlock_events(libusb_context * ctx) -{ - GET_CONTEXT(ctx); - ctx->event_handler_active = 0; - pthread_mutex_unlock(&ctx->events_lock); - - pthread_mutex_lock(&ctx->event_waiters_lock); - pthread_cond_broadcast(&ctx->event_waiters_cond); - pthread_mutex_unlock(&ctx->event_waiters_lock); -} - -int -libusb_event_handling_ok(libusb_context * ctx) -{ - int ret; - - GET_CONTEXT(ctx); - pthread_mutex_lock(&ctx->pollfd_modify_lock); - ret = ctx->pollfd_modify; - pthread_mutex_unlock(&ctx->pollfd_modify_lock); - - if (ret) - return (0); - return (1); -} - -int -libusb_event_handler_active(libusb_context * ctx) -{ - int ret; - - GET_CONTEXT(ctx); - pthread_mutex_lock(&ctx->pollfd_modify_lock); - ret = ctx->pollfd_modify; - pthread_mutex_unlock(&ctx->pollfd_modify_lock); - - if (ret) - return (1); - return (ctx->event_handler_active); -} - -void -libusb_lock_event_waiters(libusb_context * ctx) -{ - GET_CONTEXT(ctx); - pthread_mutex_lock(&ctx->event_waiters_lock); - return; -} - -void -libusb_unlock_event_waiters(libusb_context * ctx) -{ - GET_CONTEXT(ctx); - pthread_mutex_unlock(&ctx->event_waiters_lock); - return; -} - -int -libusb_wait_for_event(libusb_context * ctx, struct timeval *tv) -{ - int ret; - struct timespec ts; - - GET_CONTEXT(ctx); - if (tv == NULL) { - pthread_cond_wait(&ctx->event_waiters_cond, - &ctx->event_waiters_lock); - return (0); - } - - ret = clock_gettime(CLOCK_REALTIME, &ts); - if (ret < 0) - return (LIBUSB_ERROR_OTHER); - - ts.tv_sec = tv->tv_sec; - ts.tv_nsec = tv->tv_usec * 1000; - if (ts.tv_nsec > 1000000000) { - ts.tv_nsec -= 1000000000; - ts.tv_sec++; - } - - ret = pthread_cond_timedwait(&ctx->event_waiters_cond, - &ctx->event_waiters_lock, &ts); - - if (ret == ETIMEDOUT) - return (1); - return (0); -} - -static int -get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out) -{ - struct timeval timeout; - int ret; - - ret = libusb_get_next_timeout(ctx, &timeout); - - if (ret) { - if (timerisset(&timeout) == 0) - return 1; - if (timercmp(&timeout, tv, <) != 0) - *out = timeout; - else - *out = *tv; - } else { - *out = *tv; - } - - return (0); -} - -static int -handle_timeouts(struct libusb_context *ctx) -{ - struct timespec sys_ts; - struct timeval sys_tv; - struct timeval *cur_tv; - struct usb_transfer *xfer; - struct libusb_transfer *uxfer; - int ret; - - GET_CONTEXT(ctx); - ret = 0; - - pthread_mutex_lock(&ctx->flying_transfers_lock); - if (USB_LIST_EMPTY(&ctx->flying_transfers)); - goto out; - - ret = clock_gettime(CLOCK_MONOTONIC, &sys_ts); - TIMESPEC_TO_TIMEVAL(&sys_tv, &sys_ts); - - LIST_FOREACH_ENTRY(xfer, &ctx->flying_transfers, list) { - cur_tv = &xfer->timeout; - - if (timerisset(cur_tv) == 0) - goto out; - - if (xfer->flags & USB_TIMED_OUT) - continue; - - if ((cur_tv->tv_sec > sys_tv.tv_sec) || (cur_tv->tv_sec == sys_tv.tv_sec && - cur_tv->tv_usec > sys_tv.tv_usec)) - goto out; - - xfer->flags |= USB_TIMED_OUT; - uxfer = (libusb_transfer *) (((uint8_t *)xfer) + - sizeof(struct usb_transfer)); - ret = libusb_cancel_transfer(uxfer); - } -out: - pthread_mutex_unlock(&ctx->flying_transfers_lock); - return (ret); -} - -static int -handle_events(struct libusb_context *ctx, struct timeval *tv) -{ - struct usb_pollfd *ipollfd; - struct libusb_pollfd *tmppollfd; - struct pollfd *fds; - int tmpfd; - int ret; - int timeout; - nfds_t nfds; - int i; - - nfds = 0; - i = -1; - - pthread_mutex_lock(&ctx->pollfds_lock); - LIST_FOREACH_ENTRY(ipollfd, &ctx->pollfds, list) - nfds++; - - fds = malloc(sizeof(*fds) * nfds); - if (fds == NULL) - return (LIBUSB_ERROR_NO_MEM); - - LIST_FOREACH_ENTRY(ipollfd, &ctx->pollfds, list) { - tmppollfd = &ipollfd->pollfd; - tmpfd = tmppollfd->fd; - i++; - fds[i].fd = tmpfd; - fds[i].events = tmppollfd->events; - fds[i].revents = 0; - } - - pthread_mutex_unlock(&ctx->pollfds_lock); - - timeout = (tv->tv_sec * 1000) + (tv->tv_usec / 1000); - if (tv->tv_usec % 1000) - timeout++; - - ret = poll(fds, nfds, timeout); - if (ret == 0) { - free(fds); - return(handle_timeouts(ctx)); - } else if (ret == -1 && errno == EINTR) { - free(fds); - return LIBUSB_ERROR_INTERRUPTED; - } else if (ret < 0) { - free(fds); - return (LIBUSB_ERROR_IO); - } - - if (fds[0].revents) { - if (ret == 1){ - ret = 0; - goto handled; - } else { - fds[0].revents = 0; - ret--; - } - } - - ret = /*unknown*/0; -handled: - free(fds); - return ret; -} - -int -libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv) -{ - struct timeval timeout; - struct timeval poll_timeout; - int ret; - - GET_CONTEXT(ctx); - ret = libusb_get_next_timeout(ctx, &timeout); - if (ret != 0) { - if (timerisset(&timeout) == 0) - return (handle_timeouts(ctx)); - if (timercmp(&timeout, tv, <)) - poll_timeout = timeout; - else - poll_timeout = *tv; - } else { - poll_timeout = *tv; - } -retry: - if (libusb_try_lock_events(ctx) == 0) { - ret = handle_events(ctx, &poll_timeout); - libusb_unlock_events(ctx); - return ret; - } - - libusb_lock_event_waiters(ctx); - if (libusb_event_handler_active(ctx) == 0) { - libusb_unlock_event_waiters(ctx); - goto retry; - } - - ret = libusb_wait_for_event(ctx, &poll_timeout); - libusb_unlock_event_waiters(ctx); - - if (ret < 0) - return ret; - else if (ret == 1) - return (handle_timeouts(ctx)); - return (0); -} - -int -libusb_handle_events(libusb_context * ctx) -{ - struct timeval tv; - - tv.tv_sec = 2; - tv.tv_usec = 0; - return (libusb_handle_events_timeout(ctx, &tv)); -} - -int -libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv) -{ - int ret; - struct timeval timeout; - struct timeval poll_tv; - - GET_CONTEXT(ctx); - ret = libusb_get_next_timeout(ctx, &timeout); - if (ret) { - if (timerisset(&timeout) == 0) - return handle_timeouts(ctx); - if (timercmp(&timeout, tv, <) != 0) - poll_tv = timeout; - else - poll_tv = *tv; - } else { - poll_tv = *tv; - } - return (handle_events(ctx, &poll_tv)); -} - -int -libusb_get_next_timeout(libusb_context * ctx, struct timeval *tv) -{ - struct usb_transfer *xfer; - struct timeval *next_tv; - struct timeval cur_tv; - struct timespec cur_ts; - int found; - int ret; - - GET_CONTEXT(ctx); - found = 0; - pthread_mutex_lock(&ctx->flying_transfers_lock); - if (USB_LIST_EMPTY(&ctx->flying_transfers)) - return (0); - - LIST_FOREACH_ENTRY(xfer, &ctx->flying_transfers, list) { - if (!(xfer->flags & LIBUSB_TRANSFER_TIMED_OUT)) { - found = 1; - break ; - } - } - pthread_mutex_unlock(&ctx->flying_transfers_lock); - - if (found == 0) { - return 0; - } - - next_tv = &xfer->timeout; - if (timerisset(next_tv) == 0) - return (0); - - ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); - if (ret < 0) - return (LIBUSB_ERROR_OTHER); - TIMESPEC_TO_TIMEVAL(&cur_tv, &cur_ts); - - if (timercmp(&cur_tv, next_tv, >=)) - timerclear(tv); - else - timersub(next_tv, &cur_tv, tv); - - return (1); -} - -void -libusb_set_pollfd_notifiers(libusb_context * ctx, - libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb, - void *user_data) -{ - GET_CONTEXT(ctx); - ctx->fd_added_cb = added_cb; - ctx->fd_removed_cb = removed_cb; - ctx->fd_cb_user_data = user_data; -} - -struct libusb_pollfd ** -libusb_get_pollfds(libusb_context * ctx) -{ - struct usb_pollfd *pollfd; - libusb_pollfd **ret; - int i; - - GET_CONTEXT(ctx); - i = 0; - pthread_mutex_lock(&ctx->pollfds_lock); - LIST_FOREACH_ENTRY(pollfd, &ctx->pollfds, list) - i++; - - ret = calloc(i + 1 , sizeof(struct libusb_pollfd *)); - if (ret == NULL) { - pthread_mutex_unlock(&ctx->pollfds_lock); - return (NULL); - } - - i = 0; - LIST_FOREACH_ENTRY(pollfd, &ctx->pollfds, list) - ret[i++] = (struct libusb_pollfd *) pollfd; - ret[i] = NULL; - - return (ret); -} - -/* Synchronous device I/O */ - -static void ctrl_tr_cb(struct libusb_transfer *transfer) -{ - int *complet = transfer->user_data; - - *complet = 1; -} - -int -libusb_control_transfer(libusb_device_handle * devh, - uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, - unsigned char *data, uint16_t wLength, unsigned int timeout) -{ - struct libusb_transfer *xfer; - struct libusb_control_setup *ctr; - unsigned char *buff; - int complet; - int ret; - - if (devh == NULL || data == NULL) - return (LIBUSB_ERROR_NO_MEM); - - xfer = libusb_alloc_transfer(0); - if (xfer == NULL) - return (LIBUSB_ERROR_NO_MEM); - - buff = malloc(sizeof(libusb_control_setup) + wLength); - if (buff == NULL) { - libusb_free_transfer(xfer); - return (LIBUSB_ERROR_NO_MEM); - } - - ctr = (libusb_control_setup *)buff; - ctr->bmRequestType = bmRequestType; - ctr->bRequest = bRequest; - ctr->wValue = wValue; - ctr->wIndex = wIndex; - ctr->wLength = wLength; - if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT) - memcpy(buff + sizeof(libusb_control_setup), data, wLength); - - xfer->dev_handle = devh; - xfer->endpoint = 0; - xfer->type = LIBUSB_TRANSFER_TYPE_CONTROL; - xfer->timeout = timeout; - xfer->buffer = buff; - xfer->length = sizeof(libusb_control_setup) + wLength; - xfer->user_data = &complet; - xfer->callback = ctrl_tr_cb; - xfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; - complet = 0; - - if ((ret = libusb_submit_transfer(xfer)) < 0) { - libusb_free_transfer(xfer); - return (ret); - } - - while (!complet) - if ((ret = libusb_handle_events(devh->dev->ctx)) < 0) { - libusb_cancel_transfer(xfer); - libusb_free_transfer(xfer); - while (!complet) - if (libusb_handle_events(devh->dev->ctx)) - break; - return (ret); - } - - if ((bmRequestType & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN) - memcpy(data, buff + sizeof(libusb_control_setup), wLength); - - switch (xfer->status) { - case LIBUSB_TRANSFER_COMPLETED: - ret = xfer->actual_length; - break; - case LIBUSB_TRANSFER_TIMED_OUT: - case LIBUSB_TRANSFER_STALL: - case LIBUSB_TRANSFER_NO_DEVICE: - ret = xfer->status; - break; - default: - ret = LIBUSB_ERROR_OTHER; - } - libusb_free_transfer(xfer); - return (ret); -} - -int -libusb_bulk_transfer(struct libusb_device_handle *devh, - unsigned char endpoint, unsigned char *data, int length, - int *transferred, unsigned int timeout) -{ - struct libusb_transfer *xfer; - int complet; - int ret; - - if (devh == NULL || data == NULL) - return (LIBUSB_ERROR_NO_MEM); - - xfer = libusb_alloc_transfer(0); - if (xfer == NULL) - return (LIBUSB_ERROR_NO_MEM); - - xfer->dev_handle = devh; - xfer->endpoint = endpoint; - xfer->type = LIBUSB_TRANSFER_TYPE_BULK; - xfer->timeout = timeout; - xfer->buffer = data; - xfer->length = length; - xfer->user_data = &complet; - xfer->callback = ctrl_tr_cb; - complet = 0; - - if ((ret = libusb_submit_transfer(xfer)) < 0) { - libusb_free_transfer(xfer); - return (ret); - } - - while (!complet) - if ((ret = libusb_handle_events(devh->dev->ctx)) < 0) { - libusb_cancel_transfer(xfer); - libusb_free_transfer(xfer); - while (!complet) - if (libusb_handle_events(devh->dev->ctx)) - break; - return (ret); - } - - *transferred = xfer->actual_length; - switch (xfer->status) { - case LIBUSB_TRANSFER_COMPLETED: - ret = xfer->actual_length; - break; - case LIBUSB_TRANSFER_TIMED_OUT: - case LIBUSB_TRANSFER_OVERFLOW: - case LIBUSB_TRANSFER_STALL: - case LIBUSB_TRANSFER_NO_DEVICE: - ret = xfer->status; - break; - default: - ret = LIBUSB_ERROR_OTHER; - } - - libusb_free_transfer(xfer); - return (0); -} - -/* - * Need to fix xfer->type - */ -int -libusb_interrupt_transfer(struct libusb_device_handle *devh, - unsigned char endpoint, unsigned char *data, int length, int *transferred, - unsigned int timeout) -{ - return (libusb_bulk_transfer(devh, endpoint, data, length, - transferred, timeout)); -} From owner-p4-projects@FreeBSD.ORG Fri May 29 16:56:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 814D71065676; Fri, 29 May 2009 16:56: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 40ACA1065672 for ; Fri, 29 May 2009 16:56:43 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06FA18FC1B for ; Fri, 29 May 2009 16:56:42 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TGug4v076555 for ; Fri, 29 May 2009 16:56:42 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TGugSt076553 for perforce@freebsd.org; Fri, 29 May 2009 16:56:42 GMT (envelope-from syl@FreeBSD.org) Date: Fri, 29 May 2009 16:56:42 GMT Message-Id: <200905291656.n4TGugSt076553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163033 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, 29 May 2009 16:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163033 Change 163033 by syl@syl_rincewind on 2009/05/29 16:55:50 Remove macros that are now in libusb10.h. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#2 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#2 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#2 (text+ko) ==== @@ -38,34 +38,6 @@ #include "libusb.h" #include "libusb10.h" -extern struct libusb_context *usbi_default_context; - -#define GET_CONTEXT(ctx) \ - if (ctx == NULL) ctx = usbi_default_context; - -#define USB_LIST_EMPTY(entry) \ - ((entry)->next = (entry)) -#define LIST_ENT(ptr, type, member) \ - ((type *)((char *)(ptr) - (unsigned long) (&((type*)0L)->member))) - -#define LIST_FOREACH_ENTRY(pos, head, member) \ - for (pos = LIST_ENT((head)->next, typeof(*pos), member) ; \ - &pos->member != head ; \ - pos = LIST_ENT(pos->member.next, typeof(*pos), member)) - -struct usb_pollfd { - struct libusb_pollfd pollfd; - struct list_head list; -}; - -struct usb_transfer { - int num_iso_packets; - struct list_head list; - struct timeval timeout; - int transferred; - uint8_t flags; -}; - static int get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out) { From owner-p4-projects@FreeBSD.ORG Fri May 29 18:36:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17BDE106567C; Fri, 29 May 2009 18:36: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 C25191065679 for ; Fri, 29 May 2009 18:36:23 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C2FA8FC26 for ; Fri, 29 May 2009 18:36:23 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TIaNW0086666 for ; Fri, 29 May 2009 18:36:23 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TIaN6t086664 for perforce@freebsd.org; Fri, 29 May 2009 18:36:23 GMT (envelope-from syl@FreeBSD.org) Date: Fri, 29 May 2009 18:36:23 GMT Message-Id: <200905291836.n4TIaN6t086664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163035 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, 29 May 2009 18:36:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163035 Change 163035 by syl@syl_rincewind on 2009/05/29 18:35:22 - Free ctx after the close in libusb_init. - Add use of default context in libusb_exit. - Unref device only if unref_device is set in libusb_free_device_list. - Replace libusb_unlock_events; by libusb_unlock_envents(ctx); - Use ugen fd into pollfds. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#18 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#3 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#18 (text+ko) ==== @@ -111,9 +111,10 @@ } int -libusb_init(libusb_context ** contex) +libusb_init(libusb_context ** context) { struct libusb_context *ctx; + char * debug; int ret; ctx = malloc(sizeof(*ctx)); @@ -122,6 +123,13 @@ memset(ctx, 0, sizeof(*ctx)); + debug = getenv("LIBUSB_DEBUG"); + if (debug != NULL) { + ctx->debug = atoi(debug); + if (ctx->debug != 0) + ctx->debug_fixed = 1; + } + pthread_mutex_init(&ctx->usb_devs_lock, NULL); pthread_mutex_init(&ctx->open_devs_lock, NULL); USB_LIST_INIT(&ctx->usb_devs); @@ -139,19 +147,19 @@ ret = pipe(ctx->ctrl_pipe); if (ret < 0) { - free(ctx); usb_remove_pollfd(ctx, ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[1]); + free(ctx); return (LIBUSB_ERROR_OTHER); } ret = usb_add_pollfd(ctx, ctx->ctrl_pipe[0], POLLIN); if (ret < 0) { - free(ctx); usb_remove_pollfd(ctx, ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[1]); + free(ctx); return ret; } @@ -160,8 +168,8 @@ usbi_default_context = ctx; } - if (contex) - *contex = ctx; + if (context) + *context = ctx; return (0); } @@ -169,6 +177,8 @@ void libusb_exit(libusb_context * ctx) { + GET_CONTEXT(ctx); + usb_remove_pollfd(ctx, ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[0]); close(ctx->ctrl_pipe[1]); @@ -260,10 +270,10 @@ if (list == NULL) return ; - for (i = 0; list[i] != NULL; i++) { - libusb_unref_device(list[i]); + if (unref_devices) { + for (i = 0; list[i] != NULL; i++) + libusb_unref_device(list[i]); } - free(list); } @@ -357,9 +367,10 @@ libusb_context *ctx = dev->ctx; struct libusb20_device *pdev = dev->os_priv; libusb_device_handle *hdl; - unsigned char dummy = 1; + unsigned char dummy; int err; + dummy = 1; if (devh == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -378,6 +389,12 @@ hdl->dev = libusb_ref_device(dev); hdl->claimed_interfaces = 0; hdl->os_priv = dev->os_priv; + err = usb_add_pollfd(ctx, libusb20_dev_get_fd(pdev), POLLOUT); + if (err < 0) { + libusb_unref_device(dev); + free(hdl); + return (err); + } pthread_mutex_lock(&ctx->open_devs_lock); LIST_ADD(&hdl->list, &ctx->open_devs); @@ -402,7 +419,7 @@ pthread_mutex_lock(&ctx->pollfd_modify_lock); ctx->pollfd_modify--; pthread_mutex_unlock(&ctx->pollfd_modify_lock); - libusb_unlock_events; + libusb_unlock_events(ctx); return (0); } @@ -440,6 +457,9 @@ unsigned char dummy = 1; int err; + if (devh == NULL) + return ; + ctx = devh->dev->ctx; pdev = devh->os_priv; @@ -453,6 +473,8 @@ pthread_mutex_lock(&ctx->open_devs_lock); LIST_DEL(&devh->list); pthread_mutex_unlock(&ctx->open_devs_lock); + + usb_remove_pollfd(ctx, libusb20_dev_get_fd(pdev)); libusb_unref_device(devh->dev); libusb20_dev_close(pdev); free(devh); @@ -468,6 +490,8 @@ pthread_mutex_lock(&ctx->open_devs_lock); LIST_DEL(&devh->list); pthread_mutex_unlock(&ctx->open_devs_lock); + + usb_remove_pollfd(ctx, libusb20_dev_get_fd(pdev)); libusb_unref_device(devh->dev); libusb20_dev_close(pdev); free(devh); @@ -500,6 +524,9 @@ return (0); } +/* + * XXX this code is wrong. need update. + */ int libusb_set_configuration(libusb_device_handle * devh, int configuration) ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri May 29 19:16:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C309106566B; Fri, 29 May 2009 19:16:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F03AB1065674 for ; Fri, 29 May 2009 19:16:08 +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 C440E8FC0A for ; Fri, 29 May 2009 19:16:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJG8xi091035 for ; Fri, 29 May 2009 19:16:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TJG84f091033 for perforce@freebsd.org; Fri, 29 May 2009 19:16:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 May 2009 19:16:08 GMT Message-Id: <200905291916.n4TJG84f091033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 163039 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, 29 May 2009 19:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=163039 Change 163039 by hselasky@hselasky_laptop001 on 2009/05/29 19:15:39 libusb documentation: - fix typo Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#12 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#12 (text+ko) ==== @@ -774,7 +774,7 @@ the given USB device. . A timeout value can be specified which is passed on to the -.Xr 2 poll +.Xr poll 2 function. . .Sh USB BACKEND OPERATIONS From owner-p4-projects@FreeBSD.ORG Fri May 29 19:26:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94C361065678; Fri, 29 May 2009 19:26:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FA11106566B for ; Fri, 29 May 2009 19:26:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B7248FC1A for ; Fri, 29 May 2009 19:26:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJQKS6091858 for ; Fri, 29 May 2009 19:26:20 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TJQJq7091856 for perforce@freebsd.org; Fri, 29 May 2009 19:26:19 GMT (envelope-from trasz@freebsd.org) Date: Fri, 29 May 2009 19:26:19 GMT Message-Id: <200905291926.n4TJQJq7091856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163040 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, 29 May 2009 19:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163040 Change 163040 by trasz@trasz_victim on 2009/05/29 19:25:34 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#29 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/TEST.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/Changes#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/README.ee#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/create.make#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.i18n.guide#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.msg#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee_version.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/genstr#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/make.default#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/new_curse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/new_curse.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/load_http.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/nc.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/netcat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/popen.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_entry.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/time2posix.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusbhid/descr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/optr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/queue.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ksyms.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mld.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/multicast.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/fail.9#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/rmlock.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sx.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/antarctica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/backward#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/etcetera#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/factory#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/leapseconds#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/northamerica#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/pacificnew#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/systemv#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/ohci_atmelarm.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/files.ixp425#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/ufsread.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#40 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/rp/rp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ng_ubt.c#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/ustorage_fs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_generic.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonport.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fail.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_osd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_prot.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf_obj.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/linker_if.m#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_sem.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/linux/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/pfil.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/TODO#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/xdr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cpuset.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/fail.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ksyms.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lock.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lockstat.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/namei.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/queue.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rmlock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rwlock.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sx.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xdr/xdr_mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_xs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/file/flock/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/file/flock/flock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/vfs/trailing_slash.t#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/Artistic#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.i18n.guide#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/new_curse.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/new_curse.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/en_US.US-ASCII/ee.msg#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/kdump/mkioctls#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/perror/perror.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd32.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-linux32.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/mips-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ifmcstat/ifmcstat.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ifmcstat/ifmcstat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/jexec.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/jexec.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/jls.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/jls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/exports.5#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/Theory#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zic.8#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.190 2009/05/23 16:54:07 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.193 2009/05/27 19:28:04 ed 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,45 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER() +OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz +OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz +# 20090527: removal of legacy USB stack +OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/hid.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h +OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ubser.h +OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h +OLD_FILES+=usr/include/legacy/dev/usb/udbp.h +OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usb.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h +OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h +OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h +OLD_DIRS+=usr/include/legacy/dev/usb +OLD_DIRS+=usr/include/legacy/dev +OLD_DIRS+=usr/include/legacy +# 20090526: removal of makekey(8) +OLD_FILES+=libexec/makekey +OLD_FILES+=usr/share/man/man8/makekey.8.gz # 20090522: removal of University of Michigan NFSv4 client OLD_FILES+=etc/rc.d/idmapd OLD_FILES+=sbin/idmapd ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#29 (text+ko) ==== @@ -22,6 +22,18 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090528: + The compiling option ADAPTIVE_SX has been retired while it has been + introduced the option NO_ADAPTIVE_SX which handles the reversed logic. + The KPI for sx_init_flags() changes as accepting flags: + SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag + has been introduced in order to handle the reversed logic. + Bump __FreeBSD_version to 800092. + +20090527: + Add support for hierarchical jails. Remove global securelevel. + Bump __FreeBSD_version to 800091. + 20090523: The layout of struct vnet_net has changed, therefore modules need to be rebuilt. @@ -1535,4 +1547,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.604 2009/05/23 21:43:44 zec Exp $ +$FreeBSD: src/UPDATING,v 1.606 2009/05/29 01:49:27 attilio Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/TEST.sh#2 (text+ko) ==== @@ -28,7 +28,7 @@ # # TEST.sh - check if test(1) or builtin test works # -# $FreeBSD: src/bin/test/TEST.sh,v 1.8 2005/01/10 08:39:26 imp Exp $ +# $FreeBSD: src/bin/test/TEST.sh,v 1.9 2009/05/26 22:33:10 jilles Exp $ # force a specified test program, e.g. `env test=/bin/test sh TEST.sh' : ${test=test} @@ -133,5 +133,45 @@ t 1 '""' t 0 '! ""' +t 0 '!' +t 0 '\(' +t 0 '\)' + +t 1 '\( = \)' +t 0 '\( != \)' +t 0 '\( ! \)' +t 0 '\( \( \)' +t 0 '\( \) \)' +t 0 '! = !' +t 1 '! != !' +t 1 '-n = \)' +t 0 '! != \)' +t 1 '! = a' +t 0 '! != -n' +t 0 '! -c /etc/passwd' + +t 0 '! \( = \)' +t 1 '! \( != \)' +t 1 '! = = =' +t 0 '! = = \)' +t 0 '! "" -o ""' +t 1 '! "x" -o ""' +t 1 '! "" -o "x"' +t 1 '! "x" -o "x"' +t 0 '\( -f /etc/passwd \)' +t 1 '\( ! = \)' +t 0 '\( ! "" \)' +t 1 '\( ! -e \)' + +t 0 '0 -eq 0 -a -d /' +t 0 '-s = "" -o "" = ""' +t 0 '"" = "" -o -s = ""' +t 1 '-s = "" -o -s = ""' +t 0 '-z x -o x = "#" -o x = x' +t 1 '-z y -o y = "#" -o y = x' +t 0 '0 -ne 0 -o ! -f /' +t 0 '1 -ne 0 -o ! -f /etc/passwd' +t 1 '0 -ne 0 -o ! -f /etc/passwd' + echo "" echo "Syntax errors: $ERROR Failed: $FAILED" ==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.53 2005/01/10 08:39:26 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.54 2009/05/26 22:33:10 jilles Exp $"); #include #include @@ -163,6 +163,7 @@ struct t_op const *t_wp_op; int nargc; char **t_wp; +int parenlevel; static int aexpr(enum token); static int binop(void); @@ -171,7 +172,9 @@ static int getn(const char *); static intmax_t getq(const char *); static int intcmp(const char *, const char *); -static int isoperand(void); +static int isunopoperand(void); +static int islparenoperand(void); +static int isrparenoperand(void); static int newerf(const char *, const char *); static int nexpr(enum token); static int oexpr(enum token); @@ -205,7 +208,14 @@ #endif nargc = argc; t_wp = &argv[1]; - res = !oexpr(t_lex(*t_wp)); + parenlevel = 0; + if (nargc == 4 && strcmp(*t_wp, "!") == 0) { + /* Things like ! "" -o x do not fit in the normal grammar. */ + --nargc; + ++t_wp; + res = oexpr(t_lex(*t_wp)); + } else + res = !oexpr(t_lex(*t_wp)); if (--nargc > 0) syntax(*t_wp, "unexpected operator"); @@ -268,12 +278,16 @@ if (n == EOI) return 0; /* missing expression */ if (n == LPAREN) { + parenlevel++; if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) == - RPAREN) + RPAREN) { + parenlevel--; return 0; /* missing expression */ + } res = oexpr(nn); if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN) syntax(NULL, "closing paren expected"); + parenlevel--; return res; } if (t_wp_op && t_wp_op->op_type == UNOP) { @@ -410,8 +424,10 @@ } while (op->op_text) { if (strcmp(s, op->op_text) == 0) { - if ((op->op_type == UNOP && isoperand()) || - (op->op_num == LPAREN && nargc == 1)) + if (((op->op_type == UNOP || op->op_type == BUNOP) + && isunopoperand()) || + (op->op_num == LPAREN && islparenoperand()) || + (op->op_num == RPAREN && isrparenoperand())) break; t_wp_op = op; return op->op_num; @@ -423,7 +439,7 @@ } static int -isoperand(void) +isunopoperand(void) { struct t_op const *op = ops; char *s; @@ -431,19 +447,53 @@ if (nargc == 1) return 1; + s = *(t_wp + 1); if (nargc == 2) - return 0; - s = *(t_wp + 1); + return parenlevel == 1 && strcmp(s, ")") == 0; t = *(t_wp + 2); while (op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && - (t[0] != ')' || t[1] != '\0'); + (parenlevel == 0 || t[0] != ')' || t[1] != '\0'); + op++; + } + return 0; +} + +static int +islparenoperand(void) +{ + struct t_op const *op = ops; + char *s; + + if (nargc == 1) + return 1; + s = *(t_wp + 1); + if (nargc == 2) + return parenlevel == 1 && strcmp(s, ")") == 0; + if (nargc != 3) + return 0; + while (op->op_text) { + if (strcmp(s, op->op_text) == 0) + return op->op_type == BINOP; op++; } return 0; } +static int +isrparenoperand(void) +{ + char *s; + + if (nargc == 1) + return 0; + s = *(t_wp + 1); + if (nargc == 2) + return parenlevel == 1 && strcmp(s, ")") == 0; + return 0; +} + /* atoi with error detection */ static int getn(const char *s) ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.9 2008/05/22 23:06:19 jb Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.10 2009/05/27 01:30:23 sson Exp $ .include SUBDIR= dtrace \ + lockstat \ ${_zdb} .if ${MK_ZFS} != "no" ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/load_http.c#2 (text+ko) ==== @@ -14,11 +14,13 @@ alist_t * load_http(char *url) { - int fd, len, left, port, endhdr, removed; - char *s, *t, *u, buffer[1024], *myurl; + char *s, *t, *u, buffer[1044], *myurl; alist_t *a, *rtop, *rbot; struct sockaddr_in sin; struct hostent *host; + size_t avail; + int fd, len, left, port, endhdr, removed; + int error; /* * More than this would just be absurd. @@ -32,7 +34,14 @@ rtop = NULL; rbot = NULL; - sprintf(buffer, "GET %s HTTP/1.0\r\n", url); + avail = sizeof(buffer); + error = snprintf(buffer, avail, "GET %s HTTP/1.0\r\n", url); + + /* + * error is always less then avail due to the constraint on + * the url length above. + */ + avail -= error; myurl = strdup(url); if (myurl == NULL) @@ -51,7 +60,11 @@ if (u != NULL) s = u + 1; /* AUTH */ - sprintf(buffer + strlen(buffer), "Host: %s\r\n\r\n", s); + error = snprintf(buffer + strlen(buffer), avail, "Host: %s\r\n\r\n", s); + if (error >= avail) { + fprintf(stderr, "URL is too large: %s\n", url); + goto done; + } u = strchr(s, ':'); if (u != NULL) { @@ -83,16 +96,12 @@ if (fd == -1) goto done; - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) { - close(fd); + if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) goto done; - } len = strlen(buffer); - if (write(fd, buffer, len) != len) { - close(fd); + if (write(fd, buffer, len) != len) goto done; - } s = buffer; endhdr = 0; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/nc.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,7 +25,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/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.13 2009/05/29 07:18:31 delphij Exp $ .\" .Dd $Mdocdate: May 6 2008 $ .Dt NC 1 @@ -53,7 +53,7 @@ .Ar port Oc Oc .Xc .Op Ar hostname -.Op Ar port Ns Bq Ar s +.Op Ar port .Ek .Sh DESCRIPTION The @@ -275,8 +275,8 @@ option is given (in which case the local host is used). .Pp -.Ar port Ns Op Ar s -can be single integers or ranges. +.Ar port +can be a single integer or a range of ports. Ranges are in the form nn-mm. In general, a destination port must be specified, @@ -445,6 +445,8 @@ if the proxy requires it: .Pp .Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42 +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr cat 1 , .Xr ssh 1 , ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/netcat.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */ +/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $ */ /* @@ -967,14 +967,15 @@ void usage(int ret) { + fprintf(stderr, #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I length] [-i interval] [-O length]\n" #else - fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n" #endif - fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n"); - fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); - fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); + "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" + "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" + "\t [port]\n"); if (ret) exit(1); } ==== //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.129 2009/05/21 16:27:47 rmacklem Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.130 2009/05/27 16:16:56 thompsa Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -197,12 +197,6 @@ .. kadm5 .. - legacy - dev - usb - .. - .. - .. libmilter .. lwres ==== //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/460.status-mail-rejects#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.21 2008/01/08 07:22:43 dds Exp $ +# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.22 2009/05/28 07:43:06 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -12,10 +12,8 @@ fi case "$daily_status_mail_rejects_shorten" in >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 29 19:38:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DB911065673; Fri, 29 May 2009 19:38:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E18AE106566C for ; Fri, 29 May 2009 19:38:32 +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 D006A8FC16 for ; Fri, 29 May 2009 19:38:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TJcWqq093045 for ; Fri, 29 May 2009 19:38:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TJcWSK093043 for perforce@freebsd.org; Fri, 29 May 2009 19:38:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 May 2009 19:38:32 GMT Message-Id: <200905291938.n4TJcWSK093043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 163042 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, 29 May 2009 19:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=163042 Change 163042 by hselasky@hselasky_laptop001 on 2009/05/29 19:38:28 USB CORE: - small linux compat fix after recent changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#15 (text+ko) ==== @@ -339,6 +339,6 @@ void usb_linux_deregister(void *arg); #define interface_to_usbdev(intf) (intf)->linux_udev -#define interface_to_bsddev(intf) (intf)->linux_udev->bsd_udev +#define interface_to_bsddev(intf) (intf)->linux_udev #endif /* _USB_COMPAT_LINUX_H */ From owner-p4-projects@FreeBSD.ORG Fri May 29 20:29:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 859AB1065673; Fri, 29 May 2009 20:29:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45B851065670 for ; Fri, 29 May 2009 20:29:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34AD98FC0A for ; Fri, 29 May 2009 20:29:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TKTOB8098404 for ; Fri, 29 May 2009 20:29:24 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TKTO33098402 for perforce@freebsd.org; Fri, 29 May 2009 20:29:24 GMT (envelope-from zec@fer.hr) Date: Fri, 29 May 2009 20:29:24 GMT Message-Id: <200905292029.n4TKTO33098402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163045 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, 29 May 2009 20:29:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=163045 Change 163045 by zec@zec_tpx32 on 2009/05/29 20:28:55 Postpone the introduction of M_XVNET flag for later. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#10 (text+ko) ==== @@ -200,7 +200,6 @@ #define M_PROTO7 0x00100000 /* protocol-specific */ #define M_PROTO8 0x00200000 /* protocol-specific */ #define M_FLOWID 0x00400000 /* flowid is valid */ -#define M_XVNET 0x00800000 /* mbuf crossed from one vnet to another */ /* * For RELENG_{6,7} steal these flags for limited multiple routing table * support. In RELENG_8 and beyond, use just one flag and a tag. @@ -220,7 +219,7 @@ */ #define M_COPYFLAGS \ (M_PKTHDR|M_EOR|M_RDONLY|M_PROTOFLAGS|M_SKIP_FIREWALL|M_BCAST|M_MCAST|\ - M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB|M_XVNET) + M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB) /* * External buffer types: identify ext_buf type. From owner-p4-projects@FreeBSD.ORG Sat May 30 02:04:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA8441065676; Sat, 30 May 2009 02:04:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DCE5106568A for ; Sat, 30 May 2009 02:04:33 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 497CE8FC2E for ; Sat, 30 May 2009 02:04:33 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U24Xho050579 for ; Sat, 30 May 2009 02:04:33 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U24WAj050577 for perforce@freebsd.org; Sat, 30 May 2009 02:04:32 GMT (envelope-from nikron@FreeBSD.org) Date: Sat, 30 May 2009 02:04:32 GMT Message-Id: <200905300204.n4U24WAj050577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 02:04:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163057 Change 163057 by nikron@nmfreebsd on 2009/05/30 02:04:28 Just the world so I can keep my machine update to date in order to have NetworkManager work with current. Affected files ... .. //depot/projects/soc2009/nm-port/world/src/COPYRIGHT#1 branch .. //depot/projects/soc2009/nm-port/world/src/LOCKS#1 branch .. //depot/projects/soc2009/nm-port/world/src/MAINTAINERS#1 branch .. //depot/projects/soc2009/nm-port/world/src/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/Makefile.inc1#1 branch .. //depot/projects/soc2009/nm-port/world/src/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2009/nm-port/world/src/README#1 branch .. //depot/projects/soc2009/nm-port/world/src/UPDATING#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/config.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/iconv.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/date.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/date.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/vary.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/date/vary.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/args.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/position.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/df/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/df/df.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/df/df.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/README#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/io.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/main.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/re.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/README#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/print.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ls/util.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/cpio.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/options.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/options.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tar.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pkill/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pkill/pkill.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pkill/pkill.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/print.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/arith.y#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/error.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/error.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/init.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/input.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/input.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/main.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/main.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/options.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/options.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/output.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/output.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/show.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/show.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/var.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sh/var.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/key.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/print.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/stty/util.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/TEST.README#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/TEST.csh#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/TEST.sh#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/test.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/test/test.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/Makefile#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/Makefile.inc#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/soc2009/nm-port/world/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 03:23:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B88B1065672; Sat, 30 May 2009 03:23: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 32757106566C for ; Sat, 30 May 2009 03:23:54 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0690C8FC15 for ; Sat, 30 May 2009 03:23:54 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U3NrIO057776 for ; Sat, 30 May 2009 03:23:53 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U3NrF8057774 for perforce@freebsd.org; Sat, 30 May 2009 03:23:53 GMT (envelope-from nikron@FreeBSD.org) Date: Sat, 30 May 2009 03:23:53 GMT Message-Id: <200905300323.n4U3NrF8057774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 03:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163058 Change 163058 by nikron@nmfreebsd on 2009/05/30 03:23:10 Temp file to create a directory to put my NetworkManager source. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/temp#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat May 30 06:15:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A94461065672; Sat, 30 May 2009 06:15: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 6AD73106566B for ; Sat, 30 May 2009 06:15:53 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F02A8FC12 for ; Sat, 30 May 2009 06:15:53 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U6Fqk6083597 for ; Sat, 30 May 2009 06:15:52 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U6Fo2q083590 for perforce@freebsd.org; Sat, 30 May 2009 06:15:50 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 06:15:50 GMT Message-Id: <200905300615.n4U6Fo2q083590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 06:15:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163061 Change 163061 by zec@zec_amdx4 on 2009/05/30 06:15:04 Unbreak build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#67 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#67 (text+ko) ==== @@ -204,7 +204,7 @@ MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address"); -static struct ifnet * +struct ifnet * ifnet_byindex_locked(u_short idx) { INIT_VNET_NET(curvnet); From owner-p4-projects@FreeBSD.ORG Sat May 30 06:15:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAFB0106568D; Sat, 30 May 2009 06:15:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65ED11065680 for ; Sat, 30 May 2009 06:15:58 +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 51B528FC1E for ; Sat, 30 May 2009 06:15:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U6Fs4i083602 for ; Sat, 30 May 2009 06:15:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U6Fr1b083600 for perforce@freebsd.org; Sat, 30 May 2009 06:15:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 30 May 2009 06:15:53 GMT Message-Id: <200905300615.n4U6Fr1b083600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 163062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 06:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163062 Change 163062 by hselasky@hselasky_laptop001 on 2009/05/30 06:15:40 IFC @ 163060 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#13 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#37 integrate .. //depot/projects/usb/src/sys/conf/files.i386#26 integrate .. //depot/projects/usb/src/sys/conf/options#29 integrate .. //depot/projects/usb/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#44 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#12 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#14 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#10 integrate .. //depot/projects/usb/src/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_console.c#8 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#13 integrate .. //depot/projects/usb/src/sys/dev/rp/rp.c#5 integrate .. //depot/projects/usb/src/sys/dev/si/si.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#45 integrate .. //depot/projects/usb/src/sys/dev/syscons/daemon/daemon_saver.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/usb/src/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#25 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#36 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#152 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#61 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtwvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#15 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_rrip.c#7 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#7 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/usb/src/sys/i386/xen/clock.c#7 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/usb/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_osd.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty.c#23 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#17 integrate .. //depot/projects/usb/src/sys/kgssapi/gsstest.c#4 integrate .. //depot/projects/usb/src/sys/net/pfil.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#19 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#17 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#7 integrate .. //depot/projects/usb/src/sys/nlm/nlm_advlock.c#6 integrate .. //depot/projects/usb/src/sys/rpc/authunix_prot.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/hvcons.c#6 integrate .. //depot/projects/usb/src/sys/sys/jail.h#15 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#14 integrate .. //depot/projects/usb/src/sys/sys/mount.h#18 integrate .. //depot/projects/usb/src/sys/sys/namei.h#5 integrate .. //depot/projects/usb/src/sys/sys/param.h#32 integrate .. //depot/projects/usb/src/sys/sys/priv.h#14 integrate .. //depot/projects/usb/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/usb/src/sys/sys/sx.h#10 integrate .. //depot/projects/usb/src/sys/sys/tty.h#10 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#12 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#8 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include +#include #include #include #include @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -47,9 +47,9 @@ typedef struct sx kmutex_t; #ifndef DEBUG -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK) #endif #define mutex_init(lock, desc, type, arg) do { \ ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -49,9 +49,9 @@ typedef struct sx krwlock_t; #ifndef DEBUG -#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define RW_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK) #endif #define RW_READ_HELD(x) (rw_read_held((x))) ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include #include #include -#include #include @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.13 2009/05/28 17:36:36 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); #include #include @@ -76,8 +76,8 @@ #include static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 @@ -114,10 +114,10 @@ static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, struct usb_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); @@ -353,7 +353,7 @@ return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -527,7 +527,7 @@ union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,7 +592,7 @@ return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; @@ -602,7 +602,7 @@ device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_default(ip, ifidx) irp *ip; uint8_t ifidx; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - usb2_error_t status; + usb_error_t status; if (ifidx > 0) device_printf(dev, "warning: ifidx > 0 isn't supported.\n"); @@ -643,7 +643,7 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint(ip, ifidx, ep) irp *ip; uint8_t ifidx; @@ -654,7 +654,7 @@ struct ndisusb_ep *ne; struct usb_config cfg; struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; /* check for non-supported transfer types */ if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL || @@ -810,7 +810,7 @@ static void usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne, - struct ndisusb_xfer *nx, usb2_error_t status) + struct ndisusb_xfer *nx, usb_error_t status) { struct ndisusb_xferdone *nd; uint8_t irql; @@ -1122,7 +1122,7 @@ struct usbd_urb_bulk_or_intr_transfer *ubi; struct usbd_urb_vendor_or_class_request *vcreq; union usbd_urb *urb; - usb2_error_t status; + usb_error_t status; void *priv; dev = sc->ndis_dev; ==== //depot/projects/usb/src/sys/compat/svr4/svr4_fcntl.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.46 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.47 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -367,7 +367,7 @@ int svr4_sys_open(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open_args *uap; { struct proc *p = td->td_proc; @@ -419,7 +419,7 @@ int svr4_sys_open64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open64_args *uap; { return svr4_sys_open(td, (struct svr4_sys_open_args *)uap); @@ -427,7 +427,7 @@ int svr4_sys_creat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat_args *uap; { char *newpath; @@ -443,7 +443,7 @@ int svr4_sys_creat64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat64_args *uap; { return svr4_sys_creat(td, (struct svr4_sys_creat_args *)uap); @@ -451,7 +451,7 @@ int svr4_sys_llseek(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_llseek_args *uap; { struct lseek_args ap; @@ -472,7 +472,7 @@ int svr4_sys_access(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_access_args *uap; { char *newpath; @@ -487,7 +487,7 @@ #if defined(NOTYET) int svr4_sys_pread(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pread_args *uap; { struct pread_args pra; @@ -508,7 +508,7 @@ #if defined(NOTYET) int svr4_sys_pread64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -532,7 +532,7 @@ #if defined(NOTYET) int svr4_sys_pwrite(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pwrite_args *uap; { struct pwrite_args pwa; @@ -553,7 +553,7 @@ #if defined(NOTYET) int svr4_sys_pwrite64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -575,7 +575,7 @@ int svr4_sys_fcntl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fcntl_args *uap; { int cmd, error, *retval; ==== //depot/projects/usb/src/sys/compat/svr4/svr4_ioctl.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.25 2009/05/08 20:06:37 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.26 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -79,7 +79,7 @@ int svr4_sys_ioctl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_ioctl_args *uap; { int *retval; ==== //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.104 2009/05/20 18:36:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.108 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -121,7 +121,7 @@ #if defined(BOGUS) int svr4_sys_setitimer(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setitimer_args *uap; { td->td_retval[0] = 0; @@ -231,7 +231,7 @@ struct thread *td; struct svr4_sys_getdents64_args *uap; { - register struct dirent *bdp; + struct dirent *bdp; struct vnode *vp; caddr_t inp, buf; /* BSD-format */ int len, reclen; /* BSD-format */ @@ -370,7 +370,7 @@ svr4_dirent.d_off = (svr4_off_t)(off + reclen); svr4_dirent.d_reclen = (u_short) svr4reclen; } - strcpy(svr4_dirent.d_name, bdp->d_name); + strlcpy(svr4_dirent.d_name, bdp->d_name, sizeof(svr4_dirent.d_name)); if ((error = copyout((caddr_t)&svr4_dirent, outp, svr4reclen))) goto out; inp += reclen; @@ -487,7 +487,10 @@ reclen = bdp->d_reclen; if (reclen & 3) panic("svr4_sys_getdents64: bad reclen"); - off = *cookie++; /* each entry points to the next */ + if (cookie) + off = *cookie++; /* each entry points to the next */ + else + off += reclen; if ((off >> 32) != 0) { uprintf("svr4_sys_getdents64: dir offset too large for emulated program"); error = EINVAL; @@ -511,7 +514,7 @@ idb.d_ino = (svr4_ino_t)bdp->d_fileno; idb.d_off = (svr4_off_t)off; idb.d_reclen = (u_short)svr4_reclen; - strcpy(idb.d_name, bdp->d_name); + strlcpy(idb.d_name, bdp->d_name, sizeof(idb.d_name)); if ((error = copyout((caddr_t)&idb, outp, svr4_reclen))) goto out; /* advance past this real entry */ @@ -665,7 +668,7 @@ int svr4_sys_mknod(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_mknod_args *uap; { int *retval = td->td_retval; @@ -706,9 +709,6 @@ retval = &(td->td_retval[0]); switch (uap->name) { - case SVR4_CONFIG_UNUSED: - *retval = 0; - break; case SVR4_CONFIG_NGROUPS: *retval = NGROUPS_MAX; break; @@ -788,7 +788,45 @@ #endif break; #endif /* NOTYET */ - + case SVR4_CONFIG_COHERENCY: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_SPLIT_CACHE: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_ICACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_DCACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_ICACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHETBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_DCACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_MAXPID: + *retval = PID_MAX; + break; + case SVR4_CONFIG_STACK_PROT: + *retval = PROT_READ|PROT_WRITE|PROT_EXEC; + break; default: return EINVAL; } ==== //depot/projects/usb/src/sys/compat/svr4/svr4_resource.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.18 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.19 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -127,7 +127,7 @@ int svr4_sys_getrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -174,7 +174,7 @@ int svr4_sys_setrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -225,7 +225,7 @@ int svr4_sys_getrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -272,7 +272,7 @@ int svr4_sys_setrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); ==== //depot/projects/usb/src/sys/compat/svr4/svr4_signal.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.35 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.36 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -259,7 +259,7 @@ int svr4_sys_sigaction(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaction_args *uap; { struct svr4_sigaction isa; @@ -301,7 +301,7 @@ int svr4_sys_sigaltstack(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaltstack_args *uap; { struct svr4_sigaltstack sss; @@ -328,7 +328,7 @@ */ int svr4_sys_signal(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_signal_args *uap; { struct proc *p; @@ -493,7 +493,7 @@ int svr4_sys_sigsuspend(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigsuspend_args *uap; { svr4_sigset_t sss; @@ -510,7 +510,7 @@ int svr4_sys_kill(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_kill_args *uap; { struct kill_args ka; @@ -525,7 +525,7 @@ int svr4_sys_context(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_context_args *uap; { struct svr4_ucontext uc; @@ -565,7 +565,7 @@ int svr4_sys_pause(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pause_args *uap; { sigset_t mask; ==== //depot/projects/usb/src/sys/compat/svr4/svr4_socket.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.27 2006/07/21 20:40:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.28 2009/05/29 06:04:26 delphij Exp $"); #include #include @@ -120,7 +120,8 @@ struct stat *st; { struct svr4_sockcache_entry *e; - int len, error; + size_t len; + int error; e = malloc(sizeof(*e), M_TEMP, M_WAITOK); e->cookie = NULL; ==== //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.26 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.30 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -43,7 +43,6 @@ #include #include #include -#include #include @@ -185,7 +184,7 @@ int svr4_sys_lstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_lstat_args *uap; { struct svr4_stat svr4_st; @@ -210,7 +209,7 @@ int svr4_sys_fstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fstat_args *uap; { struct svr4_stat svr4_st; @@ -228,7 +227,7 @@ int svr4_sys_xstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_xstat_args *uap; { struct svr4_xstat svr4_st; @@ -255,7 +254,7 @@ int svr4_sys_lxstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_lxstat_args *uap; { struct svr4_xstat svr4_st; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 06:35:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FA481065670; Sat, 30 May 2009 06:35: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 0EFA0106566B for ; Sat, 30 May 2009 06:35:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0C0C8FC0C for ; Sat, 30 May 2009 06:35:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U6ZHdw085064 for ; Sat, 30 May 2009 06:35:17 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U6ZH8Y085062 for perforce@freebsd.org; Sat, 30 May 2009 06:35:17 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 06:35:17 GMT Message-Id: <200905300635.n4U6ZH8Y085062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 06:35:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=163063 Change 163063 by zec@zec_amdx4 on 2009/05/30 06:34:26 Reshuffle position of userspace interface handlers in vimage.c Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#46 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#46 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #ifdef DDB @@ -66,14 +67,17 @@ #ifdef VIMAGE static struct vimage *vimage_by_name(struct vimage *, char *); static struct vimage *vi_alloc(struct vimage *, char *); +static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int); +static void vimage_relative_name(struct vimage *, struct vimage *, + char *, int); #endif -#define VNET_LIST_LOCK() \ +#define VNET_LIST_WLOCK() \ mtx_lock(&vnet_list_refc_mtx); \ while (vnet_list_refc != 0) \ cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); -#define VNET_LIST_UNLOCK() \ +#define VNET_LIST_WUNLOCK() \ mtx_unlock(&vnet_list_refc_mtx); #ifdef VIMAGE @@ -99,21 +103,11 @@ #endif #ifdef VIMAGE + /* - * Userspace interfaces. + * Interim userspace interface - will be replaced by jail soon. */ -int -vi_child_of(struct vimage *parent, struct vimage *child) -{ - if (child == parent) - return (0); - for (; child; child = child->vi_parent) - if (child == parent) - return (1); - return (0); -} - /* * Move an ifnet to another vnet. The ifnet can be specified either * by ifp argument, or by name contained in vi_req->vi_if_xname if NULL is @@ -174,94 +168,6 @@ return (0); } -static struct vimage * -vimage_by_name(struct vimage *top, char *name) -{ - struct vimage *vip; - char *next_name; - int namelen; - - next_name = strchr(name, '.'); - if (next_name != NULL) { - namelen = next_name - name; - next_name++; - if (namelen == 0) { - if (strlen(next_name) == 0) - return(top); /* '.' == this vimage */ - else - return(NULL); - } - } else - namelen = strlen(name); - if (namelen == 0) - return(NULL); - LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) - if (strlen(vip->vi_name) == namelen && - strncmp(name, vip->vi_name, namelen) == 0) { - if (next_name != NULL) - return(vimage_by_name(vip, next_name)); - else - return(vip); - } - return(NULL); -} - -static void -vimage_relative_name(struct vimage *top, struct vimage *where, - char *buffer, int bufflen) -{ - int used = 1; - - if (where == top) { - sprintf(buffer, "."); - return; - } else - *buffer = 0; - - do { - int namelen = strlen(where->vi_name); - - if (namelen + used + 1 >= bufflen) - panic("buffer overflow"); - - if (used > 1) { - bcopy(buffer, &buffer[namelen + 1], used); - buffer[namelen] = '.'; - used++; - } else - bcopy(buffer, &buffer[namelen], used); - bcopy(where->vi_name, buffer, namelen); - used += namelen; - where = where->vi_parent; - } while (where != top); -} - -static struct vimage * -vimage_get_next(struct vimage *top, struct vimage *where, int recurse) -{ - struct vimage *next; - - if (recurse) { - /* Try to go deeper in the hierarchy */ - next = LIST_FIRST(&where->vi_child_head); - if (next != NULL) - return(next); - } - - do { - /* Try to find next sibling */ - next = LIST_NEXT(where, vi_sibling); - if (!recurse || next != NULL) - return(next); - - /* Nothing left on this level, go one level up */ - where = where->vi_parent; - } while (where != top->vi_parent); - - /* Nothing left to be visited, we are done */ - return(NULL); -} - int vi_td_ioctl(u_long cmd, struct vi_req *vi_req, struct thread *td) { @@ -273,11 +179,9 @@ if (vi_req->vi_api_cookie != VI_API_COOKIE) return (EDOOFUS); -#if 0 - error = priv_check(td, PRIV_ROOT); + error = priv_check(td, PRIV_REBOOT); /* XXX temp. priv abuse */ if (error) return (error); -#endif vip_r = vimage_by_name(vip, vi_req->vi_name); if (vip_r == NULL && !(vi_req->vi_req_action & VI_CREATE)) @@ -363,13 +267,109 @@ if (vip_r == NULL) return (ENOMEM); } + } + + return (error); +} + +int +vi_child_of(struct vimage *parent, struct vimage *child) +{ + + if (child == parent) + return (0); + for (; child; child = child->vi_parent) + if (child == parent) + return (1); + return (0); +} + +static struct vimage * +vimage_by_name(struct vimage *top, char *name) +{ + struct vimage *vip; + char *next_name; + int namelen; + + next_name = strchr(name, '.'); + if (next_name != NULL) { + namelen = next_name - name; + next_name++; + if (namelen == 0) { + if (strlen(next_name) == 0) + return(top); /* '.' == this vimage */ + else + return(NULL); + } + } else + namelen = strlen(name); + if (namelen == 0) + return(NULL); + LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) + if (strlen(vip->vi_name) == namelen && + strncmp(name, vip->vi_name, namelen) == 0) { + if (next_name != NULL) + return(vimage_by_name(vip, next_name)); + else + return(vip); + } + return(NULL); +} - /* XXX What the hell is this doing here? */ - if (vip == vip_r && !IS_DEFAULT_VIMAGE(vip)) - return (EPERM); +static void +vimage_relative_name(struct vimage *top, struct vimage *where, + char *buffer, int bufflen) +{ + int used = 1; + + if (where == top) { + sprintf(buffer, "."); + return; + } else + *buffer = 0; + + do { + int namelen = strlen(where->vi_name); + + if (namelen + used + 1 >= bufflen) + panic("buffer overflow"); + + if (used > 1) { + bcopy(buffer, &buffer[namelen + 1], used); + buffer[namelen] = '.'; + used++; + } else + bcopy(buffer, &buffer[namelen], used); + bcopy(where->vi_name, buffer, namelen); + used += namelen; + where = where->vi_parent; + } while (where != top); +} + +static struct vimage * +vimage_get_next(struct vimage *top, struct vimage *where, int recurse) +{ + struct vimage *next; + + if (recurse) { + /* Try to go deeper in the hierarchy */ + next = LIST_FIRST(&where->vi_child_head); + if (next != NULL) + return(next); } - return (error); + do { + /* Try to find next sibling */ + next = LIST_NEXT(where, vi_sibling); + if (!recurse || next != NULL) + return(next); + + /* Nothing left on this level, go one level up */ + where = where->vi_parent; + } while (where != top->vi_parent); + + /* Nothing left to be visited, we are done */ + return(NULL); } #endif /* VIMAGE */ /* User interface block */ @@ -654,9 +654,9 @@ vnet_mod_constructor(vml); CURVNET_RESTORE(); - VNET_LIST_LOCK(); + VNET_LIST_WLOCK(); LIST_INSERT_HEAD(&vnet_head, vnet, vnet_le); - VNET_LIST_UNLOCK(); + VNET_LIST_WUNLOCK(); /* XXX locking */ LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); From owner-p4-projects@FreeBSD.ORG Sat May 30 07:07:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8B411065673; Sat, 30 May 2009 07:07: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 501F5106564A for ; Sat, 30 May 2009 07:07:51 +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 3DCBA8FC0C for ; Sat, 30 May 2009 07:07:51 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U77pMp088413 for ; Sat, 30 May 2009 07:07:51 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U77plx088411 for perforce@freebsd.org; Sat, 30 May 2009 07:07:51 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 30 May 2009 07:07:51 GMT Message-Id: <200905300707.n4U77plx088411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 163065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 07:07:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=163065 Change 163065 by pgj@beehive on 2009/05/30 07:06:58 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#31 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/bcr.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#25 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#25 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#27 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#31 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#59 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#31 (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.482 2009/05/28 15:31:46 avl Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.483 2009/05/29 16:10:25 bcr Exp $ --> aaron@FreeBSD.org"> @@ -110,6 +110,8 @@ bbraun@FreeBSD.org"> +bcr@FreeBSD.org"> + bde@FreeBSD.org"> bean@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1041,6 +1041,11 @@ &pgpkey.rees; + + &a.bcr; + &pgpkey.bcr; + + &a.trhodes; &pgpkey.trhodes; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#25 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -26,6 +26,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#27 (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.223 2009/05/28 15:34:18 avl Exp $ +$FreeBSD: www/en/developers.sgml,v 1.224 2009/05/29 16:12:22 bcr Exp $ --> @@ -58,6 +58,7 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#31 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.10 2009/05/28 00:42:55 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.11 2009/05/29 05:00:42 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#59 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.258 2009/05/28 15:34:18 avl Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.259 2009/05/29 16:18:46 bcr Exp $ @@ -55,6 +55,15 @@ + 23 + + +

New committer: Benedict + Reuschling (doc/de_DE, www/de)

+ + + + 22 From owner-p4-projects@FreeBSD.ORG Sat May 30 07:31:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 752881065672; Sat, 30 May 2009 07:31:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 354DF106564A for ; Sat, 30 May 2009 07:31:15 +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 23C3F8FC17 for ; Sat, 30 May 2009 07:31:15 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U7VF18090203 for ; Sat, 30 May 2009 07:31:15 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U7VFpo090201 for perforce@freebsd.org; Sat, 30 May 2009 07:31:15 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 30 May 2009 07:31:15 GMT Message-Id: <200905300731.n4U7VFpo090201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 163066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 07:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=163066 Change 163066 by pgj@beehive on 2009/05/30 07:30:16 MFen (www): 1.258 -> 1.259 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#32 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#32 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -40,6 +40,15 @@ + 23 + + +

Új tag: Benedict + Reuschling (doc/de_DE, www/de)

+ + + + 22 From owner-p4-projects@FreeBSD.ORG Sat May 30 08:11:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2379C1065670; Sat, 30 May 2009 08:11: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 D7E3D106566B for ; Sat, 30 May 2009 08:11:56 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5D9C8FC14 for ; Sat, 30 May 2009 08:11:56 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U8BuYX094294 for ; Sat, 30 May 2009 08:11:56 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U8BufT094292 for perforce@freebsd.org; Sat, 30 May 2009 08:11:56 GMT (envelope-from syl@FreeBSD.org) Date: Sat, 30 May 2009 08:11:56 GMT Message-Id: <200905300811.n4U8BufT094292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 08:11:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=163069 Change 163069 by syl@syl_rincewind on 2009/05/30 08:11:05 - Set num_iso_packet in usb_xfer in libusb_alloc_transfer(). - We must free usb_transfer and not libusb_transfer in libusb_free_transfer(). - Update libusb_submit_transfer to follow libusb-1.0.1. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#19 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#19 (text+ko) ==== @@ -682,19 +682,21 @@ libusb_alloc_transfer(int iso_packets) { struct libusb_transfer *xfer; + struct usb_transfer *bxfer; int len; len = sizeof(struct libusb_transfer) + sizeof(struct usb_transfer) + (iso_packets * sizeof(libusb_iso_packet_descriptor)); - xfer = malloc(len); - if (xfer == NULL) + bxfer = malloc(len); + if (bxfer == NULL) return (NULL); - memset(xfer, 0, len); + memset(bxfer, 0, len); + bxfer->num_iso_packets = iso_packets; - xfer = (struct libusb_transfer *) ((uint8_t *)xfer + + xfer = (struct libusb_transfer *) ((uint8_t *)bxfer + sizeof(struct usb_transfer)); return (xfer); } @@ -702,15 +704,20 @@ void libusb_free_transfer(struct libusb_transfer *xfer) { + struct usb_transfer *bxfer; + if (xfer == NULL) return ; + bxfer = (struct usb_transfer *) ((uint8_t *)xfer - + sizeof(struct usb_transfer)); + if (xfer->buffer) free(xfer->buffer); if (xfer->user_data) free(xfer->user_data); - free(xfer); + free(bxfer); return; } @@ -745,14 +752,18 @@ usb_backend->transferred = 0; usb_backend->flags = 0; - ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); - cur_ts.tv_sec += xfer->timeout / 1000; - cur_ts.tv_nsec += (xfer->timeout % 1000) * 1000000; - if (cur_ts.tv_nsec > 1000000000) { - cur_ts.tv_nsec -= 1000000000; - cur_ts.tv_sec++; + if (xfer->timeout != 0) { + ret = clock_gettime(CLOCK_MONOTONIC, &cur_ts); + cur_ts.tv_sec += xfer->timeout / 1000; + cur_ts.tv_nsec += (xfer->timeout % 1000) * 1000000; + + if (cur_ts.tv_nsec > 1000000000) { + cur_ts.tv_nsec -= 1000000000; + cur_ts.tv_sec++; + } + + TIMESPEC_TO_TIMEVAL(&usb_backend->timeout, &cur_ts); } - TIMESPEC_TO_TIMEVAL(&usb_backend->timeout, &cur_ts); /*Add to flying list*/ pthread_mutex_lock(&ctx->flying_transfers_lock); @@ -760,7 +771,7 @@ LIST_ADD(&usb_backend->list, &ctx->flying_transfers); goto out; } - if (timerisset(&usb_backend->timeout)) { + if (timerisset(&usb_backend->timeout) == 0) { LIST_ADD_TAIL(&usb_backend->list, &ctx->flying_transfers); goto out; } From owner-p4-projects@FreeBSD.ORG Sat May 30 09:07:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8411D106566C; Sat, 30 May 2009 09:07: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 2B8DA106566B for ; Sat, 30 May 2009 09:07:54 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 185EE8FC14 for ; Sat, 30 May 2009 09:07:54 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U97raM009401 for ; Sat, 30 May 2009 09:07:53 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U97ra4009399 for perforce@freebsd.org; Sat, 30 May 2009 09:07:53 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sat, 30 May 2009 09:07:53 GMT Message-Id: <200905300907.n4U97ra4009399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 163072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 09:07:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163072 Change 163072 by dforsyth@squirrel on 2009/05/30 09:07:16 Ripped a bunch of stuff apart. Committing mostly for backup. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkg_util.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkg_util.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.c#5 (text+ko) ==== @@ -2,76 +2,35 @@ #include #include +#include + +#include "pkg_util.h" #include "pkg.h" -struct pkg { - TAILQ_ENTRY(pkg) next; - - char *ident; /* User given name for this pkg. */ - - char *pkg_name; /* name taken from contents file. */ - char *pkg_comment; - char *cwd; - int pkg_rev; - - int has_comment; - int has_contents; - int has_display; - int has_mtree_dirs; - int has_desc; - int has_required_by; -}; - /* Create a new pkg. */ struct pkg * pkg_new(const char *ident) { struct pkg *p; + char *new_ident; if (ident == NULL) return (NULL); - p = malloc(sizeof(*p)); - if (p == NULL) - return (p); - memset(p, 0, sizeof(*p)); - - p->ident = strdup(ident); - if (p->ident == NULL) { - pkg_free(p); + p = calloc(1, sizeof(*p)); + new_ident = strdup(ident); + if (p == NULL || new_ident == NULL) { + free(new_ident); + free(p); return (NULL); } + p->ident = new_ident; return (p); } -/* Read in, verify, and assign the information in p's contents file. */ - -int -set_pkg_contents(struct pkg *p, char *p_c /* <-- place holder. */) -{ - if (p == NULL) - return (-1); - if (p_c == NULL) - return (-1); - - return (0); -} - /* Read in contents of comment file. */ - -int -set_pkg_comment(struct pkg *p, char *pkg_comment) -{ - if (p == NULL) - return (-1); - if (pkg_comment == NULL) - return (-1); - - return (0); -} - char * pkg_ident(struct pkg *p) { @@ -82,21 +41,12 @@ } char * -pkg_name(struct pkg *p) +pkg_comment(struct pkg *p) { if (p == NULL) return (NULL); - return (p->pkg_name); -} - -char * -pkg_comment(struct pkg *p) -{ - if (p == NULL) - return (NULL); - - return (p->pkg_comment); + return (p->comment); } void @@ -104,11 +54,7 @@ { if (p == NULL) return; - + free(p->ident); - free(p->pkg_name); - free(p->pkg_comment); - free(p->cwd); - free(p); } ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.h#4 (text+ko) ==== @@ -1,30 +1,36 @@ #ifndef __PKG_H__ #define __PKG_H__ -#define COMMENT_FILE "+COMMENT" -#define CONTENTS_FILE "+CONTENTS" -#define DESC_FILE "+DESC" -#define DISPLAY_FILE "+DISPLAY" -#define MTREE_DIRS_FILE "+MTREE_DIRS" +struct pkg_file { + char *name; + char *path; + char *md5; +}; -/* pkgdb. */ -struct pkgdb; -struct pkg_head; -struct dirent; +struct pkg_contents { + int rev; + char *name; + char **file_list; /* place holder */ + char *cwd; + char **conflict; +}; -struct pkgdb *pkgdb_new_hierdb(const char *db_root); +struct pkg { + TAILQ_ENTRY(pkg) next; /* Hide meh */ -int pkgdb_reset(struct pkgdb *db); -struct pkgdb_subdir *pkgdb_read_pkg(struct pkgdb *db, const char *name); -struct pkg *pkgdb_next_pkg(struct pkgdb *db); - -void pkgdb_free_hierdb(struct pkgdb *db); - -int subdir_sel(struct dirent *ent); -void free_ptr_array(void **arr, int c); - -/* pkg. */ -struct pkg; + char *ident; /* User given name for this pkg. */ + char *path; + + char *comment; + struct pkg_contents *contents; + + int has_comment; + int has_contents; + int has_display; + int has_mtree_dirs; + int has_desc; + int has_required_by; +}; struct pkg *pkg_new(const char *ident); ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#5 (text+ko) ==== @@ -7,31 +7,10 @@ #include #include +#include "pkg_util.h" +#include "pkgdb.h" #include "pkg.h" -struct pkgdb { - int dirty; /* changes have been made to this database. */ - - char *db_root; - - int p_count; - struct pkg *p_curr; - TAILQ_HEAD(pkg_head, pkg) p_head; - - /* Callbacks */ - /* tuuuummmmbbbllleeewwwweeeedddddd*/ -}; - -struct pkg { - TAILQ_ENTRY(pkg) next; - - char *name; - char *path; - int file_count; - char **file_list; - int dirty; -}; - /* Everything in here is written with the current database setup in mind. * I'll add some stuff for flat databases later. */ @@ -44,7 +23,6 @@ struct stat sb; struct pkgdb *db; char *new_db_root; - struct p_head *new_p_headp; if (db_root == NULL) return (NULL); @@ -54,110 +32,76 @@ return (NULL); db = calloc(1, sizeof(*db)); - new_db_root = strdup(db_root); - // new_p_headp = calloc(1, sizeof(*db->p_headp)); - if (db == NULL || new_db_root == NULL/* || new_p_headp == NULL*/) { + new_db_root = path_strdup(db_root); + if (db == NULL || new_db_root == NULL) { free(db); free(new_db_root); - // free(new_p_headp); return (NULL); } db->db_root = new_db_root; - // db->p_headp = new_p_headp; - TAILQ_INIT(&db->p_head); - db->sd_count = 0; + db->p_count = 0; db->dirty = 1; + /* Set the callbacks for database access */ + return (db); } -/* Don't know if I'll leave this in here, the dirty var is completely - * internal... */ -int -pkgdb_is_dirty(struct pkgdb *db) -{ - if (db == NULL) - return (-1); - - return (db->dirty); -} - -int -pkgdb_set_dirty(struct pkgdb *db) -{ - if (db == NULL) - return (-1); - - return (db->dirty = 1); -} - -int -pkgdb_set_not_dirty(struct pkgdb *db) -{ - if (db == NULL) - return (-1); - - return (db->dirty = 0); -} - /* Read in the names of all subdirectories in db->db_root, and add them to * the db's package list. Set the current package to the head of the * list. The packages in db's package list are not verified. Returns the * number of subdirectories in the database. */ int -pkgdb_reset(struct pkgdb *db) +pkgdb_init_hierdb(struct pkgdb *db) { int i; - struct pkg *sd; + int p_count; + struct pkg *p; struct dirent **ents; if (db == NULL) return (-1); - + + TAILQ_INIT(&db->p_head); if (db->dirty == 0) { - /* No changes since the last reset, don't bother walking the + /* No changes since the last init, don't bother walking the * database again. */ db->p_curr = TAILQ_FIRST(&db->p_head); - return (db->sd_count); + return (db->p_count); } - db->sd_count = scandir(db->db_root, &ents, subdir_sel, alphasort); + p_count = scandir(db->db_root, &ents, subdir_sel, alphasort); /* Clear out old list. */ pkgdb_free_pkg_list(db); /* Later on I should look into inserting changes into the existing * list, rather than just bombing the whole thing. */ - TAILQ_INIT(&db->p_head); - for (i = 0; i < db->sd_count; ++i) { - sd = pkgdb_read_pkg(db, ents[i]->d_name); - if (sd == NULL) { + for (i = 0; i < p_count; ++i) { + p = pkgdb_read_pkg_hierdb(db, ents[i]->d_name); + if (p == NULL) { pkgdb_free_pkg_list(db); free(ents); return (-1); } - TAILQ_INSERT_TAIL(&db->p_head, sd, next); + TAILQ_INSERT_TAIL(&db->p_head, p, next); free(ents[i]); } free(ents); + db->p_curr = TAILQ_FIRST(&db->p_head); + db->p_count = p_count; db->dirty = 0; - return (db->sd_count); + return (db->p_count); } -int -subdir_sel(struct dirent *ent) -{ - if (strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0) - return (1); - return (0); -} +/* Read in all the package information we can right here. */ struct pkg * -pkgdb_read_pkg(struct pkgdb *db, const char *ident) +pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident) { int i; int c; @@ -165,10 +109,11 @@ char *path; struct stat sb; struct pkg *p; + struct dirent *e; struct dirent **ents; - p = pkg_new(name); - path = pkgdb_path(db, p); + p = pkg_new(ident); + path = pkgdb_pkg_path(db, p); if (p == NULL || path == NULL) { pkg_free(p); free(path); @@ -180,12 +125,30 @@ free(path); return (NULL); } - + c = scandir(path, &ents, subdir_sel, alphasort); for (i = 0; i < c; ++i) { - /* Check file names and set values in p. */ - - free(ents[i]); + s = 0; /* Reset s */ + /* Go through all the files in this package, grab the information + * that we need. */ + e = ents + i; + s = pkg_info_identify_file(e); + switch (s) { + case IS_COMMENTS: + /* Read the comments file into the comments field of this + * package. */ + break; + case IS_CONTENTS: + /* Do contents parsing stuff. Like... + p->contents = pkg_info_parse_contents_file(p, + CONTENTS_FILE); */ + break; + case IS_MTREE_DIRS: + break; + default: + /* This is an irrelevant file. */ + } + free(e); } free(ents); @@ -193,23 +156,52 @@ return (p); } +/* Grab a package from the database via ident. No need to initialize, + * this is a direct query. */ + +/* +struct pkg * +pkgdb_query_pkg(struct pkgdb *db, const char *ident) +{ + Need to add callbacks before do this. +} +*/ + +char * +pkgdb_pkg_path(struct pkgdb *db, struct pkg *p) +{ + char *new_path; + + if (db == NULL || p == NULL) { + return (NULL); + } + + new_path = malloc(strlen(db->db_root) + strlen(p->ident) + 1); + if (new_path == NULL) + return (NULL); + + strcpy(new_path, db->db_root); + strcat(new_path, p->ident); + + return (new_path); +} + /* Move the current subdir pointer to the next one in the list. Return * the previous subdir. Return NULL if there are no more left. */ struct pkg * pkgdb_next_pkg(struct pkgdb *db) { - struct pkg *sd; + struct pkg *p; if (db == NULL) return (NULL); + + if ((p = db->p_curr) == NULL) + return (NULL); - sd = db->p_curr; - if (sd == NULL) - return (NULL); - db->p_curr = TAILQ_NEXT(db->p_curr, next); - return (sd); + return (p); } /* Free a hierdb. */ @@ -228,14 +220,14 @@ void pkgdb_free_pkg_list(struct pkgdb *db) { - struct pkg *sd; - struct pkg *sdn; + struct pkg *p; + struct pkg *pn; - sd = TAILQ_FIRST(&db->p_head); - while (sd != NULL) { - sdn = TAILQ_NEXT(sd, next); - pkg_free(sd); - sd = sdn; + p = TAILQ_FIRST(&db->p_head); + while (p != NULL) { + pn = TAILQ_NEXT(p, next); + pkg_free(p); + p = pn; } TAILQ_INIT(&db->p_head); } ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#2 (text+ko) ==== @@ -1,4 +1,40 @@ #ifndef __PKGDB_H__ #define __PKGDB_H__ +#define COMMENT_FILE "+COMMENT" +#define CONTENTS_FILE "+CONTENTS" +#define DESC_FILE "+DESC" +#define DISPLAY_FILE "+DISPLAY" +#define MTREE_DIRS_FILE "+MTREE_DIRS" +#define REQUIRED_BY_FILE "+REQUIRED_BY" + +#include + +struct pkgdb { + int dirty; /* changes have been made to this database. */ + + char *db_root; + + int p_count; + struct pkg *p_curr; + TAILQ_HEAD(pkg_head, next) p_head; + + /* Callbacks */ + /* tuuuummmmbbbllleeewwwweeeedddddd*/ +}; +// struct pkg_head; + +struct pkgdb *pkgdb_new_hierdb(const char *db_root); + +int pkgdb_init_hierdb(struct pkgdb *db); +struct pkg *pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident); +struct pkg *pkgdb_next_pkg(struct pkgdb *db); + +struct pkg *pkgdb_query_pkg(struct pkgdb *db, const char *ident); + +char *pkgdb_pkg_path(struct pkgdb *db, struct pkg *p); + +void pkgdb_free_hierdb(struct pkgdb *db); +void pkgdb_free_pkg_list(struct pkgdb *db); + #endif From owner-p4-projects@FreeBSD.ORG Sat May 30 09:30:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E0721065670; Sat, 30 May 2009 09:30:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9729106566C for ; Sat, 30 May 2009 09:30:16 +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 B6D218FC0A for ; Sat, 30 May 2009 09:30:16 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4U9UGvP011109 for ; Sat, 30 May 2009 09:30:16 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4U9UG4H011107 for perforce@freebsd.org; Sat, 30 May 2009 09:30:16 GMT (envelope-from mav@freebsd.org) Date: Sat, 30 May 2009 09:30:16 GMT Message-Id: <200905300930.n4U9UG4H011107@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 Cc: Subject: PERFORCE change 163073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 09:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=163073 Change 163073 by mav@mav_mavbook on 2009/05/30 09:29:17 Add 28/48-bit commands differentiation. Teach ATA disk driver to use proper ones and AHCI controller to convert them properly to FIS. Add BIO_FLUSH support to ATA disk driver. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#4 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#4 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#4 (text+ko) ==== @@ -59,28 +59,4 @@ product, revision); } -void -ata_read_write(struct ccb_ataio *ataio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, int readop, - u_int64_t lba, u_int32_t block_count, - u_int8_t *data_ptr, u_int32_t dxfer_len, - u_int32_t timeout) -{ - cam_fill_ataio(ataio, - retries, - cbfcnp, - /*flags*/readop ? CAM_DIR_IN : CAM_DIR_OUT, - tag_action, - data_ptr, - dxfer_len, - timeout); - - ataio->cmd.command = readop ? ATA_READ_DMA48 : ATA_WRITE_DMA48; - ataio->cmd.feature = 0; - ataio->cmd.lba = lba; - ataio->cmd.count = block_count; -} - - #endif /* _KERNEL */ ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#4 (text+ko) ==== @@ -34,21 +34,15 @@ union ccb; struct ata_cmd { - u_int8_t command; /* command reg */ - u_int16_t feature; /* feature reg */ - u_int16_t count; /* count reg */ - u_int64_t lba; /* lba reg */ + u_int8_t command; /* command reg */ + u_int8_t flags; /* ATA command flags */ +#define CAM_ATAIO_48BIT 0x01 /* Command has 48-bit format */ + u_int16_t feature; /* feature reg */ + u_int16_t count; /* count reg */ + u_int64_t lba; /* lba reg */ }; void ata_print_ident(struct ata_params *ident_data); -void -ata_read_write(struct ccb_ataio *ataio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, int readop, - u_int64_t lba, u_int32_t block_count, - u_int8_t *data_ptr, u_int32_t dxfer_len, - u_int32_t timeout); - #endif ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#4 (text+ko) ==== @@ -68,9 +68,8 @@ typedef enum { DA_FLAG_PACK_INVALID = 0x001, - DA_FLAG_NEW_PACK = 0x002, - DA_FLAG_PACK_LOCKED = 0x004, - DA_FLAG_PACK_REMOVABLE = 0x008, + DA_FLAG_CAN_48BIT = 0x002, + DA_FLAG_CAN_FLUSHCACHE = 0x004, DA_FLAG_TAGGED_QUEUING = 0x010, DA_FLAG_NEED_OTAG = 0x020, DA_FLAG_WENT_IDLE = 0x040, @@ -246,23 +245,9 @@ softc->flags &= ~DA_FLAG_PACK_INVALID; } - error = 0;//dagetcapacity(periph); - - if (error == 0) { - -// if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0 && -// (softc->quirks & DA_Q_NO_PREVENT) == 0) -// daprevent(periph, PR_PREVENT); - } else - softc->flags &= ~DA_FLAG_OPEN; - cam_periph_unhold(periph); cam_periph_unlock(periph); - - if (error != 0) { - cam_periph_release(periph); - } - return (error); + return (0); } static int @@ -608,8 +593,11 @@ LIST_INIT(&softc->pending_ccbs); softc->state = DA_STATE_NORMAL; bioq_init(&softc->bio_queue); -// if (SID_IS_REMOVABLE(&cgd->inq_data)) -// softc->flags |= DA_FLAG_PACK_REMOVABLE; + + if (cgd->ident_data.support.command2 & ATA_SUPPORT_ADDRESS48) + softc->flags |= DA_FLAG_CAN_48BIT; + if (cgd->ident_data.support.command2 & ATA_SUPPORT_FLUSHCACHE) + softc->flags |= DA_FLAG_CAN_FLUSHCACHE; // if ((cgd->inq_data.flags & SID_CmdQue) != 0) // softc->flags |= DA_FLAG_TAGGED_QUEUING; @@ -652,8 +640,8 @@ softc->disk->d_maxsize = 256*1024; softc->disk->d_unit = periph->unit_number; softc->disk->d_flags = 0; -// if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0) -// softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE; + if (softc->flags & DA_FLAG_CAN_FLUSHCACHE) + softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE; dasetgeom(periph, cgd); dp = &softc->params; @@ -737,6 +725,7 @@ } else if (bp == NULL) { xpt_release_ccb(start_ccb); } else { + struct ccb_ataio *ataio = &start_ccb->ataio; u_int8_t tag_code; bioq_remove(&softc->bio_queue, bp); @@ -751,30 +740,57 @@ switch (bp->bio_cmd) { case BIO_READ: case BIO_WRITE: - ata_read_write(&start_ccb->ataio, - /*retries*/da_retry_count, - /*cbfcnp*/dadone, - /*tag_action*/tag_code, - /*read_op*/bp->bio_cmd == BIO_READ, - /*lba*/bp->bio_pblkno, - /*block_count*/bp->bio_bcount / - softc->params.secsize, - /*data_ptr*/ bp->bio_data, - /*dxfer_len*/ bp->bio_bcount, - /*timeout*/da_default_timeout*1000); + cam_fill_ataio(ataio, + da_retry_count, + dadone, + bp->bio_cmd == BIO_READ ? + CAM_DIR_IN : CAM_DIR_OUT, + tag_code, + bp->bio_data, + bp->bio_bcount, + da_default_timeout*1000); + + ataio->cmd.feature = 0; + ataio->cmd.lba = bp->bio_pblkno; + ataio->cmd.count = bp->bio_bcount / softc->params.secsize; + if ((softc->flags & DA_FLAG_CAN_48BIT) && + (ataio->cmd.lba + ataio->cmd.count >= ATA_MAX_28BIT_LBA || + ataio->cmd.count >= 256)) { + if (bp->bio_cmd == BIO_READ) + ataio->cmd.command = ATA_READ_DMA48; + else + ataio->cmd.command = ATA_WRITE_DMA48; + ataio->cmd.flags = CAM_ATAIO_48BIT; + } else { + if (bp->bio_cmd == BIO_READ) + ataio->cmd.command = ATA_READ_DMA; + else + ataio->cmd.command = ATA_WRITE_DMA; + ataio->cmd.flags = 0; + } + break; -#if 0 case BIO_FLUSH: - scsi_synchronize_cache(&start_ccb->csio, - /*retries*/1, - /*cbfcnp*/dadone, - 0, //MSG_SIMPLE_Q_TAG, - /*begin_lba*/0,/* Cover the whole disk */ - /*lb_count*/0, - SSD_FULL_SIZE, - /*timeout*/da_default_timeout*1000); + cam_fill_ataio(ataio, + 1, + dadone, + CAM_DIR_NONE, + tag_code, + NULL, + 0, + da_default_timeout*1000); + + if (softc->flags & DA_FLAG_CAN_48BIT) { + ataio->cmd.command = ATA_FLUSHCACHE48; + ataio->cmd.flags = CAM_ATAIO_48BIT; + } else { + ataio->cmd.command = ATA_FLUSHCACHE; + ataio->cmd.flags = 0; + } + ataio->cmd.feature = 0; + ataio->cmd.lba = 0; + ataio->cmd.count = 0; break; -#endif } start_ccb->ccb_h.ccb_state = DA_CCB_BUFFER_IO; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#6 (text+ko) ==== @@ -709,13 +709,13 @@ if (ccb->ccb_h.func_code == XPT_ATA_IO) { if (bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map, ccb->ataio.data_ptr, ccb->ataio.dxfer_len, - ahci_dmasetprd, slot, BUS_DMA_NOWAIT)) { + ahci_dmasetprd, slot, 0)) { device_printf(dev, "FAILURE - load data\n"); } } else { if (bus_dmamap_load(ch->dma.data_tag, slot->dma.data_map, ccb->csio.data_ptr, ccb->csio.dxfer_len, - ahci_dmasetprd, slot, BUS_DMA_NOWAIT)) { + ahci_dmasetprd, slot, 0)) { device_printf(dev, "FAILURE - load data\n"); } } @@ -1516,7 +1516,6 @@ fis[15] = ATA_A_4BIT; return 20; } else { -// ata_modify_if_48bit(request); fis[0] = 0x27; /* host to device */ // fis[1] = 0x80 | (atadev->unit & 0x0f); fis[1] = 0x80 | (0 & 0x0f); @@ -1526,7 +1525,7 @@ fis[5] = ccb->ataio.cmd.lba >> 8; fis[6] = ccb->ataio.cmd.lba >> 16; fis[7] = ATA_D_LBA; -// if (!(atadev->flags & ATA_D_48BIT_ACTIVE)) + if (!(ccb->ataio.cmd.flags & CAM_ATAIO_48BIT)) fis[7] |= (ATA_D_IBM | (ccb->ataio.cmd.lba >> 24 & 0x0f)); fis[8] = ccb->ataio.cmd.lba >> 24; fis[9] = ccb->ataio.cmd.lba >> 32; From owner-p4-projects@FreeBSD.ORG Sat May 30 11:28:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19DE21065670; Sat, 30 May 2009 11:28:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDD01106564A for ; Sat, 30 May 2009 11:28:16 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B29938FC0C for ; Sat, 30 May 2009 11:28:16 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UBSG2P022349 for ; Sat, 30 May 2009 11:28:16 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UBSGad022347 for perforce@freebsd.org; Sat, 30 May 2009 11:28:16 GMT (envelope-from syl@FreeBSD.org) Date: Sat, 30 May 2009 11:28:16 GMT Message-Id: <200905301128.n4UBSGad022347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 11:28:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=163077 Change 163077 by syl@syl_rincewind on 2009/05/30 11:28:06 - Remove ; at the end of a if in handle_timeouts. - Finish the implementation of handle_events. - Implement the usb_handle_disconnect helper. - Implement the usb_handle_transfer_completion helper. - Inline usb_add_pollfd and usb_remove_pollfd into libusb10.h. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#20 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#3 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#4 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#20 (text+ko) ==== @@ -57,59 +57,6 @@ ctx->debug = level; } -static int -usb_add_pollfd(libusb_context *ctx, int fd, short events) -{ - struct usb_pollfd *pollfd; - - if (ctx == NULL) - return (LIBUSB_ERROR_INVALID_PARAM); - - pollfd = malloc(sizeof(*pollfd)); - if (pollfd == NULL) - return (LIBUSB_ERROR_NO_MEM); - - pollfd->pollfd.fd = fd; - pollfd->pollfd.events = events; - - pthread_mutex_lock(&ctx->pollfds_lock); - LIST_ADD_TAIL(&pollfd->list, &ctx->pollfds); - pthread_mutex_unlock(&ctx->pollfds_lock); - - if (ctx->fd_added_cb) - ctx->fd_added_cb(fd, events, ctx->fd_cb_user_data); - return (0); -} - -static void -usb_remove_pollfd(libusb_context *ctx, int fd) -{ - struct usb_pollfd *pollfd; - int found; - - found = 0; - pthread_mutex_lock(&ctx->pollfds_lock); - - LIST_FOREACH_ENTRY(pollfd, &ctx->pollfds, list) { - if (pollfd->pollfd.fd == fd) { - found = 1; - break ; - } - } - - if (found == 0) { - pthread_mutex_unlock(&ctx->pollfds_lock); - return ; - } - - LIST_DEL(&pollfd->list); - pthread_mutex_unlock(&ctx->pollfds_lock); - free(pollfd); - - if (ctx->fd_removed_cb) - ctx->fd_removed_cb(fd, ctx->fd_cb_user_data); -} - int libusb_init(libusb_context ** context) { ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#3 (text+ko) ==== @@ -95,4 +95,127 @@ uint8_t flags; }; +static inline int +usb_add_pollfd(libusb_context *ctx, int fd, short events) +{ + struct usb_pollfd *pollfd; + + if (ctx == NULL) + return (LIBUSB_ERROR_INVALID_PARAM); + + pollfd = malloc(sizeof(*pollfd)); + if (pollfd == NULL) + return (LIBUSB_ERROR_NO_MEM); + + pollfd->pollfd.fd = fd; + pollfd->pollfd.events = events; + + pthread_mutex_lock(&ctx->pollfds_lock); + LIST_ADD_TAIL(&pollfd->list, &ctx->pollfds); + pthread_mutex_unlock(&ctx->pollfds_lock); + + if (ctx->fd_added_cb) + ctx->fd_added_cb(fd, events, ctx->fd_cb_user_data); + return (0); +} + +static inline void +usb_remove_pollfd(libusb_context *ctx, int fd) +{ + struct usb_pollfd *pollfd; + int found; + + found = 0; + pthread_mutex_lock(&ctx->pollfds_lock); + + LIST_FOREACH_ENTRY(pollfd, &ctx->pollfds, list) { + if (pollfd->pollfd.fd == fd) { + found = 1; + break ; + } + } + + if (found == 0) { + pthread_mutex_unlock(&ctx->pollfds_lock); + return ; + } + + LIST_DEL(&pollfd->list); + pthread_mutex_unlock(&ctx->pollfds_lock); + free(pollfd); + + if (ctx->fd_removed_cb) + ctx->fd_removed_cb(fd, ctx->fd_cb_user_data); +} + +static inline void +usb_handle_transfer_completion(struct usb_transfer *uxfer, + enum libusb_transfer_status status) +{ + libusb_transfer *xfer; + libusb_context *ctx; + int len; + + xfer = (struct libusb_transfer *) ((uint8_t *)uxfer + + sizeof(struct usb_transfer)); + ctx = xfer->dev_handle->dev->ctx; + + pthread_mutex_lock(&ctx->flying_transfers_lock); + LIST_DEL(&uxfer->list); + pthread_mutex_unlock(&ctx->flying_transfers_lock); + + if (status == LIBUSB_TRANSFER_COMPLETED && xfer->flags & + LIBUSB_TRANSFER_SHORT_NOT_OK) { + len = xfer->length; + if (xfer->type == LIBUSB_TRANSFER_TYPE_CONTROL) + len -= sizeof(libusb_control_setup); + if (len != uxfer->transferred) { + status = LIBUSB_TRANSFER_ERROR; + } + } + + xfer->status = status; + xfer->actual_length = uxfer->transferred; + + if (xfer->callback) + xfer->callback(xfer); + if (xfer->flags & LIBUSB_TRANSFER_FREE_TRANSFER) + libusb_free_transfer(xfer); + + pthread_mutex_lock(&ctx->event_waiters_lock); + pthread_cond_broadcast(&ctx->event_waiters_cond); + pthread_mutex_unlock(&ctx->event_waiters_lock); +} + +static inline void +usb_handle_disconnect(struct libusb_device_handle *devh) +{ + struct libusb_context *ctx; + struct libusb_transfer *xfer; + struct usb_transfer *cur; + struct usb_transfer *to_cancel; + + ctx = devh->dev->ctx; + + while (1) { + pthread_mutex_lock(&ctx->flying_transfers_lock); + to_cancel = NULL; + LIST_FOREACH_ENTRY(cur, &ctx->flying_transfers, list) { + xfer = (struct libusb_transfer *) ((uint8_t *)cur + + sizeof(struct usb_transfer)); + if (xfer->dev_handle == devh) { + to_cancel = cur; + break ; + } + } + pthread_mutex_unlock(&ctx->flying_transfers_lock); + + if (to_cancel == NULL) + break ; + + usb_handle_transfer_completion(to_cancel, LIBUSB_TRANSFER_NO_DEVICE); + } + return ; +} + #endif /*__LIBUSB10_H__*/ ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#4 (text+ko) ==== @@ -74,7 +74,7 @@ ret = 0; pthread_mutex_lock(&ctx->flying_transfers_lock); - if (USB_LIST_EMPTY(&ctx->flying_transfers)); + if (USB_LIST_EMPTY(&ctx->flying_transfers)) goto out; ret = clock_gettime(CLOCK_MONOTONIC, &sys_ts); @@ -94,7 +94,7 @@ goto out; xfer->flags |= USB_TIMED_OUT; - uxfer = (libusb_transfer *) (((uint8_t *)xfer) + + uxfer = (libusb_transfer *) ((uint8_t *)xfer + sizeof(struct usb_transfer)); ret = libusb_cancel_transfer(uxfer); } @@ -106,13 +106,19 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) { + struct libusb_pollfd *tmppollfd; + struct libusb_device_handle *devh; struct usb_pollfd *ipollfd; - struct libusb_pollfd *tmppollfd; + struct usb_transfer *cur; + struct usb_transfer *cancel; + struct libusb_transfer *xfer; struct pollfd *fds; + struct pollfd *tfds; + nfds_t nfds; int tmpfd; + int tmp; int ret; int timeout; - nfds_t nfds; int i; nfds = 0; @@ -163,7 +169,33 @@ } } - ret = /*unknown*/0; + pthread_mutex_lock(&ctx->open_devs_lock); + for (i = 0 ; i < nfds && ret > 0 ; i++) { + tfds = &fds[i]; + + if (!tfds->revents) + continue; + + ret--; + LIST_FOREACH_ENTRY(devh, &ctx->open_devs, list) { + if (libusb20_dev_get_fd(devh->os_priv) == tfds->fd) + break ; + } + + if (tfds->revents & POLLERR) { + usb_remove_pollfd(ctx, libusb20_dev_get_fd(devh->os_priv)); + usb_handle_disconnect(devh); + continue ; + } + ret = libusb20_dev_process(devh->os_priv); + if (ret == 0 || LIBUSB20_ERROR_NO_DEVICE) + continue; + else if (ret < 0) + goto out; + } +out: + pthread_mutex_unlock(&ctx->open_devs_lock); + handled: free(fds); return ret; From owner-p4-projects@FreeBSD.ORG Sat May 30 12:22:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCBF71065670; Sat, 30 May 2009 12:22:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B7FC1065678 for ; Sat, 30 May 2009 12:22:11 +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 6A6668FC1B for ; Sat, 30 May 2009 12:22:11 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UCMB5s027433 for ; Sat, 30 May 2009 12:22:11 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UCMBTj027431 for perforce@freebsd.org; Sat, 30 May 2009 12:22:11 GMT (envelope-from mav@freebsd.org) Date: Sat, 30 May 2009 12:22:11 GMT Message-Id: <200905301222.n4UCMBTj027431@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 Cc: Subject: PERFORCE change 163079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 12:22:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163079 Change 163079 by mav@mav_mavbook on 2009/05/30 12:21:10 Describe few more SATA capabilities bits. Affected files ... .. //depot/projects/scottl-camlock/src/sys/sys/ata.h#9 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#9 (text+ko) ==== @@ -113,6 +113,9 @@ #define ATA_SATA_GEN2 0x0004 #define ATA_SUPPORT_NCQ 0x0100 #define ATA_SUPPORT_IFPWRMNGTRCV 0x0200 +#define ATA_SUPPORT_PHYEVENTCNT 0x0400 +#define ATA_SUPPORT_NCQ_UNLOAD 0x0800 +#define ATA_SUPPORT_NCQ_PRIO 0x1000 u_int16_t reserved77; u_int16_t satasupport; From owner-p4-projects@FreeBSD.ORG Sat May 30 12:24:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A7921065677; Sat, 30 May 2009 12:24:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 512801065672 for ; Sat, 30 May 2009 12:24:49 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe09.tele2.se [212.247.155.1]) by mx1.freebsd.org (Postfix) with ESMTP id EF60D8FC16 for ; Sat, 30 May 2009 12:24:48 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=t0nNz8v6BrwA:10 a=3W0jh48ptVil740CxZAA:9 a=9yvYqD2Nb6ukYw2vl8HBYEl5UN4A:4 Received: from [62.113.132.61] (account mc467741@c2i.net HELO [10.37.1.92]) by mailfe09.swip.net (CommuniGate Pro SMTP 5.2.13) with ESMTPA id 907571389; Sat, 30 May 2009 14:24:47 +0200 From: Hans Petter Selasky To: Sylvestre Gallon Date: Sat, 30 May 2009 14:28:53 +0200 User-Agent: KMail/1.9.7 References: <200905301128.n4UBSGad022347@repoman.freebsd.org> In-Reply-To: <200905301128.n4UBSGad022347@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200905301428.54367.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 12:24:51 -0000 On Saturday 30 May 2009, Sylvestre Gallon wrote: > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0ret =3D libusb20_dev_proces= s(devh->os_priv); > +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0if (ret =3D=3D 0 || LIBUSB2= 0_ERROR_NO_DEVICE) ret =3D=3D LIBUSB20_ERROR_NO_DEVICE One note: libusb20 is not thread safe. So you might need an additional lock for that,= =20 I.E. when you call libusb20_dev_process() and libusb20_tr_submit()++ must b= e=20 atomic. If this cannot be solved in libusb10, I will do something. =2D-HPS From owner-p4-projects@FreeBSD.ORG Sat May 30 12:47:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0C1106566C; Sat, 30 May 2009 12:47:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 190A91065674 for ; Sat, 30 May 2009 12:47:48 +0000 (UTC) (envelope-from ccna.syl@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.28]) by mx1.freebsd.org (Postfix) with ESMTP id C6D498FC18 for ; Sat, 30 May 2009 12:47:47 +0000 (UTC) (envelope-from ccna.syl@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so3556368ywe.13 for ; Sat, 30 May 2009 05:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=WyM2qlZ7yhgSnAt0gOeVsh6kjIAKa19Kdg4/XuY2gjc=; b=xz3etepB6QdsfQvT4TNRz4Ra+VtfMrZR88J7z7DlDIVEKrEpraG+53Oi6yohtdMebg OLG6ntpr9qeTZtzPwBw4u/rxfkoWMADON9mrIrTSyWH3kyk4zQv38elXVpXbOL6ZOS8C 0VUxqgeZpnpCcC8CAm6aYzjMu/WejnXdp8Gw0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=I5e1/Kp3PRLrkLKP4TYXtNgJsMcF3x5AGBypO2G6CfoH/zreZNs+AqneW61Cm4rAkA Cu/86gu6uilpJLStk6oaZDkMZJeNaa7YW1m6QWWmQE9vt5Ab48GDq1b8L2MmGNNQ1Dtv 0qke4YZr2ZPJHMGgPSzQD+2SYfM2OWXJCXDWc= MIME-Version: 1.0 Received: by 10.231.38.198 with SMTP id c6mr1126943ibe.21.1243687667069; Sat, 30 May 2009 05:47:47 -0700 (PDT) In-Reply-To: <200905301428.54367.hselasky@c2i.net> References: <200905301128.n4UBSGad022347@repoman.freebsd.org> <200905301428.54367.hselasky@c2i.net> From: Sylvestre Gallon Date: Sat, 30 May 2009 14:47:27 +0200 Message-ID: <164b4c9c0905300547q6036b6dax710c1bce47599852@mail.gmail.com> To: Hans Petter Selasky Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 12:47:49 -0000 On Sat, May 30, 2009 at 2:28 PM, Hans Petter Selasky wro= te: > On Saturday 30 May 2009, Sylvestre Gallon wrote: >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0ret =3D libusb20_dev_proce= ss(devh->os_priv); >> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0if (ret =3D=3D 0 || LIBUSB= 20_ERROR_NO_DEVICE) > > ret =3D=3D LIBUSB20_ERROR_NO_DEVICE > > One note: > > libusb20 is not thread safe. So you might need an additional lock for tha= t, > I.E. when you call libusb20_dev_process() and libusb20_tr_submit()++ must= be > atomic. If this cannot be solved in libusb10, I will do something. > > --HPS > Ok, I will add a mutex for libusb20. Cheers, --=20 Sylvestre Gallon (http://devsyl.blogspot.com) Fifth Grade Student @ Epitech & Researcher @ LSE R&D @ Rathaxes (http://www.rathaxes.org) From owner-p4-projects@FreeBSD.ORG Sat May 30 12:58:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1960B1065672; Sat, 30 May 2009 12:58: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 CAC15106564A for ; Sat, 30 May 2009 12:58:48 +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 B96C18FC0A for ; Sat, 30 May 2009 12:58:48 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UCwmxk039905 for ; Sat, 30 May 2009 12:58:48 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UCwmHM039903 for perforce@freebsd.org; Sat, 30 May 2009 12:58:48 GMT (envelope-from mav@freebsd.org) Date: Sat, 30 May 2009 12:58:48 GMT Message-Id: <200905301258.n4UCwmHM039903@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 Cc: Subject: PERFORCE change 163080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 12:58:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=163080 Change 163080 by mav@mav_mavbook on 2009/05/30 12:57:50 Print some more information about device. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#5 (text+ko) ==== @@ -45,6 +45,19 @@ #include #include +static int +ata_version(int ver) +{ + int bit; + + if (ver == 0xffff) + return 0; + for (bit = 15; bit >= 0; bit--) + if (ver & (1<revision, sizeof(ident_data->revision), sizeof(revision)); - - printf("<%s %s> ATA device\n", - product, revision); + printf("<%s %s> ATA/ATAPI-%d", + product, revision, ata_version(ident_data->version_major)); + if (ident_data->satacapabilities && ident_data->satacapabilities != 0xffff) { + if (ident_data->satacapabilities & ATA_SATA_GEN2) + printf(" SATA 2.x"); + else if (ident_data->satacapabilities & ATA_SATA_GEN1) + printf(" SATA 1.x"); + else + printf(" SATA"); + } + printf(" device\n"); } #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Sat May 30 13:04:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44BE01065672; Sat, 30 May 2009 13:04:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03B081065678 for ; Sat, 30 May 2009 13:04:55 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC4A58FC12 for ; Sat, 30 May 2009 13:04:54 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UD4s5P041292 for ; Sat, 30 May 2009 13:04:54 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UD4sQG041290 for perforce@freebsd.org; Sat, 30 May 2009 13:04:54 GMT (envelope-from syl@FreeBSD.org) Date: Sat, 30 May 2009 13:04:54 GMT Message-Id: <200905301304.n4UD4sQG041290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 13:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=163081 Change 163081 by syl@syl_rincewind on 2009/05/30 13:04:04 Add libusb20_lock for libusb20 atomic functions. Release the default_context_lock on libusb_init. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#21 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#4 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#5 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#21 (text+ko) ==== @@ -46,6 +46,7 @@ static pthread_mutex_t default_context_lock = PTHREAD_MUTEX_INITIALIZER; struct libusb_context *usbi_default_context = NULL; +pthread_mutex_t libusb20_lock = PTHREAD_MUTEX_INITIALIZER; /* Library initialisation / deinitialisation */ @@ -114,6 +115,7 @@ if (!usbi_default_context) { usbi_default_context = ctx; } + pthread_mutex_unlock(&default_context_lock); if (context) *context = ctx; @@ -773,7 +775,10 @@ libusb20_tr_set_priv_sc0(usb20_xfer, xfer->callback); libusb20_tr_set_priv_sc1(usb20_xfer, xfer->user_data); libusb20_tr_set_callback(usb20_xfer, libusb10_proxy); + + pthread_mutex_lock(&libusb20_lock); libusb20_tr_submit(usb20_xfer); + pthread_mutex_unlock(&libusb20_lock); switch (libusb20_tr_get_status(usb20_xfer)) { case LIBUSB20_TRANSFER_COMPLETED: ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#4 (text+ko) ==== @@ -73,6 +73,7 @@ static int handle_timeouts(struct libusb_context *ctx); static int handle_events(struct libusb_context *ctx, struct timeval *tv); extern struct libusb_context *usbi_default_context; +extern pthread_mutex_t libusb20_lock; /* if ctx is NULL use default context*/ ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#5 (text+ko) ==== @@ -187,7 +187,11 @@ usb_handle_disconnect(devh); continue ; } + + pthread_mutex_lock(&libusb20_lock); ret = libusb20_dev_process(devh->os_priv); + pthread_mutex_unlock(&libusb20_lock); + if (ret == 0 || LIBUSB20_ERROR_NO_DEVICE) continue; else if (ret < 0) From owner-p4-projects@FreeBSD.ORG Sat May 30 15:27:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CC9D1065672; Sat, 30 May 2009 15:27: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 3CE02106566C for ; Sat, 30 May 2009 15:27:31 +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 2A32E8FC08 for ; Sat, 30 May 2009 15:27:31 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UFRUG0063245 for ; Sat, 30 May 2009 15:27:30 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UFRUbv063243 for perforce@freebsd.org; Sat, 30 May 2009 15:27:30 GMT (envelope-from mav@freebsd.org) Date: Sat, 30 May 2009 15:27:30 GMT Message-Id: <200905301527.n4UFRUbv063243@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 Cc: Subject: PERFORCE change 163089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 15:27:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=163089 Change 163089 by mav@mav_mavbook on 2009/05/30 15:27:11 Add initial experimental NCQ support. My tests of unpacking /usr/src to the empty async mount filesystem on Seagate ST3250620NS drive shows about 10-15% performance boost. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#5 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#5 (text+ko) ==== @@ -37,6 +37,7 @@ u_int8_t command; /* command reg */ u_int8_t flags; /* ATA command flags */ #define CAM_ATAIO_48BIT 0x01 /* Command has 48-bit format */ +#define CAM_ATAIO_FPDMA 0x02 /* FPDMA command */ u_int16_t feature; /* feature reg */ u_int16_t count; /* count reg */ u_int64_t lba; /* lba reg */ ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#5 (text+ko) ==== @@ -70,6 +70,7 @@ DA_FLAG_PACK_INVALID = 0x001, DA_FLAG_CAN_48BIT = 0x002, DA_FLAG_CAN_FLUSHCACHE = 0x004, + DA_FLAG_CAN_NCQ = 0x008, DA_FLAG_TAGGED_QUEUING = 0x010, DA_FLAG_NEED_OTAG = 0x020, DA_FLAG_WENT_IDLE = 0x040, @@ -598,6 +599,8 @@ softc->flags |= DA_FLAG_CAN_48BIT; if (cgd->ident_data.support.command2 & ATA_SUPPORT_FLUSHCACHE) softc->flags |= DA_FLAG_CAN_FLUSHCACHE; + if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ) + softc->flags |= DA_FLAG_CAN_NCQ; // if ((cgd->inq_data.flags & SID_CmdQue) != 0) // softc->flags |= DA_FLAG_TAGGED_QUEUING; @@ -654,6 +657,9 @@ dp->secsize, dp->heads, dp->secs_per_track, dp->cylinders); xpt_announce_periph(periph, announce_buf); +printf("%04x %04x %04x sata: %04x, queue: %d\n", + cgd->ident_data.support.command1, cgd->ident_data.support.command2, cgd->ident_data.support.extension, + cgd->ident_data.satacapabilities, ATA_QUEUE_LEN(cgd->ident_data.queue)); softc->disk->d_sectorsize = softc->params.secsize; softc->disk->d_mediasize = softc->params.secsize * (off_t)softc->params.sectors; @@ -753,7 +759,13 @@ ataio->cmd.feature = 0; ataio->cmd.lba = bp->bio_pblkno; ataio->cmd.count = bp->bio_bcount / softc->params.secsize; - if ((softc->flags & DA_FLAG_CAN_48BIT) && + if (softc->flags & DA_FLAG_CAN_NCQ) { + if (bp->bio_cmd == BIO_READ) + ataio->cmd.command = ATA_READ_FPDMA_QUEUED; + else + ataio->cmd.command = ATA_WRITE_FPDMA_QUEUED; + ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_FPDMA; + } else if ((softc->flags & DA_FLAG_CAN_48BIT) && (ataio->cmd.lba + ataio->cmd.count >= ATA_MAX_28BIT_LBA || ataio->cmd.count >= 256)) { if (bp->bio_cmd == BIO_READ) ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#7 (text+ko) ==== @@ -72,7 +72,7 @@ //static int ahci_pm_write(device_t dev, int port, int reg, u_int32_t result); static int ahci_hardreset(device_t dev, int port, uint32_t *signature); static u_int32_t ahci_softreset(device_t dev, int port); -static int ahci_setup_fis(struct ahci_cmd_tab *ctp, union ccb *ccb); +static int ahci_setup_fis(struct ahci_cmd_tab *ctp, union ccb *ccb, int tag); static void ahci_dmainit(device_t dev); static void ahci_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); static void ahci_dmafini(device_t dev); @@ -621,7 +621,7 @@ { device_t dev = (device_t)data; struct ahci_channel *ch = device_get_softc(dev); - uint32_t istatus, cstatus, res, err; + uint32_t istatus, cstatus, sstatus, res, err; enum ahci_err_type et; int i, ccs; @@ -629,7 +629,8 @@ /* Read interrupt and command statuses. */ istatus = ATA_INL(ch->r_mem, AHCI_P_IS); cstatus = ATA_INL(ch->r_mem, AHCI_P_CI); -//device_printf(dev, "%s is %08x cs %08x rslots %08x\n", __func__, istatus, cstatus, ch->rslots); + sstatus = ATA_IDX_INL(ch, ATA_SACTIVE); +//device_printf(dev, "%s is %08x cs %08x ss %08x rslots %08x\n", __func__, istatus, cstatus, sstatus, ch->rslots); /* Clear interrupt(s) */ ATA_OUTL(ch->r_mem, AHCI_P_IS, istatus); @@ -641,18 +642,18 @@ #define AHCI_STATBITS \ (AHCI_P_IX_IF|AHCI_P_IX_HBD|AHCI_P_IX_HBF|AHCI_P_IX_TFE) - if ((istatus & AHCI_STATBITS) && (cstatus & ch->rslots)) { -device_printf(dev, "%s ERROR is %08x cs %08x rs %08x\n", __func__, istatus, cstatus, ch->rslots); + if ((istatus & AHCI_STATBITS) && ((cstatus | sstatus) & ch->rslots)) { +device_printf(dev, "%s ERROR is %08x cs %08x ss %08x rs %08x\n", __func__, istatus, cstatus, sstatus, ch->rslots); ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK) >> AHCI_P_CMD_CCS_SHIFT; /* kick controller into sane state */ ahci_stop(dev); ahci_start(dev); res = ch->rslots; - err = ch->rslots & cstatus; + err = ch->rslots & (cstatus | sstatus); } else { ccs = 0; - res = ch->rslots & ~cstatus; + res = ch->rslots & ~(cstatus | sstatus); err = 0; } /* Check all slots. */ @@ -779,7 +780,7 @@ (ch->dma.work + AHCI_CT_OFFSET + (AHCI_CT_SIZE * slot->slot)); /* setup the FIS for this request */ - if (!(fis_size = ahci_setup_fis(ctp, slot->ccb))) { + if (!(fis_size = ahci_setup_fis(ctp, slot->ccb, slot->slot))) { device_printf(ch->dev, "setting up SATA FIS failed\n"); slot->ccb->ccb_h.status = CAM_REQ_INVALID; xpt_done(slot->ccb); @@ -800,10 +801,6 @@ clp->cmd_table_phys = htole64(ch->dma.work_bus + AHCI_CT_OFFSET + (AHCI_CT_SIZE * slot->slot)); - /* clear eventual ACTIVE bit */ -// ATA_IDX_OUTL(ch, ATA_SACTIVE, -// ATA_IDX_INL(ch, ATA_SACTIVE) & (1 << slot->slot)); - /* set command type bit */ if (slot->ccb->ccb_h.func_code == XPT_SCSI_IO) { ATA_OUTL(ch->r_mem, AHCI_P_CMD, @@ -815,6 +812,12 @@ slot->state = AHCI_SLOT_RUNNING; ch->rslots |= (1 << slot->slot); + if ((slot->ccb->ccb_h.func_code == XPT_ATA_IO) && + (slot->ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) { + /* Set ACTIVE bit */ + ch->aslots |= (1 << slot->slot); + ATA_IDX_OUTL(ch, ATA_SACTIVE, 1 << slot->slot); + } /* issue command to controller */ ATA_OUTL(ch->r_mem, AHCI_P_CI, (1 << slot->slot)); @@ -1492,7 +1495,7 @@ } static int -ahci_setup_fis(struct ahci_cmd_tab *ctp, union ccb *ccb) +ahci_setup_fis(struct ahci_cmd_tab *ctp, union ccb *ccb, int tag) { u_int8_t *fis = &ctp->cfis[0]; @@ -1514,7 +1517,23 @@ } fis[7] = ATA_D_LBA; fis[15] = ATA_A_4BIT; - return 20; + } else if (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA) { + fis[0] = 0x27; /* host to device */ +// fis[1] = 0x80 | (atadev->unit & 0x0f); + fis[1] = 0x80 | (0 & 0x0f); + fis[2] = ccb->ataio.cmd.command; + fis[3] = ccb->ataio.cmd.count; + fis[4] = ccb->ataio.cmd.lba; + fis[5] = ccb->ataio.cmd.lba >> 8; + fis[6] = ccb->ataio.cmd.lba >> 16; + fis[7] = ATA_D_LBA; + fis[8] = ccb->ataio.cmd.lba >> 24; + fis[9] = ccb->ataio.cmd.lba >> 32; + fis[10] = ccb->ataio.cmd.lba >> 40; + fis[11] = ccb->ataio.cmd.count >> 8; + fis[12] = tag << 3; + fis[13] = 0; + fis[15] = ATA_A_4BIT; } else { fis[0] = 0x27; /* host to device */ // fis[1] = 0x80 | (atadev->unit & 0x0f); @@ -1534,8 +1553,8 @@ fis[12] = ccb->ataio.cmd.count; fis[13] = ccb->ataio.cmd.count >> 8; fis[15] = ATA_A_4BIT; - return 20; } + return (20); } static int ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#3 (text+ko) ==== @@ -431,6 +431,7 @@ struct ahci_slot slot[AHCI_MAX_SLOTS]; uint32_t rslots; /* Running slots */ + uint32_t aslots; /* SACTIVE slots */ int lastslot; /* Last used slot */ }; From owner-p4-projects@FreeBSD.ORG Sat May 30 15:45:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA32106568E; Sat, 30 May 2009 15:45:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBFA2106566C for ; Sat, 30 May 2009 15:45:49 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA0BF8FC19 for ; Sat, 30 May 2009 15:45:49 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UFjnbq064700 for ; Sat, 30 May 2009 15:45:49 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UFjnZb064698 for perforce@freebsd.org; Sat, 30 May 2009 15:45:49 GMT (envelope-from syl@FreeBSD.org) Date: Sat, 30 May 2009 15:45:49 GMT Message-Id: <200905301545.n4UFjnZb064698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 15:45:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=163090 Change 163090 by syl@syl_rincewind on 2009/05/30 15:45:03 Apply changes from Hans Petter Selasky. - Adding a lock for all libusb20_tr_xxx. - Move transfer status update into libusb10_proxy. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#22 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#22 (text+ko) ==== @@ -570,13 +570,17 @@ GET_XFER(xfer, endpoint, devh->os_priv); + pthread_mutex_lock(&libusb20_lock); ret = libusb20_tr_open(xfer, 0, 0, endpoint); - if (ret != 0 && ret != LIBUSB20_ERROR_BUSY) + if (ret != 0 && ret != LIBUSB20_ERROR_BUSY) { + pthread_mutex_unlock(&libusb20_lock); return (LIBUSB_ERROR_OTHER); + } libusb20_tr_clear_stall_sync(xfer); if (ret == 0) /* check if we have open the device */ libusb20_tr_close(xfer); + pthread_mutex_unlock(&libusb20_lock); return (0); } @@ -673,7 +677,33 @@ static void libusb10_proxy(struct libusb20_transfer *xfer) { + pthread_mutex_lock(&libusb20_lock); + + switch (libusb20_tr_get_status(usb20_xfer)) { + case LIBUSB20_TRANSFER_COMPLETED: + xfer->status = LIBUSB_TRANSFER_COMPLETED; + break ; + case LIBUSB20_TRANSFER_OVERFLOW: + xfer->status = LIBUSB_TRANSFER_OVERFLOW; + break ; + case LIBUSB20_TRANSFER_NO_DEVICE: + xfer->status = LIBUSB_TRANSFER_NO_DEVICE; + break ; + case LIBUSB20_TRANSFER_STALL: + xfer->status = LIBUSB_TRANSFER_STALL; + break ; + case LIBUSB20_TRANSFER_CANCELLED: + xfer->status = LIBUSB_TRANSFER_CANCELLED; + break ; + case LIBUSB20_TRANSFER_TIMED_OUT: + xfer->status = LIBUSB_TRANSFER_TIMED_OUT; + break ; + default: + xfer->status = LIBUSB_TRANSFER_ERROR; + } ((libusb_transfer_cb_fn)libusb20_tr_get_priv_sc0(xfer))(libusb20_tr_get_priv_sc1(xfer)); + + pthread_mutex_unlock(&libusb20_lock); } int @@ -743,10 +773,12 @@ GET_XFER(usb20_xfer, xfer->endpoint, pdev); xfer->os_priv = usb20_xfer; + pthread_mutex_lock(&libusb20_lock); ret = libusb20_tr_open(usb20_xfer, xfer->length, MAX(2, xfer->num_iso_packets), xfer->endpoint); if (ret != 0) { + pthread_mutex_unlock(&libusb20_lock); pthread_mutex_lock(&ctx->flying_transfers_lock); LIST_DEL(&usb_backend->list); pthread_mutex_unlock(&ctx->flying_transfers_lock); @@ -776,32 +808,9 @@ libusb20_tr_set_priv_sc1(usb20_xfer, xfer->user_data); libusb20_tr_set_callback(usb20_xfer, libusb10_proxy); - pthread_mutex_lock(&libusb20_lock); libusb20_tr_submit(usb20_xfer); pthread_mutex_unlock(&libusb20_lock); - switch (libusb20_tr_get_status(usb20_xfer)) { - case LIBUSB20_TRANSFER_COMPLETED: - xfer->status = LIBUSB_TRANSFER_COMPLETED; - break ; - case LIBUSB20_TRANSFER_OVERFLOW: - xfer->status = LIBUSB_TRANSFER_OVERFLOW; - break ; - case LIBUSB20_TRANSFER_NO_DEVICE: - xfer->status = LIBUSB_TRANSFER_NO_DEVICE; - break ; - case LIBUSB20_TRANSFER_STALL: - xfer->status = LIBUSB_TRANSFER_STALL; - break ; - case LIBUSB20_TRANSFER_CANCELLED: - xfer->status = LIBUSB_TRANSFER_CANCELLED; - break ; - case LIBUSB20_TRANSFER_TIMED_OUT: - xfer->status = LIBUSB_TRANSFER_TIMED_OUT; - break ; - default: - xfer->status = LIBUSB_TRANSFER_ERROR; - } return (0); } @@ -810,8 +819,11 @@ { if (xfer == NULL) return (LIBUSB_ERROR_NO_MEM); + + pthread_mutex_lock(&libusb20_lock); libusb20_tr_stop(xfer->os_priv); libusb20_tr_close(xfer->os_priv); + pthread_mutex_unlock(&libusb20_lock); return (0); } From owner-p4-projects@FreeBSD.ORG Sat May 30 16:01:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB09D10656BF; Sat, 30 May 2009 16:01: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 6033710656B5 for ; Sat, 30 May 2009 16:01:05 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CB528FC16 for ; Sat, 30 May 2009 16:01:05 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UG157P065797 for ; Sat, 30 May 2009 16:01:05 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UG15lX065795 for perforce@freebsd.org; Sat, 30 May 2009 16:01:05 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 30 May 2009 16:01:05 GMT Message-Id: <200905301601.n4UG15lX065795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 163091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:01:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=163091 Change 163091 by antab@antab_farm on 2009/05/30 16:00:08 * Update in_cksum with copy from mips. * Update if_ate and hack it to work on at32ap700x, need to clean it up later. rootfs over NFS is now working Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/in_cksum.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#10 edit .. //depot/projects/avr32/src/sys/dev/ate/if_ate.c#2 edit .. //depot/projects/avr32/src/sys/dev/ate/if_atereg.h#1 add .. //depot/projects/avr32/src/sys/netinet/udp_usrreq.c#7 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/in_cksum.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.1 2008/04/13 07:27:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.3 2009/02/08 23:43:36 gonzo Exp $"); #include #include @@ -69,7 +69,7 @@ } static const u_int32_t in_masks[] = { -#ifndef _MISEB +#if _BYTE_ORDER == _LITTLE_ENDIAN /*0 bytes*/ /*1 byte*/ /*2 bytes*/ /*3 bytes*/ 0x00000000, 0x000000FF, 0x0000FFFF, 0x00FFFFFF, /* offset 0 */ 0x00000000, 0x0000FF00, 0x00FFFF00, 0xFFFFFF00, /* offset 1 */ @@ -104,9 +104,9 @@ union q_util q_util; if ((3 & (long) lw) == 0 && len == 20) { - sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4]; - REDUCE32; - return sum; + sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4]; + REDUCE32; + return sum; } if ((offset = 3 & (long) lw) != 0) { @@ -190,7 +190,7 @@ u_int64_t sum; union q_util q_util; union l_util l_util; - + sum = (u_int64_t) a + b + c; REDUCE16; return (sum); @@ -206,16 +206,16 @@ union q_util q_util; union l_util l_util; - len -= skip; - for (; skip && m; m = m->m_next) { - if (m->m_len > skip) { - mlen = m->m_len - skip; + len -= skip; + for (; skip && m; m = m->m_next) { + if (m->m_len > skip) { + mlen = m->m_len - skip; addr = mtod(m, caddr_t) + skip; - goto skip_start; - } else { - skip -= m->m_len; - } - } + goto skip_start; + } else { + skip -= m->m_len; + } + } for (; m && len; m = m->m_next) { if (m->m_len == 0) @@ -227,9 +227,9 @@ mlen = len; if ((clen ^ (int) addr) & 1) - sum += in_cksumdata(addr, mlen) << 8; + sum += in_cksumdata(addr, mlen) << 8; else - sum += in_cksumdata(addr, mlen); + sum += in_cksumdata(addr, mlen); clen += mlen; len -= mlen; @@ -240,9 +240,9 @@ u_int in_cksum_hdr(const struct ip *ip) { - u_int64_t sum = in_cksumdata(ip, sizeof(struct ip)); - union q_util q_util; - union l_util l_util; - REDUCE16; - return (~sum & 0xffff); + u_int64_t sum = in_cksumdata(ip, sizeof(struct ip)); + union q_util q_util; + union l_util l_util; + REDUCE16; + return (~sum & 0xffff); } ==== //depot/projects/avr32/src/sys/avr32/avr32/trap.c#10 (text+ko) ==== @@ -545,6 +545,8 @@ , frame->regs.sr); switch (type) { + case T_DATA_READ_ALIGNMENT: + case T_DATA_WRITE_ALIGNMENT: case T_TLB_MISS_EXECUTE: case T_TLB_MISS_READ: case T_TLB_MISS_WRITE: ==== //depot/projects/avr32/src/sys/dev/ate/if_ate.c#2 (text) ==== @@ -23,18 +23,14 @@ * SUCH DAMAGE. */ -/* TODO: (in no order) +/* TODO * - * 8) Need to sync busdma goo in atestop - * 9) atestop should maybe free the mbufs? - * - * 1) detach - * 2) Free dma setup - * 3) Turn on the clock in pmc? Turn off? + * 1) Turn on the clock in pmc? Turn off? + * 2) GPIO initializtion in board setup code. */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.30 2008/11/25 00:14:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.37 2009/05/13 21:01:10 stas Exp $"); #include #include @@ -69,86 +65,116 @@ #include #include -#include +#include "if_atereg.h" #include "miibus_if.h" -#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ -#define ATE_MAX_RX_BUFFERS 64 + +/* + * Driver-specific flags. + */ +#define ATE_FLAG_DETACHING 0x01 +#define ATE_FLAG_MULTICAST 0x02 struct ate_softc { - struct ifnet *ifp; /* ifnet pointer */ - struct mtx sc_mtx; /* basically a perimeter lock */ - device_t dev; /* Myself */ - device_t miibus; /* My child miibus */ - void *intrhand; /* Interrupt handle */ - struct resource *irq_res; /* IRQ resource */ + struct ifnet *ifp; /* ifnet pointer */ + struct mtx sc_mtx; /* Basically a perimeter lock */ + device_t dev; /* Myself */ + device_t miibus; /* My child miibus */ + struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ - struct callout tick_ch; /* Tick callout */ - bus_dma_tag_t mtag; /* bus dma tag for mbufs */ - bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; - struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ - bus_dma_tag_t rxtag; - bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; - void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ - int rx_buf_ptr; - bus_dma_tag_t rx_desc_tag; - bus_dmamap_t rx_desc_map; - int txcur; /* current tx map pointer */ - bus_addr_t rx_desc_phys; - eth_rx_desc_t *rx_descs; - int use_rmii; - struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ + struct callout tick_ch; /* Tick callout */ + struct ifmib_iso_8802_3 mibdata; /* Stuff for network mgmt */ + +#ifdef ATE_EMACB + bus_dma_tag_t tx_desc_tag; + bus_dmamap_t tx_desc_map; + eth_tx_desc_t *tx_descs; + bus_addr_t tx_desc_phys; +#endif + struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ + bus_dma_tag_t mtag; /* bus dma tag for mbufs */ + bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + int txcur; /* Current TX map pointer */ + int tx_clean_ptr; /* Last TX map entry we cleaned */ + + bus_dma_tag_t rxtag; + bus_dma_tag_t rx_desc_tag; + bus_dmamap_t rx_desc_map; + bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; + bus_addr_t rx_desc_phys; + eth_rx_desc_t *rx_descs; + void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ + int rx_buf_ptr; + + void *intrhand; /* Interrupt handle */ + int flags; + int if_flags; + int use_rmii; }; static inline uint32_t RD4(struct ate_softc *sc, bus_size_t off) { - return bus_read_4(sc->mem_res, off); + + return (bus_read_4(sc->mem_res, off)); } static inline void WR4(struct ate_softc *sc, bus_size_t off, uint32_t val) { + bus_write_4(sc->mem_res, off, val); } -#define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +static inline void +BARRIER(struct ate_softc *sc, bus_size_t off, bus_size_t len, int flags) +{ + + bus_barrier(sc->mem_res, off, len, flags); +} + +#define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define ATE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define ATE_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ +#define ATE_LOCK_INIT(_sc) \ + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ MTX_NETWORK_LOCK, MTX_DEF) -#define ATE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define ATE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define ATE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); +#define ATE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define ATE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define ATE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static devclass_t ate_devclass; -/* ifnet entry points */ +/* + * ifnet entry points. + */ +static void ateinit_locked(void *); +static void atestart_locked(struct ifnet *); -static void ateinit_locked(void *); -static void atestart_locked(struct ifnet *); +static void ateinit(void *); +static void atestart(struct ifnet *); +static void atestop(struct ate_softc *); +static int ateioctl(struct ifnet * ifp, u_long, caddr_t); -static void ateinit(void *); -static void atestart(struct ifnet *); -static void atestop(struct ate_softc *); -static int ateioctl(struct ifnet * ifp, u_long, caddr_t); +/* + * Bus entry points. + */ +static int ate_probe(device_t dev); +static int ate_attach(device_t dev); +static int ate_detach(device_t dev); +static void ate_intr(void *); -/* bus entry points */ - -static int ate_probe(device_t dev); -static int ate_attach(device_t dev); -static int ate_detach(device_t dev); -static void ate_intr(void *); - -/* helper routines */ -static int ate_activate(device_t dev); -static void ate_deactivate(device_t dev); -static int ate_ifmedia_upd(struct ifnet *ifp); -static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); -static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); -static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +/* + * Helper routines. + */ +static int ate_activate(device_t dev); +static void ate_deactivate(struct ate_softc *sc); +static int ate_ifmedia_upd(struct ifnet *ifp); +static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); +static int ate_get_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_set_mac(struct ate_softc *sc, u_char *eaddr); +static void ate_rxfilter(struct ate_softc *sc); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -159,6 +185,7 @@ static int ate_probe(device_t dev) { + device_set_desc(dev, "EMAC"); return (0); } @@ -166,20 +193,50 @@ static int ate_attach(device_t dev) { - struct ate_softc *sc = device_get_softc(dev); + struct ate_softc *sc; struct ifnet *ifp = NULL; struct sysctl_ctx_list *sctx; struct sysctl_oid *soid; - int err; u_char eaddr[ETHER_ADDR_LEN]; uint32_t rnd; + int rid, err; + sc = device_get_softc(dev); sc->dev = dev; + ATE_LOCK_INIT(sc); + + /* + * Allocate resources. + */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "could not allocate memory resources.\n"); + err = ENOMEM; + goto out; + } + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, "could not allocate interrupt resources.\n"); + err = ENOMEM; + goto out; + } + err = ate_activate(dev); if (err) goto out; + /* + * RMII bit is stored in USRIO and inverted in EMACB + */ +#ifdef ATE_EMACB + sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_USRIO_RMII) != ETH_USRIO_RMII; +#else sc->use_rmii = (RD4(sc, ETH_CFG) & ETH_CFG_RMII) == ETH_CFG_RMII; +#endif /* Sysctls */ sctx = device_get_sysctl_ctx(dev); @@ -187,9 +244,10 @@ SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "rmii", CTLFLAG_RD, &sc->use_rmii, 0, "rmii in use"); - /* calling atestop before ifp is set is OK */ + /* Calling atestop before ifp is set is OK. */ + ATE_LOCK(sc); atestop(sc); - ATE_LOCK_INIT(sc); + ATE_UNLOCK(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { @@ -213,7 +271,6 @@ eaddr[4] = (rnd >> 8) & 0xff; eaddr[5] = rnd & 0xff; } - ate_set_mac(sc, eaddr); sc->ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { @@ -226,7 +283,7 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_capabilities |= IFCAP_VLAN_MTU; - ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ + ifp->if_capenable |= IFCAP_VLAN_MTU; /* The hw bits already set. */ ifp->if_start = atestart; ifp->if_ioctl = ateioctl; ifp->if_init = ateinit; @@ -238,34 +295,74 @@ ifp->if_linkmib = &sc->mibdata; ifp->if_linkmiblen = sizeof(sc->mibdata); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + sc->if_flags = ifp->if_flags; ether_ifattach(ifp, eaddr); /* - * Activate the interrupt + * Activate the interrupt. */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, NULL, ate_intr, sc, &sc->intrhand); if (err) { + device_printf(dev, "could not establish interrupt handler.\n"); ether_ifdetach(ifp); - ATE_LOCK_DESTROY(sc); + goto out; } -out:; + +out: if (err) - ate_deactivate(dev); - if (err && ifp) - if_free(ifp); + ate_detach(dev); return (err); } static int ate_detach(device_t dev) { - return EBUSY; /* XXX TODO(1) */ + struct ate_softc *sc; + struct ifnet *ifp; + + sc = device_get_softc(dev); + KASSERT(sc != NULL, ("[ate: %d]: sc is NULL", __LINE__)); + ifp = sc->ifp; + if (device_is_attached(dev)) { + ATE_LOCK(sc); + sc->flags |= ATE_FLAG_DETACHING; + atestop(sc); + ATE_UNLOCK(sc); + callout_drain(&sc->tick_ch); + ether_ifdetach(ifp); + } + if (sc->miibus != NULL) { + device_delete_child(dev, sc->miibus); + sc->miibus = NULL; + } + bus_generic_detach(sc->dev); + ate_deactivate(sc); + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (ifp != NULL) { + if_free(ifp); + sc->ifp = NULL; + } + if (sc->mem_res != NULL) { + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = NULL; + } + if (sc->irq_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + ATE_LOCK_DESTROY(sc); + return (0); } static void -ate_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +ate_rx_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { struct ate_softc *sc; @@ -275,7 +372,38 @@ sc->rx_desc_phys = segs[0].ds_addr; } +#ifdef ATE_EMACB +static void +ate_tx_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct ate_softc *sc; + + if (error != 0) + return; + sc = (struct ate_softc *)arg; + sc->tx_desc_phys = segs[0].ds_addr; +} + static void +ate_load_tx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, bus_size_t mapsize, int error) +{ + struct ate_softc *sc; + + if (error != 0) + return; + sc = (struct ate_softc *)arg; + + KASSERT(nsegs == 1, ("too many segments: %d\n", nsegs)); + KASSERT(mapsize < ATE_MAX_TX_BUFFER_LENGTH, ("Transmit buffer to long")); + + bus_dmamap_sync(sc->tx_desc_tag, sc->tx_desc_map, BUS_DMASYNC_PREWRITE); + sc->tx_descs[sc->txcur].addr = segs[0].ds_addr; + sc->tx_descs[sc->txcur].status = mapsize | ETH_TX_DESC_LAST; + bus_dmamap_sync(sc->tx_desc_tag, sc->tx_desc_map, BUS_DMASYNC_POSTWRITE); +} +#endif /* ATE_EMACB */ + +static void ate_load_rx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { struct ate_softc *sc; @@ -307,26 +435,39 @@ * of different MAC chips use this method (or the reverse the bits) * method. */ -static void +static int ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; u_char *af = (u_char *) mcaf; struct ifmultiaddr *ifma; + struct ifnet *ifp; + + ifp = sc->ifp; + + if ((ifp->if_flags & IFF_PROMISC) != 0) + return (0); + if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + WR4(sc, ETH_HSL, 0xffffffff); + WR4(sc, ETH_HSH, 0xffffffff); + return (1); + } + /* + * Compute the multicast hash. + */ mcaf[0] = 0; mcaf[1] = 0; - - IF_ADDR_LOCK(sc->ifp); - TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ether_crc32_be(LLADDR((struct sockaddr_dl *) ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; af[index >> 3] |= 1 << (index & 7); } - IF_ADDR_UNLOCK(sc->ifp); + IF_ADDR_UNLOCK(ifp); /* * Write the hash to the hash register. This card can also @@ -337,44 +478,68 @@ */ WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + return (mcaf[0] || mcaf[1]); } static int ate_activate(device_t dev) { struct ate_softc *sc; - int rid, err, i; + int err, i; sc = device_get_softc(dev); - rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->mem_res == NULL) - goto errout; - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (sc->irq_res == NULL) - goto errout; /* - * Allocate DMA tags and maps + * Allocate DMA tags and maps. */ err = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, busdma_lock_mutex, &sc->sc_mtx, &sc->mtag); if (err != 0) goto errout; + for (i = 0; i < ATE_MAX_TX_BUFFERS; i++) { err = bus_dmamap_create(sc->mtag, 0, &sc->tx_map[i]); if (err != 0) goto errout; } - /* - * Allocate our Rx buffers. This chip has a rx structure that's filled - * in - */ - + +#ifdef ATE_EMACB + /* + * DMA tag and map for the TX descriptors. + */ + err = bus_dma_tag_create(bus_get_dma_tag(dev), sizeof(eth_tx_desc_t), + 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + ATE_MAX_TX_BUFFERS * sizeof(eth_tx_desc_t), 1, + ATE_MAX_TX_BUFFERS * sizeof(eth_tx_desc_t), 0, busdma_lock_mutex, + &sc->sc_mtx, &sc->tx_desc_tag); + if (err != 0) + goto errout; + if (bus_dmamem_alloc(sc->tx_desc_tag, (void **)&sc->tx_descs, + BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->tx_desc_map) != 0) + goto errout; + if (bus_dmamap_load(sc->tx_desc_tag, sc->tx_desc_map, + sc->tx_descs, ATE_MAX_TX_BUFFERS * sizeof(eth_tx_desc_t), + ate_tx_getaddr, sc, 0) != 0) + goto errout; + + /* + * Init transmit buffer queue descriptors + */ + for (i = 0; i < ATE_MAX_TX_BUFFERS - 1; i++) { + sc->tx_descs[i].addr = 0; + sc->tx_descs[i].status = ETH_TX_DESC_CPU_OWNER; + } + sc->tx_descs[ATE_MAX_TX_BUFFERS - 1].addr = 0; + sc->tx_descs[ATE_MAX_TX_BUFFERS - 1].status = ETH_TX_DESC_CPU_OWNER | + ETH_TX_DESC_WRAP; + + /* Flush the memory for the EMAC tx descriptor. */ + bus_dmamap_sync(sc->tx_desc_tag, sc->tx_desc_map, BUS_DMASYNC_PREWRITE); + /* Write the descriptor queue address. */ + WR4(sc, ETH_TBQP, sc->tx_desc_phys); +#endif + /* * Allocate DMA tags and maps for RX. */ @@ -384,7 +549,9 @@ if (err != 0) goto errout; - /* Dma TAG and MAP for the rx descriptors. */ + /* + * DMA tag and map for the RX descriptors. + */ err = bus_dma_tag_create(bus_get_dma_tag(dev), sizeof(eth_rx_desc_t), 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), 1, @@ -397,83 +564,114 @@ goto errout; if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), - ate_getaddr, sc, 0) != 0) + ate_rx_getaddr, sc, 0) != 0) goto errout; - /* XXX TODO(5) Put this in ateinit_locked? */ + + /* + * Allocate our RX buffers. This chip has a RX structure that's filled + * in. + */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { sc->rx_buf_ptr = i; if (bus_dmamem_alloc(sc->rxtag, (void **)&sc->rx_buf[i], BUS_DMA_NOWAIT, &sc->rx_map[i]) != 0) goto errout; if (bus_dmamap_load(sc->rxtag, sc->rx_map[i], sc->rx_buf[i], - MCLBYTES, ate_load_rx_buf, sc, 0) != 0) + ATE_MAX_RX_BUFFER_LENGTH, ate_load_rx_buf, sc, 0) != 0) goto errout; } sc->rx_buf_ptr = 0; - /* Flush the memory for the EMAC rx descriptor */ + /* Flush the memory for the EMAC rx descriptor. */ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); /* Write the descriptor queue address. */ WR4(sc, ETH_RBQP, sc->rx_desc_phys); return (0); + errout: - ate_deactivate(dev); return (ENOMEM); } static void -ate_deactivate(device_t dev) +ate_deactivate(struct ate_softc *sc) { - struct ate_softc *sc; + int i; - sc = device_get_softc(dev); - /* XXX TODO(2) teardown busdma junk, below from fxp -- customize */ -#if 0 - if (sc->fxp_mtag) { - for (i = 0; i < FXP_NRFABUFS; i++) { - rxp = &sc->fxp_desc.rx_list[i]; - if (rxp->rx_mbuf != NULL) { - bus_dmamap_sync(sc->fxp_mtag, rxp->rx_map, - BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(sc->fxp_mtag, rxp->rx_map); - m_freem(rxp->rx_mbuf); + KASSERT(sc != NULL, ("[ate, %d]: sc is NULL!", __LINE__)); +#ifdef ATE_EMACB + if (sc->tx_desc_tag != NULL) { + if (sc->tx_descs != NULL) { + if (sc->tx_desc_phys != 0) { + bus_dmamap_sync(sc->tx_desc_tag, + sc->tx_desc_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->tx_desc_tag, + sc->tx_desc_map); + sc->tx_desc_phys = 0; } - bus_dmamap_destroy(sc->fxp_mtag, rxp->rx_map); } - bus_dmamap_destroy(sc->fxp_mtag, sc->spare_map); - for (i = 0; i < FXP_NTXCB; i++) { - txp = &sc->fxp_desc.tx_list[i]; - if (txp->tx_mbuf != NULL) { - bus_dmamap_sync(sc->fxp_mtag, txp->tx_map, + } +#endif + if (sc->mtag != NULL) { + for (i = 0; i < ATE_MAX_TX_BUFFERS; i++) { + if (sc->sent_mbuf[i] != NULL) { + bus_dmamap_sync(sc->mtag, sc->tx_map[i], BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(sc->fxp_mtag, txp->tx_map); - m_freem(txp->tx_mbuf); + bus_dmamap_unload(sc->mtag, sc->tx_map[i]); + m_freem(sc->sent_mbuf[i]); } - bus_dmamap_destroy(sc->fxp_mtag, txp->tx_map); + bus_dmamap_destroy(sc->mtag, sc->tx_map[i]); + sc->sent_mbuf[i] = NULL; + sc->tx_map[i] = NULL; } - bus_dma_tag_destroy(sc->fxp_mtag); + bus_dma_tag_destroy(sc->mtag); + } +#ifdef ATE_EMACB + if (sc->tx_desc_tag != NULL) { + if (sc->tx_descs != NULL) + bus_dmamem_free(sc->tx_desc_tag, sc->tx_descs, + sc->tx_desc_map); + bus_dma_tag_destroy(sc->tx_desc_tag); + sc->tx_descs = NULL; + sc->tx_desc_tag = NULL; } - if (sc->fxp_stag) - bus_dma_tag_destroy(sc->fxp_stag); - if (sc->cbl_tag) - bus_dma_tag_destroy(sc->cbl_tag); - if (sc->mcs_tag) - bus_dma_tag_destroy(sc->mcs_tag); #endif - if (sc->intrhand) - bus_teardown_intr(dev, sc->irq_res, sc->intrhand); - sc->intrhand = 0; - bus_generic_detach(sc->dev); - if (sc->miibus) - device_delete_child(sc->dev, sc->miibus); - if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, - rman_get_rid(sc->mem_res), sc->mem_res); - sc->mem_res = 0; - if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->irq_res), sc->irq_res); - sc->irq_res = 0; - return; + if (sc->rx_desc_tag != NULL) { + if (sc->rx_descs != NULL) { + if (sc->rx_desc_phys != 0) { + bus_dmamap_sync(sc->rx_desc_tag, + sc->rx_desc_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rx_desc_tag, + sc->rx_desc_map); + sc->rx_desc_phys = 0; + } + } + } + if (sc->rxtag != NULL) { + for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { + if (sc->rx_buf[i] != NULL) { + if (sc->rx_descs[i].addr != 0) { + bus_dmamap_sync(sc->rxtag, + sc->rx_map[i], + BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rxtag, + sc->rx_map[i]); + sc->rx_descs[i].addr = 0; + } + bus_dmamem_free(sc->rxtag, sc->rx_buf[i], + sc->rx_map[i]); + sc->rx_buf[i] = NULL; + sc->rx_map[i] = NULL; + } + } + bus_dma_tag_destroy(sc->rxtag); + } + if (sc->rx_desc_tag != NULL) { + if (sc->rx_descs != NULL) + bus_dmamem_free(sc->rx_desc_tag, sc->rx_descs, + sc->rx_desc_map); + bus_dma_tag_destroy(sc->rx_desc_tag); + sc->rx_descs = NULL; + sc->rx_desc_tag = NULL; + } } /* @@ -512,18 +710,19 @@ static void ate_stat_update(struct ate_softc *sc, int active) { + uint32_t reg; + /* * The speed and full/half-duplex state needs to be reflected * in the ETH_CFG register. */ - if (IFM_SUBTYPE(active) == IFM_10_T) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_SPD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_SPD); + reg = RD4(sc, ETH_CFG); + reg &= ~(ETH_CFG_SPD | ETH_CFG_FD); + if (IFM_SUBTYPE(active) != IFM_10_T) + reg |= ETH_CFG_SPD; if (active & IFM_FDX) - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_FD); - else - WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_FD); + reg |= ETH_CFG_FD; + WR4(sc, ETH_CFG, reg); } static void @@ -580,8 +779,9 @@ sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); + /* - * not sure where to lump these, so count them against the errors + * Not sure where to lump these, so count them against the errors * for the interface. */ sc->ifp->if_oerrors += RD4(sc, ETH_TUE); @@ -597,6 +797,7 @@ static void ate_set_mac(struct ate_softc *sc, u_char *eaddr) { + WR4(sc, ETH_SA1L, (eaddr[3] << 24) | (eaddr[2] << 16) | (eaddr[1] << 8) | eaddr[0]); WR4(sc, ETH_SA1H, (eaddr[5] << 8) | (eaddr[4])); @@ -629,31 +830,99 @@ } return (ENXIO); } +#ifdef ATE_EMACB +/* + * Not sure if this is the best way to create the rx mbuf, but it seems to work + */ +static struct mbuf * +ate_rx_frame(struct ate_softc *sc, int start, int end, int len) +{ + int at, i, clen; + struct mbuf *m; + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { + device_printf(sc->dev, "Unable to alloc mbuf\n"); + return (NULL); + } + m->m_pkthdr.rcvif = sc->ifp; + + at = 0; + for (i = start; len > 0; i = (i + 1) % ATE_MAX_RX_BUFFERS) { + clen = (len > ATE_MAX_RX_BUFFER_LENGTH) ? ATE_MAX_RX_BUFFER_LENGTH : len; + len -= ATE_MAX_RX_BUFFER_LENGTH; + + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_POSTREAD); + m_copyback(m, at, clen, sc->rx_buf[i]); + + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); + sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], + BUS_DMASYNC_PREREAD); + + at += clen; + } + sc->rx_buf_ptr = i; + return (m); +} +#endif + static void ate_intr(void *xsc) { struct ate_softc *sc = xsc; struct ifnet *ifp = sc->ifp; - int status; + struct mbuf *mb; + void *bp; + uint32_t status, reg, rx_stat, frame_len; + int frame_start; int i; - void *bp; - struct mbuf *mb; - uint32_t rx_stat; + status = RD4(sc, ETH_ISR); if (status == 0) return; + if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTREAD); +#ifdef ATE_EMACB + i = sc->rx_buf_ptr; + frame_start = -1; + while (sc->rx_descs[i].addr & ETH_CPU_OWNER && i != (sc->rx_buf_ptr - 1)) { + rx_stat = sc->rx_descs[i].status; + if ((rx_stat & ETH_FRAME_START)) { + KASSERT(frame_start == -1, ("New frame with out finishing last")); + frame_start = i; + } + if ((rx_stat & ETH_FRAME_END)) { + frame_len = rx_stat & ETH_LEN_MASK; + KASSERT(frame_start != -1, ("End of frame without begining")); + KASSERT(frame_len != 0, ("Zero length frame")); + + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + mb = ate_rx_frame(sc, frame_start, i, frame_len); + if (mb != NULL) { + frame_start = -1; + ifp->if_ipackets++; + (*ifp->if_input)(ifp, mb); + } + } + i = (i + 1) % ATE_MAX_RX_BUFFERS; + } +#else /* ATE_EMACB */ while (sc->rx_descs[sc->rx_buf_ptr].addr & ETH_CPU_OWNER) { i = sc->rx_buf_ptr; sc->rx_buf_ptr = (i + 1) % ATE_MAX_RX_BUFFERS; bp = sc->rx_buf[i]; rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { - printf("ignoring bogus 0 len packet\n"); + if (bootverbose) + device_printf(sc->dev, "ignoring bogus zero-length packet\n"); bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; @@ -681,19 +950,47 @@ BUS_DMASYNC_POSTWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); + if (mb != NULL) { ifp->if_ipackets++; (*ifp->if_input)(ifp, mb); } - } +#endif /* !ATE_EMACB */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 16:09:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9387D10656B1; Sat, 30 May 2009 16:09: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 4F03E1065686 for ; Sat, 30 May 2009 16:09:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D5BE8FC1D for ; Sat, 30 May 2009 16:09:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UG9D3E067322 for ; Sat, 30 May 2009 16:09:13 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UG9DqQ067320 for perforce@freebsd.org; Sat, 30 May 2009 16:09:13 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 16:09:13 GMT Message-Id: <200905301609.n4UG9DqQ067320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:09:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163092 Change 163092 by zec@zec_tpx32 on 2009/05/30 16:09:10 Improve style. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#47 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#47 (text+ko) ==== @@ -268,7 +268,6 @@ return (ENOMEM); } } - return (error); } @@ -297,23 +296,24 @@ next_name++; if (namelen == 0) { if (strlen(next_name) == 0) - return(top); /* '.' == this vimage */ + return (top); /* '.' == this vimage */ else - return(NULL); + return (NULL); } } else namelen = strlen(name); if (namelen == 0) - return(NULL); - LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) + return (NULL); + LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) { if (strlen(vip->vi_name) == namelen && strncmp(name, vip->vi_name, namelen) == 0) { if (next_name != NULL) - return(vimage_by_name(vip, next_name)); + return (vimage_by_name(vip, next_name)); else - return(vip); + return (vip); } - return(NULL); + } + return (NULL); } static void @@ -355,21 +355,21 @@ /* Try to go deeper in the hierarchy */ next = LIST_FIRST(&where->vi_child_head); if (next != NULL) - return(next); + return (next); } do { /* Try to find next sibling */ next = LIST_NEXT(where, vi_sibling); if (!recurse || next != NULL) - return(next); + return (next); /* Nothing left on this level, go one level up */ where = where->vi_parent; } while (where != top->vi_parent); /* Nothing left to be visited, we are done */ - return(NULL); + return (NULL); } #endif /* VIMAGE */ /* User interface block */ From owner-p4-projects@FreeBSD.ORG Sat May 30 16:23:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9AE81065675; Sat, 30 May 2009 16:23: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 78F35106564A for ; Sat, 30 May 2009 16:23:29 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64AF18FC15 for ; Sat, 30 May 2009 16:23:29 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGNT8r068466 for ; Sat, 30 May 2009 16:23:29 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGNSH0068464 for perforce@freebsd.org; Sat, 30 May 2009 16:23:28 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 30 May 2009 16:23:28 GMT Message-Id: <200905301623.n4UGNSH0068464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 163093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163093 Change 163093 by thompsa@thompsa_burger on 2009/05/30 16:23:13 IFC Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.3#4 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/usb_buf/src/sys/conf/NOTES#3 integrate .. //depot/projects/usb_buf/src/sys/conf/files.i386#4 integrate .. //depot/projects/usb_buf/src/sys/conf/options#3 integrate .. //depot/projects/usb_buf/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/si/si.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/usb_buf/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/usb_buf/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/usb_buf/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/usb_buf/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/tty.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/usb_buf/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/pfil.h#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/usb_buf/src/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/usb_buf/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/usb_buf/src/sys/sys/jail.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/kernel.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/mount.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/namei.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/priv.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/sx.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/tty.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/vimage.h#4 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.3#4 (text+ko) ==== @@ -774,7 +774,7 @@ the given USB device. . A timeout value can be specified which is passed on to the -.Xr 2 poll +.Xr poll 2 function. . .Sh USB BACKEND OPERATIONS ==== //depot/projects/usb_buf/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/arm/arm/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#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/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include +#include #include #include #include @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -47,9 +47,9 @@ typedef struct sx kmutex_t; #ifndef DEBUG -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK) #endif #define mutex_init(lock, desc, type, arg) do { \ ==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -49,9 +49,9 @@ typedef struct sx krwlock_t; #ifndef DEBUG -#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define RW_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK) #endif #define RW_READ_HELD(x) (rw_read_held((x))) ==== //depot/projects/usb_buf/src/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include #include #include -#include #include @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.13 2009/05/28 17:36:36 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); #include #include @@ -76,8 +76,8 @@ #include static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 @@ -114,10 +114,10 @@ static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, struct usb_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); @@ -353,7 +353,7 @@ return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -527,7 +527,7 @@ union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,7 +592,7 @@ return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; @@ -602,7 +602,7 @@ device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_default(ip, ifidx) irp *ip; uint8_t ifidx; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - usb2_error_t status; + usb_error_t status; if (ifidx > 0) device_printf(dev, "warning: ifidx > 0 isn't supported.\n"); @@ -643,7 +643,7 @@ return (status); } -static usb2_error_t +static usb_error_t usbd_setup_endpoint(ip, ifidx, ep) irp *ip; uint8_t ifidx; @@ -654,7 +654,7 @@ struct ndisusb_ep *ne; struct usb_config cfg; struct usb_xfer *xfer; - usb2_error_t status; + usb_error_t status; /* check for non-supported transfer types */ if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL || @@ -810,7 +810,7 @@ static void usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne, - struct ndisusb_xfer *nx, usb2_error_t status) + struct ndisusb_xfer *nx, usb_error_t status) { struct ndisusb_xferdone *nd; uint8_t irql; @@ -1122,7 +1122,7 @@ struct usbd_urb_bulk_or_intr_transfer *ubi; struct usbd_urb_vendor_or_class_request *vcreq; union usbd_urb *urb; - usb2_error_t status; + usb_error_t status; void *priv; dev = sc->ndis_dev; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.46 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.47 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -367,7 +367,7 @@ int svr4_sys_open(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open_args *uap; { struct proc *p = td->td_proc; @@ -419,7 +419,7 @@ int svr4_sys_open64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_open64_args *uap; { return svr4_sys_open(td, (struct svr4_sys_open_args *)uap); @@ -427,7 +427,7 @@ int svr4_sys_creat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat_args *uap; { char *newpath; @@ -443,7 +443,7 @@ int svr4_sys_creat64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_creat64_args *uap; { return svr4_sys_creat(td, (struct svr4_sys_creat_args *)uap); @@ -451,7 +451,7 @@ int svr4_sys_llseek(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_llseek_args *uap; { struct lseek_args ap; @@ -472,7 +472,7 @@ int svr4_sys_access(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_access_args *uap; { char *newpath; @@ -487,7 +487,7 @@ #if defined(NOTYET) int svr4_sys_pread(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pread_args *uap; { struct pread_args pra; @@ -508,7 +508,7 @@ #if defined(NOTYET) int svr4_sys_pread64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -532,7 +532,7 @@ #if defined(NOTYET) int svr4_sys_pwrite(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pwrite_args *uap; { struct pwrite_args pwa; @@ -553,7 +553,7 @@ #if defined(NOTYET) int svr4_sys_pwrite64(td, v, retval) - register struct thread *td; + struct thread *td; void *v; register_t *retval; { @@ -575,7 +575,7 @@ int svr4_sys_fcntl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fcntl_args *uap; { int cmd, error, *retval; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.25 2009/05/08 20:06:37 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.26 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -79,7 +79,7 @@ int svr4_sys_ioctl(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_ioctl_args *uap; { int *retval; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.104 2009/05/20 18:36:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.108 2009/05/29 05:58:46 delphij Exp $"); #include "opt_mac.h" @@ -121,7 +121,7 @@ #if defined(BOGUS) int svr4_sys_setitimer(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setitimer_args *uap; { td->td_retval[0] = 0; @@ -231,7 +231,7 @@ struct thread *td; struct svr4_sys_getdents64_args *uap; { - register struct dirent *bdp; + struct dirent *bdp; struct vnode *vp; caddr_t inp, buf; /* BSD-format */ int len, reclen; /* BSD-format */ @@ -370,7 +370,7 @@ svr4_dirent.d_off = (svr4_off_t)(off + reclen); svr4_dirent.d_reclen = (u_short) svr4reclen; } - strcpy(svr4_dirent.d_name, bdp->d_name); + strlcpy(svr4_dirent.d_name, bdp->d_name, sizeof(svr4_dirent.d_name)); if ((error = copyout((caddr_t)&svr4_dirent, outp, svr4reclen))) goto out; inp += reclen; @@ -487,7 +487,10 @@ reclen = bdp->d_reclen; if (reclen & 3) panic("svr4_sys_getdents64: bad reclen"); - off = *cookie++; /* each entry points to the next */ + if (cookie) + off = *cookie++; /* each entry points to the next */ + else + off += reclen; if ((off >> 32) != 0) { uprintf("svr4_sys_getdents64: dir offset too large for emulated program"); error = EINVAL; @@ -511,7 +514,7 @@ idb.d_ino = (svr4_ino_t)bdp->d_fileno; idb.d_off = (svr4_off_t)off; idb.d_reclen = (u_short)svr4_reclen; - strcpy(idb.d_name, bdp->d_name); + strlcpy(idb.d_name, bdp->d_name, sizeof(idb.d_name)); if ((error = copyout((caddr_t)&idb, outp, svr4_reclen))) goto out; /* advance past this real entry */ @@ -665,7 +668,7 @@ int svr4_sys_mknod(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_mknod_args *uap; { int *retval = td->td_retval; @@ -706,9 +709,6 @@ retval = &(td->td_retval[0]); switch (uap->name) { - case SVR4_CONFIG_UNUSED: - *retval = 0; - break; case SVR4_CONFIG_NGROUPS: *retval = NGROUPS_MAX; break; @@ -788,7 +788,45 @@ #endif break; #endif /* NOTYET */ - + case SVR4_CONFIG_COHERENCY: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_SPLIT_CACHE: + *retval = 0; /* XXX */ + break; + case SVR4_CONFIG_ICACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_DCACHESZ: + *retval = 256; /* XXX */ + break; + case SVR4_CONFIG_ICACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHELINESZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHEBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_DCACHETBLKSZ: + *retval = 64; /* XXX */ + break; + case SVR4_CONFIG_ICACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_DCACHE_ASSOC: + *retval = 1; /* XXX */ + break; + case SVR4_CONFIG_MAXPID: + *retval = PID_MAX; + break; + case SVR4_CONFIG_STACK_PROT: + *retval = PROT_READ|PROT_WRITE|PROT_EXEC; + break; default: return EINVAL; } ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_resource.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.18 2005/01/05 22:34:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.19 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -127,7 +127,7 @@ int svr4_sys_getrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -174,7 +174,7 @@ int svr4_sys_setrlimit(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -225,7 +225,7 @@ int svr4_sys_getrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_getrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); @@ -272,7 +272,7 @@ int svr4_sys_setrlimit64(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_setrlimit64_args *uap; { int rl = svr4_to_native_rl(uap->which); ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_signal.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.35 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.36 2009/05/29 05:58:46 delphij Exp $"); #include #include @@ -259,7 +259,7 @@ int svr4_sys_sigaction(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaction_args *uap; { struct svr4_sigaction isa; @@ -301,7 +301,7 @@ int svr4_sys_sigaltstack(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigaltstack_args *uap; { struct svr4_sigaltstack sss; @@ -328,7 +328,7 @@ */ int svr4_sys_signal(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_signal_args *uap; { struct proc *p; @@ -493,7 +493,7 @@ int svr4_sys_sigsuspend(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_sigsuspend_args *uap; { svr4_sigset_t sss; @@ -510,7 +510,7 @@ int svr4_sys_kill(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_kill_args *uap; { struct kill_args ka; @@ -525,7 +525,7 @@ int svr4_sys_context(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_context_args *uap; { struct svr4_ucontext uc; @@ -565,7 +565,7 @@ int svr4_sys_pause(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_pause_args *uap; { sigset_t mask; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_socket.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.27 2006/07/21 20:40:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_socket.c,v 1.28 2009/05/29 06:04:26 delphij Exp $"); #include #include @@ -120,7 +120,8 @@ struct stat *st; { struct svr4_sockcache_entry *e; - int len, error; + size_t len; + int error; e = malloc(sizeof(*e), M_TEMP, M_WAITOK); e->cookie = NULL; ==== //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.26 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.30 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -43,7 +43,6 @@ #include #include #include -#include #include @@ -185,7 +184,7 @@ int svr4_sys_lstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_lstat_args *uap; { struct svr4_stat svr4_st; @@ -210,7 +209,7 @@ int svr4_sys_fstat(td, uap) - register struct thread *td; + struct thread *td; struct svr4_sys_fstat_args *uap; { struct svr4_stat svr4_st; @@ -228,7 +227,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 16:23:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD00E10656F0; Sat, 30 May 2009 16:23: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 A4A39106566C for ; Sat, 30 May 2009 16:23:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7899E8FC16 for ; Sat, 30 May 2009 16:23:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGNTMQ068471 for ; Sat, 30 May 2009 16:23:29 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGNTun068469 for perforce@freebsd.org; Sat, 30 May 2009 16:23:29 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 16:23:29 GMT Message-Id: <200905301623.n4UGNTun068469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=163094 Change 163094 by zec@zec_tpx32 on 2009/05/30 16:23:25 Remove VI_SET_NAME definition which is never used. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#65 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#65 (text+ko) ==== @@ -55,7 +55,6 @@ #define VI_GET 0x00000100 #define VI_GETNEXT 0x00000200 #define VI_GETNEXT_RECURSE 0x00000300 -#define VI_SET_NAME 0x00100000 #define VI_API_VERSION 1 /* Bump on struct changes. */ From owner-p4-projects@FreeBSD.ORG Sat May 30 16:26:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 019261065677; Sat, 30 May 2009 16:26:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B10FB1065672 for ; Sat, 30 May 2009 16:26:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84EF58FC18 for ; Sat, 30 May 2009 16:26:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGQWSl068707 for ; Sat, 30 May 2009 16:26:32 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGQW7D068705 for perforce@freebsd.org; Sat, 30 May 2009 16:26:32 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 30 May 2009 16:26:32 GMT Message-Id: <200905301626.n4UGQW7D068705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 163095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=163095 Change 163095 by thompsa@thompsa_burger on 2009/05/30 16:25:46 Disable compat linux for the moment. Affected files ... .. //depot/projects/usb_buf/src/sys/conf/files#5 edit Differences ... ==== //depot/projects/usb_buf/src/sys/conf/files#5 (text+ko) ==== @@ -1525,7 +1525,7 @@ # USB core # dev/usb/usb_busdma.c optional usb -dev/usb/usb_compat_linux.c optional usb +#dev/usb/usb_compat_linux.c optional usb dev/usb/usb_core.c optional usb dev/usb/usb_debug.c optional usb dev/usb/usb_dev.c optional usb From owner-p4-projects@FreeBSD.ORG Sat May 30 16:27:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F5D71065696; Sat, 30 May 2009 16:27: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 BF3AA106568B for ; Sat, 30 May 2009 16:27:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADBFE8FC1D for ; Sat, 30 May 2009 16:27:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGRX4R068770 for ; Sat, 30 May 2009 16:27:33 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGRXin068768 for perforce@freebsd.org; Sat, 30 May 2009 16:27:33 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 16:27:33 GMT Message-Id: <200905301627.n4UGRXin068768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:27:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163096 Change 163096 by zec@zec_tpx32 on 2009/05/30 16:26:42 Note that the interim vimage / vnet management API is really temporary and that it will be replaced by jail framework RSN. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#68 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#68 (text+ko) ==== @@ -2285,8 +2285,9 @@ switch (cmd) { #ifdef VIMAGE /* - * XXX Should be implemented as separate system calls. This is - * just a temporary hack! + * XXX vnet creation will be implemented through the new jail + * framework - this is just a temporary hack for testing the + * vnet create / destroy mechanisms. */ case SIOCSIFVIMAGE: error = vi_if_move((struct vi_req *) data, NULL, From owner-p4-projects@FreeBSD.ORG Sat May 30 16:30:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41EE21065673; Sat, 30 May 2009 16:30:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01FD1106566C for ; Sat, 30 May 2009 16:30:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E50EF8FC0A for ; Sat, 30 May 2009 16:30:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGUaLb069008 for ; Sat, 30 May 2009 16:30:36 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGUadi069006 for perforce@freebsd.org; Sat, 30 May 2009 16:30:36 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 16:30:36 GMT Message-Id: <200905301630.n4UGUadi069006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:30:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=163097 Change 163097 by zec@zec_tpx32 on 2009/05/30 16:30:07 Remove an unused field in struct vi_req. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#66 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#66 (text+ko) ==== @@ -41,7 +41,6 @@ int vi_api_cookie; /* Catch API mismatch. */ int vi_req_action; /* What to do with this reqest? */ u_short vi_proc_count; /* Current number of processes. */ - u_short vi_child_count; /* Current number of child vimages. */ int vi_if_count; /* Current number network interfaces. */ int vi_sock_count; char vi_name[MAXPATHLEN]; From owner-p4-projects@FreeBSD.ORG Sat May 30 16:36:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0A59106567A; Sat, 30 May 2009 16:36: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 80C19106566C for ; Sat, 30 May 2009 16:36:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6F8ED8FC13 for ; Sat, 30 May 2009 16:36:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UGahVC069503 for ; Sat, 30 May 2009 16:36:43 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UGahj4069501 for perforce@freebsd.org; Sat, 30 May 2009 16:36:43 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 16:36:43 GMT Message-Id: <200905301636.n4UGahj4069501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 16:36:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163098 Change 163098 by zec@zec_tpx32 on 2009/05/30 16:35:54 Fix typos in comments and s/ /^I/ where appropriate. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#67 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#67 (text+ko) ==== @@ -39,25 +39,25 @@ /* Interim userspace API. */ struct vi_req { int vi_api_cookie; /* Catch API mismatch. */ - int vi_req_action; /* What to do with this reqest? */ - u_short vi_proc_count; /* Current number of processes. */ - int vi_if_count; /* Current number network interfaces. */ + int vi_req_action; /* What to do with this request? */ + u_short vi_proc_count; /* Current number of processes. */ + int vi_if_count; /* Current number of ifnets. */ int vi_sock_count; char vi_name[MAXPATHLEN]; char vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */ }; -#define VI_CREATE 0x00000001 -#define VI_DESTROY 0x00000002 -#define VI_SWITCHTO 0x00000008 -#define VI_IFACE 0x00000010 -#define VI_GET 0x00000100 -#define VI_GETNEXT 0x00000200 -#define VI_GETNEXT_RECURSE 0x00000300 +#define VI_CREATE 0x00000001 +#define VI_DESTROY 0x00000002 +#define VI_SWITCHTO 0x00000008 +#define VI_IFACE 0x00000010 +#define VI_GET 0x00000100 +#define VI_GETNEXT 0x00000200 +#define VI_GETNEXT_RECURSE 0x00000300 -#define VI_API_VERSION 1 /* Bump on struct changes. */ +#define VI_API_VERSION 1 /* Bump on struct changes. */ -#define VI_API_COOKIE ((sizeof(struct vi_req) << 16) | VI_API_VERSION) +#define VI_API_COOKIE ((sizeof(struct vi_req) << 16) | VI_API_VERSION) #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Sat May 30 17:13:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BB491065673; Sat, 30 May 2009 17:13: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 EFDEE106566C for ; Sat, 30 May 2009 17:13:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE77C8FC08 for ; Sat, 30 May 2009 17:13:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UHDKDN090029 for ; Sat, 30 May 2009 17:13:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UHDK6K090027 for perforce@freebsd.org; Sat, 30 May 2009 17:13:20 GMT (envelope-from zec@fer.hr) Date: Sat, 30 May 2009 17:13:20 GMT Message-Id: <200905301713.n4UHDK6K090027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 17:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=163099 Change 163099 by zec@zec_tpx32 on 2009/05/30 17:12:41 if_reassign_common() does not exist any more. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#68 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#68 (text+ko) ==== @@ -159,7 +159,6 @@ int vi_td_ioctl(u_long, struct vi_req *, struct thread *); int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *); int vi_child_of(struct vimage *, struct vimage *); -void if_reassign_common(struct ifnet *, struct vnet *, const char *); void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); void vnet_mod_deregister(const struct vnet_modinfo *); From owner-p4-projects@FreeBSD.ORG Sat May 30 17:34:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAFB01065677; Sat, 30 May 2009 17:34: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 AA0951065672 for ; Sat, 30 May 2009 17:34:43 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95C978FC18 for ; Sat, 30 May 2009 17:34:43 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UHYhJT091731 for ; Sat, 30 May 2009 17:34:43 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UHYgUD091727 for perforce@freebsd.org; Sat, 30 May 2009 17:34:42 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 30 May 2009 17:34:42 GMT Message-Id: <200905301734.n4UHYgUD091727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 163101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 17:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163101 Change 163101 by antab@antab_farm on 2009/05/30 17:34:25 IFC @ 163088 Affected files ... .. //depot/projects/avr32/src/UPDATING#9 integrate .. //depot/projects/avr32/src/bin/cp/utils.c#2 integrate .. //depot/projects/avr32/src/bin/rm/rm.c#3 integrate .. //depot/projects/avr32/src/contrib/ipfilter/lib/load_http.c#2 integrate .. //depot/projects/avr32/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/avr32/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/Makefile#6 integrate .. //depot/projects/avr32/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/avr32/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb.3#4 integrate .. //depot/projects/avr32/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/avr32/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/avr32/src/lib/libusbhid/descr.c#4 integrate .. //depot/projects/avr32/src/sbin/dump/optr.c#3 integrate .. //depot/projects/avr32/src/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/avr32/src/sbin/mksnap_ffs/Makefile#2 integrate .. //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/avr32/src/share/man/man9/Makefile#6 integrate .. //depot/projects/avr32/src/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/avr32/src/share/man/man9/rmlock.9#2 integrate .. //depot/projects/avr32/src/share/man/man9/sx.9#2 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/avr32/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/avr32/src/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/avr32/src/sys/conf/NOTES#8 integrate .. //depot/projects/avr32/src/sys/conf/files#11 integrate .. //depot/projects/avr32/src/sys/conf/files.i386#7 integrate .. //depot/projects/avr32/src/sys/conf/options#7 integrate .. //depot/projects/avr32/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/avr32/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/avr32/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/avr32/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/avr32/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/avr32/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/avr32/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/avr32/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/avr32/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/avr32/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/avr32/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/avr32/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/avr32/src/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/avr32/src/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/avr32/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/avr32/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/avr32/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/avr32/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/avr32/src/sys/dev/si/si.c#3 integrate .. //depot/projects/avr32/src/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/avr32/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/avr32/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/avr32/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/avr32/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/avr32/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/avr32/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/at91dci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/atmegadci.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/ohci.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uhci.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/controller/uss820dci.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_axe.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/net/usb_ethernet.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hid.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_request.h#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.c#6 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#7 integrate .. //depot/projects/avr32/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/avr32/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/avr32/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/avr32/src/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/avr32/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/avr32/src/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/avr32/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/avr32/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/avr32/src/sys/i386/xen/clock.c#4 integrate .. //depot/projects/avr32/src/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/avr32/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/avr32/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/avr32/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_osd.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/avr32/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#8 integrate .. //depot/projects/avr32/src/sys/kern/tty_pts.c#6 integrate .. //depot/projects/avr32/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/avr32/src/sys/kern/vfs_default.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/avr32/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/avr32/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/avr32/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#8 integrate .. //depot/projects/avr32/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/avr32/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/avr32/src/sys/net/if.h#5 integrate .. //depot/projects/avr32/src/sys/net/if_var.h#6 integrate .. //depot/projects/avr32/src/sys/net/pfil.h#2 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/avr32/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/avr32/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/avr32/src/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/avr32/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/avr32/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/avr32/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/avr32/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/avr32/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/avr32/src/sys/sys/jail.h#6 integrate .. //depot/projects/avr32/src/sys/sys/kernel.h#4 integrate .. //depot/projects/avr32/src/sys/sys/mount.h#5 integrate .. //depot/projects/avr32/src/sys/sys/namei.h#3 integrate .. //depot/projects/avr32/src/sys/sys/param.h#9 integrate .. //depot/projects/avr32/src/sys/sys/priv.h#5 integrate .. //depot/projects/avr32/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/avr32/src/sys/sys/sx.h#3 integrate .. //depot/projects/avr32/src/sys/sys/tty.h#3 integrate .. //depot/projects/avr32/src/sys/sys/vimage.h#7 integrate .. //depot/projects/avr32/src/sys/sys/vnode.h#5 integrate .. //depot/projects/avr32/src/sys/xen/evtchn/evtchn.c#4 integrate .. //depot/projects/avr32/src/usr.bin/Makefile#5 edit .. //depot/projects/avr32/src/usr.bin/find/function.c#3 integrate .. //depot/projects/avr32/src/usr.bin/perror/perror.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/avr32/src/usr.sbin/mountd/mountd.8#3 integrate .. //depot/projects/avr32/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/nfscbd/nfscbd.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/nfsd/nfsd.8#3 integrate .. //depot/projects/avr32/src/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/nfsdumpstate/nfsdumpstate.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/nfsrevoke/nfsrevoke.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/nfsuserd/Makefile#2 integrate .. //depot/projects/avr32/src/usr.sbin/nfsuserd/nfsuserd.c#2 integrate Differences ... ==== //depot/projects/avr32/src/UPDATING#9 (text+ko) ==== @@ -22,6 +22,23 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090530: + Add VOP_ACCESSX(9). File system modules need to be rebuilt. + Bump __FreeBSD_version to 800094. + +20090529: + Add mnt_xflag field to 'struct mount'. File system modules + need to be rebuilt. + Bump __FreeBSD_version to 800093. + +20090528: + The compiling option ADAPTIVE_SX has been retired while it has been + introduced the option NO_ADAPTIVE_SX which handles the reversed logic. + The KPI for sx_init_flags() changes as accepting flags: + SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag + has been introduced in order to handle the reversed logic. + Bump __FreeBSD_version to 800092. + 20090527: Add support for hierarchical jails. Remove global securelevel. Bump __FreeBSD_version to 800091. @@ -1539,4 +1556,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.605 2009/05/27 14:11:23 jamie Exp $ +$FreeBSD: src/UPDATING,v 1.609 2009/05/30 14:01:01 trasz Exp $ ==== //depot/projects/avr32/src/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $"); #include #include @@ -365,7 +365,7 @@ if (!gotstat || fs->st_flags != ts.st_flags) if (fdval ? fchflags(fd, fs->st_flags) : - (islink ? (errno = ENOSYS) : + (islink ? lchflags(to.p_path, fs->st_flags) : chflags(to.p_path, fs->st_flags))) { warn("chflags: %s", to.p_path); rval = 1; ==== //depot/projects/avr32/src/bin/rm/rm.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.59 2009/04/29 18:08:18 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.60 2009/05/30 10:42:37 jilles Exp $"); #include #include @@ -234,7 +234,7 @@ else if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && - chflags(p->fts_accpath, + lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0) goto err; continue; @@ -253,7 +253,7 @@ if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(p->fts_accpath, + rval = lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { /* @@ -368,7 +368,7 @@ if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); + rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { if (S_ISWHT(sb.st_mode)) rval = undelete(f); ==== //depot/projects/avr32/src/contrib/ipfilter/lib/load_http.c#2 (text+ko) ==== @@ -14,11 +14,13 @@ alist_t * load_http(char *url) { - int fd, len, left, port, endhdr, removed; - char *s, *t, *u, buffer[1024], *myurl; + char *s, *t, *u, buffer[1044], *myurl; alist_t *a, *rtop, *rbot; struct sockaddr_in sin; struct hostent *host; + size_t avail; + int fd, len, left, port, endhdr, removed; + int error; /* * More than this would just be absurd. @@ -32,7 +34,14 @@ rtop = NULL; rbot = NULL; - sprintf(buffer, "GET %s HTTP/1.0\r\n", url); + avail = sizeof(buffer); + error = snprintf(buffer, avail, "GET %s HTTP/1.0\r\n", url); + + /* + * error is always less then avail due to the constraint on + * the url length above. + */ + avail -= error; myurl = strdup(url); if (myurl == NULL) @@ -51,7 +60,11 @@ if (u != NULL) s = u + 1; /* AUTH */ - sprintf(buffer + strlen(buffer), "Host: %s\r\n\r\n", s); + error = snprintf(buffer + strlen(buffer), avail, "Host: %s\r\n\r\n", s); + if (error >= avail) { + fprintf(stderr, "URL is too large: %s\n", url); + goto done; + } u = strchr(s, ':'); if (u != NULL) { @@ -83,16 +96,12 @@ if (fd == -1) goto done; - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) { - close(fd); + if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) goto done; - } len = strlen(buffer); - if (write(fd, buffer, len) != len) { - close(fd); + if (write(fd, buffer, len) != len) goto done; - } s = buffer; endhdr = 0; ==== //depot/projects/avr32/src/contrib/netcat/nc.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,7 +25,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/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.13 2009/05/29 07:18:31 delphij Exp $ .\" .Dd $Mdocdate: May 6 2008 $ .Dt NC 1 @@ -53,7 +53,7 @@ .Ar port Oc Oc .Xc .Op Ar hostname -.Op Ar port Ns Bq Ar s +.Op Ar port .Ek .Sh DESCRIPTION The @@ -275,8 +275,8 @@ option is given (in which case the local host is used). .Pp -.Ar port Ns Op Ar s -can be single integers or ranges. +.Ar port +can be a single integer or a range of ports. Ranges are in the form nn-mm. In general, a destination port must be specified, @@ -445,6 +445,8 @@ if the proxy requires it: .Pp .Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42 +.Sh EXIT STATUS +.Ex -std .Sh SEE ALSO .Xr cat 1 , .Xr ssh 1 , ==== //depot/projects/avr32/src/contrib/netcat/netcat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */ +/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $ */ /* @@ -967,14 +967,15 @@ void usage(int ret) { + fprintf(stderr, #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I length] [-i interval] [-O length]\n" #else - fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n" #endif - fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n"); - fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); - fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); + "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" + "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" + "\t [port]\n"); if (ret) exit(1); } ==== //depot/projects/avr32/src/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.95 2009/04/27 22:39:43 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.96 2009/05/30 07:08:16 kientzle Exp $ .include LIB= archive DPADD= ${LIBBZ2} ${LIBZ} -LDADD= -lbz2 -lz +LDADD= -lbz2 -lz -lmd # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -17,6 +17,7 @@ .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL +LDFLAGS+= -lcrypto .endif ==== //depot/projects/avr32/src/lib/libc/net/resolver.3#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)resolver.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.33 2007/01/09 00:28:02 imp Exp $ +.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.34 2009/05/29 07:55:44 delphij Exp $ .\" -.Dd November 4, 2006 +.Dd May 29, 2009 .Dt RESOLVER 3 .Os .Sh NAME @@ -401,6 +401,19 @@ .Va _res structure in an attempt to replace the per-thread version referred to by that macro. +.Pp +The following compile-time option can be specified to change the default +behavior of resolver routines when necessary. +.Bl -tag -width RES_ENFORCE_RFC1034 +.It Dv RES_ENFORCE_RFC1034 +If this symbol is defined during compile-time, +.Fn res_search +will enforce RFC 1034 check, namely, disallow using of underscore character +within host names. +This is used by the standard host lookup routines like +.Xr gethostbyname 3 . +For compatibility reasons this option is not enabled by default. +.El .Sh RETURN VALUES The .Fn res_init ==== //depot/projects/avr32/src/lib/libc/resolv/res_comp.c#2 (text) ==== @@ -69,7 +69,7 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.5 2008/02/16 00:16:49 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.6 2009/05/29 07:34:54 delphij Exp $"); #include "port_before.h" #include @@ -148,7 +148,11 @@ #define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) #define borderchar(c) (alphachar(c) || digitchar(c)) +#ifdef RES_ENFORCE_RFC1034 +#define middlechar(c) (borderchar(c) || hyphenchar(c)) +#else #define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c)) +#endif #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) int ==== //depot/projects/avr32/src/lib/libusb/libusb.3#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.3 2009/05/21 17:16:35 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.4 2009/05/28 17:36:36 thompsa Exp $ .\" .Dd May 21, 2009 .Dt LIBUSB 3 @@ -109,7 +109,7 @@ .Ft const char * .Fn libusb20_dev_get_backend_name "struct libusb20_device *" .Ft int -.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo" +.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo" .Ft int .Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len" .Ft const char * @@ -465,7 +465,7 @@ .Pp . .Fn libusb20_dev_get_info -retrives the BSD specific usb2_device_info structure into the memory location given by +retrives the BSD specific usb_device_info structure into the memory location given by .Fa pinfo . The USB device given by .Fa pdev ==== //depot/projects/avr32/src/lib/libusb/libusb20.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -925,7 +925,7 @@ int libusb20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (pinfo == NULL) return (LIBUSB20_ERROR_INVALID_PARAM); ==== //depot/projects/avr32/src/lib/libusb/libusb20.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.2 2009/03/17 21:20:39 delphij Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.3 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -175,7 +175,7 @@ LIBUSB20_POWER_RESUME, }; -struct usb2_device_info; +struct usb_device_info; struct libusb20_transfer; struct libusb20_backend; struct libusb20_backend_methods; @@ -253,7 +253,7 @@ int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); -int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo); int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev); ==== //depot/projects/avr32/src/lib/libusb/libusb20_int.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -49,7 +49,7 @@ typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_close_device_t)(struct libusb20_device *pdev); -typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo); typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max); ==== //depot/projects/avr32/src/lib/libusb/libusb20_ugen20.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -126,8 +126,8 @@ ugen20_enumerate(struct libusb20_device *pdev, const char *id) { const char *tmp = id; - struct usb2_device_descriptor ddesc; - struct usb2_device_info devinfo; + struct usb_device_descriptor ddesc; + struct usb_device_info devinfo; uint32_t plugtime; char buf[64]; int f; @@ -213,7 +213,7 @@ } struct ugen20_urd_state { - struct usb2_read_dir urd; + struct usb_read_dir urd; uint32_t nparsed; int f; uint8_t *ptr; @@ -298,7 +298,7 @@ static void ugen20_tr_release(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->nTransfer == 0) { return; @@ -316,8 +316,8 @@ static int ugen20_tr_renew(struct libusb20_device *pdev) { - struct usb2_fs_init fs_init; - struct usb2_fs_endpoint *pfse; + struct usb_fs_init fs_init; + struct usb_fs_endpoint *pfse; int error; uint32_t size; uint16_t nMaxTransfer; @@ -419,7 +419,7 @@ static int ugen20_close_device(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->privBeData) { memset(&fs_uninit, 0, sizeof(fs_uninit)); @@ -447,8 +447,8 @@ ugen20_get_config_desc_full(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index) { - struct usb2_gen_descriptor gen_desc; - struct usb2_config_descriptor cdesc; + struct usb_gen_descriptor gen_desc; + struct usb_config_descriptor cdesc; uint8_t *ptr; uint16_t len; int error; @@ -542,7 +542,7 @@ ugen20_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index) { - struct usb2_alt_interface alt_iface; + struct usb_alt_interface alt_iface; memset(&alt_iface, 0, sizeof(alt_iface)); @@ -663,7 +663,7 @@ struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags) { - struct usb2_ctl_request req; + struct usb_ctl_request req; memset(&req, 0, sizeof(req)); @@ -688,8 +688,8 @@ static int ugen20_process(struct libusb20_device *pdev) { - struct usb2_fs_complete temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_complete temp; + struct usb_fs_endpoint *fsep; struct libusb20_transfer *xfer; while (1) { @@ -739,8 +739,8 @@ ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no) { - struct usb2_fs_open temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_open temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -772,7 +772,7 @@ static int ugen20_tr_close(struct libusb20_transfer *xfer) { - struct usb2_fs_close temp; + struct usb_fs_close temp; memset(&temp, 0, sizeof(temp)); @@ -787,7 +787,7 @@ static int ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer) { - struct usb2_fs_clear_stall_sync temp; + struct usb_fs_clear_stall_sync temp; memset(&temp, 0, sizeof(temp)); @@ -804,8 +804,8 @@ static void ugen20_tr_submit(struct libusb20_transfer *xfer) { - struct usb2_fs_start temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_start temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -839,7 +839,7 @@ static void ugen20_tr_cancel_async(struct libusb20_transfer *xfer) { - struct usb2_fs_stop temp; + struct usb_fs_stop temp; memset(&temp, 0, sizeof(temp)); @@ -876,7 +876,7 @@ ugen20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; memset(&ugd, 0, sizeof(ugd)); @@ -892,7 +892,7 @@ static int ugen20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) { return (LIBUSB20_ERROR_INVALID_PARAM); @@ -904,7 +904,7 @@ ugen20_root_get_dev_quirk(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -931,7 +931,7 @@ ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -954,7 +954,7 @@ ugen20_root_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -978,7 +978,7 @@ ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); ==== //depot/projects/avr32/src/lib/libusbhid/descr.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $"); #include @@ -76,7 +76,7 @@ report_desc_t hid_get_report_desc(int fd) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; report_desc_t rep; void *data; ==== //depot/projects/avr32/src/sbin/dump/optr.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/optr.c,v 1.36 2009/03/02 03:08:46 cy Exp $"; + "$FreeBSD: src/sbin/dump/optr.c,v 1.37 2009/05/29 07:26:44 brian Exp $"; #endif /* not lint */ #include @@ -406,7 +406,7 @@ }; if (arg != 'w' || dumpme) (void) printf( - "%c %8s\t(%6s) Last dump: Level %c, Date %s\n", + "%c %8s\t(%6s) Last dump: Level %d, Date %s\n", dumpme && (arg != 'w') ? '>' : ' ', dtwalk->dd_name, dt ? dt->fs_file : "", ==== //depot/projects/avr32/src/sbin/fsck_ffs/fsck.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.41 2009/02/04 01:02:56 mckusick Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.42 2009/05/29 20:01:50 lulf Exp $ */ #include @@ -297,8 +297,8 @@ ufs2_daddr_t n_blks; /* number of blocks in use */ ino_t n_files; /* number of files in use */ -int got_siginfo; /* received a SIGINFO */ -int got_sigalarm; /* received a SIGALRM */ +sig_atomic_t got_siginfo; /* received a SIGINFO */ +sig_atomic_t got_sigalarm; /* received a SIGALRM */ #define clearinode(dp) \ if (sblock.fs_magic == FS_UFS1_MAGIC) { \ ==== //depot/projects/avr32/src/sbin/mksnap_ffs/Makefile#2 (text+ko) ==== @@ -1,8 +1,13 @@ -# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1 2003/03/02 01:50:33 mckusick Exp $ +# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.2 2009/05/29 19:18:41 pjd Exp $ + +.PATH: ${.CURDIR}/../mount PROG= mksnap_ffs +SRCS= mksnap_ffs.c getmntopts.c MAN= mksnap_ffs.8 +CFLAGS+=-I${.CURDIR}/../mount + .if defined(NOSUID) BINMODE=550 .else ==== //depot/projects/avr32/src/sbin/mksnap_ffs/mksnap_ffs.8#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.4 2008/07/26 13:18:33 kib Exp $ +.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.5 2009/05/29 19:18:41 pjd Exp $ .\" -.Dd January 19, 2003 +.Dd May 29, 2009 .Dt MKSNAP_FFS 8 .Os .Sh NAME @@ -42,19 +42,12 @@ .Nd take a file system snapshot .Sh SYNOPSIS >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 19:11:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A105106568B; Sat, 30 May 2009 19:11: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 101041065688 for ; Sat, 30 May 2009 19:11:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0AD88FC1E for ; Sat, 30 May 2009 19:11:28 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJBQQh002231 for ; Sat, 30 May 2009 19:11:26 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UJBNTG002228 for perforce@freebsd.org; Sat, 30 May 2009 19:11:23 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 19:11:23 GMT Message-Id: <200905301911.n4UJBNTG002228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 19:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163108 Change 163108 by trasz@trasz_victim on 2009/05/30 19:10:31 Add a temporary syscall interface. Temporary, becase it's not string based (a'la nmount(2)); the more I look at the nmount(2), the more I think it sucks for the kernel->userland direction. Affected files ... .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#2 edit .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#2 edit .. //depot/projects/soc2009/trasz_limits/sys/conf/files#4 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#1 add .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#2 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#1 add .. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#3 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#2 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#2 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#1 add .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#1 add Differences ... ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#2 (text) ==== @@ -357,6 +357,8 @@ setfib; symlinkat; unlinkat; + hrl_get; + hrl_set; }; FBSDprivate_1.0 { ==== //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -875,3 +875,5 @@ 507 AUE_NULL STD { int freebsd32_jail_set(struct iovec32 *iovp, \ unsigned int iovcnt, int flags); } 508 AUE_NULL NOPROTO { int jail_remove(int jid); } +509 AUE_NULL STD { int hrl_get(struct hrl_limit **bufp, int nentries, int *required); } +510 AUE_NULL STD { int hrl_set(struct hrl_limit **bufp, int nentries); } ==== //depot/projects/soc2009/trasz_limits/sys/conf/files#4 (text+ko) ==== @@ -1908,6 +1908,7 @@ kern/kern_exec.c standard kern/kern_exit.c standard kern/kern_fork.c standard +kern/kern_hrl.c standard kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard ==== //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.247 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp */ #include "opt_compat.h" @@ -537,4 +537,6 @@ { AS(jail_get_args), (sy_call_t *)jail_get, AUE_NULL, NULL, 0, 0 }, /* 506 = jail_get */ { AS(jail_set_args), (sy_call_t *)jail_set, AUE_NULL, NULL, 0, 0 }, /* 507 = jail_set */ { AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0 }, /* 508 = jail_remove */ + { AS(hrl_get_args), (sy_call_t *)hrl_get, AUE_NULL, NULL, 0, 0 }, /* 509 = hrl_get */ + { AS(hrl_set_args), (sy_call_t *)hrl_set, AUE_NULL, NULL, 0, 0 }, /* 510 = hrl_set */ }; ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.231 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp */ const char *syscallnames[] = { @@ -516,4 +516,6 @@ "jail_get", /* 506 = jail_get */ "jail_set", /* 507 = jail_set */ "jail_remove", /* 508 = jail_remove */ + "hrl_get", /* 509 = hrl_get */ + "hrl_set", /* 510 = hrl_set */ }; ==== //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#2 (text+ko) ==== @@ -902,5 +902,7 @@ 507 AUE_NULL STD { int jail_set(struct iovec *iovp, \ unsigned int iovcnt, int flags); } 508 AUE_NULL STD { int jail_remove(int jid); } +509 AUE_NULL STD { int hrl_get(struct hrl_limit **bufp, int nentries, int *required); } +510 AUE_NULL STD { int hrl_set(struct hrl_limit **bufp, int nentries); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/systrace_args.c,v 1.29 2009/04/29 21:50:13 jamie Exp $ + * $FreeBSD$ * This file is part of the DTrace syscall provider. */ @@ -3065,6 +3065,23 @@ *n_args = 1; break; } + /* hrl_get */ + case 509: { + struct hrl_get_args *p = params; + uarg[0] = (intptr_t) p->bufp; /* struct hrl_limit ** */ + iarg[1] = p->nentries; /* int */ + uarg[2] = (intptr_t) p->required; /* int * */ + *n_args = 3; + break; + } + /* hrl_set */ + case 510: { + struct hrl_set_args *p = params; + uarg[0] = (intptr_t) p->bufp; /* struct hrl_limit ** */ + iarg[1] = p->nentries; /* int */ + *n_args = 2; + break; + } default: *n_args = 0; break; @@ -8137,6 +8154,35 @@ break; }; break; + /* hrl_get */ + case 509: + switch(ndx) { + case 0: + p = "struct hrl_limit **"; + break; + case 1: + p = "int"; + break; + case 2: + p = "int *"; + break; + default: + break; + }; + break; + /* hrl_set */ + case 510: + switch(ndx) { + case 0: + p = "struct hrl_limit **"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; default: break; }; ==== //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#3 (text+ko) ==== @@ -464,9 +464,15 @@ #define PRIV_C4B_TRACE 651 /* Unrestricted CAPI message tracing. */ /* + * Hierarchical Resource Limits privileges. + */ +#define PRIV_HRL_SET 660 +#define PRIV_HRL_GET 661 + +/* * Track end of privilege list. */ -#define _PRIV_HIGHEST 652 +#define _PRIV_HIGHEST 663 /* * Validate that a named privilege is known by the privilege system. Invalid ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.228 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp */ #define SYS_syscall 0 @@ -424,4 +424,6 @@ #define SYS_jail_get 506 #define SYS_jail_set 507 #define SYS_jail_remove 508 -#define SYS_MAXSYSCALL 509 +#define SYS_hrl_get 509 +#define SYS_hrl_set 510 +#define SYS_MAXSYSCALL 511 ==== //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.183 2009/04/29 21:50:13 jamie Exp $ -# created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie +# $FreeBSD$ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp MIASM = \ syscall.o \ exit.o \ @@ -372,4 +372,6 @@ gssd_syscall.o \ jail_get.o \ jail_set.o \ - jail_remove.o + jail_remove.o \ + hrl_get.o \ + hrl_set.o ==== //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.232 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1638,6 +1638,15 @@ struct jail_remove_args { char jid_l_[PADL_(int)]; int jid; char jid_r_[PADR_(int)]; }; +struct hrl_get_args { + char bufp_l_[PADL_(struct hrl_limit **)]; struct hrl_limit ** bufp; char bufp_r_[PADR_(struct hrl_limit **)]; + char nentries_l_[PADL_(int)]; int nentries; char nentries_r_[PADR_(int)]; + char required_l_[PADL_(int *)]; int * required; char required_r_[PADR_(int *)]; +}; +struct hrl_set_args { + char bufp_l_[PADL_(struct hrl_limit **)]; struct hrl_limit ** bufp; char bufp_r_[PADR_(struct hrl_limit **)]; + char nentries_l_[PADL_(int)]; int nentries; char nentries_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1995,6 +2004,8 @@ int jail_get(struct thread *, struct jail_get_args *); int jail_set(struct thread *, struct jail_set_args *); int jail_remove(struct thread *, struct jail_remove_args *); +int hrl_get(struct thread *, struct hrl_get_args *); +int hrl_set(struct thread *, struct hrl_set_args *); #ifdef COMPAT_43 @@ -2591,6 +2602,8 @@ #define SYS_AUE_jail_get AUE_NULL #define SYS_AUE_jail_set AUE_NULL #define SYS_AUE_jail_remove AUE_NULL +#define SYS_AUE_hrl_get AUE_NULL +#define SYS_AUE_hrl_set AUE_NULL #undef PAD_ #undef PADL_ ==== //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#2 (text+ko) ==== @@ -65,6 +65,7 @@ getpmac \ gstat \ ${_gssd} \ + hrl \ i2c \ ifmcstat \ inetd \ From owner-p4-projects@FreeBSD.ORG Sat May 30 19:16:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35158106567B; Sat, 30 May 2009 19:16:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFBDD106564A for ; Sat, 30 May 2009 19:16:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB9708FC1A for ; Sat, 30 May 2009 19:16:34 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJGYiR002626 for ; Sat, 30 May 2009 19:16:34 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UJGYCC002624 for perforce@freebsd.org; Sat, 30 May 2009 19:16:34 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 19:16:34 GMT Message-Id: <200905301916.n4UJGYCC002624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 19:16:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=163109 Change 163109 by trasz@trasz_victim on 2009/05/30 19:16:19 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#30 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/rm/rm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/dump_machdep.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tsec/if_tsec.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_bus.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_core.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_rrip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_default.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#32 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vnode_if.src#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gsstest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvkrpc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_advlock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/authunix_prot.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kernel.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/find/function.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfscbd/nfscbd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsdumpstate/nfsdumpstate.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsrevoke/nfsrevoke.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsuserd/nfsuserd.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#30 (text+ko) ==== @@ -22,6 +22,15 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090530: + Add VOP_ACCESSX(9). File system modules need to be rebuilt. + Bump __FreeBSD_version to 800094. + +20090529: + Add mnt_xflag field to 'struct mount'. File system modules + need to be rebuilt. + Bump __FreeBSD_version to 800093. + 20090528: The compiling option ADAPTIVE_SX has been retired while it has been introduced the option NO_ADAPTIVE_SX which handles the reversed logic. @@ -1547,4 +1556,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.606 2009/05/29 01:49:27 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.609 2009/05/30 14:01:01 trasz Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $"); #include #include @@ -365,7 +365,7 @@ if (!gotstat || fs->st_flags != ts.st_flags) if (fdval ? fchflags(fd, fs->st_flags) : - (islink ? (errno = ENOSYS) : + (islink ? lchflags(to.p_path, fs->st_flags) : chflags(to.p_path, fs->st_flags))) { warn("chflags: %s", to.p_path); rval = 1; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/rm/rm.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.59 2009/04/29 18:08:18 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.60 2009/05/30 10:42:37 jilles Exp $"); #include #include @@ -234,7 +234,7 @@ else if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && - chflags(p->fts_accpath, + lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0) goto err; continue; @@ -253,7 +253,7 @@ if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(p->fts_accpath, + rval = lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { /* @@ -368,7 +368,7 @@ if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); + rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { if (S_ISWHT(sb.st_mode)) rval = undelete(f); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#7 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.95 2009/04/27 22:39:43 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.97 2009/05/30 17:26:55 kientzle Exp $ .include LIB= archive -DPADD= ${LIBBZ2} ${LIBZ} -LDADD= -lbz2 -lz +DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} +LDADD= -lbz2 -lz -lmd # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -12,14 +12,16 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.OBJDIR} #Uncomment to build with full lzma/xz support via liblzma +#liblzma is not (yet?) part of the FreeBSD base system #CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 #LDADD+= -L/usr/local/lib -llzma .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto .endif - WARNS?= 6 # Headers to be installed in /usr/include ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/fsck.h#4 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.41 2009/02/04 01:02:56 mckusick Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.42 2009/05/29 20:01:50 lulf Exp $ */ #include @@ -297,8 +297,8 @@ ufs2_daddr_t n_blks; /* number of blocks in use */ ino_t n_files; /* number of files in use */ -int got_siginfo; /* received a SIGINFO */ -int got_sigalarm; /* received a SIGALRM */ +sig_atomic_t got_siginfo; /* received a SIGINFO */ +sig_atomic_t got_sigalarm; /* received a SIGALRM */ #define clearinode(dp) \ if (sblock.fs_magic == FS_UFS1_MAGIC) { \ ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/Makefile#2 (text+ko) ==== @@ -1,8 +1,13 @@ -# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.1 2003/03/02 01:50:33 mckusick Exp $ +# $FreeBSD: src/sbin/mksnap_ffs/Makefile,v 1.2 2009/05/29 19:18:41 pjd Exp $ + +.PATH: ${.CURDIR}/../mount PROG= mksnap_ffs +SRCS= mksnap_ffs.c getmntopts.c MAN= mksnap_ffs.8 +CFLAGS+=-I${.CURDIR}/../mount + .if defined(NOSUID) BINMODE=550 .else ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.8#3 (text+ko) ==== @@ -32,9 +32,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.4 2008/07/26 13:18:33 kib Exp $ +.\" $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.8,v 1.5 2009/05/29 19:18:41 pjd Exp $ .\" -.Dd January 19, 2003 +.Dd May 29, 2009 .Dt MKSNAP_FFS 8 .Os .Sh NAME @@ -42,19 +42,12 @@ .Nd take a file system snapshot .Sh SYNOPSIS .Nm -.Ar mountpoint .Ar snapshot_name .Sh DESCRIPTION The .Nm utility creates a snapshot named -.Ar snapshot_name -on the file system mounted at -.Ar mountpoint . -The -.Ar snapshot_name -argument must be contained within the file system mounted at -.Ar mountpoint . +.Ar snapshot_name . .Pp The group ownership of the file is set to .Dq Li operator ; @@ -64,9 +57,19 @@ or members of the .Dq Li operator group. +.Sh EXAMPLES +Create a snapshot of +.Pa /usr/home +file system and mount the snapshot elsewhere: +.Bd -literal -offset indent +mksnap_ffs /usr/home/snapshot +mdconfig -a -t vnode -o readonly -f /usr/home/snapshot +mount -o ro /dev/md0 /mnt/ +.Ed .Sh SEE ALSO .Xr chmod 2 , .Xr chown 8 , +.Xr mdconfig 8, .Xr mount 8 .Sh CAVEATS The disk full situation is not handled gracefully and may ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.8 2004/12/08 11:54:50 phk Exp $ + * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.9 2009/05/29 19:18:41 pjd Exp $ */ #include @@ -44,31 +44,38 @@ #include #include #include +#include #include #include #include #include #include -void usage(void); +static void +usage(void) +{ + + errx(EX_USAGE, "usage: mksnap_ffs snapshot_name"); +} int main(int argc, char **argv) { - char *dir, *cp, path[PATH_MAX]; + char errmsg[255], path[PATH_MAX]; + char *cp, *snapname; struct statfs stfsbuf; - struct ufs_args args; struct group *grp; struct stat stbuf; - int fd; + struct iovec *iov; + int fd, iovlen; - if (argc != 3) + if (argc == 2) + snapname = argv[1]; + else if (argc == 3) + snapname = argv[2]; /* Old usage. */ + else usage(); - dir = argv[1]; - memset(&args, 0, sizeof args); - args.fspec = argv[2]; - /* * Check that the user running this program has permission * to create and remove a snapshot file from the directory @@ -77,15 +84,15 @@ * will not be able to remove the snapshot when they are * done with it. */ - if (strlen(args.fspec) >= PATH_MAX) - errx(1, "pathname too long %s", args.fspec); - cp = strrchr(args.fspec, '/'); + if (strlen(snapname) >= PATH_MAX) + errx(1, "pathname too long %s", snapname); + cp = strrchr(snapname, '/'); if (cp == NULL) { strlcpy(path, ".", PATH_MAX); - } else if (cp == args.fspec) { + } else if (cp == snapname) { strlcpy(path, "/", PATH_MAX); } else { - strlcpy(path, args.fspec, cp - args.fspec + 1); + strlcpy(path, snapname, cp - snapname + 1); } if (statfs(path, &stfsbuf) < 0) err(1, "%s", path); @@ -104,27 +111,26 @@ */ if ((grp = getgrnam("operator")) == NULL) errx(1, "Cannot retrieve operator gid"); - if (mount("ufs", dir, MNT_UPDATE | MNT_SNAPSHOT | stfsbuf.f_flags, - &args) < 0) - err(1, "Cannot create %s", args.fspec); - if ((fd = open(args.fspec, O_RDONLY)) < 0) - err(1, "Cannot open %s", args.fspec); + + build_iovec(&iov, &iovlen, "fstype", "ffs", 4); + build_iovec(&iov, &iovlen, "from", snapname, (size_t)-1); + build_iovec(&iov, &iovlen, "fspath", stfsbuf.f_mntonname, (size_t)-1); + build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); + build_iovec(&iov, &iovlen, "update", NULL, 0); + build_iovec(&iov, &iovlen, "snapshot", NULL, 0); + + if (nmount(iov, iovlen, stfsbuf.f_flags) < 0) + err(1, "Cannot create snapshot %s: %s", snapname, errmsg); + if ((fd = open(snapname, O_RDONLY)) < 0) + err(1, "Cannot open %s", snapname); if (fstat(fd, &stbuf) != 0) - err(1, "Cannot stat %s", args.fspec); + err(1, "Cannot stat %s", snapname); if ((stbuf.st_flags & SF_SNAPSHOT) == 0) - errx(1, "File %s is not a snapshot", args.fspec); + errx(1, "File %s is not a snapshot", snapname); if (fchown(fd, -1, grp->gr_gid) != 0) - err(1, "Cannot chown %s", args.fspec); + err(1, "Cannot chown %s", snapname); if (fchmod(fd, S_IRUSR | S_IRGRP) != 0) - err(1, "Cannot chmod %s", args.fspec); + err(1, "Cannot chmod %s", snapname); exit(EXIT_SUCCESS); } - -void -usage() -{ - - fprintf(stderr, "usage: mksnap_ffs mountpoint snapshot_name\n"); - exit(EX_USAGE); -} ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.350 2009/05/27 16:36:54 zml Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.351 2009/05/30 13:59:05 trasz Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1289,6 +1289,7 @@ MLINKS+=vm_page_wakeup.9 vm_page_busy.9 \ vm_page_wakeup.9 vm_page_flash.9 MLINKS+=vm_page_wire.9 vm_page_unwire.9 +MLINKS+=VOP_ACCESS.9 VOP_ACCESSX.9 MLINKS+=VOP_ATTRIB.9 VOP_GETATTR.9 \ VOP_ATTRIB.9 VOP_SETATTR.9 MLINKS+=VOP_CREATE.9 VOP_MKDIR.9 \ ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#7 (text+ko) ==== @@ -27,19 +27,22 @@ .\" (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/share/man/man9/VOP_ACCESS.9,v 1.24 2009/03/30 20:56:37 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.25 2009/05/30 13:59:05 trasz Exp $ .\" -.Dd July 24, 1996 +.Dd May 30, 2009 .Os .Dt VOP_ACCESS 9 .Sh NAME -.Nm VOP_ACCESS +.Nm VOP_ACCESS , +.Nm VOP_ACCESSX .Nd "check access permissions of a file or Unix domain socket" .Sh SYNOPSIS .In sys/param.h .In sys/vnode.h .Ft int .Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" +.Ft int +.Fn VOP_ACCESSX "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. @@ -63,6 +66,20 @@ .Dv VWRITE or .Dv VEXEC . +For +.Fn VOP_ACCESS , +the only flags that may be set in +.Fa accmode +are +.Dv VEXEC , +.Dv VWRITE , +.Dv VREAD , +.Dv VADMIN +and +.Dv VAPPEND . +To check for other bits, one has to use +.Fn VOP_ACCESSX +instead. .Sh LOCKS The vnode will be locked on entry and should remain locked on return. .Sh RETURN VALUES ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#7 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/dump_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -229,7 +229,7 @@ static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.5 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.6 2009/05/30 15:14:44 attilio Exp $"); /* * Intel XScale Queue Manager support. @@ -338,7 +338,7 @@ int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.2 2009/05/30 15:14:44 attilio Exp $ */ /*- @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include +#include #include #include #include @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include #include #include -#include #include @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.29 2009/05/29 06:27:30 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.31 2009/05/30 07:33:32 delphij Exp $"); #include #include @@ -43,7 +43,6 @@ #include #include #include -#include #include @@ -386,7 +385,7 @@ return 0; } -/*extern char ostype[], hostname[], osrelease[], version[], machine[];*/ +/*extern char ostype[], osrelease[], version[], machine[];*/ int svr4_sys_uname(td, uap) @@ -412,15 +411,12 @@ struct thread *td; struct svr4_sys_systeminfo_args *uap; { - INIT_VPROCG(TD_TO_VPROCG(td)); + struct prison *pr; char *str = NULL; int error = 0; register_t *retval = td->td_retval; size_t len = 0; - char buf[11]; /* XXX NetBSD uses 256, but we use 11 - here as that seems like awfully - excessive kstack usage for hostid - string... */ + char buf[MAXHOSTNAMELEN]; u_int rlen = uap->len; switch (uap->what) { @@ -429,7 +425,8 @@ break; case SVR4_SI_HOSTNAME: - str = V_hostname; + getcredhostname(td->td_ucred, buf, sizeof(buf)); + str = buf; break; case SVR4_SI_RELEASE: @@ -461,7 +458,10 @@ break; case SVR4_SI_HW_SERIAL: - snprintf(buf, sizeof(buf), "%lu", hostid); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + snprintf(buf, sizeof(buf), "%lu", pr->pr_hostid); + mtx_unlock(&pr->pr_mtx); str = buf; break; @@ -470,8 +470,11 @@ break; case SVR4_SI_SRPC_DOMAIN: - /* XXXRW: locking? */ - str = V_domainname; + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(buf, pr->pr_domain, sizeof(buf)); + mtx_unlock(&pr->pr_mtx); + str = buf; break; case SVR4_SI_PLATFORM: ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ddb/db_textdump.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include "opt_config.h" @@ -68,7 +68,6 @@ #include #include #include -#include #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.222 2009/05/14 22:36:56 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.225 2009/05/30 17:56:19 attilio Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -332,7 +332,7 @@ static int bge_get_eaddr(struct bge_softc *, uint8_t[]); static void bge_txeof(struct bge_softc *); -static void bge_rxeof(struct bge_softc *); +static int bge_rxeof(struct bge_softc *); static void bge_asf_driver_up (struct bge_softc *); static void bge_tick(void *); @@ -390,7 +390,7 @@ static int bge_miibus_writereg(device_t, int, int, int); static void bge_miibus_statchg(device_t); #ifdef DEVICE_POLLING -static void bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); +static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); #endif #define BGE_RESET_START 1 @@ -3050,18 +3050,18 @@ * 2) the frame is from the standard receive ring */ -static void +static int bge_rxeof(struct bge_softc *sc) { struct ifnet *ifp; - int stdcnt = 0, jumbocnt = 0; + int rx_npkts = 0, stdcnt = 0, jumbocnt = 0; BGE_LOCK_ASSERT(sc); /* Nothing to do. */ if (sc->bge_rx_saved_considx == sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx) - return; + return (rx_npkts); ifp = sc->bge_ifp; @@ -3193,9 +3193,10 @@ BGE_UNLOCK(sc); (*ifp->if_input)(ifp, m); BGE_LOCK(sc); + rx_npkts++; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + return (rx_npkts); } if (stdcnt > 0) @@ -3219,6 +3220,7 @@ if (BGE_IS_5705_PLUS(sc)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 19:38:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F0DF1065763; Sat, 30 May 2009 19:38: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 C9845106564A for ; Sat, 30 May 2009 19:38:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B44A08FC16 for ; Sat, 30 May 2009 19:38:58 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJcwrs006519 for ; Sat, 30 May 2009 19:38:58 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UJcv1V006517 for perforce@freebsd.org; Sat, 30 May 2009 19:38:57 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 19:38:57 GMT Message-Id: <200905301938.n4UJcv1V006517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 19:39:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163112 Change 163112 by trasz@trasz_victim on 2009/05/30 19:38:05 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/cp/utils.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/rm/rm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/test/TEST.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/test/test.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/Changes#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/README.ee#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/create.make#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee.1#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee.i18n.guide#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee.msg#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee_version.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/genstr#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/make.default#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/new_curse.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ee/new_curse.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/ipfilter/lib/load_http.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/netcat/nc.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/netcat/netcat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/soc2009/trasz_limits/include/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libarchive/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/gen/popen.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_compat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_entry.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/svc_dg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/time2posix.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/jail.2#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusbhid/descr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/makekey/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/libexec/makekey/makekey.8#2 delete .. //depot/projects/soc2009/trasz_limits/libexec/makekey/makekey.c#2 delete .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/dump/optr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/fsck.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/mksnap_ffs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mount.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/ppp/ppp.linkup.sample#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man3/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man3/queue.3#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ksyms.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/mld.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/multicast.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/fail.9#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man9/rmlock.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/sx.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#3 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/africa#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/antarctica#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/asia#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/australasia#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/backward#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/etcetera#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/europe#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/factory#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/northamerica#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/pacificnew#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/southamerica#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/systemv#2 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/rp/rp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/si/si.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudioreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/ng_ubt.c#3 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/bluetooth/ubtbcmfw.c#3 delete .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonport.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_subr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/clock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fail.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_osd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/linker_if.m#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_default.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/soc2009/trasz_limits/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/usb/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_var.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/pfil.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/soc2009/trasz_limits/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/mld6.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netipsec/key.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/pci/if_rl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/cpuset.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/fail.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/ksyms.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/lock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/lockstat.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/mount.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/namei.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/priv.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/queue.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rmlock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rwlock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sx.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/systm.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/tty.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vimage.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/xdr/xdr_mem.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/README#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/file/flock/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/file/flock/flock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/vfs/trailing_slash.t#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/Artistic#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/FREEBSD-upgrade#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/README#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/ee.1#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/ee.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/ee.i18n.guide#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/new_curse.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/new_curse.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/en_US.US-ASCII/ee.msg#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/find/function.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/killall/killall.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/killall/killall.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/perror/perror.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sed/sed.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/amd64-fbsd32.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/amd64-linux32.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/mips-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jexec/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jls/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jls/jls.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jls/jls.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfscbd/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfscbd/nfscbd.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfscbd/nfscbd.c#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsd.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsdumpstate/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsdumpstate/nfsdumpstate.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsdumpstate/nfsdumpstate.c#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsrevoke/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsrevoke/nfsrevoke.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsrevoke/nfsrevoke.c#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsuserd/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsuserd/nfsuserd.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsuserd/nfsuserd.c#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/timer.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/usbconfig/usbconfig.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/README#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/Theory#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zdump.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zdump.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/zic.8#3 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.190 2009/05/23 16:54:07 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.193 2009/05/27 19:28:04 ed 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,45 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER() +OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz +OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz +# 20090527: removal of legacy USB stack +OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/hid.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h +OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h +OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h +OLD_FILES+=usr/include/legacy/dev/usb/ubser.h +OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h +OLD_FILES+=usr/include/legacy/dev/usb/udbp.h +OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h +OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h +OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usb.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h +OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h +OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h +OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h +OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h +OLD_DIRS+=usr/include/legacy/dev/usb +OLD_DIRS+=usr/include/legacy/dev +OLD_DIRS+=usr/include/legacy +# 20090526: removal of makekey(8) +OLD_FILES+=libexec/makekey +OLD_FILES+=usr/share/man/man8/makekey.8.gz # 20090522: removal of University of Michigan NFSv4 client OLD_FILES+=etc/rc.d/idmapd OLD_FILES+=sbin/idmapd ==== //depot/projects/soc2009/trasz_limits/UPDATING#3 (text+ko) ==== @@ -22,6 +22,27 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090530: + Add VOP_ACCESSX(9). File system modules need to be rebuilt. + Bump __FreeBSD_version to 800094. + +20090529: + Add mnt_xflag field to 'struct mount'. File system modules + need to be rebuilt. + Bump __FreeBSD_version to 800093. + +20090528: + The compiling option ADAPTIVE_SX has been retired while it has been + introduced the option NO_ADAPTIVE_SX which handles the reversed logic. + The KPI for sx_init_flags() changes as accepting flags: + SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag + has been introduced in order to handle the reversed logic. + Bump __FreeBSD_version to 800092. + +20090527: + Add support for hierarchical jails. Remove global securelevel. + Bump __FreeBSD_version to 800091. + 20090523: The layout of struct vnet_net has changed, therefore modules need to be rebuilt. @@ -1535,4 +1556,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.604 2009/05/23 21:43:44 zec Exp $ +$FreeBSD: src/UPDATING,v 1.609 2009/05/30 14:01:01 trasz Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.58 2009/05/30 10:36:14 jilles Exp $"); #include #include @@ -365,7 +365,7 @@ if (!gotstat || fs->st_flags != ts.st_flags) if (fdval ? fchflags(fd, fs->st_flags) : - (islink ? (errno = ENOSYS) : + (islink ? lchflags(to.p_path, fs->st_flags) : chflags(to.p_path, fs->st_flags))) { warn("chflags: %s", to.p_path); rval = 1; ==== //depot/projects/soc2009/trasz_limits/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.59 2009/04/29 18:08:18 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.60 2009/05/30 10:42:37 jilles Exp $"); #include #include @@ -234,7 +234,7 @@ else if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && - chflags(p->fts_accpath, + lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0) goto err; continue; @@ -253,7 +253,7 @@ if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(p->fts_accpath, + rval = lchflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { /* @@ -368,7 +368,7 @@ if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) - rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); + rval = lchflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { if (S_ISWHT(sb.st_mode)) rval = undelete(f); ==== //depot/projects/soc2009/trasz_limits/bin/test/TEST.sh#2 (text+ko) ==== @@ -28,7 +28,7 @@ # # TEST.sh - check if test(1) or builtin test works # -# $FreeBSD: src/bin/test/TEST.sh,v 1.8 2005/01/10 08:39:26 imp Exp $ +# $FreeBSD: src/bin/test/TEST.sh,v 1.9 2009/05/26 22:33:10 jilles Exp $ # force a specified test program, e.g. `env test=/bin/test sh TEST.sh' : ${test=test} @@ -133,5 +133,45 @@ t 1 '""' t 0 '! ""' +t 0 '!' +t 0 '\(' +t 0 '\)' + +t 1 '\( = \)' +t 0 '\( != \)' +t 0 '\( ! \)' +t 0 '\( \( \)' +t 0 '\( \) \)' +t 0 '! = !' +t 1 '! != !' +t 1 '-n = \)' +t 0 '! != \)' +t 1 '! = a' +t 0 '! != -n' +t 0 '! -c /etc/passwd' + +t 0 '! \( = \)' +t 1 '! \( != \)' +t 1 '! = = =' +t 0 '! = = \)' +t 0 '! "" -o ""' +t 1 '! "x" -o ""' +t 1 '! "" -o "x"' +t 1 '! "x" -o "x"' +t 0 '\( -f /etc/passwd \)' +t 1 '\( ! = \)' +t 0 '\( ! "" \)' +t 1 '\( ! -e \)' + +t 0 '0 -eq 0 -a -d /' +t 0 '-s = "" -o "" = ""' +t 0 '"" = "" -o -s = ""' +t 1 '-s = "" -o -s = ""' +t 0 '-z x -o x = "#" -o x = x' +t 1 '-z y -o y = "#" -o y = x' +t 0 '0 -ne 0 -o ! -f /' +t 0 '1 -ne 0 -o ! -f /etc/passwd' +t 1 '0 -ne 0 -o ! -f /etc/passwd' + echo "" echo "Syntax errors: $ERROR Failed: $FAILED" ==== //depot/projects/soc2009/trasz_limits/bin/test/test.c#2 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.53 2005/01/10 08:39:26 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.54 2009/05/26 22:33:10 jilles Exp $"); #include #include @@ -163,6 +163,7 @@ struct t_op const *t_wp_op; int nargc; char **t_wp; +int parenlevel; static int aexpr(enum token); static int binop(void); @@ -171,7 +172,9 @@ static int getn(const char *); static intmax_t getq(const char *); static int intcmp(const char *, const char *); -static int isoperand(void); +static int isunopoperand(void); +static int islparenoperand(void); +static int isrparenoperand(void); static int newerf(const char *, const char *); static int nexpr(enum token); static int oexpr(enum token); @@ -205,7 +208,14 @@ #endif nargc = argc; t_wp = &argv[1]; - res = !oexpr(t_lex(*t_wp)); + parenlevel = 0; + if (nargc == 4 && strcmp(*t_wp, "!") == 0) { + /* Things like ! "" -o x do not fit in the normal grammar. */ + --nargc; + ++t_wp; + res = oexpr(t_lex(*t_wp)); + } else + res = !oexpr(t_lex(*t_wp)); if (--nargc > 0) syntax(*t_wp, "unexpected operator"); @@ -268,12 +278,16 @@ if (n == EOI) return 0; /* missing expression */ if (n == LPAREN) { + parenlevel++; if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) == - RPAREN) + RPAREN) { + parenlevel--; return 0; /* missing expression */ + } res = oexpr(nn); if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN) syntax(NULL, "closing paren expected"); + parenlevel--; return res; } if (t_wp_op && t_wp_op->op_type == UNOP) { @@ -410,8 +424,10 @@ } while (op->op_text) { if (strcmp(s, op->op_text) == 0) { - if ((op->op_type == UNOP && isoperand()) || - (op->op_num == LPAREN && nargc == 1)) + if (((op->op_type == UNOP || op->op_type == BUNOP) + && isunopoperand()) || + (op->op_num == LPAREN && islparenoperand()) || + (op->op_num == RPAREN && isrparenoperand())) break; t_wp_op = op; return op->op_num; @@ -423,7 +439,7 @@ } static int -isoperand(void) +isunopoperand(void) { struct t_op const *op = ops; char *s; @@ -431,19 +447,53 @@ if (nargc == 1) return 1; + s = *(t_wp + 1); if (nargc == 2) - return 0; - s = *(t_wp + 1); + return parenlevel == 1 && strcmp(s, ")") == 0; t = *(t_wp + 2); while (op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && - (t[0] != ')' || t[1] != '\0'); + (parenlevel == 0 || t[0] != ')' || t[1] != '\0'); + op++; + } + return 0; +} + +static int +islparenoperand(void) +{ + struct t_op const *op = ops; + char *s; + + if (nargc == 1) + return 1; + s = *(t_wp + 1); + if (nargc == 2) + return parenlevel == 1 && strcmp(s, ")") == 0; + if (nargc != 3) + return 0; + while (op->op_text) { + if (strcmp(s, op->op_text) == 0) + return op->op_type == BINOP; op++; } return 0; } +static int +isrparenoperand(void) +{ + char *s; + + if (nargc == 1) + return 0; + s = *(t_wp + 1); + if (nargc == 2) + return parenlevel == 1 && strcmp(s, ")") == 0; + return 0; +} + /* atoi with error detection */ static int getn(const char *s) ==== //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.9 2008/05/22 23:06:19 jb Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.10 2009/05/27 01:30:23 sson Exp $ .include SUBDIR= dtrace \ + lockstat \ ${_zdb} .if ${MK_ZFS} != "no" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 19:40:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 507561065691; Sat, 30 May 2009 19:40: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 08B311065687 for ; Sat, 30 May 2009 19:40:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E15EE8FC1E for ; Sat, 30 May 2009 19:39:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJdxn4006650 for ; Sat, 30 May 2009 19:39:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UJdxOj006648 for perforce@freebsd.org; Sat, 30 May 2009 19:39:59 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 19:39:59 GMT Message-Id: <200905301939.n4UJdxOj006648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 19:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=163113 Change 163113 by trasz@trasz_victim on 2009/05/30 19:39:30 Fix a mismerge and remove calls to vfs_unixify_accmode(9) which are no longer needed. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#27 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#14 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#33 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#27 (text+ko) ==== @@ -3968,27 +3968,20 @@ struct thread *a_td; } */ *ap; { - int error; - accmode_t accmode = ap->a_accmode; - - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* * ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest * we have to handle by calling vaccess(). */ - if ((accmode & ~(VREAD|VWRITE|VEXEC)) != 0) { + if ((ap->a_accmode & ~(VREAD|VWRITE|VEXEC)) != 0) { vnode_t *vp = ap->a_vp; znode_t *zp = VTOZ(vp); znode_phys_t *zphys = zp->z_phys; return (vaccess(vp->v_type, zphys->zp_mode, zphys->zp_uid, - zphys->zp_gid, accmode, ap->a_cred, NULL)); + zphys->zp_gid, ap->a_accmode, ap->a_cred, NULL)); } - return (zfs_access(ap->a_vp, accmode, 0, ap->a_cred, NULL)); + return (zfs_access(ap->a_vp, ap->a_accmode, 0, ap->a_cred, NULL)); } static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#14 (text+ko) ==== @@ -59,7 +59,7 @@ accmode_t dac_granted; accmode_t priv_granted; accmode_t acl_mask_granted; - int group_matched, i, error; + int group_matched, i; /* * Look for a normal, non-privileged way to access the file/directory @@ -71,10 +71,6 @@ if (privused != NULL) *privused = 0; - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* * Determine privileges now, but don't apply until we've found a DAC * entry that matches but has failed to allow access. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#33 (text+ko) ==== @@ -3527,7 +3527,6 @@ vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, accmode_t accmode, struct ucred *cred, int *privused) { - int error; accmode_t dac_granted; accmode_t priv_granted; @@ -3541,10 +3540,6 @@ dac_granted = 0; - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* Check the owner. */ if (cred->cr_uid == file_uid) { dac_granted |= VADMIN; @@ -3613,8 +3608,7 @@ !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VREAD; - if ((((accmode & VWRITE) && ((dac_granted & VWRITE) == 0)) || - ((accmode & VAPPEND) && ((dac_granted & VAPPEND) == 0))) && + if ((accmode & VWRITE) && ((dac_granted & VWRITE) == 0) && !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.41 2009/05/29 18:46:57 thompsa Exp $ */ /* @@ -238,12 +238,12 @@ ****************************************************************************/ /* USB methods */ -static usb2_callback_t ubt_ctrl_write_callback; -static usb2_callback_t ubt_intr_read_callback; -static usb2_callback_t ubt_bulk_read_callback; -static usb2_callback_t ubt_bulk_write_callback; -static usb2_callback_t ubt_isoc_read_callback; -static usb2_callback_t ubt_isoc_write_callback; +static usb_callback_t ubt_ctrl_write_callback; +static usb_callback_t ubt_intr_read_callback; +static usb_callback_t ubt_bulk_read_callback; +static usb_callback_t ubt_bulk_write_callback; +static usb_callback_t ubt_isoc_read_callback; +static usb_callback_t ubt_isoc_write_callback; static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); static int ubt_isoc_read_one_frame(struct usb_xfer *, int); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.24 2009/05/29 18:46:57 thompsa Exp $ */ #include "usbdevs.h" @@ -79,16 +79,16 @@ static device_attach_t ubtbcmfw_attach; static device_detach_t ubtbcmfw_detach; -static usb2_callback_t ubtbcmfw_write_callback; -static usb2_callback_t ubtbcmfw_read_callback; +static usb_callback_t ubtbcmfw_write_callback; +static usb_callback_t ubtbcmfw_read_callback; -static usb2_fifo_close_t ubtbcmfw_close; -static usb2_fifo_cmd_t ubtbcmfw_start_read; -static usb2_fifo_cmd_t ubtbcmfw_start_write; -static usb2_fifo_cmd_t ubtbcmfw_stop_read; -static usb2_fifo_cmd_t ubtbcmfw_stop_write; -static usb2_fifo_ioctl_t ubtbcmfw_ioctl; -static usb2_fifo_open_t ubtbcmfw_open; +static usb_fifo_close_t ubtbcmfw_close; +static usb_fifo_cmd_t ubtbcmfw_start_read; +static usb_fifo_cmd_t ubtbcmfw_start_write; +static usb_fifo_cmd_t ubtbcmfw_stop_read; +static usb_fifo_cmd_t ubtbcmfw_stop_write; +static usb_fifo_ioctl_t ubtbcmfw_ioctl; +static usb_fifo_open_t ubtbcmfw_open; static struct usb_fifo_methods ubtbcmfw_fifo_methods = { From owner-p4-projects@FreeBSD.ORG Sat May 30 19:46:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8DFA10656B6; Sat, 30 May 2009 19:46:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8291F10656B1 for ; Sat, 30 May 2009 19:46:06 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BDBC8FC21 for ; Sat, 30 May 2009 19:46:06 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UJk6fo007275 for ; Sat, 30 May 2009 19:46:06 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UJk6Zs007273 for perforce@freebsd.org; Sat, 30 May 2009 19:46:06 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 19:46:06 GMT Message-Id: <200905301946.n4UJk6Zs007273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 19:46:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163114 Change 163114 by trasz@trasz_victim on 2009/05/30 19:45:24 Replace VOP_ACCESS(9) with VOP_ACCESSX(9) where appropriate. Completely untested. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#19 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#34 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#18 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#19 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#17 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#29 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#19 (text+ko) ==== @@ -267,7 +267,7 @@ if (error != 0) goto out; #endif - error = VOP_ACCESS(vp, VREAD_ACL, td->td_ucred, td); + error = VOP_ACCESSX(vp, VREAD_ACL, td->td_ucred, td); if (error != 0) goto out; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#34 (text+ko) ==== @@ -3652,9 +3652,9 @@ case EXTATTR_NAMESPACE_USER: #ifdef SunOS_doesnt_do_that if (accmode == VREAD) - return (VOP_ACCESS(vp, VREAD_NAMED_ATTRS, cred, td)); + return (VOP_ACCESSX(vp, VREAD_NAMED_ATTRS, cred, td)); if (accmode == VWRITE) - return (VOP_ACCESS(vp, VWRITE_NAMED_ATTRS, cred, td)); + return (VOP_ACCESSX(vp, VWRITE_NAMED_ATTRS, cred, td)); #endif /* XXX: Is this possible for "accmode" to not be any of the two above? */ return (VOP_ACCESS(vp, accmode, cred, td)); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#18 (text+ko) ==== @@ -697,7 +697,7 @@ if (error) return (error); #endif - error = VOP_ACCESS(vp, VREAD_ATTRIBUTES, active_cred, td); + error = VOP_ACCESSX(vp, VREAD_ATTRIBUTES, active_cred, td); if (error) return (error); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#19 (text+ko) ==== @@ -377,7 +377,7 @@ /* * Must hold VWRITE_ACL or have appropriate privilege. */ - if ((error = VOP_ACCESS(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) + if ((error = VOP_ACCESSX(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) return (error); if (acl_nfs4_is_trivial(ap->a_aclp, ip->i_uid)) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#17 (text+ko) ==== @@ -100,15 +100,15 @@ if (error) return (error); - error = VOP_ACCESS(tdp, VDELETE, cred, td); + error = VOP_ACCESSX(tdp, VDELETE, cred, td); if (error == 0) return (0); - error = VOP_ACCESS(vdp, VDELETE_CHILD, cred, td); + error = VOP_ACCESSX(vdp, VDELETE_CHILD, cred, td); if (error == 0) return (0); - error = VOP_ACCESS(vdp, VEXPLICIT_DENY | VDELETE_CHILD, cred, td); + error = VOP_ACCESSX(vdp, VEXPLICIT_DENY | VDELETE_CHILD, cred, td); if (error) return (error); @@ -469,7 +469,7 @@ * XXX: Fix the comment above. */ if (flags & WILLBEDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) @@ -604,7 +604,7 @@ */ if (nameiop == RENAME && (flags & ISLASTCN)) { if (flags & WILLBEDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) @@ -637,7 +637,7 @@ * of EACCESS. */ if (tdp->v_type == VDIR) - error = VOP_ACCESS(vdp, VAPPEND, cred, cnp->cn_thread); + error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread); else error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread); if (error) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#29 (text+ko) ==== @@ -89,7 +89,7 @@ #include -static vop_access_t ufs_access; +static vop_accessx_t ufs_accessx; static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); static vop_close_t ufs_close; @@ -298,8 +298,8 @@ } static int -ufs_access(ap) - struct vop_access_args /* { +ufs_accessx(ap) + struct vop_accessx_args /* { struct vnode *a_vp; accmode_t a_accmode; struct ucred *a_cred; @@ -403,7 +403,7 @@ break; default: printf( -"ufs_access(): Error retrieving ACL on object (%d).\n", +"ufs_accessx(): Error retrieving ACL on object (%d).\n", error); /* * XXX: Fall back until debugged. Should @@ -633,11 +633,11 @@ * * XXX: Calling it four times seems a little excessive. */ - error = VOP_ACCESS(vp, VWRITE_ATTRIBUTES, cred, td); + error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td); if (error) error = VOP_ACCESS(vp, VWRITE, cred, td); } else - error = VOP_ACCESS(vp, VWRITE_ATTRIBUTES, cred, td); + error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td); if (error) return (error); if (vap->va_atime.tv_sec != VNOVAL) @@ -743,7 +743,7 @@ * To modify the permissions on a file, must possess VADMIN * for that file. */ - if ((error = VOP_ACCESS(vp, VWRITE_ACL, cred, td))) + if ((error = VOP_ACCESSX(vp, VWRITE_ACL, cred, td))) return (error); /* * Privileged processes may set the sticky bit on non-directories, @@ -810,7 +810,7 @@ * To modify the ownership of a file, must possess VADMIN for that * file. */ - if ((error = VOP_ACCESS(vp, VWRITE_OWNER, cred, td))) + if ((error = VOP_ACCESSX(vp, VWRITE_OWNER, cred, td))) return (error); /* * To change the owner of a file, or change the group of a file to a @@ -2593,7 +2593,7 @@ .vop_read = VOP_PANIC, .vop_reallocblks = VOP_PANIC, .vop_write = VOP_PANIC, - .vop_access = ufs_access, + .vop_accessx = ufs_accessx, .vop_bmap = ufs_bmap, .vop_cachedlookup = ufs_lookup, .vop_close = ufs_close, @@ -2637,7 +2637,7 @@ struct vop_vector ufs_fifoops = { .vop_default = &fifo_specops, .vop_fsync = VOP_PANIC, - .vop_access = ufs_access, + .vop_accessx = ufs_accessx, .vop_close = ufsfifo_close, .vop_getattr = ufs_getattr, .vop_inactive = ufs_inactive, From owner-p4-projects@FreeBSD.ORG Sat May 30 20:33:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E71D41065673; Sat, 30 May 2009 20:33:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A61D5106567D for ; Sat, 30 May 2009 20:33:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 924348FC18 for ; Sat, 30 May 2009 20:33:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UKXtFj011948 for ; Sat, 30 May 2009 20:33:55 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UKXtvd011944 for perforce@freebsd.org; Sat, 30 May 2009 20:33:55 GMT (envelope-from trasz@freebsd.org) Date: Sat, 30 May 2009 20:33:55 GMT Message-Id: <200905302033.n4UKXtvd011944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 20:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=163118 Change 163118 by trasz@trasz_victim on 2009/05/30 20:33:29 Fix misintegration. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/netgraph/NOTES#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_atm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_sscfu.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_sscop.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_uni.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ngatmbase.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/TODO#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_prse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/hci/ng_hci_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_hci.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_l2cap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/include/ng_ubt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/TODO#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/TODO#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/netflow.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_UI.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_async.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_atmllc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_bpf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_cisco.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_deflate.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_echo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_eiface.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_etf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ether_echo.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ether_echo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_fec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_frame_relay.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_gif.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_gif_demux.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_hole.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ip_input.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_l2tp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_lmi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_mppc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_one2many.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_parse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pipe.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_pred1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_rfc1490.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_sample.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_socketvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_split.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_sppp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tag.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tcpmss.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tee.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_vjc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_vlan.h#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/NOTES#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ccatm/ng_ccatm.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ccatm/ng_ccatm_cust.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_atm.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_atm.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_ccatm.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_sscfu.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_sscop.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ng_uni.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ngatmbase.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/ngatmbase.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscfu/ng_sscfu.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscop/ng_sscop.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/uni/ng_uni.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/atm/uni/ng_uni_cust.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/TODO#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 (text+ko) ==== ==== //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ */ /*- - * Copyright (c) 2001-2002 Maksim Yevmenkin + * Copyright (c) 2001-2009 Maksim Yevmenkin * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,29 +27,89 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ng_ubt.c,v 1.22 2005/10/31 17:57:44 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.36 2008/10/03 22:40:42 emax Exp $ + * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.41 2009/05/29 18:46:57 thompsa Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +/* + * NOTE: ng_ubt2 driver has a split personality. On one side it is + * a USB device driver and on the other it is a Netgraph node. This + * driver will *NOT* create traditional /dev/ enties, only Netgraph + * node. + * + * NOTE ON LOCKS USED: ng_ubt2 drives uses 2 locks (mutexes) + * + * 1) sc_if_mtx - lock for device's interface #0 and #1. This lock is used + * by USB for any USB request going over device's interface #0 and #1, + * i.e. interrupt, control, bulk and isoc. transfers. + * + * 2) sc_ng_mtx - this lock is used to protect shared (between USB, Netgraph + * and Taskqueue) data, such as outgoing mbuf queues, task flags and hook + * pointer. This lock *SHOULD NOT* be grabbed for a long time. In fact, + * think of it as a spin lock. + * + * NOTE ON LOCKING STRATEGY: ng_ubt2 driver operates in 3 different contexts. + * + * 1) USB context. This is where all the USB related stuff happens. All + * callbacks run in this context. All callbacks are called (by USB) with + * appropriate interface lock held. It is (generally) allowed to grab + * any additional locks. + * + * 2) Netgraph context. This is where all the Netgraph related stuff happens. + * Since we mark node as WRITER, the Netgraph node will be "locked" (from + * Netgraph point of view). Any variable that is only modified from the + * Netgraph context does not require any additonal locking. It is generally + * *NOT* allowed to grab *ANY* additional locks. Whatever you do, *DO NOT* + * grab any lock in the Netgraph context that could cause de-scheduling of + * the Netgraph thread for significant amount of time. In fact, the only + * lock that is allowed in the Netgraph context is the sc_ng_mtx lock. + * Also make sure that any code that is called from the Netgraph context + * follows the rule above. + * + * 3) Taskqueue context. This is where ubt_task runs. Since we are generally + * NOT allowed to grab any lock that could cause de-scheduling in the + * Netgraph context, and, USB requires us to grab interface lock before + * doing things with transfers, it is safer to transition from the Netgraph + * context to the Taskqueue context before we can call into USB subsystem. + * + * So, to put everything together, the rules are as follows. + * It is OK to call from the USB context or the Taskqueue context into + * the Netgraph context (i.e. call NG_SEND_xxx functions). In other words + * it is allowed to call into the Netgraph context with locks held. + * Is it *NOT* OK to call from the Netgraph context into the USB context, + * because USB requires us to grab interface locks, and, it is safer to + * avoid it. So, to make things safer we set task flags to indicate which + * actions we want to perform and schedule ubt_task which would run in the + * Taskqueue context. + * Is is OK to call from the Taskqueue context into the USB context, + * and, ubt_task does just that (i.e. grabs appropriate interface locks + * before calling into USB). + * Access to the outgoing queues, task flags and hook pointer is + * controlled by the sc_ng_mtx lock. It is an unavoidable evil. Again, + * sc_ng_mtx should really be a spin lock (and it is very likely to an + * equivalent of spin lock due to adaptive nature of FreeBSD mutexes). + * All USB callbacks accept softc pointer as a private data. USB ensures + * that this pointer is valid. + */ +#include "usbdevs.h" #include -#include -#include -#include +#include +#include + +#define USB_DEBUG_VAR usb2_debug + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -59,73 +119,17 @@ #include #include -#include "usbdevs.h" +static int ubt_modevent(module_t, int, void *); +static device_probe_t ubt_probe; +static device_attach_t ubt_attach; +static device_detach_t ubt_detach; -/* - * USB methods - */ +static void ubt_task_schedule(ubt_softc_p, int); +static task_fn_t ubt_task; -static device_probe_t ubt_match; -static device_attach_t ubt_attach; -static device_detach_t ubt_detach; +#define ubt_xfer_start(sc, i) usb2_transfer_start((sc)->sc_xfer[(i)]) -static device_method_t ubt_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ubt_match), - DEVMETHOD(device_attach, ubt_attach), - DEVMETHOD(device_detach, ubt_detach), - - { 0, 0 } -}; - -static driver_t ubt_driver = { - "ubt", - ubt_methods, - sizeof(struct ubt_softc) -}; - -static devclass_t ubt_devclass; - -static int ubt_modevent (module_t, int, void *); - -static usbd_status ubt_request_start (ubt_softc_p); -static void ubt_request_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_request_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_intr_start (ubt_softc_p); -static void ubt_intr_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_intr_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_in_start (ubt_softc_p); -static void ubt_bulk_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_bulk_out_start (ubt_softc_p); -static void ubt_bulk_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_bulk_out_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_in_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_in_start (ubt_softc_p); -static void ubt_isoc_in_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_in_complete2 (node_p, hook_p, void *, int); - -static usbd_status ubt_isoc_out_start_one (ubt_softc_p, int); -static usbd_status ubt_isoc_out_start (ubt_softc_p); -static void ubt_isoc_out_complete (usbd_xfer_handle, - usbd_private_handle, usbd_status); -static void ubt_isoc_out_complete2 (node_p, hook_p, void *, int); - -static void ubt_reset (ubt_softc_p); - -/* - * Netgraph methods - */ - +/* Netgraph methods */ static ng_constructor_t ng_ubt_constructor; static ng_shutdown_t ng_ubt_shutdown; static ng_newhook_t ng_ubt_newhook; @@ -141,7 +145,8 @@ { "qlen", &ng_parse_int32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_qlen_type = { +static const struct ng_parse_type ng_ubt_node_qlen_type = +{ &ng_parse_struct_type, &ng_ubt_node_qlen_type_fields }; @@ -157,61 +162,64 @@ { "ierrors", &ng_parse_uint32_type, }, { NULL, } }; -static const struct ng_parse_type ng_ubt_node_stat_type = { +static const struct ng_parse_type ng_ubt_node_stat_type = +{ &ng_parse_struct_type, &ng_ubt_node_stat_type_fields }; /* Netgraph node command list */ -static const struct ng_cmdlist ng_ubt_cmdlist[] = { +static const struct ng_cmdlist ng_ubt_cmdlist[] = { - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_DEBUG, - "set_debug", - &ng_parse_uint16_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_DEBUG, - "get_debug", - NULL, - &ng_parse_uint16_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_SET_QLEN, - "set_qlen", - &ng_ubt_node_qlen_type, - NULL -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_QLEN, - "get_qlen", - &ng_ubt_node_qlen_type, - &ng_ubt_node_qlen_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_GET_STAT, - "get_stat", - NULL, - &ng_ubt_node_stat_type -}, -{ - NGM_UBT_COOKIE, - NGM_UBT_NODE_RESET_STAT, - "reset_stat", - NULL, - NULL -}, -{ 0, } + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_DEBUG, + "set_debug", + &ng_parse_uint16_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_DEBUG, + "get_debug", + NULL, + &ng_parse_uint16_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_SET_QLEN, + "set_qlen", + &ng_ubt_node_qlen_type, + NULL + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_QLEN, + "get_qlen", + &ng_ubt_node_qlen_type, + &ng_ubt_node_qlen_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_GET_STAT, + "get_stat", + NULL, + &ng_ubt_node_stat_type + }, + { + NGM_UBT_COOKIE, + NGM_UBT_NODE_RESET_STAT, + "reset_stat", + NULL, + NULL + }, + { 0, } }; /* Netgraph node type */ -static struct ng_type typestruct = { - .version = NG_ABI_VERSION, +static struct ng_type typestruct = +{ + .version = NG_ABI_VERSION, .name = NG_UBT_NODE_TYPE, .constructor = ng_ubt_constructor, .rcvmsg = ng_ubt_rcvmsg, @@ -220,192 +228,251 @@ .connect = ng_ubt_connect, .rcvdata = ng_ubt_rcvdata, .disconnect = ng_ubt_disconnect, - .cmdlist = ng_ubt_cmdlist + .cmdlist = ng_ubt_cmdlist }; -/* - * Module - */ - -DRIVER_MODULE(ubt, uhub, ubt_driver, ubt_devclass, ubt_modevent, 0); -MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); -MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); -MODULE_DEPEND(ubt, usb, 1, 1, 1); - - /**************************************************************************** **************************************************************************** ** USB specific **************************************************************************** ****************************************************************************/ +/* USB methods */ +static usb_callback_t ubt_ctrl_write_callback; +static usb_callback_t ubt_intr_read_callback; +static usb_callback_t ubt_bulk_read_callback; +static usb_callback_t ubt_bulk_write_callback; +static usb_callback_t ubt_isoc_read_callback; +static usb_callback_t ubt_isoc_write_callback; + +static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); +static int ubt_isoc_read_one_frame(struct usb_xfer *, int); + /* - * Load/Unload the driver module + * USB config + * + * The following desribes usb transfers that could be submitted on USB device. + * + * Interface 0 on the USB device must present the following endpoints + * 1) Interrupt endpoint to receive HCI events + * 2) Bulk IN endpoint to receive ACL data + * 3) Bulk OUT endpoint to send ACL data + * + * Interface 1 on the USB device must present the following endpoints + * 1) Isochronous IN endpoint to receive SCO data + * 2) Isochronous OUT endpoint to send SCO data */ -static int -ubt_modevent(module_t mod, int event, void *data) +static const struct usb_config ubt_config[UBT_N_TRANSFER] = { - int error; + /* + * Interface #0 + */ + + /* Outgoing bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 0, + .bufsize = UBT_BULK_WRITE_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .force_short_xfer = 1, }, + .callback = &ubt_bulk_write_callback, + }, + /* Incoming bulk transfer - ACL packets */ + [UBT_IF_0_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .bufsize = UBT_BULK_READ_BUFFER_SIZE, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .callback = &ubt_bulk_read_callback, + }, + /* Incoming interrupt transfer - HCI events */ + [UBT_IF_0_INTR_DT_RD] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 0, + .flags = { .pipe_bof = 1, .short_xfer_ok = 1, }, + .bufsize = UBT_INTR_BUFFER_SIZE, + .callback = &ubt_intr_read_callback, + }, + /* Outgoing control transfer - HCI commands */ + [UBT_IF_0_CTRL_DT_WR] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* control pipe */ + .direction = UE_DIR_ANY, + .if_index = 0, + .bufsize = UBT_CTRL_BUFFER_SIZE, + .callback = &ubt_ctrl_write_callback, + .timeout = 5000, /* 5 seconds */ + }, + + /* + * Interface #1 + */ + + /* Incoming isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Incoming isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_RD2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_read_callback, + }, + /* Outgoing isochronous transfer #1 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR1] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, + /* Outgoing isochronous transfer #2 - SCO packets */ + [UBT_IF_1_ISOC_DT_WR2] = { + .type = UE_ISOCHRONOUS, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .if_index = 1, + .bufsize = 0, /* use "wMaxPacketSize * frames" */ + .frames = UBT_ISOC_NFRAMES, + .flags = { .short_xfer_ok = 1, }, + .callback = &ubt_isoc_write_callback, + }, +}; - switch (event) { - case MOD_LOAD: - error = ng_newtype(&typestruct); - if (error != 0) - printf( -"%s: Could not register Netgraph node type, error=%d\n", - NG_UBT_NODE_TYPE, error); - else - error = usbd_driver_load(mod, event, data); - break; +/* + * If for some reason device should not be attached then put + * VendorID/ProductID pair into the list below. The format is + * as follows: + * + * { USB_VPI(VENDOR_ID, PRODUCT_ID, 0) }, + * + * where VENDOR_ID and PRODUCT_ID are hex numbers. + */ - case MOD_UNLOAD: - error = ng_rmtype(&typestruct); - if (error == 0) - error = usbd_driver_load(mod, event, data); - break; +static const struct usb_device_id ubt_ignore_devs[] = +{ + /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x2200, 0) }, +}; - default: - error = EOPNOTSUPP; - break; - } +/* List of supported bluetooth devices */ +static const struct usb_device_id ubt_devs[] = +{ + /* Generic Bluetooth class devices */ + { USB_IFACE_CLASS(UDCLASS_WIRELESS), + USB_IFACE_SUBCLASS(UDSUBCLASS_RF), + USB_IFACE_PROTOCOL(UDPROTO_BLUETOOTH) }, - return (error); -} /* ubt_modevent */ + /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ + { USB_VPI(USB_VENDOR_AVM, 0x3800, 0) }, +}; /* - * Probe for a USB Bluetooth device + * Probe for a USB Bluetooth device. + * USB context. */ static int -ubt_match(device_t self) +ubt_probe(device_t dev) { - /* - * If for some reason device should not be attached then put - * VendorID/ProductID pair into the list below. The format is - * as follows: - * - * { VENDOR_ID, PRODUCT_ID }, - * - * where VENDOR_ID and PRODUCT_ID are hex numbers. - */ + struct usb_attach_arg *uaa = device_get_ivars(dev); - static struct usb_devno const ubt_ignored_devices[] = { - { USB_VENDOR_AVM, 0x2200 }, /* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); - /* - * If device violates Bluetooth specification and has bDeviceClass, - * bDeviceSubClass and bDeviceProtocol set to wrong values then you - * could try to put VendorID/ProductID pair into the list below. - * Adding VendorID/ProductID pair into this list forces ng_ubt(4) - * to attach to the broken device. - */ + if (uaa->info.bIfaceIndex != 0) + return (ENXIO); - static struct usb_devno const ubt_broken_devices[] = { - { USB_VENDOR_AVM, 0x3800 }, /* AVM USB Bluetooth-Adapter BlueFritz! v2.0 */ - { 0, 0 } /* This should be the last item in the list */ - }; + if (uaa->use_generic == 0) + return (ENXIO); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device); + if (usb2_lookup_id_by_uaa(ubt_ignore_devs, + sizeof(ubt_ignore_devs), uaa) == 0) + return (ENXIO); - if (uaa->iface == NULL || - usb_lookup(ubt_ignored_devices, uaa->vendor, uaa->product)) - return (UMATCH_NONE); - - if (dd->bDeviceClass == UDCLASS_WIRELESS && - dd->bDeviceSubClass == UDSUBCLASS_RF && - dd->bDeviceProtocol == UDPROTO_BLUETOOTH) - return (UMATCH_DEVCLASS_DEVSUBCLASS); - - if (usb_lookup(ubt_broken_devices, uaa->vendor, uaa->product)) - return (UMATCH_VENDOR_PRODUCT); - - return (UMATCH_NONE); -} /* ubt_match */ + return (usb2_lookup_id_by_uaa(ubt_devs, sizeof(ubt_devs), uaa)); +} /* ubt_probe */ /* - * Attach the device + * Attach the device. + * USB context. */ static int -ubt_attach(device_t self) +ubt_attach(device_t dev) { - struct ubt_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usb_config_descriptor_t *cd = NULL; - usb_interface_descriptor_t *id = NULL; - usb_endpoint_descriptor_t *ed = NULL; - usbd_status error; - int i, ai, alt_no, isoc_in, isoc_out, - isoc_isize, isoc_osize; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ubt_softc *sc = device_get_softc(dev); + struct usb_endpoint_descriptor *ed; + struct usb_interface_descriptor *id; + uint16_t wMaxPacketSize; + uint8_t alt_index, i, j; + uint8_t iface_index[2] = { 0, 1 }; + + device_set_usb2_desc(dev); - /* Get USB device info */ - sc->sc_dev = self; - sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_debug = NG_UBT_WARN_LEVEL; /* - * Initialize device softc structure + * Create Netgraph node */ - /* State */ - sc->sc_debug = NG_UBT_WARN_LEVEL; - sc->sc_flags = 0; - NG_UBT_STAT_RESET(sc->sc_stat); + if (ng_make_node_common(&typestruct, &sc->sc_node) != 0) { + UBT_ALERT(sc, "could not create Netgraph node\n"); + return (ENXIO); + } + + /* Name Netgraph node */ + if (ng_name_node(sc->sc_node, device_get_nameunit(dev)) != 0) { + UBT_ALERT(sc, "could not name Netgraph node\n"); + NG_NODE_UNREF(sc->sc_node); + return (ENXIO); + } + NG_NODE_SET_PRIVATE(sc->sc_node, sc); + NG_NODE_FORCE_WRITER(sc->sc_node); - /* Interfaces */ - sc->sc_iface0 = sc->sc_iface1 = NULL; + /* + * Initialize device softc structure + */ - /* Interrupt pipe */ - sc->sc_intr_ep = -1; - sc->sc_intr_pipe = NULL; - sc->sc_intr_xfer = NULL; - sc->sc_intr_buffer = NULL; + /* initialize locks */ + mtx_init(&sc->sc_ng_mtx, "ubt ng", NULL, MTX_DEF); + mtx_init(&sc->sc_if_mtx, "ubt if", NULL, MTX_DEF | MTX_RECURSE); - /* Control pipe */ - sc->sc_ctrl_xfer = NULL; - sc->sc_ctrl_buffer = NULL; + /* initialize packet queues */ NG_BT_MBUFQ_INIT(&sc->sc_cmdq, UBT_DEFAULT_QLEN); - - /* Bulk-in pipe */ - sc->sc_bulk_in_ep = -1; - sc->sc_bulk_in_pipe = NULL; - sc->sc_bulk_in_xfer = NULL; - sc->sc_bulk_in_buffer = NULL; - - /* Bulk-out pipe */ - sc->sc_bulk_out_ep = -1; - sc->sc_bulk_out_pipe = NULL; - sc->sc_bulk_out_xfer = NULL; - sc->sc_bulk_out_buffer = NULL; NG_BT_MBUFQ_INIT(&sc->sc_aclq, UBT_DEFAULT_QLEN); - - /* Isoc-in pipe */ - sc->sc_isoc_in_buffer = NULL; - sc->sc_isoc_in_ep = -1; - sc->sc_isoc_in_pipe = NULL; - bzero(&sc->sc_isoc_in, sizeof(sc->sc_isoc_in)); - - /* Isoc-out pipe */ - sc->sc_isoc_out_ep = -1; - sc->sc_isoc_out_pipe = NULL; - bzero(&sc->sc_isoc_out, sizeof(sc->sc_isoc_out)); - - sc->sc_isoc_size = -1; NG_BT_MBUFQ_INIT(&sc->sc_scoq, UBT_DEFAULT_QLEN); - /* Netgraph part */ - sc->sc_node = NULL; - sc->sc_hook = NULL; + /* initialize glue task */ + TASK_INIT(&sc->sc_task, 0, ubt_task, sc); /* - * XXX set configuration? + * Configure Bluetooth USB device. Discover all required USB + * interfaces and endpoints. * - * Configure Bluetooth USB device. Discover all required USB interfaces - * and endpoints. - * * USB device must present two interfaces: * 1) Interface 0 that has 3 endpoints * 1) Interrupt endpoint to receive HCI events @@ -416,1524 +483,804 @@ * 1) Isochronous IN endpoint to receive SCO data * 2) Isochronous OUT endpoint to send SCO data * - * Interface 1 (with isochronous endpoints) has several alternate + * Interface 1 (with isochronous endpoints) has several alternate * configurations with different packet size. */ /* - * Interface 0 + * For interface #1 search alternate settings, and find + * the descriptor with the largest wMaxPacketSize */ - error = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface0); - if (error || sc->sc_iface0 == NULL) { - printf("%s: Could not get interface 0 handle. %s (%d), " \ - "handle=%p\n", device_get_nameunit(sc->sc_dev), - usbd_errstr(error), error, sc->sc_iface0); - goto bad; - } + wMaxPacketSize = 0; + alt_index = 0; + i = 0; + j = 0; + ed = NULL; - id = usbd_get_interface_descriptor(sc->sc_iface0); - if (id == NULL) { - printf("%s: Could not get interface 0 descriptor\n", - device_get_nameunit(sc->sc_dev)); - goto bad; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 30 20:41:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF2591065674; Sat, 30 May 2009 20:41:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F666106566C for ; Sat, 30 May 2009 20:41:09 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8314E8FC14 for ; Sat, 30 May 2009 20:41:09 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UKf9AT012592 for ; Sat, 30 May 2009 20:41:09 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4UKf2Sj012582 for perforce@freebsd.org; Sat, 30 May 2009 20:41:02 GMT (envelope-from syl@FreeBSD.org) Date: Sat, 30 May 2009 20:41:02 GMT Message-Id: <200905302041.n4UKf2Sj012582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 20:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163120 Change 163120 by syl@syl_rincewind on 2009/05/30 20:40:23 - Style change. - Use get_next_timeout() instead of libusb_get_next_timeout() in libusb_handle_events_timeout() and in libusb_handle_evens_locked(). - Fix a deadlock into libusb_get_next_timeout(). - Use USB_TIMED_OUT instead of LIBUSB_TRANSFER_TIMED_OUT. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#23 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#6 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#23 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#6 (text+ko) ==== @@ -259,7 +259,7 @@ ret = ctx->pollfd_modify; pthread_mutex_unlock(&ctx->pollfd_modify_lock); - if (ret) + if (ret != 0) return (0); return (1); } @@ -274,7 +274,7 @@ ret = ctx->pollfd_modify; pthread_mutex_unlock(&ctx->pollfd_modify_lock); - if (ret) + if (ret != 0) return (1); return (ctx->event_handler_active); } @@ -284,7 +284,6 @@ { GET_CONTEXT(ctx); pthread_mutex_lock(&ctx->event_waiters_lock); - return; } void @@ -292,7 +291,6 @@ { GET_CONTEXT(ctx); pthread_mutex_unlock(&ctx->event_waiters_lock); - return; } int @@ -335,16 +333,9 @@ int ret; GET_CONTEXT(ctx); - ret = libusb_get_next_timeout(ctx, &timeout); + ret = get_next_timeout(ctx, tv, &poll_timeout); if (ret != 0) { - if (timerisset(&timeout) == 0) - return (handle_timeouts(ctx)); - if (timercmp(&timeout, tv, <)) - poll_timeout = timeout; - else - poll_timeout = *tv; - } else { - poll_timeout = *tv; + return handle_timeouts(ctx); } retry: if (libusb_try_lock_events(ctx) == 0) { @@ -383,21 +374,14 @@ libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv) { int ret; - struct timeval timeout; struct timeval poll_tv; GET_CONTEXT(ctx); - ret = libusb_get_next_timeout(ctx, &timeout); - if (ret) { - if (timerisset(&timeout) == 0) - return handle_timeouts(ctx); - if (timercmp(&timeout, tv, <) != 0) - poll_tv = timeout; - else - poll_tv = *tv; - } else { - poll_tv = *tv; + ret = get_next_timeout(ctx, tv, &poll_tv); + if (ret != 0) { + return handle_timeouts(ctx); } + return (handle_events(ctx, &poll_tv)); } @@ -414,11 +398,13 @@ GET_CONTEXT(ctx); found = 0; pthread_mutex_lock(&ctx->flying_transfers_lock); - if (USB_LIST_EMPTY(&ctx->flying_transfers)) + if (USB_LIST_EMPTY(&ctx->flying_transfers)) { + pthread_mutex_unlock(&ctx->flying_transfers_lock); return (0); + } LIST_FOREACH_ENTRY(xfer, &ctx->flying_transfers, list) { - if (!(xfer->flags & LIBUSB_TRANSFER_TIMED_OUT)) { + if (!(xfer->flags & USB_TIMED_OUT)) { found = 1; break ; } @@ -438,7 +424,7 @@ return (LIBUSB_ERROR_OTHER); TIMESPEC_TO_TIMEVAL(&cur_tv, &cur_ts); - if (timercmp(&cur_tv, next_tv, >=)) + if (timercmp(&cur_tv, next_tv, >=) != 0) timerclear(tv); else timersub(next_tv, &cur_tv, tv); @@ -473,7 +459,7 @@ ret = calloc(i + 1 , sizeof(struct libusb_pollfd *)); if (ret == NULL) { pthread_mutex_unlock(&ctx->pollfds_lock); - return (NULL); + return (ret); } i = 0;