From owner-p4-projects@FreeBSD.ORG Sun Dec 14 11:03:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE27C1065677; Sun, 14 Dec 2008 11:03: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 81C131065673 for ; Sun, 14 Dec 2008 11:03:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 702988FC0C for ; Sun, 14 Dec 2008 11:03:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEB3gmI030461 for ; Sun, 14 Dec 2008 11:03:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEB3gl5030459 for perforce@freebsd.org; Sun, 14 Dec 2008 11:03:42 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 14 Dec 2008 11:03:42 GMT Message-Id: <200812141103.mBEB3gl5030459@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 154637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 11:03:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154637 Change 154637 by rene@rene_self on 2008/12/14 11:02:54 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#10 integrate .. //depot/projects/docproj_nl/www/en/index.xsl#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#9 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#22 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#3 (text+ko) ==== @@ -7,7 +7,7 @@ # # Author: Jens Schweikhardt # $Id: stage_1.sh,v 1.7 2004/01/03 13:50:41 toor Exp toor $ -# $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh,v 1.6 2008/12/03 21:59:51 schweikh Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh,v 1.7 2008/12/11 19:48:21 schweikh Exp $ PATH=/bin:/usr/bin:/sbin:/usr/sbin @@ -85,7 +85,7 @@ # The loader.conf and device.hints are required by the installkernel target. # If you have not copied them in Step 2, cp them as shown in the next 2 lines. # cp sys/boot/forth/loader.conf ${DESTDIR}/boot/defaults - # cp sys/i386/conf/GENERIC.hints ${DESTDIR}/boot/device.hints + # cp sys/${TARGET}/conf/GENERIC.hints ${DESTDIR}/boot/device.hints make installkernel DESTDIR=${DESTDIR} KERNCONF=${KERNCONF} TARGET=${TARGET} } ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1402,7 +1402,7 @@ The ca_cert field indicates the pathname of the CA certificate file. This file - is needed to verify the server certificat. + is needed to verify the server certificate. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -25,13 +25,42 @@ For a list of additional sources of information, please see . + Changes from the + Third Edition + + The current online version of the Handbook represents the + cumulative effort of many hundreds of contributors over the past + 10 years. The following are some of the significant changes since + the two volume third edition was published in 2004: + + + + , DTrace, has been added with + information about the powerful DTrace performance analysis + tool. + + + + , File Systems Support, has + been added with information about non-native file systems in + &os;, such as ZFS from &sun;. + + + + , Virtualization, has + been added with information about installing &os; on + virtualization software. + + + Changes from the - Second Edition + Second Edition (2004) - This third edition is the culmination of over two years of + The third edition was the culmination of over two years of work by the dedicated members of the FreeBSD Documentation - Project. The following are the major changes in this new - edition: + Project. The printed edition grew to such a size that it was + necessary to publish as two separate volumes. The following are + the major changes in this new edition: @@ -112,7 +141,7 @@ Changes from the - First Edition + First Edition (2001) The second edition was the culmination of over two years of work by the dedicated members of the FreeBSD Documentation ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ pkg-plist. Later we will see how pkg-plist - and PLIST_FILES can be used to fulfil + and PLIST_FILES can be used to fulfill more sophisticated tasks. @@ -12022,7 +12022,7 @@ - 8.0-CURRENT after adding an argumentt to MEXTADD(9) + 8.0-CURRENT after adding an argument to MEXTADD(9) 800016 @@ -12235,6 +12235,15 @@ 800053 + 8.0-CURRENT after the addition of buf_ring, + memory barriers and ifnet functions to facilitate + multiple hardware transmit queues for cards that + support them, and a lockless ring-buffer implementation + to enable drivers to more efficiently manage queuing + of packets. + 800054 + + 8.0-CURRENT after the addition of Intel™ Core, Core2, and Atom support to &man.hwpmc.4;. 800055 @@ -12244,6 +12253,16 @@ multi-/no-IPv4/v6 jails. 800056 + + 8.0-CURRENT after the switch to the + ath hal source code. + 800057 + + + 8.0-CURRENT after the introduction of + the VOP_VPTOCNP operation. + 800058 + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ + ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -122,9 +122,8 @@ RELENG_6_4 Frozen - &contact.re; - A branch for FreeBSD 6.4 release candidate - (to be the FreeBSD 6.4 supported errata fix branch). + &contact.so; + FreeBSD 6.4 supported errata fix branch. ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#22 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.213 2008/12/08 09:10:44 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.214 2008/12/13 19:09:59 danger Exp $ @@ -36,6 +36,21 @@ 12 + 9 + + + FreeBSD 7.1-RC1 Available + +

The first release candidate of &os; 7.1 is now available. + ISO images for Tier-1 architectures are now available on + most of the &os; + mirror sites.

+ + + + 3 From owner-p4-projects@FreeBSD.ORG Sun Dec 14 11:40:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15ECB1065676; Sun, 14 Dec 2008 11:40: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 B67B01065675 for ; Sun, 14 Dec 2008 11:40: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 A60068FC12 for ; Sun, 14 Dec 2008 11:40: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 mBEBeJO5033329 for ; Sun, 14 Dec 2008 11:40:19 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEBeJfT033327 for perforce@freebsd.org; Sun, 14 Dec 2008 11:40:19 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 14 Dec 2008 11:40:19 GMT Message-Id: <200812141140.mBEBeJfT033327@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 154638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 11:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=154638 Change 154638 by rene@rene_self on 2008/12/14 11:39:39 MFen handbook/preface 1.43 -> 1.44 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Remko Lodder %SOURCE% en_US.ISO8859-1/books/handbook/preface/preface.sgml - %SRCID% 1.43 + %SRCID% 1.44 --> @@ -32,13 +32,43 @@ Voor een lijst van extra bronnen van informatie zie . + Wijzigingen ten + opzichte van de derde editie + + De huidige online versie van het Handboek representeert de + gezamenlijke inspanning van vele honderden bijdragende vrijwilligers + van de laatste 10 jaar. Hieronder staan enkele van de belangrijke + wijzigingen sinds de tweedelige derde editie in 2004 werd + uitgegeven: + + + + , &dtrace;, is toegevoegd met + informatie over het krachtige prestatie-analysegereedschap + &dtrace;. + + + + , Ondersteuning voor + bestandssystemen, is toegevoegd met informatie over vreemde + bestandssystemen in &os;, zoals ZFS van &sun;. + + + + , Virtualisatie, is + toegevoegd met informatie over het installeren van &os; op + virtualisatiesoftware. + + + Wijzigingen ten - opzichte van de tweede editie + opzichte van de tweede editie (2004) - Deze derde editie is het resultaat van meer dan twee jaar - werk van de toegewijde leden van het &os; Documentation Project. - Hieronder staan de grootste veranderingen in deze nieuwe - editie: + De derde editie was het resultaat van meer dan twee jaar + werk van de toegewijde leden van het &os; Documentation Project. De + gedrukte editie werd zo groot dat het noodzakelijk was om het was + om het als twee afzonderlijke delen te publiceren. Hieronder staan + de grootste veranderingen in deze nieuwe editie: @@ -124,7 +154,7 @@ Veranderingen ten - opzichte van de eerste editie + opzichte van de eerste editie (2001) Deze tweede editie is een optelsom van meer dan twee jaar werk door vaste leden van het &os; Documentation Project. @@ -136,7 +166,7 @@ - Alle ASCII figuren zijn vervangen door grafische + Alle ASCII-figuren zijn vervangen door grafische diagrammen. From owner-p4-projects@FreeBSD.ORG Sun Dec 14 14:57:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1C371065676; Sun, 14 Dec 2008 14:57: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 5B9561065672; Sun, 14 Dec 2008 14:57:45 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe04.swip.net [212.247.154.97]) by mx1.freebsd.org (Postfix) with ESMTP id B7A8C8FC16; Sun, 14 Dec 2008 14:57:44 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=9QZaWaqL03AA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=4mJciNRHH2yAkD04LsIA:9 a=mbLb6u595XxxHeMsqJmA12gRNZgA:4 a=9aOQ2cSd83gA:10 a=LY0hPdMaydYA:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe04.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1165097623; Sun, 14 Dec 2008 15:57:42 +0100 From: Hans Petter Selasky To: Warner Losh Date: Sun, 14 Dec 2008 15:59:58 +0100 User-Agent: KMail/1.9.7 References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812131005.33499.hselasky@c2i.net> <20081213.130816.74659290.imp@bsdimp.com> In-Reply-To: <20081213.130816.74659290.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812141559.59329.hselasky@c2i.net> Cc: sam@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 14:57:45 -0000 On Saturday 13 December 2008, Warner Losh wrote: > From: Hans Petter Selasky > Subject: Re: PERFORCE change 154573 for review > Date: Sat, 13 Dec 2008 10:05:32 +0100 > > > This is absoultely the wrong way to implement this. It is so wrong, I > don't even know where to begin. Consider this an 'over my dead body' > level of objection to this design. > We don't want to check a variable in the softc every time we do a htoleXX() ?? Do you have a better suggestion? --HPS From owner-p4-projects@FreeBSD.ORG Sun Dec 14 15:03:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 596111065686; Sun, 14 Dec 2008 15:03: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 1BB011065688 for ; Sun, 14 Dec 2008 15:03:48 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 083EA8FC16 for ; Sun, 14 Dec 2008 15:03:48 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEF3lQL062410 for ; Sun, 14 Dec 2008 15:03:48 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEF3lYQ062408 for perforce@freebsd.org; Sun, 14 Dec 2008 15:03:47 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 15:03:47 GMT Message-Id: <200812141503.mBEF3lYQ062408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 15:03:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=154645 Change 154645 by zec@zec_tca51 on 2008/12/14 15:03:28 IFC @ 154644 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#14 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/vimage/src/sys/boot/Makefile#7 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfs.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#31 integrate .. //depot/projects/vimage/src/sys/conf/options#40 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#15 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#15 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/vimage/src/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/exception.s#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#9 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#14 integrate .. //depot/projects/vimage/src/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#16 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#11 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#28 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#9 integrate .. //depot/projects/vimage/src/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/net/if.c#56 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#23 integrate .. //depot/projects/vimage/src/sys/net/pfil.h#4 integrate .. //depot/projects/vimage/src/sys/net/raw_cb.h#5 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#24 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#19 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#48 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/icmp6.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/icmp_var.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#24 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#23 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#59 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#69 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/vimage/src/sys/netinet/udp_var.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#42 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#38 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#8 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#43 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#12 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.h#3 integrate .. //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#31 integrate .. //depot/projects/vimage/src/sys/netipsec/ipip_var.h#2 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_usrreq.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/vimage/src/sys/sys/param.h#37 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#8 integrate .. //depot/projects/vimage/src/sys/sys/resource.h#8 integrate .. //depot/projects/vimage/src/sys/sys/ttyhook.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#73 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#15 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ */ #include "opt_atpic.h" @@ -459,9 +459,9 @@ */ movq %rsp,%rsi /* source stack pointer */ movq $TF_SIZE,%rcx - movq PCPU(RSP0),%rbx - subq %rcx,%rbx - movq %rbx,%rdi /* destination stack pointer */ + movq PCPU(RSP0),%rdx + subq %rcx,%rdx + movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ cld @@ -470,7 +470,7 @@ movl %ss,%eax pushq %rax /* tf_ss */ - pushq %rbx /* tf_rsp (on kernel stack) */ + pushq %rdx /* tf_rsp (on kernel stack) */ pushfq /* tf_rflags */ movl %cs,%eax pushq %rax /* tf_cs */ @@ -480,16 +480,20 @@ /* * At this point the processor has exited NMI mode and is running * with interrupts turned off on the normal kernel stack. - * We turn interrupts back on, and take the usual 'doreti' exit - * path. * * If a pending NMI gets recognized at or after this point, it - * will cause a kernel callchain to be traced. Since this path - * is only taken for NMI interrupts from user space, our `swapgs' - * state is correct for taking the doreti path. + * will cause a kernel callchain to be traced. + * + * We turn interrupts back on, and call the user callchain capture hook. */ + movq pmc_hook,%rax + orq %rax,%rax + jz nocallchain + movq PCPU(CURTHREAD),%rdi /* thread */ + movq $PMC_FN_USER_CALLCHAIN,%rsi /* command */ + movq %rsp,%rdx /* frame */ sti - jmp doreti + call *%rax nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#11 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.171 2008/12/12 16:09:34 jkoshy Exp $"); #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" #include @@ -44,6 +45,9 @@ #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -216,3 +220,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_GSBASE, MSR_GSBASE); + +#ifdef HWPMC_HOOKS +ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN); +#endif ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.168 2008/12/12 23:17:00 jkim Exp $"); #include "opt_cpu.h" @@ -322,15 +322,15 @@ "\003SVM" /* Secure Virtual Mode */ "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ - "\006" - "\007" - "\010" + "\006ABM" /* LZCNT instruction */ + "\007SSE4A" /* SSE4A */ + "\010MAS" /* Misaligned SSE mode */ "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ - "\012" - "\013" - "\014" - "\015" - "\016" + "\012OSVW" /* OS visible workaround */ + "\013IBS" /* Instruction based sampling */ + "\014SSE5" /* SSE5 */ + "\015SKINIT" /* SKINIT/STGI */ + "\016WDT" /* Watchdog timer */ "\017" "\020" "\021" ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.50 2008/12/11 15:56:30 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -299,6 +299,7 @@ /* Program LINT[01] LVT entries. */ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); + #ifdef HWPMC_HOOKS /* Program the PMC LVT entry if present. */ if (maxlvt >= LVT_PMC) @@ -644,6 +645,18 @@ lapic->eoi = 0; } +/* + * Read the contents of the error status register. We have to write + * to the register first before reading from it. + */ +u_int +lapic_error(void) +{ + + lapic->esr = 0; + return (lapic->esr); +} + void lapic_handle_intr(int vector, struct trapframe *frame) { ==== //depot/projects/vimage/src/sys/amd64/include/apicreg.h#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/amd64/include/apicreg.h,v 1.28 2005/01/21 06:01:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.29 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -260,6 +260,14 @@ # define APIC_TPR_INT 0x000000f0 # define APIC_TPR_SUB 0x0000000f +/* fields in ESR */ +#define APIC_ESR_SEND_CS_ERROR 0x00000001 +#define APIC_ESR_RECEIVE_CS_ERROR 0x00000002 +#define APIC_ESR_SEND_ACCEPT 0x00000004 +#define APIC_ESR_RECEIVE_ACCEPT 0x00000008 +#define APIC_ESR_SEND_ILLEGAL_VECTOR 0x00000020 +#define APIC_ESR_RECEIVE_ILLEGAL_VECTOR 0x00000040 +#define APIC_ESR_ILLEGAL_REGISTER 0x00000080 /* fields in ICR_LOW */ #define APIC_VECTOR_MASK 0x000000ff ==== //depot/projects/vimage/src/sys/amd64/include/apicvar.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.25 2007/05/08 22:01:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.26 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -200,6 +200,7 @@ void lapic_disable(void); void lapic_dump(const char *str); void lapic_eoi(void); +u_int lapic_error(void); int lapic_id(void); void lapic_init(vm_paddr_t addr); int lapic_intr_pending(u_int vector); ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.50 2008/11/26 19:25:13 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.51 2008/12/12 23:17:00 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -150,7 +150,15 @@ #define AMDID2_SVM 0x00000004 #define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 +#define AMDID2_ABM 0x00000020 +#define AMDID2_SSE4A 0x00000040 +#define AMDID2_MAS 0x00000080 #define AMDID2_PREFETCH 0x00000100 +#define AMDID2_OSVW 0x00000200 +#define AMDID2_IBS 0x00000400 +#define AMDID2_SSE5 0x00000800 +#define AMDID2_SKINIT 0x00001000 +#define AMDID2_WDT 0x00002000 /* * CPUID instruction 1 eax info ==== //depot/projects/vimage/src/sys/boot/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.37 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.38 2008/12/14 02:57:41 nyan Exp $ .include @@ -12,7 +12,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/vimage/src/sys/boot/zfs/zfs.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $ + * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $"); /* * Stand-alone file reading package. @@ -486,6 +486,7 @@ } f->f_devdata = spa; + free(dev); return (0); } ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#31 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.131 2008/12/10 16:11:09 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.132 2008/12/12 12:12:36 kib Exp $"); #include #include @@ -79,6 +79,7 @@ #include #include +#include #include #include #include @@ -874,7 +875,8 @@ static int linprocfs_doprocmaps(PFS_FILL_ARGS) { - vm_map_t map = &p->p_vmspace->vm_map; + struct vmspace *vm; + vm_map_t map; vm_map_entry_t entry, tmp_entry; vm_object_t obj, tobj, lobj; vm_offset_t e_start, e_end; @@ -899,6 +901,10 @@ return (EOPNOTSUPP); error = 0; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + return (ESRCH); + map = &vm->vm_map; vm_map_lock_read(map); for (entry = map->header.next; entry != &map->header; entry = entry->next) { @@ -985,6 +991,7 @@ } } vm_map_unlock_read(map); + vmspace_free(vm); return (error); } ==== //depot/projects/vimage/src/sys/conf/options#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.650 2008/12/10 23:12:39 zec Exp $ +# $FreeBSD: src/sys/conf/options,v 1.651 2008/12/11 16:13:17 bz Exp $ # # On the handling of kernel options # @@ -415,7 +415,6 @@ TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h -VIMAGE_GLOBALS opt_global.h XBONEHACK # @@ -787,3 +786,4 @@ # Virtualize the network stack VIMAGE opt_global.h +VIMAGE_GLOBALS opt_global.h ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.18 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.19 2008/12/13 19:13:03 bz Exp $"); #endif #include ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.8 2008/12/10 23:12:39 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.9 2008/12/13 22:04:52 bz Exp $"); #include #include @@ -116,24 +116,22 @@ #define ISN_STATIC_INCREMENT 4096 #define ISN_RANDOM_INCREMENT (4096 - 1) -#ifdef VIMAGE_GLOBALS -static u_char isn_secret[32]; -static int isn_last_reseed; -static u_int32_t isn_offset; -static MD5_CTX isn_ctx; -#endif +static u_char pf_isn_secret[32]; +static int pf_isn_last_reseed; +static u_int32_t pf_isn_offset; u_int32_t pf_new_isn(struct pf_state *s) { + MD5_CTX isn_ctx; u_int32_t md5_buffer[4]; u_int32_t new_isn; struct pf_state_host *src, *dst; /* Seed if this is the first use, reseed if requested. */ - if (isn_last_reseed == 0) { - read_random(&isn_secret, sizeof(isn_secret)); - isn_last_reseed = ticks; + if (pf_isn_last_reseed == 0) { + read_random(&pf_isn_secret, sizeof(pf_isn_secret)); + pf_isn_last_reseed = ticks; } if (s->direction == PF_IN) { @@ -162,11 +160,11 @@ MD5Update(&isn_ctx, (u_char *) &src->addr, sizeof(struct in_addr)); } - MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); + MD5Update(&isn_ctx, (u_char *) &pf_isn_secret, sizeof(pf_isn_secret)); MD5Final((u_char *) &md5_buffer, &isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - isn_offset += ISN_STATIC_INCREMENT + + pf_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += isn_offset; + new_isn += pf_isn_offset; return (new_isn); } ==== //depot/projects/vimage/src/sys/dev/acpica/acpi_smbat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.5 2006/02/21 03:16:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.7 2008/12/13 07:45:48 silby Exp $"); #include "opt_acpi.h" #include @@ -61,6 +61,23 @@ ACPI_SERIAL_DECL(smbat, "ACPI Smart Battery"); +SYSCTL_DECL(_debug_acpi); +SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL, "Battery debugging"); + +/* On some laptops with smart batteries, enabling battery monitoring + * software causes keystrokes from atkbd to be lost. This has also been + * reported on Linux, and is apparently due to the keyboard and I2C line + * for the battery being routed through the same chip. Whether that's + * accurate or not, adding extra sleeps to the status checking code + * causes the problem to go away. + * + * If you experience that problem, try a value of 10ms and move up + * from there. + */ +static int batt_sleep_ms; +SYSCTL_INT(_debug_acpi_batt, OID_AUTO, batt_sleep_ms, CTLFLAG_RW, &batt_sleep_ms, 0, + "Sleep during battery status updates to prevent keystroke loss."); + static device_method_t acpi_smbat_methods[] = { /* device interface */ DEVMETHOD(device_probe, acpi_smbat_probe), @@ -176,6 +193,9 @@ ACPI_SERIAL_ASSERT(smbat); + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + val = addr; error = ACPI_EC_WRITE(sc->ec_dev, sc->sb_base_addr + SMBUS_ADDR, val, 1); @@ -194,6 +214,9 @@ if (error) goto out; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + for (to = SMBUS_TIMEOUT; to != 0; to--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_PRTCL, &val, 1); @@ -239,6 +262,9 @@ ACPI_SERIAL_ASSERT(smbat); + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + val = addr; error = ACPI_EC_WRITE(sc->ec_dev, sc->sb_base_addr + SMBUS_ADDR, val, 1); @@ -257,6 +283,9 @@ if (error) goto out; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + for (to = SMBUS_TIMEOUT; to != 0; to--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_PRTCL, &val, 1); @@ -292,6 +321,9 @@ if (len > val) len = val; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + while (len--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_DATA + len, &val, 1); @@ -299,6 +331,8 @@ goto out; ptr[len] = val; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); } out: ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah.c,v 1.15 2008/11/15 22:15:44 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.2 2008/12/13 03:48:33 sam Exp $ */ #include "opt_ah.h" @@ -32,7 +32,7 @@ const char* ath_hal_probe(uint16_t vendorid, uint16_t devid) { - struct ath_hal_chip **pchip; + struct ath_hal_chip * const *pchip; OS_SET_FOREACH(pchip, ah_chips) { const char *name = (*pchip)->probe(vendorid, devid); @@ -53,7 +53,7 @@ ath_hal_attach(uint16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st, HAL_BUS_HANDLE sh, HAL_STATUS *error) { - struct ath_hal_chip **pchip; + struct ath_hal_chip * const *pchip; OS_SET_FOREACH(pchip, ah_chips) { struct ath_hal_chip *chip = *pchip; @@ -88,7 +88,7 @@ struct ath_hal_rf * ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode) { - struct ath_hal_rf **prf; + struct ath_hal_rf * const *prf; OS_SET_FOREACH(prf, ah_rfs) { struct ath_hal_rf *rf = *prf; ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.2 2008/12/11 04:03:13 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.3 2008/12/13 03:49:01 sam Exp $ */ #include "opt_ah.h" @@ -160,18 +160,6 @@ return AH_FALSE; } -/* XXX conditionalize by target byte order */ -#ifndef bswap16 -static __inline__ uint16_t -__bswap16(uint16_t _x) -{ - return ((uint16_t)( - (((const uint8_t *)(&_x))[0] ) | - (((const uint8_t *)(&_x))[1]<< 8)) - ); -} -#endif - /* Do structure specific swaps if Eeprom format is non native to host */ static void eepromSwap(struct ar5416eeprom *ee) ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_eeprom_v3.c,v 1.4 2008/11/27 22:39:42 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v3.c,v 1.2 2008/12/13 03:47:42 sam Exp $ */ #include "opt_ah.h" @@ -26,9 +26,9 @@ getPcdacInterceptsFromPcdacMinMax(HAL_EEPROM *ee, uint16_t pcdacMin, uint16_t pcdacMax, uint16_t *vp) { - const static uint16_t intercepts3[] = + static const uint16_t intercepts3[] = { 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 }; - const static uint16_t intercepts3_2[] = + static const uint16_t intercepts3_2[] = { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 }; const uint16_t *ip = ee->ee_version < AR_EEPROM_VER3_2 ? intercepts3 : intercepts3_2; ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_internal.h,v 1.21 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.2 2008/12/13 03:50:31 sam Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -42,23 +42,6 @@ #define offsetof(type, field) ((size_t)(&((type *)0)->field)) #endif -/* - * Remove const in a way that keeps the compiler happy. - * This works for gcc but may require other magic for - * other compilers (not sure where this should reside). - * Note that uintptr_t is C99. - */ -#ifndef __DECONST -#ifndef _UINTPTR_T -#if AH_WORDSIZE == 64 -typedef unsigned long int uintptr_t; -#else -typedef unsigned int uintptr_t; -#endif -#endif -#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) -#endif - typedef struct { uint16_t start; /* first register */ uint16_t end; /* ending register or zero */ @@ -114,12 +97,12 @@ }; #ifndef AH_RF #define AH_RF(_name, _probe, _attach) \ -static struct ath_hal_rf name##_rf = { \ - .name = #_name, \ +static struct ath_hal_rf _name##_rf = { \ + .name = __STRING(_name), \ .probe = _probe, \ .attach = _attach \ }; \ -OS_DATA_SET(ah_rfs, name##_rf) +OS_DATA_SET(ah_rfs, _name##_rf) #endif struct ath_hal_rf *ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode); ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5111.c,v 1.7 2008/11/10 04:08:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5111.c,v 1.2 2008/12/13 03:45:54 sam Exp $ */ #include "opt_ah.h" @@ -90,7 +90,7 @@ uint16_t channel5111; /* 11a channel for 5111 */ } CHAN_INFO_2GHZ; - const static CHAN_INFO_2GHZ chan2GHzData[] = { + static const CHAN_INFO_2GHZ chan2GHzData[] = { { 1, 0x46, 96 }, /* 2312 -19 */ { 1, 0x46, 97 }, /* 2317 -18 */ { 1, 0x46, 98 }, /* 2322 -17 */ ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312.h,v 1.5 2008/11/22 07:37:40 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312.h,v 1.2 2008/12/13 03:44:44 sam Exp $ */ #ifndef _ATH_AR5312_H_ #define _ATH_AR5312_H_ @@ -38,8 +38,6 @@ AH_PRIVATE(ah)->ah_devid == AR5212_AR2317_REV1 || \ AH_PRIVATE(ah)->ah_devid == AR5212_AR2317_REV2) -extern struct ath_hal * ar5312Attach(uint16_t devid, HAL_SOFTC sc, - HAL_BUS_TAG st, HAL_BUS_HANDLE sh, HAL_STATUS *status); extern HAL_BOOL ar5312IsInterruptPending(struct ath_hal *ah); /* AR5312 */ ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312_attach.c,v 1.8 2008/11/27 22:30:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.2 2008/12/13 03:45:00 sam Exp $ */ #include "opt_ah.h" @@ -318,7 +318,6 @@ case AR5212_AR2313_REV8: return "Atheros 2313 WiSoC"; case AR5212_AR2315_REV6: - case AR5212_AR2315_REV6: case AR5212_AR2315_REV7: return "Atheros 2315 WiSoC"; case AR5212_AR2317_REV1: ==== //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.41 2008/11/27 09:00:47 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.42 2008/12/13 13:07:12 jkoshy Exp $"); #include #include @@ -1863,8 +1863,11 @@ /* * Record a call chain. */ + KASSERT(td == curthread, ("[pmc,%d] td != curthread", + __LINE__)); pmc_capture_user_callchain(PCPU_GET(cpuid), (struct trapframe *) arg); + td->td_pflags &= ~TDP_CALLCHAIN; break; default: @@ -3794,30 +3797,28 @@ */ static void -pmc_post_callchain_ast(void) +pmc_post_callchain_callback(void) { struct thread *td; td = curthread; + KASSERT((td->td_pflags & TDP_CALLCHAIN) == 0, + ("[pmc,%d] thread %p already marked for callchain capture", + __LINE__, (void *) td)); + /* - * Mark this thread as needing processing in ast(). - * td->td_pflags will be safe to touch as the process was in - * user space when it was interrupted. + * Mark this thread as needing callchain capture. + * `td->td_pflags' will be safe to touch because this thread + * was in user space when it was interrupted. */ td->td_pflags |= TDP_CALLCHAIN; /* - * Again, since we've entered this function directly from - * userland, `td' is guaranteed to be not locked by this CPU, - * so its safe to try acquire the thread lock even though we - * are executing in an NMI context. We need to acquire this - * lock before touching `td_flags' because other CPUs may be - * in the process of touching this field. + * Don't let this thread migrate between CPUs until callchain + * capture completes. */ - thread_lock(td); - td->td_flags |= TDF_ASTPENDING; - thread_unlock(td); + sched_pin(); return; } @@ -3869,6 +3870,10 @@ (int) (psb->ps_write - psb->ps_samples), (int) (psb->ps_read - psb->ps_samples)); + KASSERT(pm->pm_runcount >= 0, + ("[pmc,%d] pm=%p runcount %d", __LINE__, (void *) pm, + pm->pm_runcount)); + atomic_add_rel_32(&pm->pm_runcount, 1); /* hold onto PMC */ ps->ps_pmc = pm; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 14 15:10:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8F681065676; Sun, 14 Dec 2008 15:10: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 ACD101065672 for ; Sun, 14 Dec 2008 15:10:55 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9BE6D8FC13 for ; Sun, 14 Dec 2008 15:10:55 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEFAt5F063059 for ; Sun, 14 Dec 2008 15:10:55 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEFAtgu063057 for perforce@freebsd.org; Sun, 14 Dec 2008 15:10:55 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 15:10:55 GMT Message-Id: <200812141510.mBEFAtgu063057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 15:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=154646 Change 154646 by zec@zec_tpx32 on 2008/12/14 15:10:44 Partial resolving of misintegrations. Affected files ... .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_desc.h#3 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#23 edit .. //depot/projects/vimage/src/sys/net/if_var.h#24 edit Differences ... ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_desc.h#3 (text+ko) ==== @@ -22,10 +22,6 @@ #include "opt_ah.h" /* NB: required for AH_SUPPORT_AR5416 */ -#ifndef AH_SUPPORT_AR5416 -#define AH_SUPPORT_AR5416 -#endif - /* * Transmit descriptor status. This structure is filled * in only after the tx descriptor process method finds a ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#23 (text+ko) ==== @@ -1321,7 +1321,7 @@ break; } } -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS /* * If the symbol is not found in global namespace, * try to look it up in the current vimage namespace. ==== //depot/projects/vimage/src/sys/net/if_var.h#24 (text+ko) ==== @@ -665,7 +665,6 @@ struct ifaddr *ifaddr_byindex(u_short idx); struct cdev *ifdev_byindex(u_short idx); -extern int ifqmaxlen; #ifdef VIMAGE_GLOBALS extern struct ifnethead ifnet; extern struct ifnet *loif; /* first loopback interface */ From owner-p4-projects@FreeBSD.ORG Sun Dec 14 16:21:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3BAF1065679; Sun, 14 Dec 2008 16: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 7601F1065676; Sun, 14 Dec 2008 16:21:39 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe13.tele2.se [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id D5B508FC16; Sun, 14 Dec 2008 16:21:38 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=9QZaWaqL03AA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=Fh-P19vL6c5jBdxs1SYA:9 a=_5GlLgH6ut_i8OXqlAsK9C0QMj4A:4 a=LY0hPdMaydYA:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe13.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 775804387; Sun, 14 Dec 2008 16:21:34 +0100 From: Hans Petter Selasky To: Sam Leffler Date: Sun, 14 Dec 2008 16:23:50 +0100 User-Agent: KMail/1.9.7 References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812131005.33499.hselasky@c2i.net> <494414EF.3080403@freebsd.org> In-Reply-To: <494414EF.3080403@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812141623.51473.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 16:21:40 -0000 On Saturday 13 December 2008, Sam Leffler wrote: > Hans Petter Selasky wrote: > > On Saturday 13 December 2008, Sam Leffler wrote: > > No. But if you are interested in helping debug the problem I'm happy to > send you debug output. The controller rejects all cmds setting the > ERRINT status bit. The qTD contents and xfer contents look fine but I > haven't been able to identify the cause given the overlay qTD contents. > I'm in the process of collecting comparative traces from linux where usb > works. > Send me the EHCI traces and I will have a look at it. Have you tried USB2? The patches which you need to apply should be similar. --HPS From owner-p4-projects@FreeBSD.ORG Sun Dec 14 17:02:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C6271065675; Sun, 14 Dec 2008 17:02: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 F35ED1065672 for ; Sun, 14 Dec 2008 17:02:49 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF5BF8FC19 for ; Sun, 14 Dec 2008 17:02:49 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEH2nPr081977 for ; Sun, 14 Dec 2008 17:02:49 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEH2nLA081975 for perforce@freebsd.org; Sun, 14 Dec 2008 17:02:49 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 14 Dec 2008 17:02:49 GMT Message-Id: <200812141702.mBEH2nLA081975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 17:02:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154647 Change 154647 by nwhitehorn@nwhitehorn_trantor on 2008/12/14 17:01:50 IFC to get ready for merging OFW changes to support G5 systems Affected files ... .. //depot/projects/ppc-g5/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/ppc-g5/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/ppc-g5/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/ppc-g5/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/ppc-g5/sbin/devd/devd.cc#2 integrate .. //depot/projects/ppc-g5/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/ppc-g5/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/newfs.c#3 integrate .. //depot/projects/ppc-g5/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/cxgb.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ddb.4#6 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#7 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/ppc-g5/share/man/man9/ifnet.9#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/ppc-g5/sys/boot/Makefile#5 integrate .. //depot/projects/ppc-g5/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/ppc-g5/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/ppc-g5/sys/conf/files#8 integrate .. //depot/projects/ppc-g5/sys/conf/options#7 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/re/if_re.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/snp/snp.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_sw_transfer.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ata-usb2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/ppc-g5/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/i386/exception.s#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/kern_linker.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_poll.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_proc.c#7 integrate .. //depot/projects/ppc-g5/sys/kern/kern_prot.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_vimage.c#1 branch .. //depot/projects/ppc-g5/sys/kern/subr_prf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_trap.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/tty_pts.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_default.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vnode_if.src#4 integrate .. //depot/projects/ppc-g5/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/modules/aio/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/net/if.c#6 integrate .. //depot/projects/ppc-g5/sys/net/if_bridge.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.h#3 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#6 integrate .. //depot/projects/ppc-g5/sys/net/if_var.h#4 integrate .. //depot/projects/ppc-g5/sys/net/pfil.h#2 integrate .. //depot/projects/ppc-g5/sys/net/raw_cb.h#2 integrate .. //depot/projects/ppc-g5/sys/net/route.c#6 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#5 integrate .. //depot/projects/ppc-g5/sys/net/vnet.h#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/icmp6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/ppc-g5/sys/netinet/in_proto.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/in_var.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_var.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/vinet.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/vinet6.h#3 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipip_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/ppc-g5/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/ppc-g5/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/ppc-g5/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/aio.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/kernel.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/pmc.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/resource.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysctl.h#4 integrate .. //depot/projects/ppc-g5/sys/sys/ttyhook.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/vimage.h#4 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#7 integrate .. //depot/projects/ppc-g5/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/ppc-g5/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/fetch/fetch.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/fwcontrol/fwmpegts.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/jexec/jexec.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/jls/jls.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/ppc-g5/contrib/binutils/bfd/config.bfd#2 (text+ko) ==== @@ -768,6 +768,10 @@ targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; + mips*-*-freebsd*) + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ==== //depot/projects/ppc-g5/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ==== @@ -281,6 +281,9 @@ #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI) +/* True if relocations are stored in-place. */ +#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI) + /* We can only have 64bit addresses if the object file format supports it. */ #define HAVE_32BIT_ADDRESSES \ @@ -13020,6 +13023,26 @@ if (fixp->fx_addsy == NULL) return 1; + /* If symbol SYM is in a mergeable section, relocations of the form + SYM + 0 can usually be made section-relative. The mergeable data + is then identified by the section offset rather than by the symbol. + + However, if we're generating REL LO16 relocations, the offset is split + between the LO16 and parterning high part relocation. The linker will + need to recalculate the complete offset in order to correctly identify + the merge data. + + The linker has traditionally not looked for the parterning high part + relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be + placed anywhere. Rather than break backwards compatibility by changing + this, it seems better not to force the issue, and instead keep the + original symbol. This will work with either linker behavior. */ + if ((fixp->fx_r_type == BFD_RELOC_LO16 + || reloc_needs_lo_p (fixp->fx_r_type)) + && HAVE_IN_PLACE_ADDENDS + && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0) + return 0; + #ifdef OBJ_ELF if (OUTPUT_FLAVOR == bfd_target_elf_flavour && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16 ==== //depot/projects/ppc-g5/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.19 2008/12/11 08:15:14 imp Exp $ # BINDIR @@ -20,6 +20,10 @@ # DEO: why not used? #SRCS+= itbl-ops.c +.if ${TARGET_ARCH} == "mips" +SRCS+= itbl-ops.c itbl-parse.y itbl-lex.l +.endif + .if ${TARGET_ARCH} == "amd64" SRCS+= tc-i386.c .elif ${TARGET_ARCH} == "powerpc" ==== //depot/projects/ppc-g5/gnu/usr.bin/binutils/libbfd/bfd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.5 2008/12/11 08:20:34 imp Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -57,7 +57,7 @@ #define BFD_ARCH_SIZE 64 -#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) +#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long ==== //depot/projects/ppc-g5/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.64 2008/08/06 14:02:05 dfr Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $ .\" .\" %beginstrip% . @@ -69,6 +69,8 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 +.ds doc-operating-system-FreeBSD-7.1 7.1 .ds doc-operating-system-FreeBSD-8.0 8.0 . .ec ==== //depot/projects/ppc-g5/lib/libc/stdio/vfprintf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.81 2008/06/29 22:54:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.83 2008/12/11 02:39:27 das Exp $"); /* * Actual printf innards. @@ -396,12 +396,6 @@ char sign; /* sign prefix (' ', '+', '-', or \0) */ char thousands_sep; /* locale specific thousands separator */ const char *grouping; /* locale specific numeric grouping rules */ - - if (__use_xprintf == 0 && getenv("USE_XPRINTF")) - __use_xprintf = 1; - if (__use_xprintf > 0) - return (__xvprintf(fp, fmt0, ap)); - #ifndef NO_FLOATING_POINT /* * We can decompose the printed representation of floating @@ -568,14 +562,11 @@ val = GETARG (int); \ } + if (__use_xprintf == 0 && getenv("USE_XPRINTF")) + __use_xprintf = 1; + if (__use_xprintf > 0) + return (__xvprintf(fp, fmt0, ap)); - thousands_sep = '\0'; - grouping = NULL; - convbuf = NULL; -#ifndef NO_FLOATING_POINT - dtoaresult = NULL; - decimal_point = localeconv()->decimal_point; -#endif /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -585,6 +576,9 @@ fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (char *)fmt0; argtable = NULL; nextarg = 1; @@ -593,6 +587,10 @@ uio.uio_resid = 0; uio.uio_iovcnt = 0; ret = 0; +#ifndef NO_FLOATING_POINT + dtoaresult = NULL; + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). ==== //depot/projects/ppc-g5/lib/libc/stdio/vfwprintf.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.33 2008/08/04 06:55:42 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.34 2008/12/11 02:39:27 das Exp $"); /* * Actual wprintf innards. @@ -575,12 +575,6 @@ } - thousands_sep = '\0'; - grouping = NULL; -#ifndef NO_FLOATING_POINT - decimal_point = localeconv()->decimal_point; -#endif - convbuf = NULL; /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -590,11 +584,17 @@ fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (wchar_t *)fmt0; argtable = NULL; nextarg = 1; va_copy(orgap, ap); ret = 0; +#ifndef NO_FLOATING_POINT + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). ==== //depot/projects/ppc-g5/sbin/atacontrol/atacontrol.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.31 2008/06/25 18:11:22 bz Exp $ +.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.32 2008/12/14 12:56:56 ru Exp $ .\" -.Dd June 25, 2008 +.Dd December 14, 2008 .Dt ATACONTROL 8 .Os .Sh NAME @@ -63,6 +63,7 @@ .Nm .Ic mode .Ar device +.Op Ar mode .Nm .Ic info .Ar channel @@ -94,7 +95,7 @@ .Ar channel argument is the ATA channel device (e.g., ata0) on which to operate. The following commands are supported: -.Bl -tag -width "rebuild" +.Bl -tag -width ".Ic addspare" .It Ic attach Attach an ATA .Ar channel . @@ -162,9 +163,13 @@ .It Ic status Get the status of an ATA RAID. .It Ic mode -Without the mode argument, the current transfer modes of the +Without the +.Ar mode +argument, the current transfer mode of the device are printed. -If the mode argument is given, the ATA driver +If the +.Ar mode +argument is given, the ATA driver is asked to change the transfer mode to the one given. The ATA driver will reject modes that are not supported by the hardware. @@ -190,13 +195,12 @@ .Cm UDMA6 (alias .Cm UDMA133 ) . -The device name and manufacture/version strings are shown. .It Ic cap Show detailed info about the device on .Ar device . .It Ic spindown Set or report timeout after which the -.Ar device +.Ar device will be spun down. To arm the timeout the device needs at least one more request after setting the timeout. @@ -205,6 +209,7 @@ .It Ic info Show info about the attached devices on the .Ar channel . +The device name and manufacture/version strings are shown. .It Ic list Show info about all attached devices on all active controllers. .El @@ -312,7 +317,7 @@ RAID controller, then shut the system down, make sure that the disk that was still working is moved to the bootable position (channel 0 or whatever the BIOS allows the system to boot from) and the blank disk -is placed in the secondary position, then boot the system into +is placed in the secondary position, then boot the system into single-user mode and issue the command: .Pp .Dl "atacontrol addspare ar0 ad6" ==== //depot/projects/ppc-g5/sbin/devd/devd.cc#2 (text+ko) ==== @@ -34,7 +34,7 @@ // - devd.conf needs more details on the supported statements. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.33 2006/09/17 22:49:26 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.34 2008/12/14 11:48:51 phk Exp $"); #include #include @@ -307,7 +307,7 @@ config::parse_one_file(const char *fn) { if (Dflag) - printf("Parsing %s\n", fn); + fprintf(stderr, "Parsing %s\n", fn); yyin = fopen(fn, "r"); if (yyin == NULL) err(1, "Cannot open config file %s", fn); @@ -325,7 +325,7 @@ char path[PATH_MAX]; if (Dflag) - printf("Parsing files in %s\n", dirname); + fprintf(stderr, "Parsing files in %s\n", dirname); dirp = opendir(dirname); if (dirp == NULL) return; ==== //depot/projects/ppc-g5/sbin/devd/devd.conf.5#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/sbin/devd/devd.conf.5,v 1.11 2006/10/24 20:20:41 ru Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.12 2008/12/14 11:47:39 phk Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -110,7 +110,7 @@ .It Ic directory Qq Ar /some/path ; Adds the given directory to the list of directories from which .Xr devd 8 -will read +will read all files named "*.conf" as further configuration files. Any number of .Ic directory ==== //depot/projects/ppc-g5/sbin/geom/misc/subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.8 2008/06/06 22:44:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.9 2008/12/13 14:14:56 lulf Exp $"); #include #include @@ -211,7 +211,7 @@ sector = NULL; error = 0; - fd = open(path, O_WRONLY); + fd = open(path, O_RDWR); if (fd == -1) return (errno); mediasize = g_get_mediasize(name); ==== //depot/projects/ppc-g5/sbin/newfs/newfs.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.86 2008/12/03 18:36:59 luigi Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.87 2008/12/12 15:56:38 luigi Exp $"); /* * newfs: friendly front end to mkfs @@ -354,11 +354,6 @@ mediasize = st.st_size; /* set fssize from the partition */ } else { - part_name = special[strlen(special) - 1]; - if ((part_name < 'a' || part_name > 'h') && !isdigit(part_name)) - errx(1, "%s: can't figure out file system partition", - special); - if (sectorsize == 0) if (ioctl(disk.d_fd, DIOCGSECTORSIZE, §orsize) == -1) sectorsize = 0; /* back out on error for safety */ @@ -368,6 +363,12 @@ pp = NULL; lp = getdisklabel(special); if (lp != NULL) { + if (!is_file) /* already set for files */ + part_name = special[strlen(special) - 1]; + if ((part_name < 'a' || part_name - 'a' >= MAXPARTITIONS) && + !isdigit(part_name)) + errx(1, "%s: can't figure out file system partition", + special); cp = &part_name; if (isdigit(*cp)) pp = &lp->d_partitions[RAW_PART]; ==== //depot/projects/ppc-g5/share/man/man4/acpi_aiboost.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_aiboost.4,v 1.1 2008/08/21 00:40:55 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_aiboost.4,v 1.2 2008/12/13 09:33:03 schweikh Exp $ .\" .Dd March 14, 2007 .Dt ACPI_AIBOOST 4 @@ -56,8 +56,8 @@ descriptions and provides its data via the .Xr sysctl 8 interface, under dev.acpi_aiboost.0 namespace. -Descriptions for these values are set to sysctl description, -which can be see with sysctl -d. +Descriptions for these values are available +with sysctl -d. .Pp The .Nm ==== //depot/projects/ppc-g5/share/man/man4/cxgb.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007, Chelsio Inc +.\" Copyright (c) 2007-2008, Chelsio Inc .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/cxgb.4,v 1.8 2007/09/26 21:31:47 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/cxgb.4,v 1.9 2008/12/12 05:45:39 kmacy Exp $ .\" .Dd March 14, 2007 .Dt CXGB 4 @@ -56,7 +56,8 @@ The .Nm driver supports Transmit/Receive checksum offload, -Jumbo Frames as well as TCP segmentation offload (TSO). +Jumbo Frames, TCP segmentation offload (TSO), Large Receive Offload (LRO), +VLAN hardware insertion / extraction, and VLAN checksum offload. For further hardware information, see .Pa http://www.chelsio.com/ . .Pp @@ -76,7 +77,7 @@ .Sh HARDWARE The .Nm -driver supports 10 Gigabit Ethernet adapters based on the T3 and T3B chipset: +driver supports 10 Gigabit and 1 Gigabit Ethernet adapters based on the T3 and T3B chipset: .Pp .Bl -bullet -compact .It @@ -111,7 +112,7 @@ If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related to the issue to -.Aq help@chelsio.com . +.Aq support@chelsio.com . .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ==== //depot/projects/ppc-g5/share/man/man4/ddb.4#6 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.62 2008/11/29 14:32:14 bz Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.63 2008/12/12 05:42:57 jhb Exp $ .\" .Dd November 29, 2008 .Dt DDB 4 @@ -102,10 +102,7 @@ .Sh DESCRIPTION The .Nm -kernel debugger has most of the features of the old -.Nm kdb , -but with a more rational syntax -inspired by +kernel debugger is an interactive debugger with a syntax inspired by .Xr gdb 1 . If linked into the running kernel, it can be invoked locally with the @@ -202,7 +199,7 @@ .Nm emacs control keys, the usual .Tn ANSI -arrow keys might be used to +arrow keys may be used to browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS @@ -254,8 +251,6 @@ display as an instruction with possible alternate formats depending on the machine: .Bl -tag -width ".Tn powerpc" -compact -.It Tn alpha -Show the registers of the instruction. .It Tn amd64 No alternate format. .It Tn i386 ==== //depot/projects/ppc-g5/share/man/man9/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.344 2008/11/23 20:05:12 hrs Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.345 2008/12/12 01:08:28 marcus Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -348,6 +348,7 @@ VOP_SETACL.9 \ VOP_SETEXTATTR.9 \ VOP_STRATEGY.9 \ + VOP_VPTOCNP.9 \ VOP_VPTOFH.9 \ vput.9 \ vref.9 \ ==== //depot/projects/ppc-g5/share/man/man9/ifnet.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.53 2007/03/14 13:19:50 bms Exp $ +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.54 2008/12/11 22:51:11 kmacy Exp $ .\" .Dd March 14, 2007 .Os @@ -103,6 +103,10 @@ .Ft void .Fn \*(lp*if_start\*(rp "struct ifnet *ifp" .Ft int +.Fn \*(lp*if_transmit\*(rp "struct ifnet *ifp" "struct mbuf *m" +.Ft void +.Fn \*(lp*if_qflush\*(rp "struct ifnet *ifp" +.Ft int .Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data" .Ft void .Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp" @@ -350,6 +354,20 @@ Output a packet on interface .Fa ifp , or queue it on the output queue if the interface is already active. +.It Fn if_transmit +Transmit a packet on an interface or queue it if the interface is +in use. This function will return +.Dv ENOBUFS +if the devices software and hardware queues are both full. This +function must be installed after +.It Fn if_qflush +Free mbufs in internally managed queues when the interface is marked down. +This function must be installed after +.Fn if_attach +to override the default implementation. This function is exposed in order +to allow drivers to manage their own queues and to reduce the latency +caused by a frequently gratuitous enqueue / dequeue pair to ifq. The +suggested internal software queueing mechanism is buf_ring. .It Fn if_start Start queued output on an interface. This function is exposed in @@ -363,7 +381,8 @@ (Thus, .Dv IFF_OACTIVE does not literally mean that output is active, but rather that the -device's internal output queue is full.) +device's internal output queue is full.) Please note that this function +will soon be deprecated. .It Fn if_done Not used. We are not even sure what it was ever for. ==== //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ */ #include "opt_atpic.h" @@ -459,9 +459,9 @@ */ movq %rsp,%rsi /* source stack pointer */ movq $TF_SIZE,%rcx - movq PCPU(RSP0),%rbx - subq %rcx,%rbx - movq %rbx,%rdi /* destination stack pointer */ + movq PCPU(RSP0),%rdx + subq %rcx,%rdx + movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ cld @@ -470,7 +470,7 @@ movl %ss,%eax pushq %rax /* tf_ss */ - pushq %rbx /* tf_rsp (on kernel stack) */ + pushq %rdx /* tf_rsp (on kernel stack) */ pushfq /* tf_rflags */ movl %cs,%eax pushq %rax /* tf_cs */ @@ -480,16 +480,20 @@ /* * At this point the processor has exited NMI mode and is running * with interrupts turned off on the normal kernel stack. - * We turn interrupts back on, and take the usual 'doreti' exit - * path. * * If a pending NMI gets recognized at or after this point, it - * will cause a kernel callchain to be traced. Since this path - * is only taken for NMI interrupts from user space, our `swapgs' - * state is correct for taking the doreti path. + * will cause a kernel callchain to be traced. + * + * We turn interrupts back on, and call the user callchain capture hook. */ + movq pmc_hook,%rax + orq %rax,%rax + jz nocallchain + movq PCPU(CURTHREAD),%rdi /* thread */ + movq $PMC_FN_USER_CALLCHAIN,%rsi /* command */ + movq %rsp,%rdx /* frame */ sti - jmp doreti + call *%rax nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.171 2008/12/12 16:09:34 jkoshy Exp $"); #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" #include @@ -44,6 +45,9 @@ #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -216,3 +220,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_GSBASE, MSR_GSBASE); + +#ifdef HWPMC_HOOKS +ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN); +#endif ==== //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.168 2008/12/12 23:17:00 jkim Exp $"); #include "opt_cpu.h" @@ -322,15 +322,15 @@ "\003SVM" /* Secure Virtual Mode */ "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ - "\006" - "\007" - "\010" + "\006ABM" /* LZCNT instruction */ + "\007SSE4A" /* SSE4A */ + "\010MAS" /* Misaligned SSE mode */ "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ - "\012" - "\013" - "\014" - "\015" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 14 17:11:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D29F106567E; Sun, 14 Dec 2008 17:11: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 5104F1065679 for ; Sun, 14 Dec 2008 17:11:02 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E92E8FC24 for ; Sun, 14 Dec 2008 17:11:02 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEHB0jm083546 for ; Sun, 14 Dec 2008 17:11:00 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEHAwcC083543 for perforce@freebsd.org; Sun, 14 Dec 2008 17:10:58 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 17:10:58 GMT Message-Id: <200812141710.mBEHAwcC083543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 17:11:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=154648 Change 154648 by zec@zec_tca51 on 2008/12/14 17:10:56 Unbreak options VIMAGE build. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#13 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#71 edit .. //depot/projects/vimage/src/sys/net/bpf.c#31 edit .. //depot/projects/vimage/src/sys/net/if.c#57 edit .. //depot/projects/vimage/src/sys/net/if_var.h#25 edit .. //depot/projects/vimage/src/sys/net/raw_cb.h#6 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#49 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#25 edit .. //depot/projects/vimage/src/sys/netinet/in_var.h#15 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#60 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#74 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_uuid.c#13 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#71 (text+ko) ==== @@ -28,15 +28,21 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/kern/kern_vimage.c,v 1.1 2008/12/10 23:12:39 zec Exp $"); + #include "opt_ddb.h" #include +#include #include #include #include #include #include #include +#include +#include #include #include #include @@ -48,11 +54,13 @@ #include #endif -#include -#include +#include #include #include +#include +#include #include +#include //#define DEBUG_ORDERING @@ -143,7 +151,7 @@ { struct vnet_modlink *vml, *vml_iter; - /* Do not register the same module instance more than once */ + /* Do not register the same module instance more than once. */ TAILQ_FOREACH(vml_iter, &vnet_modlink_head, vml_mod_le) if (vml_iter->vml_modinfo == vmi && vml_iter->vml_iarg == iarg) break; @@ -605,9 +613,9 @@ vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) { struct vnet_modlink *vml; + struct vnet_symmap *mapentry; TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) { - struct vnet_symmap *mapentry; if (vml->vml_modinfo->vmi_symmap == NULL) continue; @@ -619,12 +627,11 @@ (u_long) curvnet->mod_data[vml->vml_modinfo->vmi_id]; lookup->symvalue += mapentry->offset; lookup->symsize = mapentry->size; - return 0; + return (0); } } } - - return ENOENT; + return (ENOENT); } ==== //depot/projects/vimage/src/sys/net/bpf.c#31 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if.c#57 (text+ko) ==== @@ -171,7 +171,7 @@ static struct filterops netdev_filtops = { 1, NULL, filt_netdetach, filt_netdev }; -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS static struct vnet_symmap vnet_net_symmap[] = { VNET_SYMMAP(net, ifnet), VNET_SYMMAP(net, rt_tables), @@ -179,10 +179,10 @@ VNET_SYMMAP(net, rttrash), VNET_SYMMAP_END }; -#endif VNET_MOD_DECLARE(NET, net, vnet_net_iattach, vnet_net_idetach, NONE, vnet_net_symmap) +#endif /* * System initialization @@ -2993,7 +2993,7 @@ void if_deregister_com_alloc(u_char type) { - + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, ==== //depot/projects/vimage/src/sys/net/if_var.h#25 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/raw_cb.h#6 (text+ko) ==== @@ -55,11 +55,9 @@ #define RAWRCVQ 8192 #ifdef _KERNEL - #ifdef VIMAGE_GLOBALS extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list; #endif - extern struct mtx rawcb_mtx; /* ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#49 (text+ko) ==== @@ -3079,7 +3079,6 @@ switch (event) { case MOD_LOAD: /* Initialize everything. */ - V_nextID = 1; NG_WORKLIST_LOCK_INIT(); mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, MTX_DEF); ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#25 (text+ko) ==== @@ -223,7 +223,7 @@ #define in6p_ppcb inp_ppcb /* for KAME src sync over BSD*'s */ #define inp_vnet inp_pcbinfo->ipi_vnet -}; + /* * The range of the generation count, as used in this implementation, is 9e19. * We would have to create 300 billion connections per second for this number ==== //depot/projects/vimage/src/sys/netinet/in_var.h#15 (text+ko) ==== @@ -84,7 +84,6 @@ /* * Hash table for IP addresses. */ -LIST_HEAD(in_ifaddrhashhead, in_ifaddr); TAILQ_HEAD(in_ifaddrhead, in_ifaddr); LIST_HEAD(in_ifaddrhashhead, in_ifaddr); #ifdef VIMAGE_GLOBALS ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#60 (text+ko) ==== @@ -136,8 +136,6 @@ static int verbose_limit; #endif -#endif - static uma_zone_t ipfw_dyn_rule_zone; /* @@ -156,8 +154,6 @@ ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr; ipfw_nat_cfg_t *ipfw_nat_get_log_ptr; -#ifndef VIMAGE - #ifdef VIMAGE_GLOBALS static int fw_debug; static int autoinc_step; @@ -4527,7 +4523,7 @@ } done: callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz, - ipfw_tick, arg); + ipfw_tick, arg); } static int vnet_ipfw_iattach(const void *unused) ==== //depot/projects/vimage/src/sys/sys/vimage.h#74 (text+ko) ==== @@ -50,10 +50,23 @@ struct vprocg; struct vnet; struct vi_req; +struct vnet_modinfo; struct kld_sym_lookup; struct ifnet; /* XXX must go away */ +#ifdef VIMAGE_GLOBALS +#define VSYM(base, sym) (sym) +#else +#ifdef VIMAGE +#define VSYM(base, sym) ((base)->_##sym) +#else +#define VSYM(base, sym) (base ## _0._ ## sym) +#endif +#endif + +#ifdef VIMAGE + #define curvnet curthread->td_vnet #define basevnet thread0.td_ucred->cr_vimage->v_net @@ -64,8 +77,6 @@ typedef int vnet_detach_fn(const void *); -#ifdef VIMAGE - #define V_GLOBAL 0 #define V_NET 1 #define V_PROCG 2 @@ -173,8 +184,6 @@ .vmi_idetach = m_idetach \ }; -#define VSYM(base, sym) ((base)->_##sym) - #define VNET_SYMMAP(mod, name) \ { #name, offsetof(struct vnet_##mod, _##name), \ sizeof(((struct vnet_##mod *) curthread)->_##name) } @@ -278,7 +287,6 @@ #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() #define VNET_ASSERT(condition) -#define VSYM(base, sym) (sym) #define INIT_FROM_VNET(vnet, modindex, modtype, sym) #define VNET_ITERATOR_DECL(arg) #define VNET_FOREACH(arg) @@ -304,7 +312,11 @@ #define VCPU(sym) VSYM(vcpu, sym) #define V_hostname VPROCG(hostname) +#ifdef VIMAGE #define G_hostname VSYM(basevprocg, hostname) /* global hostname */ +#else +#define G_hostname VSYM(vprocg, hostname) /* global hostname */ +#endif #define V_domainname VPROCG(domainname) #define V_morphing_symlinks VPROCG(morphing_symlinks) @@ -312,19 +324,19 @@ #define V_avg1_fixp VCPU(avg1_fixp) #define V_avg2_fixp VCPU(avg2_fixp) -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_deregister(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); +int vi_symlookup(struct kld_sym_lookup *, char *); +#endif -void printcpuinfo(struct vprocg *); -void vi_cpu_acct(void *); +#ifdef VIMAGE int vi_td_ioctl(u_long, struct vi_req *, struct thread *); int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *); void if_reassign_common(struct ifnet *, struct vnet *, const char *); -int vi_symlookup(struct kld_sym_lookup *, char *); struct vimage *vnet2vimage(struct vnet *); struct vimage *vimage_by_name(struct vimage *, char *); char *vnet_name(struct vnet *); @@ -377,6 +389,8 @@ struct vnet *v_net; }; +#endif /* VIMAGE */ + struct vprocg { LIST_ENTRY(vprocg) vprocg_le; u_int vprocg_ref; /* reference count */ @@ -400,7 +414,11 @@ u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */ }; -#endif /* VIMAGE */ +#ifndef VIMAGE_GLOBALS +#ifndef VIMAGE +extern struct vprocg vprocg_0; +#endif +#endif struct vi_req { int req_action; /* What to do with this reqest? */ @@ -442,7 +460,4 @@ #define VI_SET_NAME 0x00100000 #define VI_SET_CHROOT 0x00200000 -int vi_symlookup(struct kld_sym_lookup *, char *); -void vnet_mod_register(const struct vnet_modinfo *); - #endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Dec 14 17:41:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9322F1065677; Sun, 14 Dec 2008 17:41: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 5671A1065676 for ; Sun, 14 Dec 2008 17:41:34 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 42E7C8FC1C for ; Sun, 14 Dec 2008 17:41:34 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEHfXoY085860 for ; Sun, 14 Dec 2008 17:41:33 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEHfXJW085858 for perforce@freebsd.org; Sun, 14 Dec 2008 17:41:33 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 17:41:33 GMT Message-Id: <200812141741.mBEHfXJW085858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 17:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154650 Change 154650 by zec@zec_tpx32 on 2008/12/14 17:41:06 IFC @ 154644 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#19 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snp/snp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uark2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubsa2.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubser2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ucycom2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ugensa2.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uipaq2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umct2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umodem2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umoscom2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvisor2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ata-usb2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#4 integrate .. //depot/projects/vimage-commit2/src/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/pfil.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#38 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipip_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cuda.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#24 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/resource.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ttyhook.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#27 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ */ #include "opt_atpic.h" @@ -459,9 +459,9 @@ */ movq %rsp,%rsi /* source stack pointer */ movq $TF_SIZE,%rcx - movq PCPU(RSP0),%rbx - subq %rcx,%rbx - movq %rbx,%rdi /* destination stack pointer */ + movq PCPU(RSP0),%rdx + subq %rcx,%rdx + movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ cld @@ -470,7 +470,7 @@ movl %ss,%eax pushq %rax /* tf_ss */ - pushq %rbx /* tf_rsp (on kernel stack) */ + pushq %rdx /* tf_rsp (on kernel stack) */ pushfq /* tf_rflags */ movl %cs,%eax pushq %rax /* tf_cs */ @@ -480,16 +480,20 @@ /* * At this point the processor has exited NMI mode and is running * with interrupts turned off on the normal kernel stack. - * We turn interrupts back on, and take the usual 'doreti' exit - * path. * * If a pending NMI gets recognized at or after this point, it - * will cause a kernel callchain to be traced. Since this path - * is only taken for NMI interrupts from user space, our `swapgs' - * state is correct for taking the doreti path. + * will cause a kernel callchain to be traced. + * + * We turn interrupts back on, and call the user callchain capture hook. */ + movq pmc_hook,%rax + orq %rax,%rax + jz nocallchain + movq PCPU(CURTHREAD),%rdi /* thread */ + movq $PMC_FN_USER_CALLCHAIN,%rsi /* command */ + movq %rsp,%rdx /* frame */ sti - jmp doreti + call *%rax nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.171 2008/12/12 16:09:34 jkoshy Exp $"); #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" #include @@ -44,6 +45,9 @@ #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -216,3 +220,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_GSBASE, MSR_GSBASE); + +#ifdef HWPMC_HOOKS +ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN); +#endif ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.168 2008/12/12 23:17:00 jkim Exp $"); #include "opt_cpu.h" @@ -322,15 +322,15 @@ "\003SVM" /* Secure Virtual Mode */ "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ - "\006" - "\007" - "\010" + "\006ABM" /* LZCNT instruction */ + "\007SSE4A" /* SSE4A */ + "\010MAS" /* Misaligned SSE mode */ "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ - "\012" - "\013" - "\014" - "\015" - "\016" + "\012OSVW" /* OS visible workaround */ + "\013IBS" /* Instruction based sampling */ + "\014SSE5" /* SSE5 */ + "\015SKINIT" /* SKINIT/STGI */ + "\016WDT" /* Watchdog timer */ "\017" "\020" "\021" ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.50 2008/12/11 15:56:30 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -299,6 +299,7 @@ /* Program LINT[01] LVT entries. */ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); + #ifdef HWPMC_HOOKS /* Program the PMC LVT entry if present. */ if (maxlvt >= LVT_PMC) @@ -644,6 +645,18 @@ lapic->eoi = 0; } +/* + * Read the contents of the error status register. We have to write + * to the register first before reading from it. + */ +u_int +lapic_error(void) +{ + + lapic->esr = 0; + return (lapic->esr); +} + void lapic_handle_intr(int vector, struct trapframe *frame) { ==== //depot/projects/vimage-commit2/src/sys/amd64/include/apicreg.h#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/amd64/include/apicreg.h,v 1.28 2005/01/21 06:01:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.29 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -260,6 +260,14 @@ # define APIC_TPR_INT 0x000000f0 # define APIC_TPR_SUB 0x0000000f +/* fields in ESR */ +#define APIC_ESR_SEND_CS_ERROR 0x00000001 +#define APIC_ESR_RECEIVE_CS_ERROR 0x00000002 +#define APIC_ESR_SEND_ACCEPT 0x00000004 +#define APIC_ESR_RECEIVE_ACCEPT 0x00000008 +#define APIC_ESR_SEND_ILLEGAL_VECTOR 0x00000020 +#define APIC_ESR_RECEIVE_ILLEGAL_VECTOR 0x00000040 +#define APIC_ESR_ILLEGAL_REGISTER 0x00000080 /* fields in ICR_LOW */ #define APIC_VECTOR_MASK 0x000000ff ==== //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.25 2007/05/08 22:01:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.26 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -200,6 +200,7 @@ void lapic_disable(void); void lapic_dump(const char *str); void lapic_eoi(void); +u_int lapic_error(void); int lapic_id(void); void lapic_init(vm_paddr_t addr); int lapic_intr_pending(u_int vector); ==== //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.50 2008/11/26 19:25:13 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.51 2008/12/12 23:17:00 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -150,7 +150,15 @@ #define AMDID2_SVM 0x00000004 #define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 +#define AMDID2_ABM 0x00000020 +#define AMDID2_SSE4A 0x00000040 +#define AMDID2_MAS 0x00000080 #define AMDID2_PREFETCH 0x00000100 +#define AMDID2_OSVW 0x00000200 +#define AMDID2_IBS 0x00000400 +#define AMDID2_SSE5 0x00000800 +#define AMDID2_SKINIT 0x00001000 +#define AMDID2_WDT 0x00002000 /* * CPUID instruction 1 eax info ==== //depot/projects/vimage-commit2/src/sys/boot/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.37 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.38 2008/12/14 02:57:41 nyan Exp $ .include @@ -12,7 +12,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/vimage-commit2/src/sys/boot/zfs/zfs.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $ + * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $"); /* * Stand-alone file reading package. @@ -486,6 +486,7 @@ } f->f_devdata = spa; + free(dev); return (0); } ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#17 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.131 2008/12/10 16:11:09 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.132 2008/12/12 12:12:36 kib Exp $"); #include #include @@ -79,6 +79,7 @@ #include #include +#include #include #include #include @@ -874,7 +875,8 @@ static int linprocfs_doprocmaps(PFS_FILL_ARGS) { - vm_map_t map = &p->p_vmspace->vm_map; + struct vmspace *vm; + vm_map_t map; vm_map_entry_t entry, tmp_entry; vm_object_t obj, tobj, lobj; vm_offset_t e_start, e_end; @@ -899,6 +901,10 @@ return (EOPNOTSUPP); error = 0; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + return (ESRCH); + map = &vm->vm_map; vm_map_lock_read(map); for (entry = map->header.next; entry != &map->header; entry = entry->next) { @@ -985,6 +991,7 @@ } } vm_map_unlock_read(map); + vmspace_free(vm); return (error); } ==== //depot/projects/vimage-commit2/src/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.650 2008/12/10 23:12:39 zec Exp $ +# $FreeBSD: src/sys/conf/options,v 1.651 2008/12/11 16:13:17 bz Exp $ # # On the handling of kernel options # @@ -415,7 +415,6 @@ TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h -VIMAGE_GLOBALS opt_global.h XBONEHACK # @@ -786,3 +785,4 @@ # Virtualize the network stack VIMAGE opt_global.h +VIMAGE_GLOBALS opt_global.h ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.18 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.19 2008/12/13 19:13:03 bz Exp $"); #endif #include @@ -115,8 +115,10 @@ void pfi_detach_group_event(void * __unused, struct ifg_group *); void pfi_ifaddr_event(void * __unused, struct ifnet *); +#ifdef VIMAGE_GLOBALS extern struct ifgrouphead ifg_head; #endif +#endif RB_PROTOTYPE(pfi_ifhead, pfi_kif, pfik_tree, pfi_if_compare); RB_GENERATE(pfi_ifhead, pfi_kif, pfik_tree, pfi_if_compare); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.8 2008/12/10 23:12:39 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.9 2008/12/13 22:04:52 bz Exp $"); #include #include @@ -116,22 +116,22 @@ #define ISN_STATIC_INCREMENT 4096 #define ISN_RANDOM_INCREMENT (4096 - 1) -static u_char isn_secret[32]; -static int isn_last_reseed; -static u_int32_t isn_offset; -static MD5_CTX isn_ctx; +static u_char pf_isn_secret[32]; +static int pf_isn_last_reseed; +static u_int32_t pf_isn_offset; u_int32_t pf_new_isn(struct pf_state *s) { + MD5_CTX isn_ctx; u_int32_t md5_buffer[4]; u_int32_t new_isn; struct pf_state_host *src, *dst; /* Seed if this is the first use, reseed if requested. */ - if (isn_last_reseed == 0) { - read_random(&isn_secret, sizeof(isn_secret)); - isn_last_reseed = ticks; + if (pf_isn_last_reseed == 0) { + read_random(&pf_isn_secret, sizeof(pf_isn_secret)); + pf_isn_last_reseed = ticks; } if (s->direction == PF_IN) { @@ -160,11 +160,11 @@ MD5Update(&isn_ctx, (u_char *) &src->addr, sizeof(struct in_addr)); } - MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); + MD5Update(&isn_ctx, (u_char *) &pf_isn_secret, sizeof(pf_isn_secret)); MD5Final((u_char *) &md5_buffer, &isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - isn_offset += ISN_STATIC_INCREMENT + + pf_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += isn_offset; + new_isn += pf_isn_offset; return (new_isn); } ==== //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_smbat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.5 2006/02/21 03:16:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_smbat.c,v 1.7 2008/12/13 07:45:48 silby Exp $"); #include "opt_acpi.h" #include @@ -61,6 +61,23 @@ ACPI_SERIAL_DECL(smbat, "ACPI Smart Battery"); +SYSCTL_DECL(_debug_acpi); +SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL, "Battery debugging"); + +/* On some laptops with smart batteries, enabling battery monitoring + * software causes keystrokes from atkbd to be lost. This has also been + * reported on Linux, and is apparently due to the keyboard and I2C line + * for the battery being routed through the same chip. Whether that's + * accurate or not, adding extra sleeps to the status checking code + * causes the problem to go away. + * + * If you experience that problem, try a value of 10ms and move up + * from there. + */ +static int batt_sleep_ms; +SYSCTL_INT(_debug_acpi_batt, OID_AUTO, batt_sleep_ms, CTLFLAG_RW, &batt_sleep_ms, 0, + "Sleep during battery status updates to prevent keystroke loss."); + static device_method_t acpi_smbat_methods[] = { /* device interface */ DEVMETHOD(device_probe, acpi_smbat_probe), @@ -176,6 +193,9 @@ ACPI_SERIAL_ASSERT(smbat); + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + val = addr; error = ACPI_EC_WRITE(sc->ec_dev, sc->sb_base_addr + SMBUS_ADDR, val, 1); @@ -194,6 +214,9 @@ if (error) goto out; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + for (to = SMBUS_TIMEOUT; to != 0; to--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_PRTCL, &val, 1); @@ -239,6 +262,9 @@ ACPI_SERIAL_ASSERT(smbat); + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + val = addr; error = ACPI_EC_WRITE(sc->ec_dev, sc->sb_base_addr + SMBUS_ADDR, val, 1); @@ -257,6 +283,9 @@ if (error) goto out; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + for (to = SMBUS_TIMEOUT; to != 0; to--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_PRTCL, &val, 1); @@ -292,6 +321,9 @@ if (len > val) len = val; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); + while (len--) { error = ACPI_EC_READ(sc->ec_dev, sc->sb_base_addr + SMBUS_DATA + len, &val, 1); @@ -299,6 +331,8 @@ goto out; ptr[len] = val; + if (batt_sleep_ms) + AcpiOsSleep(batt_sleep_ms); } out: ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah.c,v 1.15 2008/11/15 22:15:44 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.c,v 1.2 2008/12/13 03:48:33 sam Exp $ */ #include "opt_ah.h" @@ -32,7 +32,7 @@ const char* ath_hal_probe(uint16_t vendorid, uint16_t devid) { - struct ath_hal_chip **pchip; + struct ath_hal_chip * const *pchip; OS_SET_FOREACH(pchip, ah_chips) { const char *name = (*pchip)->probe(vendorid, devid); @@ -53,7 +53,7 @@ ath_hal_attach(uint16_t devid, HAL_SOFTC sc, HAL_BUS_TAG st, HAL_BUS_HANDLE sh, HAL_STATUS *error) { - struct ath_hal_chip **pchip; + struct ath_hal_chip * const *pchip; OS_SET_FOREACH(pchip, ah_chips) { struct ath_hal_chip *chip = *pchip; @@ -88,7 +88,7 @@ struct ath_hal_rf * ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode) { - struct ath_hal_rf **prf; + struct ath_hal_rf * const *prf; OS_SET_FOREACH(prf, ah_rfs) { struct ath_hal_rf *rf = *prf; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.2 2008/12/11 04:03:13 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.3 2008/12/13 03:49:01 sam Exp $ */ #include "opt_ah.h" @@ -160,18 +160,6 @@ return AH_FALSE; } -/* XXX conditionalize by target byte order */ -#ifndef bswap16 -static __inline__ uint16_t -__bswap16(uint16_t _x) -{ - return ((uint16_t)( - (((const uint8_t *)(&_x))[0] ) | - (((const uint8_t *)(&_x))[1]<< 8)) - ); -} -#endif - /* Do structure specific swaps if Eeprom format is non native to host */ static void eepromSwap(struct ar5416eeprom *ee) ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_eeprom_v3.c,v 1.4 2008/11/27 22:39:42 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v3.c,v 1.2 2008/12/13 03:47:42 sam Exp $ */ #include "opt_ah.h" @@ -26,9 +26,9 @@ getPcdacInterceptsFromPcdacMinMax(HAL_EEPROM *ee, uint16_t pcdacMin, uint16_t pcdacMax, uint16_t *vp) { - const static uint16_t intercepts3[] = + static const uint16_t intercepts3[] = { 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 }; - const static uint16_t intercepts3_2[] = + static const uint16_t intercepts3_2[] = { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 }; const uint16_t *ip = ee->ee_version < AR_EEPROM_VER3_2 ? intercepts3 : intercepts3_2; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_internal.h,v 1.21 2008/11/27 22:29:27 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_internal.h,v 1.2 2008/12/13 03:50:31 sam Exp $ */ #ifndef _ATH_AH_INTERAL_H_ #define _ATH_AH_INTERAL_H_ @@ -42,23 +42,6 @@ #define offsetof(type, field) ((size_t)(&((type *)0)->field)) #endif -/* - * Remove const in a way that keeps the compiler happy. - * This works for gcc but may require other magic for - * other compilers (not sure where this should reside). - * Note that uintptr_t is C99. - */ -#ifndef __DECONST -#ifndef _UINTPTR_T -#if AH_WORDSIZE == 64 -typedef unsigned long int uintptr_t; -#else -typedef unsigned int uintptr_t; -#endif -#endif -#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) -#endif - typedef struct { uint16_t start; /* first register */ uint16_t end; /* ending register or zero */ @@ -114,12 +97,12 @@ }; #ifndef AH_RF #define AH_RF(_name, _probe, _attach) \ -static struct ath_hal_rf name##_rf = { \ - .name = #_name, \ +static struct ath_hal_rf _name##_rf = { \ + .name = __STRING(_name), \ .probe = _probe, \ .attach = _attach \ }; \ -OS_DATA_SET(ah_rfs, name##_rf) +OS_DATA_SET(ah_rfs, _name##_rf) #endif struct ath_hal_rf *ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode); ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5111.c,v 1.7 2008/11/10 04:08:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5111.c,v 1.2 2008/12/13 03:45:54 sam Exp $ */ #include "opt_ah.h" @@ -90,7 +90,7 @@ uint16_t channel5111; /* 11a channel for 5111 */ } CHAN_INFO_2GHZ; - const static CHAN_INFO_2GHZ chan2GHzData[] = { + static const CHAN_INFO_2GHZ chan2GHzData[] = { { 1, 0x46, 96 }, /* 2312 -19 */ { 1, 0x46, 97 }, /* 2317 -18 */ { 1, 0x46, 98 }, /* 2322 -17 */ ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312.h,v 1.5 2008/11/22 07:37:40 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312.h,v 1.2 2008/12/13 03:44:44 sam Exp $ */ #ifndef _ATH_AR5312_H_ #define _ATH_AR5312_H_ @@ -38,8 +38,6 @@ AH_PRIVATE(ah)->ah_devid == AR5212_AR2317_REV1 || \ AH_PRIVATE(ah)->ah_devid == AR5212_AR2317_REV2) -extern struct ath_hal * ar5312Attach(uint16_t devid, HAL_SOFTC sc, - HAL_BUS_TAG st, HAL_BUS_HANDLE sh, HAL_STATUS *status); extern HAL_BOOL ar5312IsInterruptPending(struct ath_hal *ah); /* AR5312 */ ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312_attach.c,v 1.8 2008/11/27 22:30:03 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.2 2008/12/13 03:45:00 sam Exp $ */ #include "opt_ah.h" @@ -318,7 +318,6 @@ case AR5212_AR2313_REV8: return "Atheros 2313 WiSoC"; case AR5212_AR2315_REV6: - case AR5212_AR2315_REV6: case AR5212_AR2315_REV7: return "Atheros 2315 WiSoC"; case AR5212_AR2317_REV1: ==== //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.41 2008/11/27 09:00:47 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.42 2008/12/13 13:07:12 jkoshy Exp $"); #include #include @@ -1863,8 +1863,11 @@ /* * Record a call chain. */ + KASSERT(td == curthread, ("[pmc,%d] td != curthread", + __LINE__)); pmc_capture_user_callchain(PCPU_GET(cpuid), (struct trapframe *) arg); + td->td_pflags &= ~TDP_CALLCHAIN; break; default: @@ -3794,30 +3797,28 @@ */ static void -pmc_post_callchain_ast(void) +pmc_post_callchain_callback(void) { struct thread *td; td = curthread; + KASSERT((td->td_pflags & TDP_CALLCHAIN) == 0, + ("[pmc,%d] thread %p already marked for callchain capture", + __LINE__, (void *) td)); + /* - * Mark this thread as needing processing in ast(). - * td->td_pflags will be safe to touch as the process was in - * user space when it was interrupted. + * Mark this thread as needing callchain capture. + * `td->td_pflags' will be safe to touch because this thread + * was in user space when it was interrupted. */ td->td_pflags |= TDP_CALLCHAIN; /* - * Again, since we've entered this function directly from - * userland, `td' is guaranteed to be not locked by this CPU, - * so its safe to try acquire the thread lock even though we - * are executing in an NMI context. We need to acquire this - * lock before touching `td_flags' because other CPUs may be - * in the process of touching this field. + * Don't let this thread migrate between CPUs until callchain + * capture completes. */ - thread_lock(td); - td->td_flags |= TDF_ASTPENDING; - thread_unlock(td); + sched_pin(); return; } @@ -3869,6 +3870,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 14 19:18:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50A131065679; Sun, 14 Dec 2008 19:18: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 134041065670; Sun, 14 Dec 2008 19:18:19 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 8A27E8FC08; Sun, 14 Dec 2008 19:18:18 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBEJHK5U016509; Sun, 14 Dec 2008 12:17:20 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 12:17:20 -0700 (MST) Message-Id: <20081214.121720.-861029116.imp@bsdimp.com> To: ed@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812032046.mB3KkUBx016516@repoman.freebsd.org> References: <200812032046.mB3KkUBx016516@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 19:18:19 -0000 In message: <200812032046.mB3KkUBx016516@repoman.freebsd.org> Ed Schouten writes: : I'm not entirely happy with modifying kern.post.mk to generate : teken_state.h. Maybe we should regenerate by hand... You can do this in the "files*" file... Warner : Affected files ... : : .. //depot/projects/mpsafetty/sys/conf/files#29 edit : .. //depot/projects/mpsafetty/sys/conf/kern.post.mk#2 edit : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#1 add : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#1 add : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#2 edit : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#2 edit : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_internal.h#2 delete : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_state.c#2 delete : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.c#2 delete : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#1 add : .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_cons25.h#1 add : : Differences ... : : ==== //depot/projects/mpsafetty/sys/conf/files#29 (text+ko) ==== : : @@ -1432,8 +1432,6 @@ : dev/syscons/syscons.c optional sc : dev/syscons/sysmouse.c optional sc : dev/syscons/teken/teken.c optional sc : -dev/syscons/teken/teken_state.c optional sc : -dev/syscons/teken/teken_subr.c optional sc : dev/syscons/warp/warp_saver.c optional warp_saver : dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux : dev/tdfx/tdfx_pci.c optional tdfx pci : : ==== //depot/projects/mpsafetty/sys/conf/kern.post.mk#2 (text+ko) ==== : : @@ -98,7 +98,8 @@ : .endif : : .if !exists(${.OBJDIR}/.depend) : -${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} : +${SYSTEM_OBJS}: assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND:M*.h}\ : + ${MFILES:T:S/.m$/.h/} : .endif : : LNFILES= ${CFILES:T:S/.c$/.ln/} : @@ -117,7 +118,7 @@ : ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \ : linterrs makelinks tags vers.c \ : vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ : - ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ : + teken_state.h ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ : ${CLEAN} : : lint: ${LNFILES} : @@ -147,7 +148,7 @@ : kernel-depend: .depend : # The argument list can be very long, so use make -V and xargs to : # pass it to mkdep. : -SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ : +SRCS= assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND} ${CFILES} \ : ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ : ${MFILES:T:S/.m$/.h/} : .depend: .PRECIOUS ${SRCS} : @@ -258,6 +259,10 @@ : vnode_if_typedef.h: : ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -q : : +teken_state.h: $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences : + ${AWK} -f $S/dev/syscons/teken/gensequences \ : + < $S/dev/syscons/teken/sequences > teken_state.h : + : # XXX strictly, everything depends on Makefile because changes to ${PROF} : # only appear there, but we don't handle that. : : : ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#2 (text+ko) ==== : : @@ -24,17 +24,141 @@ : * SUCH DAMAGE. : */ : : -#include "teken_internal.h" : +#if defined(__FreeBSD__) && defined(_KERNEL) : +#include : +#include : +#include : +#define teken_assert(x) MPASS(x) : +#define teken_printf(x,...) : +#else /* !(__FreeBSD__ && _KERNEL) */ : +#include : +#include : +#include : +#include : +#include : +#define teken_assert(x) assert(x) : +#define teken_printf(x,...) do { \ : + if (df != NULL) \ : + fprintf(df, x, ## __VA_ARGS__); \ : +} while (0) : +/* debug messages */ : +static FILE *df; : +#endif /* __FreeBSD__ && _KERNEL */ : + : +#include "teken.h" : + : +#define teken_clamp(x,low,high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) : + : +/* Private flags for teken_format_t. */ : +#define TF_REVERSE 0x08 : + : +/* Private flags for t_stateflags. */ : +#define TS_FIRSTDIGIT 0x01 /* First numeric digit in escape sequence. */ : +#define TS_INSERT 0x02 /* Insert mode. */ : +#define TS_AUTOWRAP 0x04 /* Autowrap. */ : +#define TS_ORIGIN 0x08 /* Origin mode. */ : + : +static teken_state_t teken_state_init; : : -const teken_attr_t teken_defattr = { : +static const teken_attr_t teken_defattr = { : .ta_format = 0, : .ta_fgcolor = TC_WHITE, : .ta_bgcolor = TC_BLACK, : }; : : -#if !(defined(__FreeBSD__) && defined(_KERNEL)) : -FILE *df = NULL; : -#endif /* !(__FreeBSD__ && _KERNEL) */ : +/* : + * Wrappers for hooks. : + */ : + : +static inline void : +teken_funcs_bell(teken_t *t) : +{ : + : + t->t_funcs->tf_bell(t->t_softc); : +} : + : +static inline void : +teken_funcs_cursor(teken_t *t) : +{ : + : + teken_assert(t->t_cursor.tp_row < t->t_winsize.tp_row); : + teken_assert(t->t_cursor.tp_col < t->t_winsize.tp_col); : + : + t->t_funcs->tf_cursor(t->t_softc, &t->t_cursor); : +} : + : +static inline void : +teken_funcs_putchar(teken_t *t, const teken_pos_t *p, teken_char_t c, : + const teken_attr_t *a) : +{ : + teken_attr_t ta; : + : + teken_assert(p->tp_row < t->t_winsize.tp_row); : + teken_assert(p->tp_col < t->t_winsize.tp_col); : + : + /* Apply inversion. */ : + if (a->ta_format & TF_REVERSE) { : + ta.ta_format = a->ta_format; : + ta.ta_fgcolor = a->ta_bgcolor; : + ta.ta_bgcolor = a->ta_fgcolor; : + a = &ta; : + } : + : + t->t_funcs->tf_putchar(t->t_softc, p, c, a); : +} : + : +static inline void : +teken_funcs_fill(teken_t *t, const teken_rect_t *r, : + const teken_char_t c, const teken_attr_t *a) : +{ : + teken_attr_t ta; : + : + teken_assert(r->tr_end.tp_row > r->tr_begin.tp_row); : + teken_assert(r->tr_end.tp_row <= t->t_winsize.tp_row); : + teken_assert(r->tr_end.tp_col > r->tr_begin.tp_col); : + teken_assert(r->tr_end.tp_col <= t->t_winsize.tp_col); : + : + /* Apply inversion. */ : + if (a->ta_format & TF_REVERSE) { : + ta.ta_format = a->ta_format; : + ta.ta_fgcolor = a->ta_bgcolor; : + ta.ta_bgcolor = a->ta_fgcolor; : + a = &ta; : + } : + : + t->t_funcs->tf_fill(t->t_softc, r, c, a); : +} : + : +static inline void : +teken_funcs_copy(teken_t *t, const teken_rect_t *r, const teken_pos_t *p) : +{ : + : + teken_assert(r->tr_end.tp_row > r->tr_begin.tp_row); : + teken_assert(r->tr_end.tp_row <= t->t_winsize.tp_row); : + teken_assert(r->tr_end.tp_col > r->tr_begin.tp_col); : + teken_assert(r->tr_end.tp_col <= t->t_winsize.tp_col); : + teken_assert(p->tp_row + (r->tr_end.tp_row - r->tr_begin.tp_row) <= t->t_winsize.tp_row); : + teken_assert(p->tp_col + (r->tr_end.tp_col - r->tr_begin.tp_col) <= t->t_winsize.tp_col); : + : + t->t_funcs->tf_copy(t->t_softc, r, p); : +} : + : +static inline void : +teken_funcs_param(teken_t *t, int cmd, int value) : +{ : + : + t->t_funcs->tf_param(t->t_softc, cmd, value); : +} : + : +static inline void : +teken_funcs_respond(teken_t *t, const void *buf, size_t len) : +{ : + : + t->t_funcs->tf_respond(t->t_softc, buf, len); : +} : + : +#include "teken_subr.h" : +#include "teken_subr_cons25.h" : : /* : * Programming interface. : @@ -45,38 +169,113 @@ : { : teken_pos_t tp = { .tp_row = 24, .tp_col = 80 }; : : +#if !(defined(__FreeBSD__) && defined(_KERNEL)) : + df = fopen("debuglog", "w"); : + if (df != NULL) : + setvbuf(df, NULL, _IOLBF, BUFSIZ); : +#endif /* !(__FreeBSD__ && _KERNEL) */ : + : t->t_funcs = tf; : t->t_softc = softc; : : t->t_nextstate = teken_state_init; : t->t_cursor.tp_row = t->t_cursor.tp_col = 0; : - t->t_savepos = t->t_cursor; : - t->t_stateflags = 0; : + t->t_saved_cursor = t->t_nextchar = t->t_cursor; : + t->t_stateflags = TS_AUTOWRAP; : + : + t->t_curattr = t->t_saved_curattr = teken_defattr; : + : + teken_tab_default(t); : : - t->t_curattr = teken_defattr; : +#ifdef TEKEN_UTF8 : + t->t_utf8_left = 0; : +#endif /* TEKEN_UTF8 */ : : teken_winsize(t, &tp); : +} : : -#if !(defined(__FreeBSD__) && defined(_KERNEL)) : - df = fopen("debuglog", "w"); : - if (df != NULL) : - setvbuf(df, NULL, _IOLBF, BUFSIZ); : -#endif /* !(__FreeBSD__ && _KERNEL) */ : +static void : +teken_input_char(teken_t *t, teken_char_t c) : +{ : + : + switch (c) { : + case '\0': : + teken_subr_null_character(t); : + break; : + case '\a': : + teken_subr_bell(t); : + break; : + case '\b': : + teken_subr_backspace(t); : + break; : + case '\n': : + teken_subr_newline(t); : + break; : + case '\r': : + teken_subr_carriage_return(t); : + break; : + case '\t': : + teken_subr_horizontal_tab(t); : + break; : + case '\x0B': : + teken_subr_vertical_tab(t); : + break; : + default: : + t->t_nextstate(t, c); : + break; : + } : + : + /* Post-processing assertions. */ : + teken_assert(t->t_cursor.tp_row >= t->t_originreg.ts_begin); : + teken_assert(t->t_cursor.tp_row < t->t_originreg.ts_end); : + teken_assert(t->t_cursor.tp_row < t->t_winsize.tp_row); : + teken_assert(t->t_cursor.tp_col < t->t_winsize.tp_col); : + teken_assert(t->t_saved_cursor.tp_row < t->t_winsize.tp_row); : + teken_assert(t->t_saved_cursor.tp_col < t->t_winsize.tp_col); : + teken_assert(t->t_nextchar.tp_row <= t->t_winsize.tp_row); : + teken_assert(t->t_scrollreg.ts_end <= t->t_winsize.tp_row); : + teken_assert(t->t_scrollreg.ts_begin < t->t_scrollreg.ts_end); : + teken_assert(t->t_originreg.ts_end <= t->t_winsize.tp_row); : + teken_assert(t->t_originreg.ts_begin < t->t_originreg.ts_end); : } : : static void : -teken_input_byte(teken_t *t, char c) : +teken_input_byte(teken_t *t, unsigned char c) : { : : - /* XXX: UTF-8! */ : -#if 1 : - teken_printf("C %3u %3u -> ", t->t_cursor.tp_row, t->t_cursor.tp_col); : - t->t_nextstate(t, c); : - teken_printf("%3u %3u B %3hhu (%c)\n", t->t_cursor.tp_row, t->t_cursor.tp_col, (unsigned char)c, c); : - teken_printf("%u %u %u\n", t->t_curattr.ta_format, t->t_curattr.ta_fgcolor, t->t_curattr.ta_bgcolor); : -#else : - t->t_nextstate(t, c); : -#endif : +#ifdef TEKEN_UTF8 : + /* : + * UTF-8 handling. : + */ : + if ((c & 0x80) == 0x00) { : + /* One-byte sequence. */ : + t->t_utf8_left = 0; : + teken_input_char(t, c); : + } else if ((c & 0xe0) == 0xc0) { : + /* Two-byte sequence. */ : + t->t_utf8_left = 1; : + t->t_utf8_partial = c & 0x1f; : + } else if ((c & 0xf0) == 0xe0) { : + /* Three-byte sequence. */ : + t->t_utf8_left = 2; : + t->t_utf8_partial = c & 0x0f; : + } else if ((c & 0xf8) == 0xf0) { : + /* Four-byte sequence. */ : + t->t_utf8_left = 3; : + t->t_utf8_partial = c & 0x07; : + } else if ((c & 0xc0) == 0x80) { : + if (t->t_utf8_left == 0) : + return; : + t->t_utf8_left--; : + t->t_utf8_partial = (t->t_utf8_partial << 6) | (c & 0x3f); : + if (t->t_utf8_left == 0) { : + teken_printf("Got UTF-8 char %u\n", t->t_utf8_partial); : + teken_input_char(t, t->utf8_partial); : + } : + } : +#else /* !TEKEN_UTF8 */ : + teken_input_char(t, c); : +#endif /* TEKEN_UTF8 */ : } : : void : @@ -93,10 +292,13 @@ : { : teken_rect_t tr; : : + teken_assert(p->tp_col <= T_NUMCOL); : + : t->t_winsize = *p; : /* XXX: discards active scroll region. */ : t->t_scrollreg.ts_begin = 0; : t->t_scrollreg.ts_end = t->t_winsize.tp_row; : + t->t_originreg = t->t_scrollreg; : : /* Blank screen. */ : tr.tr_begin.tp_row = 0; : @@ -104,3 +306,64 @@ : tr.tr_end = t->t_winsize; : teken_funcs_fill(t, &tr, ' ', &teken_defattr); : } : + : +/* : + * State machine. : + */ : + : +static void : +teken_state_switch(teken_t *t, teken_state_t *s) : +{ : + : + t->t_nextstate = s; : + t->t_curnum = 0; : + t->t_stateflags |= TS_FIRSTDIGIT; : +} : + : +static int : +teken_state_numbers(teken_t *t, teken_char_t c) : +{ : + : + teken_assert(t->t_curnum < T_NUMSIZE); : + : + if (c >= '0' && c <= '9') { : + /* : + * Don't do math with the default value of 1 when a : + * custom number is inserted. : + */ : + if (t->t_stateflags & TS_FIRSTDIGIT) { : + t->t_stateflags &= ~TS_FIRSTDIGIT; : + t->t_nums[t->t_curnum] = 0; : + } else { : + t->t_nums[t->t_curnum] *= 10; : + } : + : + t->t_nums[t->t_curnum] += c - '0'; : + return (1); : + } else if (c == ';') { : + if (t->t_stateflags & TS_FIRSTDIGIT) : + t->t_nums[t->t_curnum] = 0; : + : + /* Only allow a limited set of arguments. */ : + if (++t->t_curnum == T_NUMSIZE) { : + teken_state_switch(t, teken_state_init); : + return (1); : + } : + : + t->t_stateflags |= TS_FIRSTDIGIT; : + return (1); : + } else { : + if (t->t_stateflags & TS_FIRSTDIGIT && t->t_curnum > 0) { : + /* Finish off the last empty argument. */ : + t->t_nums[t->t_curnum] = 0; : + t->t_curnum++; : + } else if ((t->t_stateflags & TS_FIRSTDIGIT) == 0) { : + /* Also count the last argument. */ : + t->t_curnum++; : + } : + } : + : + return (0); : +} : + : +#include "teken_state.h" : : ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#2 (text+ko) ==== : : @@ -34,17 +34,16 @@ : * commands. It implements commands similar to xterm-color. : */ : : -#if 0 : -/* XXX: UTF-8 */ : +#ifdef TEKEN_UTF8 : typedef uint32_t teken_char_t; : -#endif : +#else /* !TEKEN_UTF8 */ : typedef unsigned char teken_char_t; : +#endif /* TEKEN_UTF8 */ : typedef unsigned int teken_unit_t; : typedef char teken_format_t; : #define TF_BOLD 0x01 : #define TF_UNDERLINE 0x02 : #define TF_BLINK 0x04 : -#define TF_REVERSE 0x08 : typedef char teken_color_t; : #define TC_BLACK 0 : #define TC_RED 1 : @@ -89,9 +88,10 @@ : const teken_attr_t *); : typedef void tf_copy_t(void *, const teken_rect_t *, const teken_pos_t *); : typedef void tf_param_t(void *, int, int); : -#define TP_SHOWCURSOR 0x00 : -#define TP_CURSORKEYS 0x01 : -#define TP_KEYPADAPP 0x02 : +#define TP_SHOWCURSOR 0 : +#define TP_CURSORKEYS 1 : +#define TP_KEYPADAPP 2 : +typedef void tf_respond_t(void *, const void *, size_t); : : typedef struct { : tf_bell_t *tf_bell; : @@ -100,6 +100,7 @@ : tf_fill_t *tf_fill; : tf_copy_t *tf_copy; : tf_param_t *tf_param; : + tf_respond_t *tf_respond; : } teken_funcs_t; : : /* : @@ -111,19 +112,31 @@ : : teken_state_t *t_nextstate; : unsigned int t_stateflags; : -#define TS_FIRSTDIGIT 0x01 /* First numeric digit in escape sequence. */ : -#define TS_INSERT 0x02 /* Insert mode. */ : : -#define T_NUMSIZE 4 : +#define T_NUMSIZE 8 : unsigned int t_nums[T_NUMSIZE]; : unsigned int t_curnum; : : teken_pos_t t_cursor; : - teken_pos_t t_savepos; : + teken_attr_t t_curattr; : + teken_pos_t t_saved_cursor; : + teken_attr_t t_saved_curattr; : + : + teken_pos_t t_nextchar; : teken_pos_t t_winsize; : + : + /* For DECSTBM. */ : teken_span_t t_scrollreg; : + /* For DECOM. */ : + teken_span_t t_originreg; : : - teken_attr_t t_curattr; : +#define T_NUMCOL 160 : + unsigned int t_tabstops[T_NUMCOL / (sizeof(unsigned int) * 8)]; : + : +#ifdef TEKEN_UTF8 : + unsigned int t_utf8_left; : + teken_char_t t_utf8_partial; : +#endif /* TEKEN_UTF8 */ : }; : : void teken_init(teken_t *, const teken_funcs_t *, void *); : From owner-p4-projects@FreeBSD.ORG Sun Dec 14 19:20:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BD061065679; Sun, 14 Dec 2008 19:20: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 1FD44106564A for ; Sun, 14 Dec 2008 19:20:26 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id B28748FC13 for ; Sun, 14 Dec 2008 19:20:25 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id E1F541CF65; Sun, 14 Dec 2008 20:20:57 +0100 (CET) Date: Sun, 14 Dec 2008 20:20:57 +0100 From: Ed Schouten To: "M. Warner Losh" Message-ID: <20081214192057.GP1176@hoeg.nl> References: <200812032046.mB3KkUBx016516@repoman.freebsd.org> <20081214.121720.-861029116.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BouVgDkIlpb7X6Bk" Content-Disposition: inline In-Reply-To: <20081214.121720.-861029116.imp@bsdimp.com> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 19:20:26 -0000 --BouVgDkIlpb7X6Bk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * M. Warner Losh wrote: > In message: <200812032046.mB3KkUBx016516@repoman.freebsd.org> > Ed Schouten writes: > : I'm not entirely happy with modifying kern.post.mk to generate > : teken_state.h. Maybe we should regenerate by hand... >=20 > You can do this in the "files*" file... Great! I just spotted the `compile-with' commands. I'll change it in a couple of minutes. Thanks! --=20 Ed Schouten WWW: http://80386.nl/ --BouVgDkIlpb7X6Bk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAklFXJkACgkQ52SDGA2eCwUplACeIo+UVBM0yUrT+FPoTIAqwE6q bv8An1z2otiWGPzNhbKVrTAUp9LXfJ3H =Jn5J -----END PGP SIGNATURE----- --BouVgDkIlpb7X6Bk-- From owner-p4-projects@FreeBSD.ORG Sun Dec 14 19:33:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E3241065675; Sun, 14 Dec 2008 19:33: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 42230106564A for ; Sun, 14 Dec 2008 19:33:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 302DA8FC1B for ; Sun, 14 Dec 2008 19:33:28 +0000 (UTC) (envelope-from ed@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 mBEJXSpT097097 for ; Sun, 14 Dec 2008 19:33:28 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEJXROG097095 for perforce@freebsd.org; Sun, 14 Dec 2008 19:33:27 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 14 Dec 2008 19:33:27 GMT Message-Id: <200812141933.mBEJXROG097095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 19:33:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=154655 Change 154655 by ed@ed_dull on 2008/12/14 19:32:29 Generate teken_state.h using /sys/conf/files instead of hacks added to kern.post.mk. I wasn't aware we had a `compile-with' command yet. Pointed out by: imp Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#34 edit .. //depot/projects/mpsafetty/sys/conf/kern.post.mk#3 integrate Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#34 (text+ko) ==== @@ -75,6 +75,11 @@ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" +teken_state.h optional sc \ + dependency "$S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences" \ + compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ + no-obj no-implicit-rule before-depend \ + clean "teken_state.h" usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ ==== //depot/projects/mpsafetty/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -98,8 +98,7 @@ .endif .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND:M*.h}\ - ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -118,7 +117,7 @@ ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \ linterrs makelinks tags vers.c \ vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \ - teken_state.h ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ + ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \ ${CLEAN} lint: ${LNFILES} @@ -148,7 +147,7 @@ kernel-depend: .depend # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -SRCS= assym.s vnode_if.h teken_state.h ${BEFORE_DEPEND} ${CFILES} \ +SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} .depend: .PRECIOUS ${SRCS} @@ -259,10 +258,6 @@ vnode_if_typedef.h: ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -q -teken_state.h: $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences - ${AWK} -f $S/dev/syscons/teken/gensequences \ - < $S/dev/syscons/teken/sequences > teken_state.h - # XXX strictly, everything depends on Makefile because changes to ${PROF} # only appear there, but we don't handle that. From owner-p4-projects@FreeBSD.ORG Sun Dec 14 19:42:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED34A1065675; Sun, 14 Dec 2008 19:42: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 B0F921065670 for ; Sun, 14 Dec 2008 19:42:37 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D57F8FC0C for ; Sun, 14 Dec 2008 19:42:37 +0000 (UTC) (envelope-from ed@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 mBEJgb4B097927 for ; Sun, 14 Dec 2008 19:42:37 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEJgbUp097925 for perforce@freebsd.org; Sun, 14 Dec 2008 19:42:37 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 14 Dec 2008 19:42:37 GMT Message-Id: <200812141942.mBEJgbUp097925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 19:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=154656 Change 154656 by ed@ed_dull on 2008/12/14 19:41:48 IFC, so I can generate new diffs. Affected files ... .. //depot/projects/mpsafetty/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/mpsafetty/sbin/devd/devd.cc#2 integrate .. //depot/projects/mpsafetty/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/mpsafetty/sys/boot/Makefile#6 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/snp/snp.c#16 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#67 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#9 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/mpsafetty/sys/netinet/vinet.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/ttyhook.h#10 integrate .. //depot/projects/mpsafetty/usr.sbin/jls/jls.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/cdrom.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#5 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/sbin/atacontrol/atacontrol.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.31 2008/06/25 18:11:22 bz Exp $ +.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.32 2008/12/14 12:56:56 ru Exp $ .\" -.Dd June 25, 2008 +.Dd December 14, 2008 .Dt ATACONTROL 8 .Os .Sh NAME @@ -63,6 +63,7 @@ .Nm .Ic mode .Ar device +.Op Ar mode .Nm .Ic info .Ar channel @@ -94,7 +95,7 @@ .Ar channel argument is the ATA channel device (e.g., ata0) on which to operate. The following commands are supported: -.Bl -tag -width "rebuild" +.Bl -tag -width ".Ic addspare" .It Ic attach Attach an ATA .Ar channel . @@ -162,9 +163,13 @@ .It Ic status Get the status of an ATA RAID. .It Ic mode -Without the mode argument, the current transfer modes of the +Without the +.Ar mode +argument, the current transfer mode of the device are printed. -If the mode argument is given, the ATA driver +If the +.Ar mode +argument is given, the ATA driver is asked to change the transfer mode to the one given. The ATA driver will reject modes that are not supported by the hardware. @@ -190,13 +195,12 @@ .Cm UDMA6 (alias .Cm UDMA133 ) . -The device name and manufacture/version strings are shown. .It Ic cap Show detailed info about the device on .Ar device . .It Ic spindown Set or report timeout after which the -.Ar device +.Ar device will be spun down. To arm the timeout the device needs at least one more request after setting the timeout. @@ -205,6 +209,7 @@ .It Ic info Show info about the attached devices on the .Ar channel . +The device name and manufacture/version strings are shown. .It Ic list Show info about all attached devices on all active controllers. .El @@ -312,7 +317,7 @@ RAID controller, then shut the system down, make sure that the disk that was still working is moved to the bootable position (channel 0 or whatever the BIOS allows the system to boot from) and the blank disk -is placed in the secondary position, then boot the system into +is placed in the secondary position, then boot the system into single-user mode and issue the command: .Pp .Dl "atacontrol addspare ar0 ad6" ==== //depot/projects/mpsafetty/sbin/devd/devd.cc#2 (text+ko) ==== @@ -34,7 +34,7 @@ // - devd.conf needs more details on the supported statements. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.33 2006/09/17 22:49:26 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.34 2008/12/14 11:48:51 phk Exp $"); #include #include @@ -307,7 +307,7 @@ config::parse_one_file(const char *fn) { if (Dflag) - printf("Parsing %s\n", fn); + fprintf(stderr, "Parsing %s\n", fn); yyin = fopen(fn, "r"); if (yyin == NULL) err(1, "Cannot open config file %s", fn); @@ -325,7 +325,7 @@ char path[PATH_MAX]; if (Dflag) - printf("Parsing files in %s\n", dirname); + fprintf(stderr, "Parsing files in %s\n", dirname); dirp = opendir(dirname); if (dirp == NULL) return; ==== //depot/projects/mpsafetty/sbin/devd/devd.conf.5#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/sbin/devd/devd.conf.5,v 1.11 2006/10/24 20:20:41 ru Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.12 2008/12/14 11:47:39 phk Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -110,7 +110,7 @@ .It Ic directory Qq Ar /some/path ; Adds the given directory to the list of directories from which .Xr devd 8 -will read +will read all files named "*.conf" as further configuration files. Any number of .Ic directory ==== //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.134 2008/12/13 13:07:12 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ */ #include "opt_atpic.h" @@ -459,9 +459,9 @@ */ movq %rsp,%rsi /* source stack pointer */ movq $TF_SIZE,%rcx - movq PCPU(RSP0),%rbx - subq %rcx,%rbx - movq %rbx,%rdi /* destination stack pointer */ + movq PCPU(RSP0),%rdx + subq %rcx,%rdx + movq %rdx,%rdi /* destination stack pointer */ shrq $3,%rcx /* trap frame size in long words */ cld @@ -470,7 +470,7 @@ movl %ss,%eax pushq %rax /* tf_ss */ - pushq %rbx /* tf_rsp (on kernel stack) */ + pushq %rdx /* tf_rsp (on kernel stack) */ pushfq /* tf_rflags */ movl %cs,%eax pushq %rax /* tf_cs */ ==== //depot/projects/mpsafetty/sys/boot/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.37 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.38 2008/12/14 02:57:41 nyan Exp $ .include @@ -12,7 +12,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.8 2008/12/10 23:12:39 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.9 2008/12/13 22:04:52 bz Exp $"); #include #include @@ -116,22 +116,22 @@ #define ISN_STATIC_INCREMENT 4096 #define ISN_RANDOM_INCREMENT (4096 - 1) -static u_char isn_secret[32]; -static int isn_last_reseed; -static u_int32_t isn_offset; -static MD5_CTX isn_ctx; +static u_char pf_isn_secret[32]; +static int pf_isn_last_reseed; +static u_int32_t pf_isn_offset; u_int32_t pf_new_isn(struct pf_state *s) { + MD5_CTX isn_ctx; u_int32_t md5_buffer[4]; u_int32_t new_isn; struct pf_state_host *src, *dst; /* Seed if this is the first use, reseed if requested. */ - if (isn_last_reseed == 0) { - read_random(&isn_secret, sizeof(isn_secret)); - isn_last_reseed = ticks; + if (pf_isn_last_reseed == 0) { + read_random(&pf_isn_secret, sizeof(pf_isn_secret)); + pf_isn_last_reseed = ticks; } if (s->direction == PF_IN) { @@ -160,11 +160,11 @@ MD5Update(&isn_ctx, (u_char *) &src->addr, sizeof(struct in_addr)); } - MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); + MD5Update(&isn_ctx, (u_char *) &pf_isn_secret, sizeof(pf_isn_secret)); MD5Final((u_char *) &md5_buffer, &isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - isn_offset += ISN_STATIC_INCREMENT + + pf_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += isn_offset; + new_isn += pf_isn_offset; return (new_isn); } ==== //depot/projects/mpsafetty/sys/dev/snp/snp.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.111 2008/11/05 15:04:03 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.112 2008/12/13 21:17:46 mav Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -246,7 +247,7 @@ sx_xunlock(&snp_register_lock); return (EBUSY); } - error = ttyhook_register(&ss->snp_tty, td, *(int *)data, + error = ttyhook_register(&ss->snp_tty, td->td_proc, *(int *)data, &snp_hook, ss); sx_xunlock(&snp_register_lock); if (error != 0) ==== //depot/projects/mpsafetty/sys/kern/tty.c#67 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.298 2008/11/08 20:40:39 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.299 2008/12/13 21:17:46 mav Exp $"); #include "opt_compat.h" @@ -37,6 +37,7 @@ #include #include #include +#include #include #ifdef COMPAT_43TTY #include @@ -1673,18 +1674,24 @@ } int -ttyhook_register(struct tty **rtp, struct thread *td, int fd, +ttyhook_register(struct tty **rtp, struct proc *p, int fd, struct ttyhook *th, void *softc) { struct tty *tp; struct file *fp; struct cdev *dev; struct cdevsw *cdp; + struct filedesc *fdp; int error; /* Validate the file descriptor. */ - if (fget(td, fd, &fp) != 0) - return (EINVAL); + if ((fdp = p->p_fd) == NULL) + return (EBADF); + FILEDESC_SLOCK(fdp); + if ((fp = fget_locked(fdp, fd)) == NULL || fp->f_ops == &badfileops) { + FILEDESC_SUNLOCK(fdp); + return (EBADF); + } /* Make sure the vnode is bound to a character device. */ error = EINVAL; @@ -1723,7 +1730,7 @@ done3: tty_unlock(tp); done2: dev_relthread(dev); -done1: fdrop(fp, td); +done1: FILEDESC_SUNLOCK(fdp); return (error); } ==== //depot/projects/mpsafetty/sys/net/rtsock.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.156 2008/12/10 09:21:52 kmacy Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.157 2008/12/13 22:41:36 thompsa Exp $ */ #include "opt_sctp.h" #include "opt_mpath.h" @@ -673,10 +673,10 @@ rt->rt_ifa->ifa_addr))) { RT_UNLOCK(rt); RADIX_NODE_HEAD_LOCK(rnh); - if ((error = rt_getifa_fib(&info, - rt->rt_fibnum)) != 0) + error = rt_getifa_fib(&info, rt->rt_fibnum); + RADIX_NODE_HEAD_UNLOCK(rnh); + if (error != 0) senderr(error); - RADIX_NODE_HEAD_UNLOCK(rnh); RT_LOCK(rt); } if (info.rti_ifa != NULL && ==== //depot/projects/mpsafetty/sys/netgraph/netgraph.h#7 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.79 2008/12/10 23:12:39 zec Exp $ + * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.80 2008/12/13 22:26:24 mav Exp $ * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $ */ @@ -1130,7 +1130,6 @@ item_p ng_package_msg_self(node_p here, hook_p hook, struct ng_mesg *msg); void ng_replace_retaddr(node_p here, item_p item, ng_ID_t retaddr); int ng_rmhook_self(hook_p hook); /* if a node wants to kill a hook */ -int ng_rmnode_flags(node_p here, int flags); int ng_rmnode_self(node_p here); /* if a node wants to suicide */ int ng_rmtype(struct ng_type *tp); int ng_snd_item(item_p item, int queue); ==== //depot/projects/mpsafetty/sys/netgraph/ng_base.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.169 2008/12/10 23:12:39 zec Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.170 2008/12/13 22:26:24 mav Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -1521,7 +1521,7 @@ /* Shut this node down as soon as everyone is clear of it */ /* Should add arg "immediately" to jump the queue */ int -ng_rmnode_flags(node_p node, int flags) +ng_rmnode_self(node_p node) { int error; @@ -1531,16 +1531,10 @@ if (node->nd_flags & NGF_CLOSING) return (0); - error = ng_send_fn1(node, NULL, &ng_rmnode, NULL, 0, flags); + error = ng_send_fn(node, NULL, &ng_rmnode, NULL, 0); return (error); } -int -ng_rmnode_self(node_p node) -{ - return (ng_rmnode_flags(node, NG_NOFLAGS)); -} - static void ng_rmhook_part2(node_p node, hook_p hook, void *arg1, int arg2) { ==== //depot/projects/mpsafetty/sys/netgraph/ng_tty.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ * * Updated by Andrew Thompson for MPSAFE TTY. * - * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.41 2008/11/08 06:25:57 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.43 2008/12/13 22:05:46 mav Exp $ * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $ */ @@ -114,7 +114,6 @@ static th_rint_t ngt_rint; static th_rint_bypass_t ngt_rint_bypass; static th_rint_poll_t ngt_rint_poll; -static th_close_t ngt_close; static struct ttyhook ngt_hook = { .th_getc_inject = ngt_getc_inject, @@ -122,7 +121,6 @@ .th_rint = ngt_rint, .th_rint_bypass = ngt_rint_bypass, .th_rint_poll = ngt_rint_poll, - .th_close = ngt_close, }; /* Netgraph node type descriptor */ @@ -252,7 +250,6 @@ ngt_rcvmsg(node_p node, item_p item, hook_p lasthook) { struct proc *p; - struct thread *td; const sc_p sc = NG_NODE_PRIVATE(node); struct ng_mesg *msg, *resp = NULL; int error = 0; @@ -266,12 +263,13 @@ return (EBUSY); p = pfind(((int *)msg->data)[0]); - if (p == NULL) + if (p == NULL || (p->p_flag & P_WEXIT)) return (ESRCH); - td = FIRST_THREAD_IN_PROC(p); - error = ttyhook_register(&sc->tp, td, ((int *)msg->data)[1], + _PHOLD(p); + PROC_UNLOCK(p); + error = ttyhook_register(&sc->tp, p, ((int *)msg->data)[1], &ngt_hook, sc); - PROC_UNLOCK(p); + PRELE(p); if (error != 0) return (error); break; @@ -515,12 +513,3 @@ return (1); } -static void -ngt_close(struct tty *tp) -{ - sc_p sc = ttyhook_softc(tp); - - /* Must be queued to drop the tty lock */ - ng_rmnode_flags(sc->node, NG_QUEUE); -} - ==== //depot/projects/mpsafetty/sys/netinet/in_pcb.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.233 2008/12/10 13:24:38 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.234 2008/12/14 17:47:33 bz Exp $"); #include "opt_ddb.h" #include "opt_ipsec.h" @@ -695,6 +695,10 @@ ia = ifatoia(ifa_ifwithnet(sintosa(&sain))); if (cred == NULL || !jailed(cred)) { +#if __FreeBSD_version < 800000 + if (ia == NULL) + ia = (struct in_ifaddr *)sro.ro_rt->rt_ifa; +#endif if (ia == NULL) { error = ENETUNREACH; goto done; ==== //depot/projects/mpsafetty/sys/netinet/in_rmx.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.65 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.66 2008/12/13 20:16:03 kmacy Exp $"); #include #include @@ -115,7 +115,7 @@ * ARP entry and delete it if so. */ rt2 = in_rtalloc1((struct sockaddr *)sin, 0, - RTF_CLONING, rt->rt_fibnum); + RTF_CLONING|RTF_RNH_LOCKED, rt->rt_fibnum); if (rt2) { if (rt2->rt_flags & RTF_LLINFO && rt2->rt_flags & RTF_HOST && ==== //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.204 2008/12/13 19:13:03 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.206 2008/12/13 20:34:41 kmacy Exp $"); #define DEB(x) #define DDB(x) x @@ -1814,6 +1814,7 @@ INIT_VNET_IPFW(curvnet); struct radix_node_head *rnh; struct table_entry *ent; + struct radix_node *rn; if (tbl >= IPFW_TABLES_MAX) return (EINVAL); @@ -1826,8 +1827,10 @@ ent->mask.sin_addr.s_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0); ent->addr.sin_addr.s_addr = addr & ent->mask.sin_addr.s_addr; IPFW_WLOCK(ch); - if (rnh->rnh_addaddr(&ent->addr, &ent->mask, rnh, (void *)ent) == - NULL) { + RADIX_NODE_HEAD_LOCK(rnh); + rn = rnh->rnh_addaddr(&ent->addr, &ent->mask, rnh, (void *)ent); + RADIX_NODE_HEAD_UNLOCK(rnh); + if (rn == NULL) { IPFW_WUNLOCK(ch); free(ent, M_IPFW_TBL); return (EEXIST); ==== //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.327 2008/12/11 16:05:07 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.328 2008/12/13 21:59:18 bz Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -1486,13 +1486,13 @@ static u_char isn_secret[32]; static int isn_last_reseed; static u_int32_t isn_offset, isn_offset_old; -static MD5_CTX isn_ctx; #endif tcp_seq tcp_new_isn(struct tcpcb *tp) { INIT_VNET_INET(tp->t_vnet); + MD5_CTX isn_ctx; u_int32_t md5_buffer[4]; tcp_seq new_isn; @@ -1508,25 +1508,25 @@ } /* Compute the md5 hash and return the ISN. */ - MD5Init(&V_isn_ctx); - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_fport, sizeof(u_short)); - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_lport, sizeof(u_short)); + MD5Init(&isn_ctx); + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_fport, sizeof(u_short)); + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_lport, sizeof(u_short)); #ifdef INET6 if ((tp->t_inpcb->inp_vflag & INP_IPV6) != 0) { - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->in6p_faddr, + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->in6p_faddr, sizeof(struct in6_addr)); - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->in6p_laddr, + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->in6p_laddr, sizeof(struct in6_addr)); } else #endif { - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_faddr, + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_faddr, sizeof(struct in_addr)); - MD5Update(&V_isn_ctx, (u_char *) &tp->t_inpcb->inp_laddr, + MD5Update(&isn_ctx, (u_char *) &tp->t_inpcb->inp_laddr, sizeof(struct in_addr)); } - MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret)); - MD5Final((u_char *) &md5_buffer, &V_isn_ctx); + MD5Update(&isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret)); + MD5Final((u_char *) &md5_buffer, &isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; V_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); ==== //depot/projects/mpsafetty/sys/netinet/vinet.h#5 (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.6 2008/12/10 23:12:39 zec Exp $ + * $FreeBSD: src/sys/netinet/vinet.h,v 1.7 2008/12/13 21:59:18 bz Exp $ */ #ifndef _NETINET_VINET_H_ @@ -142,7 +142,6 @@ int _isn_last_reseed; u_int32_t _isn_offset; u_int32_t _isn_offset_old; - MD5_CTX _isn_ctx; struct inpcbhead _udb; struct inpcbinfo _udbinfo; @@ -265,7 +264,6 @@ #define V_ipsendredirects VNET_INET(ipsendredirects) #define V_ipstat VNET_INET(ipstat) #define V_ipstealth VNET_INET(ipstealth) -#define V_isn_ctx VNET_INET(isn_ctx) #define V_isn_last_reseed VNET_INET(isn_last_reseed) #define V_isn_offset VNET_INET(isn_offset) #define V_isn_offset_old VNET_INET(isn_offset_old) ==== //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#8 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.31 2008/12/08 00:28:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.32 2008/12/13 20:15:42 kmacy Exp $"); #include #include @@ -160,7 +160,7 @@ * Find out if it is because of an * ARP entry and delete it if so. */ - rt2 = rtalloc1((struct sockaddr *)sin6, 0, RTF_CLONING); + rt2 = rtalloc1((struct sockaddr *)sin6, 0, RTF_RNH_LOCKED|RTF_CLONING); if (rt2) { if (rt2->rt_flags & RTF_LLINFO && rt2->rt_flags & RTF_HOST && @@ -187,7 +187,7 @@ * net route entry, 3ffe:0501:: -> if0. * This case should not raise an error. */ - rt2 = rtalloc1((struct sockaddr *)sin6, 0, RTF_CLONING); + rt2 = rtalloc1((struct sockaddr *)sin6, 0, RTF_RNH_LOCKED|RTF_CLONING); if (rt2) { if ((rt2->rt_flags & (RTF_CLONING|RTF_HOST|RTF_GATEWAY)) == RTF_CLONING ==== //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.13 2008/10/15 03:38:03 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/ofw/ofw_syscons.c,v 1.15 2008/12/13 20:53:57 nwhitehorn Exp $"); #include #include @@ -137,10 +137,12 @@ */ static vi_blank_display_t ofwfb_blank_display8; static vi_putc_t ofwfb_putc8; +static vi_putm_t ofwfb_putm8; static vi_set_border_t ofwfb_set_border8; static vi_blank_display_t ofwfb_blank_display32; static vi_putc_t ofwfb_putc32; +static vi_putm_t ofwfb_putm32; static vi_set_border_t ofwfb_set_border32; VIDEO_DRIVER(ofwfb, ofwfbvidsw, ofwfb_configure); @@ -250,10 +252,12 @@ if (depth == 8) { sc->sc_blank = ofwfb_blank_display8; sc->sc_putc = ofwfb_putc8; + sc->sc_putm = ofwfb_putm8; sc->sc_set_border = ofwfb_set_border8; } else if (depth == 32) { sc->sc_blank = ofwfb_blank_display32; sc->sc_putc = ofwfb_putc32; + sc->sc_putm = ofwfb_putm32; sc->sc_set_border = ofwfb_set_border32; } else return (0); @@ -304,36 +308,14 @@ { struct ofwfb_softc *sc; video_info_t *vi; - char name[64]; - ihandle_t ih; - int i; int cborder; int font_height; - int retval; sc = (struct ofwfb_softc *)adp; vi = &adp->va_info; vid_init_struct(adp, "ofwfb", -1, unit); - if (sc->sc_depth == 8) { - /* - * Install the ISO6429 colormap - older OFW systems - * don't do this by default - */ - memset(name, 0, sizeof(name)); - OF_package_to_path(sc->sc_node, name, sizeof(name)); - ih = OF_open(name); - for (i = 0; i < 16; i++) { - OF_call_method("color!", ih, 4, 1, - ofwfb_cmap[i].red, - ofwfb_cmap[i].green, - ofwfb_cmap[i].blue, - i, - &retval); - } - } - /* The default font size can be overridden by loader */ font_height = 16; TUNABLE_INT_FETCH("hw.syscons.fsize", &font_height); @@ -375,10 +357,13 @@ */ adp->va_window = (vm_offset_t) ofwfb_static_window; - /* Enable future font-loading and flag color support */ - adp->va_flags |= V_ADP_FONT | V_ADP_COLOR; - - ofwfb_blank_display(&sc->sc_va, V_DISPLAY_ON); + /* + * Enable future font-loading and flag color support, as well as + * adding V_ADP_MODECHANGE so that we ofwfb_set_mode() gets called + * when the X server shuts down. This enables us to get the console + * back when X disappears. + */ + adp->va_flags |= V_ADP_FONT | V_ADP_COLOR | V_ADP_MODECHANGE; ofwfb_set_mode(&sc->sc_va, 0); @@ -404,6 +389,37 @@ static int ofwfb_set_mode(video_adapter_t *adp, int mode) { + struct ofwfb_softc *sc; + char name[64]; + ihandle_t ih; + int i, retval; + + sc = (struct ofwfb_softc *)adp; + + /* + * Open the display device, which will initialize it. + */ + + memset(name, 0, sizeof(name)); + OF_package_to_path(sc->sc_node, name, sizeof(name)); + ih = OF_open(name); + + if (sc->sc_depth == 8) { + /* + * Install the ISO6429 colormap - older OFW systems + * don't do this by default + */ + for (i = 0; i < 16; i++) { + OF_call_method("color!", ih, 4, 1, + ofwfb_cmap[i].red, + ofwfb_cmap[i].green, + ofwfb_cmap[i].blue, + i, + &retval); + } + } + + ofwfb_blank_display(&sc->sc_va, V_DISPLAY_ON); return (0); } @@ -823,7 +839,86 @@ sc = (struct ofwfb_softc *)adp; - /* put mouse */ + return ((*sc->sc_putm)(adp, x, y, pixel_image, pixel_mask, size, + width)); +} + +static int +ofwfb_putm8(video_adapter_t *adp, int x, int y, uint8_t *pixel_image, + uint32_t pixel_mask, int size, int width) +{ + struct ofwfb_softc *sc; + int i, j, k; + uint32_t *addr; + u_char fg, bg; + union { + uint32_t l[2]; + uint8_t c[8]; + } ch; + + + sc = (struct ofwfb_softc *)adp; + addr = (u_int32_t *)((int)sc->sc_addr + + (y + sc->sc_ymargin)*sc->sc_stride + + x + sc->sc_xmargin); + + fg = ofwfb_foreground(SC_NORM_ATTR); + bg = ofwfb_background(SC_NORM_ATTR); + + for (i = 0; i < size && i+y < sc->sc_height - 2*sc->sc_ymargin; i++) { + /* + * Use the current values for the line + */ + ch.l[0] = addr[0]; + ch.l[1] = addr[1]; + + /* + * Calculate 2 x 4-chars at a time, and then + * write these out. + */ + for (j = 0, k = width; j < 8; j++, k--) { + if (x + j >= sc->sc_width - 2*sc->sc_xmargin) + continue; + + if (pixel_image[i] & (1 << k)) + ch.c[j] = (ch.c[j] == fg) ? bg : fg; + } + + addr[0] = ch.l[0]; + addr[1] = ch.l[1]; + addr += (sc->sc_stride / sizeof(u_int32_t)); + } + + return (0); +} + +static int +ofwfb_putm32(video_adapter_t *adp, int x, int y, uint8_t *pixel_image, + uint32_t pixel_mask, int size, int width) +{ + struct ofwfb_softc *sc; + int i, j, k; + uint32_t fg, bg; + uint32_t *addr; + + sc = (struct ofwfb_softc *)adp; + addr = (uint32_t *)sc->sc_addr + + (y + sc->sc_ymargin)*(sc->sc_stride/4) + + x + sc->sc_xmargin; + + fg = ofwfb_pix32(ofwfb_foreground(SC_NORM_ATTR)); + bg = ofwfb_pix32(ofwfb_background(SC_NORM_ATTR)); + + for (i = 0; i < size && i+y < sc->sc_height - 2*sc->sc_ymargin; i++) { + for (j = 0, k = width; j < 8; j++, k--) { + if (x + j >= sc->sc_width - 2*sc->sc_xmargin) + continue; + + if (pixel_image[i] & (1 << k)) + *(addr + j) = (*(addr + j) == fg) ? bg : fg; + } + addr += (sc->sc_stride/4); + } return (0); } ==== //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/ofw/ofw_syscons.h,v 1.4 2005/02/25 02:29:01 grehan Exp $ + * $FreeBSD: src/sys/powerpc/ofw/ofw_syscons.h,v 1.5 2008/12/13 20:13:22 nwhitehorn Exp $ */ #ifndef _OFW_SYSCONS_H_ @@ -51,6 +51,7 @@ vi_blank_display_t *sc_blank; vi_putc_t *sc_putc; + vi_putm_t *sc_putm; vi_set_border_t *sc_set_border; #define OFWSC_MAXADDR 8 ==== //depot/projects/mpsafetty/sys/sys/ttyhook.h#10 (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/sys/ttyhook.h,v 1.1 2008/09/22 19:25:14 ed Exp $ + * $FreeBSD: src/sys/sys/ttyhook.h,v 1.2 2008/12/13 21:17:46 mav Exp $ */ #ifndef _SYS_TTYHOOK_H_ @@ -66,7 +66,7 @@ th_close_t *th_close; }; -int ttyhook_register(struct tty **, struct thread *, int, +int ttyhook_register(struct tty **, struct proc *, int, struct ttyhook *, void *); void ttyhook_unregister(struct tty *); #define ttyhook_softc(tp) ((tp)->t_hooksoftc) ==== //depot/projects/mpsafetty/usr.sbin/jls/jls.c#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/usr.sbin/jls/jls.c,v 1.7 2008/12/11 01:04:25 bz Exp $ + * $FreeBSD: src/usr.sbin/jls/jls.c,v 1.8 2008/12/14 16:56:47 bz Exp $ */ #include @@ -48,7 +48,7 @@ #ifdef SUPPORT_OLD_XPRISON static -char *print_xprison_v1(void *p, char *end) +char *print_xprison_v1(void *p, char *end, unsigned flags) { struct xprison_v1 *xp; struct in_addr in; @@ -57,15 +57,18 @@ errx(1, "Invalid length for jail"); xp = (struct xprison_v1 *)p; - printf("%6d %-29.29s %.74s\n", - xp->pr_id, xp->pr_host, xp->pr_path); - - /* We are not printing an empty line here for state and name. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 14 19:47:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B37C1065673; Sun, 14 Dec 2008 19:47: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 4F9001065670 for ; Sun, 14 Dec 2008 19:47:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E12788FC14 for ; Sun, 14 Dec 2008 19:47:42 +0000 (UTC) (envelope-from ed@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 mBEJlg9V098750 for ; Sun, 14 Dec 2008 19:47:42 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEJlgoh098748 for perforce@freebsd.org; Sun, 14 Dec 2008 19:47:42 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 14 Dec 2008 19:47:42 GMT Message-Id: <200812141947.mBEJlgoh098748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 19:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154657 Change 154657 by ed@ed_dull on 2008/12/14 19:47:18 Use my FreeBSD email address consistently. I've used it in all the files, except this one. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#9 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#9 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Ed Schouten + * Copyright (c) 2008 Ed Schouten * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:07:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BDE910656F2; Sun, 14 Dec 2008 21:07: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 E19F710656D4 for ; Sun, 14 Dec 2008 21:07:03 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CED8B8FC14 for ; Sun, 14 Dec 2008 21:07:03 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBEL73xC026740 for ; Sun, 14 Dec 2008 21:07:03 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEL73kH026738 for perforce@freebsd.org; Sun, 14 Dec 2008 21:07:03 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 21:07:03 GMT Message-Id: <200812142107.mBEL73kH026738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:07:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=154661 Change 154661 by zec@zec_tca51 on 2008/12/14 21:06:10 Unbreak GENERIC / LINT / VIMAGE_GLOBALS and VIMAGE builds. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#72 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#16 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#6 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#27 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#24 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#61 edit .. //depot/projects/vimage/src/sys/netinet/ip_var.h#16 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#75 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#72 (text+ko) ==== @@ -62,6 +62,8 @@ #include #include +struct vnet_modlink; + //#define DEBUG_ORDERING MALLOC_DEFINE(M_VIMAGE, "vimage", "virtual image resource container"); @@ -69,12 +71,19 @@ MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); +#ifdef VIMAGE static struct vimage *vi_alloc(struct vimage *, char *); static int vi_destroy(struct vimage *); -static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); static int vnet_mod_destructor(struct vnet_modlink *); +#endif +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vprocg vprocg_0; +#endif +#endif + #ifdef VI_PREALLOC_SIZE /* * A private memory allocator can be enabled by setting VI_PREALLOC_SIZE @@ -112,33 +121,40 @@ #define vi_free(addr, type) free((addr), (type)) #endif /* VI_PREALLOC_SIZE */ -struct vimage_list_head vimage_head; -struct vnet_list_head vnet_head; -struct vprocg_list_head vprocg_head; -struct vcpu_list_head vcpu_head; +#ifndef VIMAGE_GLOBALS +static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; +static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; +static void vnet_mod_complete_registration(struct vnet_modlink *); -struct cv vnet_list_condvar; -struct mtx vnet_list_refc_mtx; -int vnet_list_refc = 0; +int +vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) +{ + struct vnet_modlink *vml; + struct vnet_symmap *mapentry; -struct mtx vcpu_list_mtx; + TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) { -#define VNET_LIST_LOCK() \ - mtx_lock(&vnet_list_refc_mtx); \ - while (vnet_list_refc != 0) \ - cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); + if (vml->vml_modinfo->vmi_symmap == NULL) + continue; -#define VNET_LIST_UNLOCK() \ - mtx_unlock(&vnet_list_refc_mtx); - -static u_int last_vi_id = 0; -static u_int last_vnet_id = 0; -static u_int last_vprocg_id = 0; -static u_int last_vcpu_id = 0; + for (mapentry = vml->vml_modinfo->vmi_symmap; + mapentry->name != NULL; mapentry++) { + if (strcmp(symstr, mapentry->name) == 0) { +#ifdef VIMAGE + lookup->symvalue = + (u_long) curvnet->mod_data[vml->vml_modinfo->vmi_id]; + lookup->symvalue += mapentry->offset; +#else + lookup->symvalue = (u_long) mapentry->offset; +#endif + lookup->symsize = mapentry->size; + return (0); + } + } + } + return (ENOENT); +} -static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; -static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; - void vnet_mod_register(const struct vnet_modinfo *vmi) { @@ -200,11 +216,13 @@ TAILQ_INSERT_TAIL(&vnet_modlink_head, vml, vml_mod_le); +#ifdef VIMAGE VNET_FOREACH(vnet_iter) { CURVNET_SET_QUIET(vnet_iter); vnet_mod_constructor(vml); CURVNET_RESTORE(); } +#endif /* Check for pending modules depending on us */ do { @@ -225,7 +243,33 @@ } } while (vml_iter != NULL); } +#endif /* !VIMAGE_GLOBALS */ + +#ifdef VIMAGE +struct vimage_list_head vimage_head; +struct vnet_list_head vnet_head; +struct vprocg_list_head vprocg_head; +struct vcpu_list_head vcpu_head; + +struct cv vnet_list_condvar; +struct mtx vnet_list_refc_mtx; +int vnet_list_refc = 0; + +struct mtx vcpu_list_mtx; + +#define VNET_LIST_LOCK() \ + mtx_lock(&vnet_list_refc_mtx); \ + while (vnet_list_refc != 0) \ + cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); +#define VNET_LIST_UNLOCK() \ + mtx_unlock(&vnet_list_refc_mtx); + +static u_int last_vi_id = 0; +static u_int last_vnet_id = 0; +static u_int last_vprocg_id = 0; +static u_int last_vcpu_id = 0; + void vnet_mod_deregister(const struct vnet_modinfo *vmi) { @@ -609,32 +653,6 @@ } -int -vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) -{ - struct vnet_modlink *vml; - struct vnet_symmap *mapentry; - - TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) { - - if (vml->vml_modinfo->vmi_symmap == NULL) - continue; - - for (mapentry = vml->vml_modinfo->vmi_symmap; - mapentry->name != NULL; mapentry++) { - if (strcmp(symstr, mapentry->name) == 0) { - lookup->symvalue = - (u_long) curvnet->mod_data[vml->vml_modinfo->vmi_id]; - lookup->symvalue += mapentry->offset; - lookup->symsize = mapentry->size; - return (0); - } - } - } - return (ENOENT); -} - - struct vimage * vi_alloc(struct vimage *parent, char *name) { @@ -1005,3 +1023,5 @@ } } #endif + +#endif /* VIMAGE */ ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#16 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#6 (text+ko) ==== @@ -78,6 +78,12 @@ int _parse_http_version; }; +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_accf_http vnet_accf_http_0; +#endif +#endif + #define INIT_VNET_ACCF_HTTP(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_ACCF_HTTP, struct vnet_accf_http, vnet_accf_http) ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#27 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#24 (text+ko) ==== @@ -736,7 +736,6 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; eventhandler_tag _ifaddr_event_tag; - struct ip_fw_ugid _fw_ugid_cache; }; #ifndef VIMAGE @@ -782,7 +781,6 @@ #define V_ipfw_timeout VNET_IPFW(ipfw_timeout) #define V_ipfw_timeout VNET_IPFW(ipfw_timeout) #define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag) -#define V_fw_ugid_cache VNET_IPFW(fw_ugid_cache) #endif /* _KERNEL */ #endif /* _IPFW2_H */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#61 (text+ko) ==== @@ -289,15 +289,15 @@ SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, dyn_keepalive, 0, "Enable keepalives for dyn. rules"); -#ifndef VIMAGE -static int fw_deny_unknown_exthdrs; -#endif - #ifdef INET6 /* * IPv6 specific variables */ +#ifdef VIMAGE_GLOBALS +static int fw_deny_unknown_exthdrs; +#endif + SYSCTL_DECL(_net_inet6_ip6); SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, fw, CTLFLAG_RW | CTLFLAG_SECURE, 0, "Firewall"); @@ -311,10 +311,6 @@ #endif /* INET6 */ #endif /* SYSCTL_NODE */ -#ifdef VIMAGE_GLOBALS -static int fw_deny_unknown_exthdrs; -#endif - /* * L3HDR maps an ipv4 pointer into a layer3 header pointer of type T * Other macros just cast void * into the appropriate type @@ -2161,9 +2157,7 @@ * these types of constraints, as well as decrease contention * on pcb related locks. */ -#ifndef VIMAGE - struct ip_fw_ugid fw_ugid_cache; /* XXX Marko revisit this */ -#endif + struct ip_fw_ugid fw_ugid_cache; int ugid_lookup = 0; /* @@ -2623,7 +2617,7 @@ proto, oif, dst_ip, dst_port, src_ip, src_port, - &V_fw_ugid_cache, + &fw_ugid_cache, &ugid_lookup, args->inp); break; ==== //depot/projects/vimage/src/sys/netinet/ip_var.h#16 (text+ko) ==== @@ -181,7 +181,6 @@ extern int ip_do_randomid; extern int ip_defttl; /* default IP ttl */ extern int ipforwarding; /* ip forwarding */ -extern int ip_do_randomid; #ifdef IPSTEALTH extern int ipstealth; /* stealth forwarding */ #endif ==== //depot/projects/vimage/src/sys/sys/vimage.h#75 (text+ko) ==== @@ -50,7 +50,6 @@ struct vprocg; struct vnet; struct vi_req; -struct vnet_modinfo; struct kld_sym_lookup; struct ifnet; /* XXX must go away */ @@ -66,16 +65,88 @@ #endif #ifdef VIMAGE +#define curvnet curthread->td_vnet +#else +#define curvnet NULL +#endif -#define curvnet curthread->td_vnet +#define VNET_SYMMAP(mod, name) \ + { #name, offsetof(struct vnet_##mod, _##name), \ + sizeof(((struct vnet_##mod *) curthread)->_##name) } -#define basevnet thread0.td_ucred->cr_vimage->v_net -#define basevprocg thread0.td_ucred->cr_vimage->v_procg -#define basevcpu thread0.td_ucred->cr_vimage->v_cpu +#ifdef VIMAGE +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach, \ + .vmi_struct_size = \ + sizeof(struct vnet_##m_name_lc), \ + .vmi_symmap = m_symmap \ +}; +#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach \ +}; +#else +#ifdef VIMAGE_GLOBALS +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) +#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson) +#else +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_symmap = m_symmap \ +}; +#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson) +#endif +#endif typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); +#ifndef VIMAGE_GLOBALS + +struct vnet_symmap { + char *name; + size_t offset; + size_t size; +}; + +struct vnet_modinfo { + u_int vmi_id; + u_int vmi_dependson; + char *vmi_name; + vnet_attach_fn *vmi_iattach; + vnet_detach_fn *vmi_idetach; + size_t vmi_struct_size; + struct vnet_symmap *vmi_symmap; +}; + +struct vnet_modlink { + TAILQ_ENTRY(vnet_modlink) vml_mod_le; + const struct vnet_modinfo *vml_modinfo; + const void *vml_iarg; + const char *vml_iname; +}; +#endif + +#define VNET_SYMMAP_END { NULL, 0 } + +#define basevnet thread0.td_ucred->cr_vimage->v_net +#define basevprocg thread0.td_ucred->cr_vimage->v_procg +#define basevcpu thread0.td_ucred->cr_vimage->v_cpu #define V_GLOBAL 0 #define V_NET 1 @@ -125,6 +196,8 @@ #define V_MOD_vprocg 0 #define V_MOD_vcpu 0 +#ifdef VIMAGE + struct vnet { void *mod_data[VNET_MOD_MAX]; @@ -138,59 +211,6 @@ u_int vnet_magic_n; }; -struct vnet_symmap { - char *name; - size_t offset; - size_t size; -}; - -struct vnet_modinfo { - u_int vmi_id; - u_int vmi_dependson; - char *vmi_name; - vnet_attach_fn *vmi_iattach; - vnet_detach_fn *vmi_idetach; - size_t vmi_struct_size; - struct vnet_symmap *vmi_symmap; -}; - -struct vnet_modlink { - TAILQ_ENTRY(vnet_modlink) vml_mod_le; - const struct vnet_modinfo *vml_modinfo; - const void *vml_iarg; - const char *vml_iname; -}; - -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach, \ - .vmi_struct_size = \ - sizeof(struct vnet_##m_name_lc), \ - .vmi_symmap = m_symmap \ -}; - -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) \ - static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ - .vmi_id = VNET_MOD_##m_name_uc, \ - .vmi_dependson = VNET_MOD_##m_dependson, \ - .vmi_name = #m_name_lc, \ - .vmi_iattach = m_iattach, \ - .vmi_idetach = m_idetach \ -}; - -#define VNET_SYMMAP(mod, name) \ - { #name, offsetof(struct vnet_##mod, _##name), \ - sizeof(((struct vnet_##mod *) curthread)->_##name) } - -#define VNET_SYMMAP_END \ - { NULL, 0 } - #define VNET_MAGIC_N 0x3e0d8f29 @@ -276,13 +296,7 @@ #else /* !VIMAGE */ -#define VNET_SYMMAP_END { NULL, 0 } - /* Non-VIMAGE null-macros */ -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) #define CURVNET_SET(arg) #define CURVNET_SET_QUIET(arg) #define CURVNET_RESTORE() From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:24:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85F021065675; Sun, 14 Dec 2008 21:24: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 47E00106564A; Sun, 14 Dec 2008 21:24:27 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id E0A1C8FC08; Sun, 14 Dec 2008 21:24:26 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELMAeI021818; Sun, 14 Dec 2008 14:22:10 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:22:10 -0700 (MST) Message-Id: <20081214.142210.1102529432.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812061000.mB6A0YwA051708@repoman.freebsd.org> References: <200812061000.mB6A0YwA051708@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:24:27 -0000 In message: <200812061000.mB6A0YwA051708@repoman.freebsd.org> Hans Petter Selasky writes: : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#27 (text+ko) ==== : : @@ -811,6 +811,7 @@ : product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader : product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard : product ALCOR NEC_KBD_HUB 0x9472 NEC Kbd Hub : +product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive This should be sorted by device id number. Also, it is product, not product Warner : /* Altec Lansing products */ : product ALTEC ADA70 0x0070 ADA70 Speakers : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#13 (text+ko) ==== : : @@ -818,6 +818,7 @@ : #define USB_PRODUCT_ALCOR_UMCR_9361 0x9361 /* USB Multimedia Card Reader */ : #define USB_PRODUCT_ALCOR_SM_KBD 0x9410 /* MicroConnectors/StrongMan Keyboard */ : #define USB_PRODUCT_ALCOR_NEC_KBD_HUB 0x9472 /* NEC Kbd Hub */ : +#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ : : /* Altec Lansing products */ : #define USB_PRODUCT_ALTEC_ADA70 0x0070 /* ADA70 Speakers */ : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#13 (text+ko) ==== : : @@ -653,6 +653,12 @@ : "NEC Kbd Hub", : }, : { : + USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, : + 0, : + "Alcor Micro", : + "Transcend JetFlash Drive", : + }, : + { : USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, : 0, : "Altec Lansing", : : ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#17 (text+ko) ==== : : @@ -400,6 +400,10 @@ : UMASS_PROTO_SCSI | UMASS_PROTO_BBB, : NO_GETMAXLUN : }, : + {USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, RID_WILDCARD, : + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, : + NO_GETMAXLUN : + }, : {USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230, RID_WILDCARD, : UMASS_PROTO_SCSI | UMASS_PROTO_BBB, : NO_INQUIRY : @@ -636,10 +640,10 @@ : UMASS_PROTO_SCSI, : NO_GETMAXLUN : }, : - { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SDS_HOTFIND_D, RID_WILDCARD, : - UMASS_PROTO_SCSI | UMASS_PROTO_BBB, : - NO_GETMAXLUN | NO_SYNCHRONIZE_CACHE : - }, : + {USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SDS_HOTFIND_D, RID_WILDCARD, : + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, : + NO_GETMAXLUN | NO_SYNCHRONIZE_CACHE : + }, : {USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_CFMS_RW, RID_WILDCARD, : UMASS_PROTO_SCSI, : NO_QUIRKS : From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:24:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF43D1065686; Sun, 14 Dec 2008 21:24: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 A22CD1065744; Sun, 14 Dec 2008 21:24:28 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 872D88FC13; Sun, 14 Dec 2008 21:24:27 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELMlvJ021857; Sun, 14 Dec 2008 14:22:47 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:22:47 -0700 (MST) Message-Id: <20081214.142247.-1540392820.imp@bsdimp.com> To: hselasky@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812061016.mB6AGpgA053888@repoman.freebsd.org> References: <200812061016.mB6AGpgA053888@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:24:29 -0000 In message: <200812061016.mB6AGpgA053888@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=154173 : : Change 154173 by hselasky@hselasky_laptop001 on 2008/12/06 10:15:56 : : : Add USB device ID's from Michael. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#28 edit : .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#13 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#14 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#14 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#28 (text+ko) ==== : : @@ -1430,6 +1430,7 @@ : product HP OJ4215 0x3d11 OfficeJet 4215 : product HP HN210E 0x811c Ethernet HN210E : product HP2 C500 0x6002 PhotoSmart C500 : +product HP HS2300 0x1e1d MC8775 This is out of order. It should be sorted in numeric order with the other HP products (with the single HP2 coming last). Warner : /* HTC products */ : product HTC WINMOBILE 0x00ce HTC USB Sync : : ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#13 (text+ko) ==== : : @@ -649,6 +649,7 @@ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ : + {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSPA, U3GFL_NONE))}, /* XXX */ : /* Sierra TruInstaller device ID */ : {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GINFO(U3GSP_UMTS, U3GFL_SIERRA_INIT))}, : }; : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#14 (text+ko) ==== : : @@ -1437,6 +1437,7 @@ : #define USB_PRODUCT_HP_OJ4215 0x3d11 /* OfficeJet 4215 */ : #define USB_PRODUCT_HP_HN210E 0x811c /* Ethernet HN210E */ : #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ : +#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ : : /* HTC products */ : #define USB_PRODUCT_HTC_WINMOBILE 0x00ce /* HTC USB Sync */ : : ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#14 (text+ko) ==== : : @@ -3131,6 +3131,12 @@ : "PhotoSmart C500", : }, : { : + USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, : + 0, : + "Hewlett Packard", : + "MC8775", : + }, : + { : USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, : 0, : "HTC", : From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:30:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECEFC1065672; Sun, 14 Dec 2008 21:30: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 9884F1065670; Sun, 14 Dec 2008 21:30:32 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 4667B8FC14; Sun, 14 Dec 2008 21:30:32 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELTiO3021915; Sun, 14 Dec 2008 14:29:44 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:29:45 -0700 (MST) Message-Id: <20081214.142945.-861028970.imp@bsdimp.com> To: sam@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812090452.mB94qbdB066779@repoman.freebsd.org> References: <200812090452.mB94qbdB066779@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:30:33 -0000 In message: <200812090452.mB94qbdB066779@repoman.freebsd.org> Sam Leffler writes: : http://perforce.freebsd.org/chv.cgi?CH=154383 : : Change 154383 by sam@sam_ebb on 2008/12/09 04:51:47 : : one possible solution to the ath_rate/sample symbol dependency : problem; bundle rate control code into the driver : : Affected files ... : : .. //depot/projects/vap/sys/modules/ath/Makefile#9 edit : : Differences ... : : ==== //depot/projects/vap/sys/modules/ath/Makefile#9 (text+ko) ==== : : @@ -29,44 +29,80 @@ : # $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ : # : : -.PATH: ${.CURDIR}/../../dev/ath \ : - ${.CURDIR}/../../dev/ath/ath_hal \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5416 : +ATH_RATE= sample # tx rate control algorithm Maybe ATH_RATE ?= sample here? Apart from that, I like the rest of these changes (and the companion commit to remove the other, now-obsolete Makefiles). Warner : + : +.PATH: ${.CURDIR}/../../dev/ath : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal : + : +KMOD= if_ath : +SRCS= if_ath.c if_ath_pci.c : +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it : +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c : +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h : : -AR5210_SRCS=ah_eeprom_v1.c \ : +# : +# AR5210 support; these are first generation 11a-only devices. : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210 : +SRCS+= ah_eeprom_v1.c \ : ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ : ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ : ar5210_recv.c ar5210_reset.c ar5210_xmit.c : -AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ : + : +# : +# AR5211 support; these are second generation 11b/g/a devices : +# (but 11g was OFDM only and is not supported). : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211 : +SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ : ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ : ar5211_recv.c ar5211_reset.c ar5211_xmit.c : -AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ : + : +# : +# AR5212 support; this covers all other pci/cardbus legacy parts. : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212 : +SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ : ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ : ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ : - ar5212_rfgain.c ar5212_xmit.c \ : - ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c : -AR5416_SRCS=ah_eeprom_v14.c \ : + ar5212_rfgain.c ar5212_xmit.c : +# RF backends : +SRCS+= ar5111.c : +SRCS+= ar5112.c : +SRCS+= ar2413.c : +SRCS+= ar2425.c : +SRCS+= ar5413.c : + : +# : +# AR5416, AR9160 support; these are 11n parts but only really : +# supported (right now) operating in legacy mode. Note enabling : +# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h : +# so the 11n tx/rx descriptor format is handled. : +# : +# NB: 9160 depends on 5416 but 5416 does not require 9160 : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416 : +SRCS+= ah_eeprom_v14.c \ : ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ : ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ : ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ : ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ : - ar5416_reset.c ar5416_xmit.c \ : - ar2133.c : -AR9160_SRCS=ar9160_attach.c : + ar5416_reset.c ar5416_xmit.c : +SRCS+= ar9160_attach.c : +# RF backend for 5416 and 9160 : +SRCS+= ar2133.c : : -KMOD= if_ath : -SRCS= if_ath.c if_ath_pci.c : -# NB: v3 eeprom support used by both AR5211 and AR5212; just include it : -SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c : -SRCS+= ${AR5210_SRCS} : -SRCS+= ${AR5211_SRCS} : -SRCS+= ${AR5212_SRCS} : -SRCS+= ${AR5416_SRCS} : -SRCS+= ${AR9160_SRCS} : -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h : +# NB: rate control is bound to the driver by symbol names so only pick one : +.if ${ATH_RATE} == "sample" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample : +SRCS+= sample.c opt_wlan.h : +.elif ${ATH_RATE} == "onoe" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe : +SRCS+= onoe.c : +.elif ${ATH_RATE} == "amrr" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr : +SRCS+= amrr.c : +.endif : : CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal : : From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:33:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A37A91065676; Sun, 14 Dec 2008 21:33: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 65F81106564A; Sun, 14 Dec 2008 21:33:26 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1DB8FC13; Sun, 14 Dec 2008 21:33:25 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELWuWD021936; Sun, 14 Dec 2008 14:32:56 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:32:57 -0700 (MST) Message-Id: <20081214.143257.1645216129.imp@bsdimp.com> To: sam@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812101754.mBAHsoEI024577@repoman.freebsd.org> References: <200812101754.mBAHsoEI024577@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:33:27 -0000 In message: <200812101754.mBAHsoEI024577@repoman.freebsd.org> Sam Leffler writes: : http://perforce.freebsd.org/chv.cgi?CH=154450 : : Change 154450 by sam@sam_ebb on 2008/12/10 17:53:56 : : Remove EHCI_SCFLG_BIGENDIAN; this appears to be the wrong : approach. Handle the 1- and 2-byte register ops by overriding : the bus tag ops in the bus-shim. Also mark the controller with : EHCI_SCFLG_FORCESPEED as we need to identify the device speed : from the PortStatus following a port enable. FYI: On the Alchemy USB device, one has to always to 4-byte operations on the hardware for a similar flag to be effective. Thanks for stubbing your toe on this limitation in our stack so I won't have to stub mine nearly as badly... Warner : Affected files ... : : .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#2 edit : .. //depot/projects/vap/sys/dev/usb/ehci.c#16 edit : .. //depot/projects/vap/sys/dev/usb/ehcivar.h#10 edit : : Differences ... : : ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#2 (text+ko) ==== : : @@ -38,10 +38,12 @@ : #include : #include : #include : +#include : #include : #include : +#include : + : #include : -#include : #include : : #include : @@ -58,11 +60,21 @@ : #define EHCI_VENDORID_IXP4XX 0x42fa05 : #define EHCI_HC_DEVSTR "IXP4XX Integrated USB 2.0 controller" : : -static device_attach_t ehci_ixp_attach; : -static device_detach_t ehci_ixp_detach; : -static device_shutdown_t ehci_ixp_shutdown; : -static device_suspend_t ehci_ixp_suspend; : -static device_resume_t ehci_ixp_resume; : +struct ixp_ehci_softc { : + ehci_softc_t base; /* storage for EHCI code */ : + bus_space_tag_t iot; : + bus_space_handle_t ioh; : + struct bus_space tag; /* tag for private bus space ops */ : +}; : + : +static int ehci_ixp_detach(device_t self); : + : +static uint8_t ehci_bs_r_1(void *, bus_space_handle_t, bus_size_t); : +static void ehci_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); : +static uint16_t ehci_bs_r_2(void *, bus_space_handle_t, bus_size_t); : +static void ehci_bs_w_2(void *, bus_space_handle_t, bus_size_t, uint16_t); : +static uint32_t ehci_bs_r_4(void *, bus_space_handle_t, bus_size_t); : +static void ehci_bs_w_4(void *, bus_space_handle_t, bus_size_t, uint32_t); : : static int : ehci_ixp_suspend(device_t self) : @@ -112,7 +124,8 @@ : static int : ehci_ixp_attach(device_t self) : { : - ehci_softc_t *sc = device_get_softc(self); : + struct ixp_ehci_softc *isc = device_get_softc(self); : + ehci_softc_t *sc = &isc->base; : int err, rid; : : sc->sc_bus.usbrev = USBREV_2_0; : @@ -126,16 +139,27 @@ : device_printf(self, "Could not map memory\n"); : return ENXIO; : } : - sc->iot = rman_get_bustag(sc->io_res); : + : + /* : + * Craft special resource for bus space ops that handle : + * byte-alignment of non-word addresses. Also, since : + * we're already intercepting bus space ops we handle : + * the register window offset that could otherwise be : + * done with bus_space_subregion. : + */ : + isc->iot = rman_get_bustag(sc->io_res); : + isc->tag.bs_cookie = isc->iot; : + /* read single */ : + isc->tag.bs_r_1 = ehci_bs_r_1, : + isc->tag.bs_r_2 = ehci_bs_r_2, : + isc->tag.bs_r_4 = ehci_bs_r_4, : + /* write (single) */ : + isc->tag.bs_w_1 = ehci_bs_w_1, : + isc->tag.bs_w_2 = ehci_bs_w_2, : + isc->tag.bs_w_4 = ehci_bs_w_4, : + : + sc->iot = &isc->tag; : sc->ioh = rman_get_bushandle(sc->io_res); : - : - /* shift register window for EHCI driver */ : - if (bus_space_subregion(sc->iot, sc->ioh, : - 0x100, IXP435_USB1_SIZE - 0x100, &sc->ioh) != 0) { : - device_printf(self, "Could not setup subregion for USB host" : - "registers\n"); : - return ENXIO; : - } : sc->sc_size = IXP435_USB1_SIZE - 0x100; : : rid = 0; : @@ -197,10 +221,13 @@ : * Arrange to force Host mode, select big-endian byte alignment, : * and arrange to not terminate reset operations (the adapter : * will ignore it if we do but might as well save a reg write). : + * Also, the controller has an embedded Transaction Translator : + * which means port speed must be read from the Port Status : + * register following a port enable. : */ : sc->sc_flags |= EHCI_SCFLG_SETMODE : - | EHCI_SCFLG_BIGENDIAN : | EHCI_SCFLG_NORESTERM : + | EHCI_SCFLG_FORCESPEED : ; : err = ehci_init(sc); : if (!err) { : @@ -219,7 +246,8 @@ : static int : ehci_ixp_detach(device_t self) : { : - ehci_softc_t *sc = device_get_softc(self); : + struct ixp_ehci_softc *isc = device_get_softc(self); : + ehci_softc_t *sc = &isc->base; : int err; : : if (sc->sc_flags & EHCI_SCFLG_DONEINIT) { : @@ -262,6 +290,48 @@ : return 0; : } : : +/* : + * Bus space accessors for PIO operations. : + */ : + : +static uint8_t : +ehci_bs_r_1(void *t, bus_space_handle_t h, bus_size_t o) : +{ : + return bus_space_read_1((bus_space_tag_t) t, h, : + 0x100 + (o &~ 3) + (3 - (o & 3))); : +} : + : +static void : +ehci_bs_w_1(void *t, bus_space_handle_t h, bus_size_t o, u_int8_t v) : +{ : + panic("%s", __func__); : +} : + : +static uint16_t : +ehci_bs_r_2(void *t, bus_space_handle_t h, bus_size_t o) : +{ : + return bus_space_read_2((bus_space_tag_t) t, h, : + 0x100 + (o &~ 3) + (2 - (o & 3))); : +} : + : +static void : +ehci_bs_w_2(void *t, bus_space_handle_t h, bus_size_t o, uint16_t v) : +{ : + panic("%s", __func__); : +} : + : +static uint32_t : +ehci_bs_r_4(void *t, bus_space_handle_t h, bus_size_t o) : +{ : + return bus_space_read_4((bus_space_tag_t) t, h, 0x100 + o); : +} : + : +static void : +ehci_bs_w_4(void *t, bus_space_handle_t h, bus_size_t o, uint32_t v) : +{ : + bus_space_write_4((bus_space_tag_t) t, h, 0x100 + o, v); : +} : + : static device_method_t ehci_methods[] = { : /* Device interface */ : DEVMETHOD(device_probe, ehci_ixp_probe), : @@ -280,7 +350,7 @@ : static driver_t ehci_driver = { : "ehci", : ehci_methods, : - sizeof(ehci_softc_t), : + sizeof(struct ixp_ehci_softc), : }; : static devclass_t ehci_devclass; : DRIVER_MODULE(ehci, ixp, ehci_driver, ehci_devclass, 0, 0); : : ==== //depot/projects/vap/sys/dev/usb/ehci.c#16 (text+ko) ==== : : @@ -351,12 +351,10 @@ : usb_delay_ms(&sc->sc_bus, 1); : hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET; : if (!hcr) { : - if (sc->sc_flags & (EHCI_SCFLG_SETMODE | EHCI_SCFLG_BIGENDIAN)) { : + if (sc->sc_flags & EHCI_SCFLG_SETMODE) { : /* : * Force USBMODE as requested. Controllers : - * may have multiple operating modes and on : - * some platforms we need to force big-endian : - * byte alignement of data structures. : + * may have multiple operating modes. : */ : uint32_t usbmode = EOREAD4(sc, EHCI_USBMODE); : if (sc->sc_flags & EHCI_SCFLG_SETMODE) { : @@ -364,11 +362,6 @@ : device_printf(sc->sc_bus.bdev, : "set host controller mode\n"); : } : - if (sc->sc_flags & EHCI_SCFLG_BIGENDIAN) { : - usbmode |= EHCI_UM_ES_BE; : - device_printf(sc->sc_bus.bdev, : - "set big-endian byte alignment\n"); : - } : EOWRITE4(sc, EHCI_USBMODE, usbmode); : } : return (USBD_NORMAL_COMPLETION); : @@ -395,11 +388,9 @@ : : /* NB: must handle byte-order manually before ehci_hcreset */ : : - sc->sc_offs = EREAD1(sc, sc->sc_flags & EHCI_SCFLG_BIGENDIAN ? : - 3-EHCI_CAPLENGTH : EHCI_CAPLENGTH); : + sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH); : : - version = EREAD2(sc, sc->sc_flags & EHCI_SCFLG_BIGENDIAN ? : - 2-EHCI_HCIVERSION : EHCI_HCIVERSION); : + version = EREAD2(sc, EHCI_HCIVERSION); : device_printf(sc->sc_bus.bdev, "EHCI version %x.%x\n", : version >> 8, version & 0xff); : : : ==== //depot/projects/vap/sys/dev/usb/ehcivar.h#10 (text+ko) ==== : : @@ -125,7 +125,6 @@ : #define EHCI_SCFLG_SETMODE 0x0004 /* set bridge mode again after init (Marvell) */ : #define EHCI_SCFLG_FORCESPEED 0x0008 /* force speed (Marvell) */ : #define EHCI_SCFLG_NORESTERM 0x0010 /* don't terminate reset sequence (Marvell) */ : -#define EHCI_SCFLG_BIGENDIAN 0x0020 /* set big-endian select on reset */ : : typedef struct ehci_softc { : struct usbd_bus sc_bus; /* base device */ : From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:34:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51E1C1065670; Sun, 14 Dec 2008 21:34: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 156B01065678 for ; Sun, 14 Dec 2008 21:34: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 EDB018FC08 for ; Sun, 14 Dec 2008 21:34:31 +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 mBELYV1f029401 for ; Sun, 14 Dec 2008 21:34:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBELYVWl029399 for perforce@freebsd.org; Sun, 14 Dec 2008 21:34:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 14 Dec 2008 21:34:31 GMT Message-Id: <200812142134.mBELYVWl029399@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 154662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:34:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=154662 Change 154662 by hselasky@hselasky_laptop001 on 2008/12/14 21:34:01 Some nits M. Warner Losh pointed out. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#29 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#15 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#29 (text+ko) ==== @@ -806,12 +806,12 @@ /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB 0x2802 Kbd Hub +product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard product ALCOR NEC_KBD_HUB 0x9472 NEC Kbd Hub -product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive /* Altec Lansing products */ product ALTEC ADA70 0x0070 ADA70 Speakers @@ -1424,13 +1424,13 @@ product HP 568J 0x1116 Jornada 568 product HP 930C 0x1204 DeskJet 930c product HP P2000U 0x1801 Inkjet P-2000U +product HP HS2300 0x1e1d MC8775 product HP 640C 0x2004 DeskJet 640c product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 product HP OJ4215 0x3d11 OfficeJet 4215 product HP HN210E 0x811c Ethernet HN210E product HP2 C500 0x6002 PhotoSmart C500 -product HP HS2300 0x1e1d MC8775 /* HTC products */ product HTC WINMOBILE 0x00ce HTC USB Sync ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#15 (text+ko) ==== @@ -813,12 +813,12 @@ /* Alcor Micro, Inc. products */ #define USB_PRODUCT_ALCOR2_KBD_HUB 0x2802 /* Kbd Hub */ +#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ #define USB_PRODUCT_ALCOR_MA_KBD_HUB 0x9213 /* MacAlly Kbd Hub */ #define USB_PRODUCT_ALCOR_AU9814 0x9215 /* AU9814 Hub */ #define USB_PRODUCT_ALCOR_UMCR_9361 0x9361 /* USB Multimedia Card Reader */ #define USB_PRODUCT_ALCOR_SM_KBD 0x9410 /* MicroConnectors/StrongMan Keyboard */ #define USB_PRODUCT_ALCOR_NEC_KBD_HUB 0x9472 /* NEC Kbd Hub */ -#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ /* Altec Lansing products */ #define USB_PRODUCT_ALTEC_ADA70 0x0070 /* ADA70 Speakers */ @@ -1431,13 +1431,13 @@ #define USB_PRODUCT_HP_568J 0x1116 /* Jornada 568 */ #define USB_PRODUCT_HP_930C 0x1204 /* DeskJet 930c */ #define USB_PRODUCT_HP_P2000U 0x1801 /* Inkjet P-2000U */ +#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ #define USB_PRODUCT_HP_640C 0x2004 /* DeskJet 640c */ #define USB_PRODUCT_HP_4670V 0x3005 /* ScanJet 4670v */ #define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */ #define USB_PRODUCT_HP_OJ4215 0x3d11 /* OfficeJet 4215 */ #define USB_PRODUCT_HP_HN210E 0x811c /* Ethernet HN210E */ #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ -#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ /* HTC products */ #define USB_PRODUCT_HTC_WINMOBILE 0x00ce /* HTC USB Sync */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#15 (text+ko) ==== @@ -623,6 +623,12 @@ "Kbd Hub", }, { + USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, + 0, + "Alcor Micro", + "Transcend JetFlash Drive", + }, + { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB, 0, "Alcor Micro", @@ -653,12 +659,6 @@ "NEC Kbd Hub", }, { - USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, - 0, - "Alcor Micro", - "Transcend JetFlash Drive", - }, - { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0, "Altec Lansing", @@ -3095,6 +3095,12 @@ "Inkjet P-2000U", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, + 0, + "Hewlett Packard", + "MC8775", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_640C, 0, "Hewlett Packard", @@ -3131,12 +3137,6 @@ "PhotoSmart C500", }, { - USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, - 0, - "Hewlett Packard", - "MC8775", - }, - { USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, 0, "HTC", From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:39:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C0961065673; Sun, 14 Dec 2008 21:39: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 622D91065670 for ; Sun, 14 Dec 2008 21:39:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 248178FC18 for ; Sun, 14 Dec 2008 21:39:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELconC022009; Sun, 14 Dec 2008 14:38:50 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:38:51 -0700 (MST) Message-Id: <20081214.143851.-494097696.imp@bsdimp.com> To: ed@80386.nl From: "M. Warner Losh" In-Reply-To: <20081214192057.GP1176@hoeg.nl> References: <200812032046.mB3KkUBx016516@repoman.freebsd.org> <20081214.121720.-861029116.imp@bsdimp.com> <20081214192057.GP1176@hoeg.nl> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:39:51 -0000 In message: <20081214192057.GP1176@hoeg.nl> Ed Schouten writes: : * M. Warner Losh wrote: : > In message: <200812032046.mB3KkUBx016516@repoman.freebsd.org> : > Ed Schouten writes: : > : I'm not entirely happy with modifying kern.post.mk to generate : > : teken_state.h. Maybe we should regenerate by hand... : > : > You can do this in the "files*" file... : : Great! I just spotted the `compile-with' commands. I'll change it in a : couple of minutes. Thanks! No Problem. glad I could help. I've been trying to shrink kern.post.mk for years, so I have a visceral reaction when I see people adding to it... Warner From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:39:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6BD41065677; Sun, 14 Dec 2008 21: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 9A80B1065672; Sun, 14 Dec 2008 21:39:54 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 5C62C8FC08; Sun, 14 Dec 2008 21:39:54 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELbn41022006; Sun, 14 Dec 2008 14:37:49 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:37:49 -0700 (MST) Message-Id: <20081214.143749.58455689.imp@bsdimp.com> To: hselasky@c2i.net From: "M. Warner Losh" In-Reply-To: <200812141559.59329.hselasky@c2i.net> References: <200812131005.33499.hselasky@c2i.net> <20081213.130816.74659290.imp@bsdimp.com> <200812141559.59329.hselasky@c2i.net> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: sam@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:39:55 -0000 In message: <200812141559.59329.hselasky@c2i.net> Hans Petter Selasky writes: : On Saturday 13 December 2008, Warner Losh wrote: : > From: Hans Petter Selasky : > Subject: Re: PERFORCE change 154573 for review : > Date: Sat, 13 Dec 2008 10:05:32 +0100 : > : : > : > This is absoultely the wrong way to implement this. It is so wrong, I : > don't even know where to begin. Consider this an 'over my dead body' : > level of objection to this design. : > : : We don't want to check a variable in the softc every time we do a htoleXX() ?? : : Do you have a better suggestion? Usually the bus_space stuff is used for situations like this so that the drivers don't have to care. Warner From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:46:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C56051065675; Sun, 14 Dec 2008 21:46: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 8954E1065672 for ; Sun, 14 Dec 2008 21:46:44 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 777CF8FC14 for ; Sun, 14 Dec 2008 21:46:44 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBELkiZi030359 for ; Sun, 14 Dec 2008 21:46:44 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBELkitV030355 for perforce@freebsd.org; Sun, 14 Dec 2008 21:46:44 GMT (envelope-from zec@icir.org) Date: Sun, 14 Dec 2008 21:46:44 GMT Message-Id: <200812142146.mBELkitV030355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=154663 Change 154663 by zec@zec_tca51 on 2008/12/14 21:45:46 Mostly futile attempt at diff reductions head / vimage. Affected files ... .. //depot/projects/vimage/src/sys/conf/files#49 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#9 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#73 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#32 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#40 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.h#13 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#36 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#76 edit Differences ... ==== //depot/projects/vimage/src/sys/conf/files#49 (text+ko) ==== @@ -1952,9 +1952,8 @@ kern/kern_timeout.c standard kern/kern_umtx.c standard kern/kern_uuid.c standard -kern/kern_vimage.c optional vimage +kern/kern_vimage.c standard kern/kern_xxx.c standard -kern/kern_vimage.c standard kern/link_elf.c standard kern/linker_if.m standard kern/md4c.c optional netsmb ==== //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#9 (text+ko) ==== @@ -1856,15 +1856,6 @@ pf_osfp_validate(void); /* - * Stack virtualization support. - */ -#ifdef VIMAGE -struct vnet_pf { - struct vnet *parent_vnet; -}; -#endif - -/* * Symbol translation macros */ #define INIT_VNET_PF(vnet) \ ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#73 (text+ko) ==== @@ -66,7 +66,7 @@ //#define DEBUG_ORDERING -MALLOC_DEFINE(M_VIMAGE, "vimage", "virtual image resource container"); +MALLOC_DEFINE(M_VIMAGE, "vimage", "vimage resource container"); MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); @@ -84,42 +84,8 @@ #endif #endif -#ifdef VI_PREALLOC_SIZE -/* - * A private memory allocator can be enabled by setting VI_PREALLOC_SIZE - * to amount of memory (in bytes) to be reserved for the allocator at - * boot time. This pool is guaranteed to reside on a 4M superpage(s) on - * i386 and amd64, thus potentially reducing TLB trashing. - * - * So far I couldn't observe any significant performance impact of using - * this allocator vs. the standard malloc(), whereas in FreeBSD 4.11 - * days I recall using "uninitialized data" storage vs. malloc() would - * be an instant win... Is it possible that these days all malloc'ed - * kernel storage is automagically placed on 4M superpages, so that this - * effort is redundant? Who knows... Therefore this code is disabled by - * default, so vi_alloc() and vi_free() simply resolve to standard - * malloc() and free(). - */ - -static void *vi_malloc(unsigned long, struct malloc_type *, int); -static void vi_free(void *, struct malloc_type *); - -struct vi_mtrack { - LIST_ENTRY(vi_mtrack) vmt_le; - char *vmt_addr; - size_t vmt_size; - int vmt_flags; -}; - -static char vi_mpool[VI_PREALLOC_SIZE]; -static struct uma_zone *vi_mtrack_zone; -static LIST_HEAD(, vi_mtrack) vi_mem_free_head; -static LIST_HEAD(, vi_mtrack) vi_mem_alloc_head; -static int vi_mpool_fail_cnt = 0; -#else #define vi_malloc(addr, type, flags) malloc((addr), (type), (flags)) #define vi_free(addr, type) free((addr), (type)) -#endif /* VI_PREALLOC_SIZE */ #ifndef VIMAGE_GLOBALS static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; @@ -869,19 +835,6 @@ static void vi_init(void *unused) { -#ifdef VI_PREALLOC_SIZE - struct vi_mtrack *vmt; - - /* Initialize our private memory allocator */ - LIST_INIT(&vi_mem_free_head); - LIST_INIT(&vi_mem_alloc_head); - vi_mtrack_zone = uma_zcreate("vi_mtrack", sizeof(struct vi_mtrack), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - vmt = uma_zalloc(vi_mtrack_zone, M_NOWAIT); - vmt->vmt_addr = vi_mpool; - vmt->vmt_size = VI_PREALLOC_SIZE; - LIST_INSERT_HEAD(&vi_mem_free_head, vmt, vmt_le); -#endif /* VI_PREALLOC_SIZE */ /* vnet module list is both forward and reverse traversable */ TAILQ_INIT(&vnet_modlink_head); @@ -924,77 +877,6 @@ SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL); SYSINIT(vimage_done, SI_SUB_VIMAGE_DONE, SI_ORDER_FIRST, vi_init_done, NULL); -#ifdef VI_PREALLOC_SIZE -void * -vi_malloc(unsigned long size, struct malloc_type *type, int flags) -{ - void *addr; - struct vi_mtrack *vmt = NULL; - struct vi_mtrack *vmt_iter; - - /* Attempt to find a free chunk in our private pool */ - LIST_FOREACH(vmt_iter, &vi_mem_free_head, vmt_le) - if (vmt_iter->vmt_size >= size && - (vmt == NULL || vmt_iter->vmt_size < vmt->vmt_size)) { - vmt = vmt_iter; - /* Exact fit is an optimal choice, we are done. */ - if (vmt_iter->vmt_size == size) - break; - } - - /* Not (enough) free space in our pool, resort to malloc() */ - if (vmt == NULL) { - if (vi_mpool_fail_cnt == 0) - printf("vi_mpool exhausted," - "consider increasing VI_PREALLOC_SIZE\n"); - vi_mpool_fail_cnt++; - addr = malloc(size, type, flags); - return addr; - } - - addr = vmt->vmt_addr; - if (vmt->vmt_size == size) { - /* Move the descriptor from free to allocated list */ - LIST_REMOVE(vmt, vmt_le); - LIST_INSERT_HEAD(&vi_mem_alloc_head, vmt, vmt_le); - } else { - /* Shrink the existing free space block */ - vmt->vmt_addr += size; - vmt->vmt_size -= size; - - /* Create a new descriptor and place it on allocated list */ - vmt = uma_zalloc(vi_mtrack_zone, M_NOWAIT); - vmt->vmt_addr = addr; - vmt->vmt_size = size; - LIST_INSERT_HEAD(&vi_mem_alloc_head, vmt, vmt_le); - } - - bzero(addr, size); - return addr; -} - -void -vi_free(void *addr, struct malloc_type *type) -{ - struct vi_mtrack *vmt; - - /* Attempt to find the chunk in our allocated pool */ - LIST_FOREACH(vmt, &vi_mem_alloc_head, vmt_le) - if (vmt->vmt_addr == addr) - break; - - /* Not found in our private pool, resort to free() */ - if (vmt == NULL) { - free(addr, type); - return; - } - - /* Move the descriptor from allocated to free list */ - LIST_REMOVE(vmt, vmt_le); - LIST_INSERT_HEAD(&vi_mem_free_head, vmt, vmt_le); -} -#endif /* VI_PREALLOC_SIZE */ - #ifdef DDB static void db_vnet_ptr(void *arg) ==== //depot/projects/vimage/src/sys/netinet6/in6_src.c#32 (text+ko) ==== @@ -1003,8 +1003,10 @@ struct in6_addrpolicy ape_policy; }; +TAILQ_HEAD(addrsel_policyhead, addrsel_policyent); + #ifdef VIMAGE_GLOBALS -TAILQ_HEAD(, addrsel_policyent) addrsel_policytab; +struct addrsel_policyhead addrsel_policytab; #endif static void ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#40 (text+ko) ==== @@ -154,8 +154,8 @@ V_nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL; + V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ V_dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ - V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ V_llinfo_nd6.ln_next = &V_llinfo_nd6; V_llinfo_nd6.ln_prev = &V_llinfo_nd6; ==== //depot/projects/vimage/src/sys/netinet6/nd6.h#13 (text+ko) ==== @@ -341,6 +341,7 @@ extern struct nd_prhead nd_prefix; extern int nd6_debug; extern int nd6_onlink_ns_rfc4861; + extern struct callout nd6_timer_ch; /* nd6_rtr.c */ ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#36 (text+ko) ==== @@ -108,8 +108,8 @@ static int vnet_ipsec_idetach(const void *); #endif +#ifdef VIMAGE_GLOBALS /* NB: name changed so netstat doesn't use it */ -#ifdef VIMAGE_GLOBALS struct ipsecstat ipsec4stat; struct secpolicy ip4_def_policy; int ipsec_debug; ==== //depot/projects/vimage/src/sys/sys/vimage.h#76 (text+ko) ==== @@ -297,27 +297,27 @@ #else /* !VIMAGE */ /* Non-VIMAGE null-macros */ -#define CURVNET_SET(arg) -#define CURVNET_SET_QUIET(arg) -#define CURVNET_RESTORE() -#define VNET_ASSERT(condition) -#define INIT_FROM_VNET(vnet, modindex, modtype, sym) -#define VNET_ITERATOR_DECL(arg) -#define VNET_FOREACH(arg) -#define VNET_LIST_RLOCK() -#define VNET_LIST_RUNLOCK() -#define INIT_VPROCG(arg) -#define VPROCG_ITERLOOP_BEGIN() -#define VPROCG_ITERLOOP_END() -#define INIT_VCPU(arg) -#define TD_TO_VIMAGE(td) -#define TD_TO_VNET(td) -#define TD_TO_VPROCG(td) -#define TD_TO_VCPU(td) -#define P_TO_VIMAGE(p) -#define P_TO_VNET(p) -#define P_TO_VPROCG(p) -#define P_TO_VCPU(p) +#define CURVNET_SET(arg) +#define CURVNET_SET_QUIET(arg) +#define CURVNET_RESTORE() +#define VNET_ASSERT(condition) +#define INIT_FROM_VNET(vnet, modindex, modtype, sym) +#define VNET_ITERATOR_DECL(arg) +#define VNET_FOREACH(arg) +#define VNET_LIST_RLOCK() +#define VNET_LIST_RUNLOCK() +#define INIT_VPROCG(arg) +#define VPROCG_ITERLOOP_BEGIN() +#define VPROCG_ITERLOOP_END() +#define INIT_VCPU(arg) +#define TD_TO_VIMAGE(td) +#define TD_TO_VNET(td) +#define TD_TO_VPROCG(td) +#define TD_TO_VCPU(td) +#define P_TO_VIMAGE(p) +#define P_TO_VNET(p) +#define P_TO_VPROCG(p) +#define P_TO_VCPU(p) #endif /* !VIMAGE */ From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:48:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE5A61065672; Sun, 14 Dec 2008 21:48: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 82C75106564A for ; Sun, 14 Dec 2008 21:48:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 70BE88FC16 for ; Sun, 14 Dec 2008 21:48:46 +0000 (UTC) (envelope-from ed@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 mBELmkwb030479 for ; Sun, 14 Dec 2008 21:48:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBELmk8P030477 for perforce@freebsd.org; Sun, 14 Dec 2008 21:48:46 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 14 Dec 2008 21:48:46 GMT Message-Id: <200812142148.mBELmk8P030477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 21:48:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=154664 Change 154664 by ed@ed_dull on 2008/12/14 21:48:29 Misc. fixes for libteken: - Use BLANK instead of ' ' throughout the source code. - Fix CBT (Cursor Backward Tabulation). - Remove assertions that weren't valid and fix signedness for certain calculations. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#6 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#11 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#6 (text+ko) ==== @@ -69,6 +69,9 @@ #define TS_ORIGIN 0x08 /* Origin mode. */ #define TS_WRAPPED 0x10 /* Next character should be printed on col 0. */ +/* Character that blanks a cell. */ +#define BLANK ' ' + static teken_state_t teken_state_init; static const teken_attr_t teken_defattr = { @@ -222,7 +225,7 @@ teken_subr_carriage_return(t); break; case '\t': - teken_subr_cursor_forward_tabulation(t, 1); + teken_subr_horizontal_tab(t); break; default: t->t_nextstate(t, c); @@ -307,7 +310,7 @@ tr.tr_begin.tp_row = 0; tr.tr_begin.tp_col = 0; tr.tr_end = t->t_winsize; - teken_funcs_fill(t, &tr, ' ', &teken_defattr); + teken_funcs_fill(t, &tr, BLANK, &teken_defattr); } /* ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#11 (text+ko) ==== @@ -109,7 +109,7 @@ tr.tr_begin.tp_col = 0; tr.tr_end.tp_row = t->t_scrollreg.ts_end; tr.tr_end.tp_col = t->t_winsize.tp_col; - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } else { /* Scroll up. */ amount = -amount; @@ -130,7 +130,7 @@ tr.tr_begin.tp_col = 0; tr.tr_end.tp_row = t->t_scrollreg.ts_begin + amount; tr.tr_end.tp_col = t->t_winsize.tp_col; - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } } @@ -233,7 +233,20 @@ teken_subr_cursor_backward_tabulation(teken_t *t, unsigned int ntabs) { - teken_printf("CBT???\n"); + if (ntabs == 0) + ntabs = 1; + + do { + /* Stop when we've reached the beginning of the line. */ + if (t->t_cursor.tp_col == 0) + break; + + t->t_cursor.tp_col--; + + /* Tab marker set. */ + if (teken_tab_isset(t, t->t_cursor.tp_col)) + ntabs--; + } while (ntabs > 0); } static void @@ -278,7 +291,7 @@ if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) break; - teken_subr_regular_character(t, ' '); + t->t_cursor.tp_col++; /* Tab marker set. */ if (teken_tab_isset(t, t->t_cursor.tp_col)) @@ -333,9 +346,7 @@ if (nrows == 0) nrows = 1; - /* XXX: does this assertion hold? */ - teken_assert(t->t_cursor.tp_row >= t->t_scrollreg.ts_begin); - if (nrows > (t->t_cursor.tp_row - t->t_scrollreg.ts_begin)) + if (nrows > ((int)t->t_cursor.tp_row - t->t_scrollreg.ts_begin)) t->t_cursor.tp_row = t->t_scrollreg.ts_begin; else t->t_cursor.tp_row -= nrows; @@ -366,7 +377,7 @@ } /* Blank trailing columns. */ - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } static void @@ -374,9 +385,6 @@ { teken_rect_t tr; - /* XXX: does this assertion hold? */ - teken_assert(t->t_cursor.tp_row >= t->t_scrollreg.ts_begin); - if (nrows == 0) nrows = 1; @@ -384,7 +392,7 @@ tr.tr_end.tp_row = t->t_scrollreg.ts_end; tr.tr_end.tp_col = t->t_winsize.tp_col; - if (nrows < (t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { + if (nrows < ((int)t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { /* Copy rows up. */ tr.tr_begin.tp_row = t->t_cursor.tp_row + nrows; teken_funcs_copy(t, &tr, &t->t_cursor); @@ -395,7 +403,7 @@ } /* Blank trailing rows. */ - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } static void @@ -448,7 +456,7 @@ else tr.tr_end.tp_col = t->t_winsize.tp_col - 1; - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } static void @@ -484,7 +492,7 @@ break; } - teken_funcs_fill(t, &r, ' ', &t->t_curattr); + teken_funcs_fill(t, &r, BLANK, &t->t_curattr); } static void @@ -510,7 +518,7 @@ break; } - teken_funcs_fill(t, &r, ' ', &t->t_curattr); + teken_funcs_fill(t, &r, BLANK, &t->t_curattr); } static void @@ -523,6 +531,23 @@ } static void +teken_subr_horizontal_tab(teken_t *t) +{ + teken_rect_t tr; + + tr.tr_begin = t->t_cursor; + tr.tr_end.tp_row = tr.tr_begin.tp_row + 1; + + teken_subr_cursor_forward_tabulation(t, 1); + + /* Blank region that we skipped. */ + if (t->t_cursor.tp_col > tr.tr_begin.tp_col) { + tr.tr_end.tp_col = t->t_cursor.tp_col; + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); + } +} + +static void teken_subr_horizontal_tab_set(teken_t *t) { @@ -568,7 +593,7 @@ } /* Blank current location. */ - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } static void @@ -579,14 +604,11 @@ if (nrows == 0) nrows = 1; - /* XXX: does this assertion hold? */ - teken_assert(t->t_cursor.tp_row >= t->t_scrollreg.ts_begin); - tr.tr_begin.tp_row = t->t_cursor.tp_row; tr.tr_begin.tp_col = 0; tr.tr_end.tp_col = t->t_winsize.tp_col; - if (nrows < (t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { + if (nrows < ((int)t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { teken_pos_t tp; /* Copy lines down. */ @@ -601,7 +623,7 @@ } /* Blank current location. */ - teken_funcs_fill(t, &tr, ' ', &t->t_curattr); + teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } static void @@ -792,7 +814,6 @@ break; case 47: /* Switch to alternate buffer. */ teken_printf("Switch to alternate buffer\n"); - /* XXX: unsupported. */ break; default: teken_printf("Unknown DECRST: %u\n", cmd); @@ -847,8 +868,6 @@ teken_subr_reverse_index(teken_t *t) { - /* XXX: does this assertion hold? */ - teken_assert(t->t_cursor.tp_row >= t->t_scrollreg.ts_begin); if (t->t_cursor.tp_row > t->t_scrollreg.ts_begin) { t->t_cursor.tp_row--; t->t_stateflags &= ~TS_WRAPPED; @@ -927,7 +946,7 @@ teken_printf("DECSET reverse wraparound\n"); break; case 47: /* Switch to alternate buffer. */ - /* XXX: unsupported. */ + teken_printf("Switch away from alternate buffer\n"); break; default: teken_printf("Unknown DECSET: %u\n", cmd); From owner-p4-projects@FreeBSD.ORG Sun Dec 14 22:20:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCE371065673; Sun, 14 Dec 2008 22:20: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 92A7B1065670 for ; Sun, 14 Dec 2008 22:20:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68CEA8FC08 for ; Sun, 14 Dec 2008 22:20:23 +0000 (UTC) (envelope-from sam@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 mBEMKN35033822 for ; Sun, 14 Dec 2008 22:20:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBEMKNqM033820 for perforce@freebsd.org; Sun, 14 Dec 2008 22:20:23 GMT (envelope-from sam@freebsd.org) Date: Sun, 14 Dec 2008 22:20:23 GMT Message-Id: <200812142220.mBEMKNqM033820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 22:20:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=154665 Change 154665 by sam@sam_ebb on 2008/12/14 22:19:22 allow override of ATH_RATE Submitted by: imp Affected files ... .. //depot/projects/vap/sys/modules/ath/Makefile#10 edit Differences ... ==== //depot/projects/vap/sys/modules/ath/Makefile#10 (text+ko) ==== @@ -29,7 +29,7 @@ # $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ # -ATH_RATE= sample # tx rate control algorithm +ATH_RATE?= sample # tx rate control algorithm .PATH: ${.CURDIR}/../../dev/ath .PATH: ${.CURDIR}/../../dev/ath/ath_hal From owner-p4-projects@FreeBSD.ORG Sun Dec 14 22:34:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 913181065679; Sun, 14 Dec 2008 22:34:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56B9A106564A for ; Sun, 14 Dec 2008 22:34:42 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe12.tele2.se [212.247.155.97]) by mx1.freebsd.org (Postfix) with ESMTP id DFE508FC13 for ; Sun, 14 Dec 2008 22:34:41 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=8Sj-2-tmaYAA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=qUBIVDft1Ri5S32rfiQA:9 a=auaz68RysHvJSA62Fzwgmb58R24A:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe12.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 993196247; Sun, 14 Dec 2008 22:34:38 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Sun, 14 Dec 2008 22:36:53 +0100 User-Agent: KMail/1.9.7 References: <200812061000.mB6A0YwA051708@repoman.freebsd.org> <20081214.142210.1102529432.imp@bsdimp.com> In-Reply-To: <20081214.142210.1102529432.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812142236.54424.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 22:34:42 -0000 On Sunday 14 December 2008, M. Warner Losh wrote: > In message: <200812061000.mB6A0YwA051708@repoman.freebsd.org> > > Hans Petter Selasky writes: > : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#27 (text+ko) ==== > : > : @@ -811,6 +811,7 @@ > : product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader > : product ALCOR SM_KBD 0x9410 MicroConnectors/StrongMan Keyboard > : product ALCOR NEC_KBD_HUB 0x9472 NEC Kbd Hub > : +product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive > > This should be sorted by device id number. Also, it is > product, not product > > Warner Fixed. --HPS From owner-p4-projects@FreeBSD.ORG Sun Dec 14 23:37:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDF5D1065675; Sun, 14 Dec 2008 23:37: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 AF0B11065670 for ; Sun, 14 Dec 2008 23:37:27 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 768F98FC16 for ; Sun, 14 Dec 2008 23:37:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id mBENbLnC001460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 14 Dec 2008 15:37:21 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <494598B0.9090501@freebsd.org> Date: Sun, 14 Dec 2008 15:37:20 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Hans Petter Selasky References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812131005.33499.hselasky@c2i.net> <494414EF.3080403@freebsd.org> <200812141623.51473.hselasky@c2i.net> In-Reply-To: <200812141623.51473.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC-sonic.net-Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Dec 2008 23:37:28 -0000 Hans Petter Selasky wrote: > On Saturday 13 December 2008, Sam Leffler wrote: > >> Hans Petter Selasky wrote: >> >>> On Saturday 13 December 2008, Sam Leffler wrote: >>> > > >> No. But if you are interested in helping debug the problem I'm happy to >> send you debug output. The controller rejects all cmds setting the >> ERRINT status bit. The qTD contents and xfer contents look fine but I >> haven't been able to identify the cause given the overlay qTD contents. >> I'm in the process of collecting comparative traces from linux where usb >> works. >> >> > > Send me the EHCI traces and I will have a look at it. Have you tried USB2? The > patches which you need to apply should be similar. > This is what I get w/ sysctl hw.usb.ehci.debug=6 for the first cmd submitted after card insert: avila1# ehci_pcd: change=0x02 ehci_root_ctrl_start: type=0xa3 request=00 ehci_root_ctrl_start: type=0x23 request=01 ehci_root_ctrl_start: type=0x23 request=03 ehci_root_ctrl_start: reset port 1 ehci_pcd: change=0x00 ehci after reset, status=0x08001205 ehci port 1 reset, status = 0x08001205 ehci_root_ctrl_start: type=0xa3 request=00 ehci_root_ctrl_start: type=0x23 request=01 ehci_root_ctrl_start: type=0xa3 request=00 ehci_open: pipe=0xc1101d80, xfertype=0, addr=0, endpt=1 (0) ehci_add_qh: QH(0xd0093de0) at 0x01088de0: sqtd=0xd0094de0 inactivesqtd=0xd0094de0 link=0x01088e42 endp=0x80086000 addr=0x00 inact=0 endpt=0 eps=2 dtc=1 hrecl=0 mpl=0x8 ctl=0 nrl=8 endphub=0x40811c00 smask=0x00 cmask=0x1c huba=0x01 port=1 mult=1 curqtd=0x00000001 Overlay qTD: next=0x01089de0<> altnext=0x00000001 status=0x00000000: toggle=0 bytes=0x0 ioc=0 c_page=0x0 cerr=0 pid=0 stat=0x0 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 ehci_device_request: type=0x80, request=0x06, wValue=0x0100, wIndex=0x0000 len=8, addr=0, endpt=0 ehci_alloc_sqtd_chain: start len=8 ehci_device_request: QH(0xd0093de0) at 0x01088de0: sqtd=0xd0094de0 inactivesqtd=0xd0094d80 link=0x01088e42 endp=0x80086000 addr=0x00 inact=0 endpt=0 eps=2 dtc=1 hrecl=0 mpl=0x8 ctl=0 nrl=8 endphub=0x40811c00 smask=0x00 cmask=0x1c huba=0x01 port=1 mult=1 curqtd=0x00000001 Overlay qTD: next=0x01089de0<> altnext=0x00000001 status=0x00000000: toggle=0 bytes=0x0 ioc=0 c_page=0x0 cerr=0 pid=0 stat=0x0 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094de0) at 0x01089de0: next=0x01089cc0<> altnext=0x01089d80<> status=0x00080e00: toggle=0 bytes=0x8 ioc=0 c_page=0x0 cerr=3 pid=2 stat=0x0 buffer[0]=0x01091fc0 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094cc0) at 0x01089cc0: next=0x01089d20<> altnext=0x01089d80<> status=0x80080d80: toggle=1 bytes=0x8 ioc=0 c_page=0x0 cerr=3 pid=1 stat=0x80 buffer[0]=0x014b8a3c buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094d20) at 0x01089d20: next=0x01089d80<> altnext=0x01089d80<> status=0x80008c80: toggle=1 bytes=0x0 ioc=1 c_page=0x0 cerr=3 pid=0 stat=0x80 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094d80) at 0x01089d80: next=0x00000001 altnext=0x00000001 status=0x00000000: toggle=0 bytes=0x0 ioc=0 c_page=0x0 cerr=0 pid=0 stat=0x0 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 ehci_intr1: ERRINT ehci_check_intr: ex=0xc1096800 ehci_idone: ex=0xc1096800 ehci_idone: xfer=0xc1096800, pipe=0xc1101d80 ready ehci_idone: updated overlay next ptr ehci_idone: len=8, actlen=0, cerr=3, status=0x80080d40 ehci_idone: error, addr=0, endpt=0x00, status 0x80080d40 QH(0xd0093de0) at 0x01088de0: sqtd=0xd0094de0 inactivesqtd=0xd0094d80 link=0x01088e42 endp=0x80086000 addr=0x00 inact=0 endpt=0 eps=2 dtc=1 hrecl=0 mpl=0x8 ctl=0 nrl=8 endphub=0x40811c00 smask=0x00 cmask=0x1c huba=0x01 port=1 mult=1 curqtd=0x01089cc0<> Overlay qTD: next=0x01089d80<> altnext=0x01089d90<> status=0x80080d40: toggle=1 bytes=0x8 ioc=0 c_page=0x0 cerr=3 pid=1 stat=0x40 buffer[0]=0x014b8a3c buffer[1]=0x00000008 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094de0) at 0x01089de0: next=0x01089cc0<> altnext=0x01089d80<> status=0x80000e00: toggle=1 bytes=0x0 ioc=0 c_page=0x0 cerr=3 pid=2 stat=0x0 buffer[0]=0x01091fc8 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094cc0) at 0x01089cc0: next=0x01089d20<> altnext=0x01089d80<> status=0x80080d40: toggle=1 bytes=0x8 ioc=0 c_page=0x0 cerr=3 pid=1 stat=0x40 buffer[0]=0x014b8a3c buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094d20) at 0x01089d20: next=0x01089d80<> altnext=0x01089d80<> status=0x80008c80: toggle=1 bytes=0x0 ioc=1 c_page=0x0 cerr=3 pid=0 stat=0x80 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 QTD(0xd0094d80) at 0x01089d80: next=0x00000001 altnext=0x00000001 status=0x00000000: toggle=0 bytes=0x0 ioc=0 c_page=0x0 cerr=0 pid=0 stat=0x0 buffer[0]=0x00000000 buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 Subsequent cmds fail similarly. I don't see the issue and don't understand how to use the overlay qTD information to pinpoint the reason the controller is rejecting the request. This happens w/ either of the 2 USB ports (1 port / controller): ehci0: on ixp0 ehci0: [GIANT-LOCKED] ehci0: [ITHREAD] usb0: EHCI version 1.0 usb0: stop timeout usb0: set host controller mode usb0 on ehci0 usb0: USB revision 2.0 uhub0: on usb0 uhub0: 1 port with 1 removable, self powered ehci1: on ixp0 ehci1: [GIANT-LOCKED] ehci1: [ITHREAD] usb1: EHCI version 1.0 usb1: stop timeout usb1: set host controller mode usb1 on ehci1 usb1: USB revision 2.0 uhub1: on usb1 uhub1: 1 port with 1 removable, self powered Sam From owner-p4-projects@FreeBSD.ORG Mon Dec 15 00:20:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F7DA1065679; Mon, 15 Dec 2008 00:20: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 631731065677 for ; Mon, 15 Dec 2008 00:20:25 +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 4F06D8FC16 for ; Mon, 15 Dec 2008 00:20:25 +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 mBF0KP56044924 for ; Mon, 15 Dec 2008 00:20:25 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF0KPbt044922 for perforce@freebsd.org; Mon, 15 Dec 2008 00:20:25 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 15 Dec 2008 00:20:25 GMT Message-Id: <200812150020.mBF0KPbt044922@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 154670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 00:20:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=154670 Change 154670 by rene@rene_self on 2008/12/15 00:20:10 Fix a lot of nits in the Committers Guide, like capitalization, entity usage, language fixes, and some tiny content fixes. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#8 (text+ko) ==== @@ -9,7 +9,7 @@ - The FreeBSD Documentation Project + The &os; Documentation Project @@ -25,7 +25,8 @@ 2005 2006 2007 - The FreeBSD Documentation Project + 2008 + The &os; Documentation Project @@ -39,18 +40,18 @@ - This document provides information for the FreeBSD committer + This document provides information for the &os; committer community. All new committers should read this document before they start, and existing committers are strongly encouraged to review it from time to time. - Almost all FreeBSD developers have commmit rights to one or + Almost all &os; developers have commmit rights to one or more repositories. However, a few developers do not, and some of the information here applies to them as well. (For instance, some people only have rights to work with the Problem Report database). Please see for more information. - This document may also be of interest to members of the FreeBSD + This document may also be of interest to members of the &os; community who want to learn more about how the project works. @@ -86,7 +87,7 @@ &a.bugmeister; - &a.ceri; &a.linimon;, and &a.remko + &a.ceri; &a.linimon;, and &a.remko; @@ -139,10 +140,10 @@ Commit Bit Types - The FreeBSD CVS repository has a number of components which, + The &os; CVS repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and - various maintained utilities. When FreeBSD commit bits are + various maintained utilities. When &os; commit bits are allocated, the areas of the tree where the bit may be used are specified. Generally, the areas associated with a bit reflect who authorized the allocation of the commit bit. Additional areas of @@ -185,9 +186,9 @@ Commit bits allocated prior to the development of the notion of areas of authority may be appropriate for use in many parts of the tree. However, common sense dictates that a committer who has not - previously worked in an area of the tree seek review prior to - committing, seek approval from the appropriate responsible party, - and/or work with a mentor. Since the rules regarding code + previously worked in an area of the tree seeks review prior to + committing, seeks approval from the appropriate responsible party, + and/or works with a mentor. Since the rules regarding code maintenance differ by area of the tree, this is as much for the benefit of the committer working in an area of less familiarity as it is for others working on the tree. @@ -281,7 +282,7 @@ via CVSup for the convenience of our users. Note that the www module containing sources - for the FreeBSD website is + for the &os; website is contained within the doc repository. The CVS repositories are hosted on the repository machines. @@ -382,7 +383,7 @@ linkend="repomeisters">repomeister will copy the file(s) to their new name and/or location and let you know when it is done. The purpose of a repository copy is to preserve file - change history, or logs. We in the FreeBSD Project greatly + change history, or logs. We in the &os; Project greatly value the change history that CVS gives to the project. CVS reference information, tutorials, and FAQs can be found at: @@ -435,7 +436,7 @@ - Practical FreeBSD examples: + Practical &os; examples: @@ -690,7 +691,7 @@ Merging is what happens if you check out a copy of - some source code, modify it, then someone else commits a + some file, modify it, then someone else commits a change, and you run cvs update. CVS notices that you have made local changes, and tries to merge your changes with the changes between the version you originally @@ -750,7 +751,7 @@ You will almost certainly get a conflict because - of the $Id$ (or in FreeBSD's case, + of the $Id$ (or in &os;'s case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict (remove the marker lines and the second $Id$ line, @@ -1187,7 +1188,7 @@ will have any idea who you are or what you are working on. You do not have to write a comprehensive biography, just write a paragraph or two about who you are and what you plan to be working on as a - developer in FreeBSD. (You should also mention who your mentor + developer in &os;. (You should also mention who your mentor will be). Email this to the &a.developers; and you will be on your way! @@ -1213,7 +1214,7 @@ check in place but that may change. Some people blame these checks for bouncing valid email. If you want these checks turned off for your email you can place a file named - ~/.spam_lover in your home directory + ~/.spam_lover on freefall.FreeBSD.org to disable the checks for your email. @@ -1232,7 +1233,7 @@ All new developers also have a mentor assigned to them for the first few months. Your mentor is responsible for teaching you the rules and conventions of the project and guiding your - first steps in the developer community. He or she is also + first steps in the developer community. Your mentor is also personally responsible for your actions during this initial period. @@ -1339,7 +1340,7 @@ person has made. It can be found on freefall at ~fenner/bin/whodid. If your queries go unanswered or the committer otherwise indicates a lack of - proprietary interest in the area affected, go ahead and commit + interest in the area affected, go ahead and commit it. If you are unsure about a commit for any reason at @@ -1355,7 +1356,7 @@ If they see a different solution to a problem than you, or even a different problem, it is not because they are stupid, because they have questionable parentage, or because they are trying to - destroy your hard work, personal image, or FreeBSD, but simply + destroy your hard work, personal image, or &os;, but simply because they have a different outlook on the world. Different is good. @@ -1379,7 +1380,7 @@ GNATS - The FreeBSD Project utilizes + The &os; Project utilizes GNATS for tracking bugs and change requests. Be sure that if you commit a fix or suggestion found in a GNATS PR, you use @@ -1408,8 +1409,8 @@ - You can run a local copy of GNATS, and then integrate the FreeBSD - GNATS tree in to it using CVSup. Then you can run GNATS commands + You can run a local copy of GNATS, and then integrate the &os; + GNATS tree in to it using CVSup. Then you can run the GNATS commands locally. This lets you query the PR database without needing to be connected to the Internet. @@ -1427,7 +1428,7 @@ gnats release=current prefix=/usr - This will place the FreeBSD GNATS tree in + This will place the &os; GNATS tree in /usr/gnats. You can use a refuse file to control which categories to receive. For example, to only receive docs PRs, @@ -1471,7 +1472,7 @@ # This category is mandatory pending:Category for faulty PRs:gnats-admin: # -# FreeBSD categories +# &os; categories # docs:Documentation Bug:freebsd-doc: @@ -1511,7 +1512,7 @@ Who's Who Besides the repository - meisters, there are other FreeBSD project members and teams whom you will + meisters, there are other &os; project members and teams whom you will probably get to know in your role as a committer. Briefly, and by no means all-inclusively, these are: @@ -1524,7 +1525,7 @@ John is the manager of the SMPng Project, and has authority over the architectural design and implementation of the move to fine-grained kernel threading and locking. - He's also the editor of the SMPng Architecture Document. + He is also the editor of the SMPng Architecture Document. If you are working on fine-grained SMP and locking, please coordinate with John. You can learn more about the SMPng Project on its home page: @@ -1538,7 +1539,7 @@ doceng is the group responsible for the documentation build infrastructure, approving new documentation committers, and - ensuring that the FreeBSD website and documentation on the FTP + ensuring that the &os; website and documentation on the FTP site is up to date with respect to the CVS tree. It is not a conflict resolution body. The vast majority of documentation related discussion takes place on the &a.doc;. More details regarding the doceng team can be found in its charter. Committers @@ -1567,7 +1568,7 @@ When you do a commit that could have been done better, Bruce will be there to tell you. Be thankful that someone is. Bruce is also very knowledgeable on the various - standards applicable to FreeBSD. + standards applicable to &os;. @@ -1603,7 +1604,7 @@ Colin is the - FreeBSD Security + &os; Security Officer and oversees the &a.security-officer;. @@ -1618,7 +1619,7 @@ are not sure of some potential change to the networking subsystem you have in mind, Garrett is someone to talk to. Garrett is also very knowledgeable on the various - standards applicable to FreeBSD. + standards applicable to &os;. @@ -1643,12 +1644,12 @@ voting, announcements, etc. The &a.developers; is for the exclusive use of - FreeBSD committers. In order to develop FreeBSD, committers must + &os; committers. In order to develop &os;, committers must have the ability to openly discuss matters that will be resolved before they are publicly announced. Frank discussions of work in - progress are not suitable for open publication and may harm FreeBSD. + progress are not suitable for open publication and may harm &os;. - All FreeBSD committers are reminded to obey the copyright of the + All &os; committers are reminded to obey the copyright of the original author(s) of &a.developers; mail. Do not publish or forward messages from the &a.developers; outside the list membership without permission of all of the authors. @@ -1661,12 +1662,12 @@ This list is not intended as a place for code reviews or a replacement for the &a.arch; or the &a.audit;. In fact - using it as such hurts the FreeBSD Project as it gives a sense of a - closed list where general decisions affecting all of the FreeBSD + using it as such hurts the &os; Project as it gives a sense of a + closed list where general decisions affecting all of the &os; using community are made without being open. Last, but not least never, never ever, email - the &a.developers; and CC:/BCC: another FreeBSD list. - Never, ever email another FreeBSD email list and CC:/BCC: + the &a.developers; and CC:/BCC: another &os; list. + Never, ever email another &os; email list and CC:/BCC: the &a.developers;. Doing so can greatly diminish the benefits of this list. @@ -1679,7 +1680,7 @@ - If you do not wish to type your password in every + If you do not wish to type in your password every time you use &man.ssh.1;, and you use RSA or DSA keys to authenticate, &man.ssh-agent.1; is there for your convenience. If you want to use &man.ssh-agent.1;, make @@ -1702,7 +1703,7 @@ ($HOME/.ssh/id_dsa.pub or $HOME/.ssh/id_rsa.pub) to the person setting you up as a committer so it can be put - into yourlogin file in + into yourlogin in /etc/ssh-keys/ on freefall. @@ -1789,7 +1790,7 @@ - The FreeBSD Committers' Big List of Rules + The &os; Committers' Big List of Rules @@ -1858,7 +1859,7 @@ Do not commit to anything under the src/contrib, - src/crypto, and + src/crypto, or src/sys/contrib trees without explicit approval from the respective maintainer(s). @@ -1997,7 +1998,7 @@ Respect existing maintainers if listed. - Many parts of FreeBSD are not owned in + Many parts of &os; are not owned in the sense that any specific individual will jump up and yell if you commit a change to their area, but it still pays to check first. One convention we use @@ -2016,8 +2017,8 @@ question and see if someone has been working recently or predominantly in that area. - Other areas of FreeBSD fall under the control of - someone who manages an overall category of FreeBSD + Other areas of &os; fall under the control of + someone who manages an overall category of &os; evolution, such as internationalization or networking. See @@ -2111,7 +2112,7 @@ flame-o-gram at least had the grace to send it privately, then have the grace to keep it private yourself. If you feel you are being unfairly treated by another developer, - and it is causing you anguish, bring the matter up with + and it is causing you anguish, bring up the matter with core rather than taking it public. Core will do its best to play peace makers and get things back to sanity. In cases where the dispute involves a change to the codebase and @@ -2134,7 +2135,7 @@ and committing 10 megabytes worth of accumulated stuff. People who abuse this on a regular basis will have their commit privileges suspended until they get back from the - FreeBSD Happy Reeducation Camp we run in Greenland. + &os; Happy Reeducation Camp we run in Greenland. @@ -2167,9 +2168,9 @@ running that code. If you have a change which also may break another architecture, be sure and test on all supported architectures. Please refer to the FreeBSD Internal + url="http://www.FreeBSD.org/internal/">&os; Internal Page for a list of available resources. As other - architectures are added to the FreeBSD supported platforms + architectures are added to the &os; supported platforms list, the appropriate shared testing resources will be made available. @@ -2194,7 +2195,7 @@ Please note that this does not mean you should not try to improve the software in question; you are still more than welcome to do so. Ideally, you should submit your patches to - the vendor. If your changes are FreeBSD-specific, talk to the + the vendor. If your changes are &os;-specific, talk to the maintainer; they may be willing to apply them locally. But whatever you do, do not commit there by yourself! @@ -2208,9 +2209,9 @@ Policy on Multiple Architectures - FreeBSD has added several new arch ports during recent + &os; has added several new architecture ports during recent release cycles and is truly no longer an &i386; centric operating - system. In an effort to make it easier to keep FreeBSD portable + system. In an effort to make it easier to keep &os; portable across the platforms we support, core has developed the following mandate: @@ -2223,7 +2224,7 @@ to the source tree. - The i386 and Sparc64 platforms were chosen due to being more + The Sparc64 and i386 platforms were chosen due to being more readily available to developers and as representatives of more diverse processor and system designs - big vs little endian, register file vs register stack, different DMA and cache @@ -2306,39 +2307,39 @@ Support for Multiple Architectures - FreeBSD is a highly portable operating system intended to + &os; is a highly portable operating system intended to function on many different types of hardware architectures. Maintaining clean separation of Machine Dependent (MD) and Machine Independent (MI) code, as well as minimizing MD code, is an important part of our strategy to remain agile with regards to current hardware trends. Each new hardware architecture supported by - FreeBSD adds substantially to the cost of code maintenance, + &os; adds substantially to the cost of code maintenance, toolchain support, and release engineering. It also dramatically increases the cost of effective testing of kernel changes. As such, there is strong motivation to differentiate between classes of support for various architectures while remaining strong in a few - key architectures that are seen as the FreeBSD "target audience". + key architectures that are seen as the &os; "target audience". Statement of General Intent - The FreeBSD Project targets "production quality commercial + The &os; Project targets "production quality commercial off-the-shelf (COTS) workstation, server, and high-end embedded systems". By retaining a focus on a narrow set of architectures - of interest in these environments, the FreeBSD Project is able + of interest in these environments, the &os; Project is able to maintain high levels of quality, stability, and performance, as well as minimize the load on various support teams on the project, such as the ports team, documentation team, security officer, and release engineering teams. Diversity in - hardware support broadens the options for FreeBSD consumers by + hardware support broadens the options for &os; consumers by offering new features and usage opportunities (such as support - for 64-bit CPUs, use in embedded environments, etc.), but these + for 64 bit CPUs, use in embedded environments, etc.), but these benefits must always be carefully considered in terms of the real-world maintenance cost associated with additional platform support. - The FreeBSD Project differentiates platform targets into + The &os; Project differentiates platform targets into four tiers. Each tier includes a specification of the requirements for an architecture to be in that tier, as well as specifying the obligations of developers with @@ -2357,13 +2358,13 @@ (features which are inherently architecture-specific, such as support for hardware device drivers, may be exempt from this requirement). In general, all Tier 1 platforms must have build - and tinderbox support either in the FreeBSD.org cluster, or + and Tinderbox support either in the FreeBSD.org cluster, or be easily available for all developers. Embedded platforms may - substitute an emulator available in the FreeBSD cluster for + substitute an emulator available in the &os; cluster for actual hardware. Tier 1 architectures are expected to be Production Quality - with respects to all aspects of the FreeBSD operating system, + with respects to all aspects of the &os; operating system, including installation and development environments. Tier 1 architectures are expected to be completely @@ -2377,12 +2378,12 @@ platform, or have the appropriate filters to prevent the inappropriate ones from building there. The packaging system must support all Tier 1 architectures. To ensure an - architectures Tier 1 status, proponents of that architecture + architecture's Tier 1 status, proponents of that architecture must show that all relevant packages can be built on that platform. Tier 1 embedded architectures must be able to cross-build - packages on at least one other tier 1 architecture. The + packages on at least one other Tier 1 architecture. The packages must be the most relevant for the platform, but may be a non-empty subset of those that build natively. @@ -2403,19 +2404,19 @@ maintainer is expected to work with the platform maintainers to refine these changes. Major new toolchain components are allowed to break support for Tier 2 architectures if the - FreeBSD-local changes haven't been incorporated upstream. The + &os;-local changes have not been incorporated upstream. The toolchain maintainers are expected to provide prompt review of any proposed changes and cannot block, through their inaction, - changes going into the tree. New features added to FreeBSD + changes going into the tree. New features added to &os; should be feasible to implement on these platforms, but an implementation is not required before the feature may be added - to the FreeBSD source tree. New features that may be difficult + to the &os; source tree. New features that may be difficult to implement on Tier 2 architectures should provide a means of disabling them on those architectures. The implementation of - a Tier 2 architecture may be committed to the main FreeBSD + a Tier 2 architecture may be committed to the main &os; tree as long as it does not interfere with production work on Tier 1 platforms, or substantially with other Tier 2 platforms. - Before a Tier 2 platform can be added to the FreeBSD base + Before a Tier 2 platform can be added to the &os; base source tree, the platform must be able to boot multi-user on actual hardware. Generally, there must be at least three active developers working on the platform. @@ -2425,22 +2426,22 @@ reaching end of life may also be moved from Tier 1 status to Tier 2 status as the availability of resources to continue to maintain the system in a Production Quality state diminishes. Well supported - niche architectures may also be tier 2. + niche architectures may also be Tier 2. Tier 2 architectures may have some support for them integrated into the ports infrastructure. They may have cross compilation support added, at the discretion of portmgr. Some - ports must built natively, into packages if the package system + ports must built natively into packages if the package system supports that architecture. If not integrated into the base system, some external patches for the architecture for ports must be available. - Tier 2 architectures can be integrated into the FreeBSD + Tier 2 architectures can be integrated into the &os; handbook. The basics for how to get a system running must be documented, although not necessarily for every single board or - system a tier 2 architecture supports. The supported hardware + system a Tier 2 architecture supports. The supported hardware list must exist and should be no more than a couple of months - old. It should be integrated into the FreeBSD + old. It should be integrated into the &os; documentation. Current Tier 2 platforms are ARM, PowerPC, ia64, Sparc64 and @@ -2456,13 +2457,13 @@ Tier 3 platforms are architectures in the early stages of development, for non-mainstream hardware platforms, or which are considered legacy systems unlikely to see broad future - use. New tier 3 systems will not be committed to the base + use. New Tier 3 systems will not be committed to the base source tree. Support for Tier 3 systems may be worked on in - the FreeBSD Perforce Repository, providing source control and - easier change integration from the main FreeBSD tree. + the &os; Perforce Repository, providing source control and + easier change integration from the main &os; tree. Platforms that transition to Tier 3 status may be removed from the tree if they are no longer actively supported by the - FreeBSD developer community at the discretion of the release + &os; developer community at the discretion of the release engineer. Tier 3 platforms may have ports support, either integrated @@ -2471,7 +2472,7 @@ Tier 3 platforms must have the basics documented for how to build a kernel and how to boot it on at least one target hardware or emulation environment. This documentation need - not be integrated into the FreeBSD tree. + not be integrated into the &os; tree. Current Tier 3 platforms are MIPS and &s390;. @@ -2490,7 +2491,7 @@ Policy on Changing the Tier of an Architecture Systems may only be moved from one tier to another by - approval of the FreeBSD Core Team, which shall make that + approval of the &os; Core Team, which shall make that decision in collaboration with the Security Officer, Release Engineering, and toolchain maintenance teams. @@ -2555,10 +2556,10 @@ make sure you have fixed the simple ones. If the port came from a submitter who has not - contributed to the project before, add that person's + contributed to the Project before, add that person's name to the Additional - Contributors section of the FreeBSD Contributors + Contributors section of the &os; Contributors List. Close the PR if the port came in as a PR. To close @@ -3232,7 +3233,7 @@ Issues Specific To Developers Who Are Not Committers - A few people who have access to the FreeBSD machines do not + A few people who have access to the &os; machines do not have commit bits. For instance, the project is willing to give access to the GNATS database to contributors who have shown interest and dedication in working on Problem Reports. @@ -3276,7 +3277,7 @@ - The FreeBSD Committers' Big List of Rules + The &os; Committers' Big List of Rules @@ -3392,7 +3393,7 @@ well. This information consists of one or more lines containing the - key word or phrase, a colon, tabs for formatting, and then the + key word or phrase, a colon, tabs and/or spaces for formatting, and then the additional information. The key words or phrases are: @@ -3410,14 +3411,14 @@ Submitted by: The name and e-mail address of the person that submitted the fix; for committers, just the username on - the FreeBSD cluster. + the &os; cluster. Reviewed by: The name and e-mail address of the person or people that reviewed the change; for committers, just the - username on the FreeBSD cluster. If a patch was + username on the &os; cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. @@ -3426,7 +3427,7 @@ Approved by: The name and e-mail address of the person or people that approved the change; for committers, just the - username on the FreeBSD cluster. It is customary to get + username on the &os; cluster. It is customary to get prior approval for a commit if it is to an area of the tree to which you do not usually commit. In addition, during the run up to a new release all commits @@ -3586,7 +3587,7 @@ The mailing lists are archived under /g/mail which will show up as /hub/g/mail with &man.pwd.1;. - This location is accessible from any machine on the FreeBSD cluster. + This location is accessible from any machine on the &os; cluster. From owner-p4-projects@FreeBSD.ORG Mon Dec 15 03:30:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 129C81065670; Mon, 15 Dec 2008 03:30: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 C932A106568A for ; Mon, 15 Dec 2008 03:30:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2D7D8FC4D for ; Mon, 15 Dec 2008 03:30:39 +0000 (UTC) (envelope-from sam@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 mBF3UdAr072994 for ; Mon, 15 Dec 2008 03:30:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF3Ucag072992 for perforce@freebsd.org; Mon, 15 Dec 2008 03:30:38 GMT (envelope-from sam@freebsd.org) Date: Mon, 15 Dec 2008 03:30:38 GMT Message-Id: <200812150330.mBF3Ucag072992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 03:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=154679 Change 154679 by sam@sam_ebb on 2008/12/15 03:30:08 IFC @ 154678 Affected files ... .. //depot/projects/vap/UPDATING#25 integrate .. //depot/projects/vap/contrib/binutils/bfd/config.bfd#3 integrate .. //depot/projects/vap/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/vap/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/vap/etc/regdomain.xml#8 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/bfd.h#3 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/vap/gnu/usr.bin/cc/libiberty/config.h#3 integrate .. //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/vap/gnu/usr.bin/sort/config.h#5 integrate .. //depot/projects/vap/include/arpa/nameser.h#3 integrate .. //depot/projects/vap/include/resolv.h#3 integrate .. //depot/projects/vap/include/string.h#4 integrate .. //depot/projects/vap/kerberos5/include/config.h#4 integrate .. //depot/projects/vap/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/vap/lib/libarchive/test/main.c#9 integrate .. //depot/projects/vap/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/vap/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/vap/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/vap/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/vap/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/vap/lib/libc/resolv/res_mkquery.c#3 integrate .. //depot/projects/vap/lib/libc/resolv/res_query.c#3 integrate .. //depot/projects/vap/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/vap/lib/libc/stdio/vfprintf.c#5 integrate .. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/vap/lib/libc/string/strdup.3#4 integrate .. //depot/projects/vap/lib/libmagic/config.h#4 integrate .. //depot/projects/vap/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#7 integrate .. //depot/projects/vap/lib/libutil/Makefile#8 integrate .. //depot/projects/vap/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/vap/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/vap/sbin/atacontrol/atacontrol.8#5 integrate .. //depot/projects/vap/sbin/devd/devd.cc#3 integrate .. //depot/projects/vap/sbin/devd/devd.conf.5#3 integrate .. //depot/projects/vap/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#34 integrate .. //depot/projects/vap/sbin/ifconfig/ifvlan.c#9 integrate .. //depot/projects/vap/sbin/ifconfig/regdomain.c#12 integrate .. //depot/projects/vap/sbin/ifconfig/regdomain.h#4 integrate .. //depot/projects/vap/sbin/newfs/newfs.c#5 integrate .. //depot/projects/vap/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/vap/share/man/man4/cxgb.4#3 integrate .. //depot/projects/vap/share/man/man4/ddb.4#15 integrate .. //depot/projects/vap/share/man/man4/man4.powerpc/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/vap/share/man/man9/Makefile#18 integrate .. //depot/projects/vap/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/vap/share/man/man9/ifnet.9#3 integrate .. //depot/projects/vap/sys/amd64/amd64/exception.S#9 integrate .. //depot/projects/vap/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#15 integrate .. //depot/projects/vap/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/vap/sys/amd64/include/apicreg.h#4 integrate .. //depot/projects/vap/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#13 integrate .. //depot/projects/vap/sys/boot/Makefile#10 integrate .. //depot/projects/vap/sys/boot/forth/support.4th#6 integrate .. //depot/projects/vap/sys/boot/i386/boot0/boot0.S#8 integrate .. //depot/projects/vap/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/vap/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/vap/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_signal.h#3 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/vap/sys/conf/files#62 integrate .. //depot/projects/vap/sys/conf/options#35 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#8 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#130 integrate .. //depot/projects/vap/sys/dev/ath/if_athvar.h#42 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/vap/sys/dev/dc/if_dc.c#7 integrate .. //depot/projects/vap/sys/dev/dc/if_dcreg.h#5 integrate .. //depot/projects/vap/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/vap/sys/dev/mfi/mfi_pci.c#6 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#18 integrate .. //depot/projects/vap/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/vap/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/vap/sys/dev/snp/snp.c#11 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#12 integrate .. //depot/projects/vap/sys/dev/usb/ucomvar.h#9 integrate .. //depot/projects/vap/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/vap/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/vap/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/vap/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/vap/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/vap/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/vap/sys/fs/deadfs/dead_vnops.c#6 integrate .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_map.c#8 integrate .. //depot/projects/vap/sys/geom/geom_subr.c#11 integrate .. //depot/projects/vap/sys/i386/i386/exception.s#7 integrate .. //depot/projects/vap/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/vap/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/vap/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/vap/sys/i386/include/apicvar.h#8 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#17 integrate .. //depot/projects/vap/sys/kern/kern_linker.c#14 integrate .. //depot/projects/vap/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/vap/sys/kern/kern_poll.c#11 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#18 integrate .. //depot/projects/vap/sys/kern/kern_prot.c#8 integrate .. //depot/projects/vap/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/vap/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/vap/sys/kern/kern_vimage.c#1 branch .. //depot/projects/vap/sys/kern/subr_param.c#9 integrate .. //depot/projects/vap/sys/kern/subr_prf.c#8 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#11 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#23 integrate .. //depot/projects/vap/sys/kern/tty.c#18 integrate .. //depot/projects/vap/sys/kern/tty_pts.c#9 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/vap/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/vap/sys/kern/vfs_default.c#13 integrate .. //depot/projects/vap/sys/kern/vfs_export.c#11 integrate .. //depot/projects/vap/sys/kern/vnode_if.src#11 integrate .. //depot/projects/vap/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/vap/sys/modules/Makefile#49 integrate .. //depot/projects/vap/sys/modules/aio/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ath/Makefile#11 integrate .. //depot/projects/vap/sys/net/if.c#22 integrate .. //depot/projects/vap/sys/net/if_bridge.c#11 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/vap/sys/net/if_gif.c#14 integrate .. //depot/projects/vap/sys/net/if_gif.h#7 integrate .. //depot/projects/vap/sys/net/if_tun.c#13 integrate .. //depot/projects/vap/sys/net/if_var.h#15 integrate .. //depot/projects/vap/sys/net/pfil.h#5 integrate .. //depot/projects/vap/sys/net/radix.c#6 integrate .. //depot/projects/vap/sys/net/radix.h#4 integrate .. //depot/projects/vap/sys/net/raw_cb.h#5 integrate .. //depot/projects/vap/sys/net/route.c#17 integrate .. //depot/projects/vap/sys/net/route.h#11 integrate .. //depot/projects/vap/sys/net/rtsock.c#16 integrate .. //depot/projects/vap/sys/net/vnet.h#3 integrate .. //depot/projects/vap/sys/net80211/_ieee80211.h#14 integrate .. //depot/projects/vap/sys/net80211/ieee80211.c#55 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#33 integrate .. //depot/projects/vap/sys/net80211/ieee80211_dfs.h#5 integrate .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#31 integrate .. //depot/projects/vap/sys/net80211/ieee80211_input.c#36 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#71 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.c#54 integrate .. //depot/projects/vap/sys/net80211/ieee80211_node.h#33 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#66 integrate .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#17 integrate .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#31 integrate .. //depot/projects/vap/sys/net80211/ieee80211_var.h#58 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#14 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#26 integrate .. //depot/projects/vap/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#12 integrate .. //depot/projects/vap/sys/netgraph/ng_ipfw.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_tty.c#8 integrate .. //depot/projects/vap/sys/netinet/icmp6.h#5 integrate .. //depot/projects/vap/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#25 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/vap/sys/netinet/in_proto.c#8 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/vap/sys/netinet/in_var.h#9 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#13 integrate .. //depot/projects/vap/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/vap/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/vap/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#15 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#15 integrate .. //depot/projects/vap/sys/netinet/ip_var.h#8 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_db.c#9 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#12 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.h#6 integrate .. //depot/projects/vap/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/vap/sys/netinet/udp_var.h#5 integrate .. //depot/projects/vap/sys/netinet/vinet.h#4 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/vap/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/vap/sys/netinet6/ip6_var.h#11 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#11 integrate .. //depot/projects/vap/sys/netinet6/nd6.h#8 integrate .. //depot/projects/vap/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/vap/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/vap/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/vap/sys/netipsec/ipip_var.h#3 integrate .. //depot/projects/vap/sys/netipsec/ipsec.c#13 integrate .. //depot/projects/vap/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/vap/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/vap/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#17 integrate .. //depot/projects/vap/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.c#8 integrate .. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.h#4 integrate .. //depot/projects/vap/sys/powerpc/powermac/cuda.c#4 integrate .. //depot/projects/vap/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/vap/sys/powerpc/powermac/macgpio.c#2 integrate .. //depot/projects/vap/sys/powerpc/powermac/macgpiovar.h#2 integrate .. //depot/projects/vap/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/vap/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/vap/sys/sys/aio.h#5 integrate .. //depot/projects/vap/sys/sys/kernel.h#14 integrate .. //depot/projects/vap/sys/sys/param.h#36 integrate .. //depot/projects/vap/sys/sys/pmc.h#10 integrate .. //depot/projects/vap/sys/sys/resource.h#6 integrate .. //depot/projects/vap/sys/sys/rwlock.h#8 integrate .. //depot/projects/vap/sys/sys/sysctl.h#13 integrate .. //depot/projects/vap/sys/sys/ttyhook.h#2 integrate .. //depot/projects/vap/sys/sys/vimage.h#4 integrate .. //depot/projects/vap/sys/sys/vnode.h#20 integrate .. //depot/projects/vap/sys/sys/vtoc.h#2 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/vap/tools/tools/ath/athdebug/Makefile#4 integrate .. //depot/projects/vap/tools/tools/ath/athstats/Makefile#8 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#6 integrate .. //depot/projects/vap/usr.bin/fetch/fetch.1#4 integrate .. //depot/projects/vap/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/vap/usr.bin/file/config.h#4 integrate .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/vap/usr.sbin/fwcontrol/fwcontrol.c#5 integrate .. //depot/projects/vap/usr.sbin/fwcontrol/fwmpegts.c#3 integrate .. //depot/projects/vap/usr.sbin/jexec/jexec.c#5 integrate .. //depot/projects/vap/usr.sbin/jls/jls.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/cdrom.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/config.c#5 integrate .. //depot/projects/vap/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/label.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/main.c#5 integrate .. //depot/projects/vap/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.h#7 integrate .. //depot/projects/vap/usr.sbin/sysinstall/system.c#5 integrate .. //depot/projects/vap/usr.sbin/syslogd/syslogd.8#5 integrate Differences ... ==== //depot/projects/vap/UPDATING#25 (text+ko) ==== @@ -38,11 +38,11 @@ and thereby the code size); consult ath_hal(4) for details. 20081121: - __FreeBSD_version 800054 adds memory barriers to - , new interfaces to ifnet to facilitate + __FreeBSD_version 800054 adds memory barriers to + , new interfaces to ifnet to facilitate multiple hardware transmit queues for cards that support them, and a lock-less ring-buffer implementation to - enable drivers to more efficiently manage queueing of + enable drivers to more efficiently manage queueing of packets. 20081117: @@ -287,11 +287,11 @@ be recompiled; this includes the hal and xorg-server ports. 20070928: - The caching daemon (cached) was renamed to nscd. nscd.conf - configuration file should be used instead of cached.conf and - nscd_enable, nscd_pidfile and nscd_flags options should be used - instead of cached_enable, cached_pidfile and cached_flags in - rc.conf. + The caching daemon (cached) was renamed to nscd. nscd.conf + configuration file should be used instead of cached.conf and + nscd_enable, nscd_pidfile and nscd_flags options should be used + instead of cached_enable, cached_pidfile and cached_flags in + rc.conf. 20070921: The getfacl(1) utility now prints owning user and group name @@ -299,7 +299,7 @@ This is the same behavior as getfacl(1) on Solaris and Linux. 20070704: - The new IPsec code is now compiled in using the IPSEC option. The + The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel configuration. The FAST_IPSEC kernel option is now deprecated. @@ -602,10 +602,10 @@ If you have such a file, you need old utility to decrypt it. 20060709: - The interface version of the i4b kernel part has changed. So - after updating the kernel sources and compiling a new kernel, - the i4b user space tools in "/usr/src/usr.sbin/i4b" must also - be rebuilt, and vice versa. + The interface version of the i4b kernel part has changed. So + after updating the kernel sources and compiling a new kernel, + the i4b user space tools in "/usr/src/usr.sbin/i4b" must also + be rebuilt, and vice versa. 20060627: The XBOX kernel now defaults to the nfe(4) driver instead of @@ -1071,7 +1071,7 @@ - + To upgrade in-place from 5.x-stable to current @@ -1178,4 +1178,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $ +$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $ ==== //depot/projects/vap/contrib/binutils/bfd/config.bfd#3 (text+ko) ==== @@ -768,6 +768,10 @@ targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; + mips*-*-freebsd*) + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ==== //depot/projects/vap/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ==== @@ -281,6 +281,9 @@ #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI) +/* True if relocations are stored in-place. */ +#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI) + /* We can only have 64bit addresses if the object file format supports it. */ #define HAVE_32BIT_ADDRESSES \ @@ -13020,6 +13023,26 @@ if (fixp->fx_addsy == NULL) return 1; + /* If symbol SYM is in a mergeable section, relocations of the form + SYM + 0 can usually be made section-relative. The mergeable data + is then identified by the section offset rather than by the symbol. + + However, if we're generating REL LO16 relocations, the offset is split + between the LO16 and parterning high part relocation. The linker will + need to recalculate the complete offset in order to correctly identify + the merge data. + + The linker has traditionally not looked for the parterning high part + relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be + placed anywhere. Rather than break backwards compatibility by changing + this, it seems better not to force the issue, and instead keep the + original symbol. This will work with either linker behavior. */ + if ((fixp->fx_r_type == BFD_RELOC_LO16 + || reloc_needs_lo_p (fixp->fx_r_type)) + && HAVE_IN_PLACE_ADDENDS + && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0) + return 0; + #ifdef OBJ_ELF if (OUTPUT_FLAVOR == bfd_target_elf_flavour && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16 ==== //depot/projects/vap/etc/regdomain.xml#8 (text+ko) ==== @@ -22,7 +22,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$ + $FreeBSD: src/etc/regdomain.xml,v 1.2 2008/12/15 01:18:11 sam Exp $ --> ==== //depot/projects/vap/gnu/usr.bin/binutils/as/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.19 2008/12/11 08:15:14 imp Exp $ # BINDIR @@ -20,6 +20,10 @@ # DEO: why not used? #SRCS+= itbl-ops.c +.if ${TARGET_ARCH} == "mips" +SRCS+= itbl-ops.c itbl-parse.y itbl-lex.l +.endif + .if ${TARGET_ARCH} == "amd64" SRCS+= tc-i386.c .elif ${TARGET_ARCH} == "powerpc" ==== //depot/projects/vap/gnu/usr.bin/binutils/libbfd/bfd.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.5 2008/12/11 08:20:34 imp Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -57,7 +57,7 @@ #define BFD_ARCH_SIZE 64 -#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) +#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long ==== //depot/projects/vap/gnu/usr.bin/cc/libiberty/config.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* config.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.2 2008/12/08 21:04:24 kib Exp $ */ /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. This function is required for alloca.c support on those systems. */ @@ -235,7 +235,7 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strndup' function. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 ==== //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.64 2008/08/06 14:02:05 dfr Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $ .\" .\" %beginstrip% . @@ -69,6 +69,8 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 +.ds doc-operating-system-FreeBSD-7.1 7.1 .ds doc-operating-system-FreeBSD-8.0 8.0 . .ec ==== //depot/projects/vap/gnu/usr.bin/sort/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.11 2008/12/08 21:04:24 kib Exp $ */ /* config.h. Generated by configure. */ /* config.hin. Generated from configure.ac by autoheader. */ @@ -759,7 +759,7 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strndup' function. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define to 1 if you have the `strpbrk' function. */ #define HAVE_STRPBRK 1 ==== //depot/projects/vap/include/arpa/nameser.h#3 (text+ko) ==== @@ -49,8 +49,8 @@ */ /* - * $Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $ - * $FreeBSD: src/include/arpa/nameser.h,v 1.20 2007/06/03 17:20:25 ume Exp $ + * $Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $ + * $FreeBSD: src/include/arpa/nameser.h,v 1.21 2008/12/14 19:39:53 ume Exp $ */ #ifndef _ARPA_NAMESER_H_ @@ -424,9 +424,10 @@ #define NS_NXT_MAX 127 /*% - * EDNS0 extended flags, host order. + * EDNS0 extended flags and option codes, host order. */ #define NS_OPT_DNSSEC_OK 0x8000U +#define NS_OPT_NSID 3 /*% * Inline versions of get/put short/long. Pointer is advanced. ==== //depot/projects/vap/include/resolv.h#3 (text+ko) ==== @@ -50,8 +50,8 @@ /*% * @(#)resolv.h 8.1 (Berkeley) 6/2/93 - * $Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $ - * $FreeBSD: src/include/resolv.h,v 1.32 2007/06/03 17:20:25 ume Exp $ + * $Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $ + * $FreeBSD: src/include/resolv.h,v 1.33 2008/12/14 19:39:53 ume Exp $ */ #ifndef _RESOLV_H_ @@ -245,6 +245,7 @@ #define RES_NOCHECKNAME 0x00008000 /*%< do not check names for sanity. */ #define RES_KEEPTSIG 0x00010000 /*%< do not strip TSIG records */ #define RES_BLAST 0x00020000 /*%< blast all recursive servers */ +#define RES_NSID 0x00040000 /*%< request name server ID */ #define RES_NOTLDQUERY 0x00100000 /*%< don't unqualified name as a tld */ #define RES_USE_DNSSEC 0x00200000 /*%< use DNSSEC using OK bit in OPT */ /* #define RES_DEBUG2 0x00400000 */ /* nslookup internal */ @@ -386,6 +387,7 @@ #define sym_ntos __sym_ntos #define sym_ston __sym_ston #define res_nopt __res_nopt +#define res_nopt_rdata __res_nopt_rdata #define res_ndestroy __res_ndestroy #define res_nametoclass __res_nametoclass #define res_nametotype __res_nametotype @@ -474,6 +476,8 @@ union res_sockaddr_union *, int); void res_nclose(res_state); int res_nopt(res_state, int, u_char *, int, int); +int res_nopt_rdata(res_state, int, u_char *, int, u_char *, + u_short, u_short, u_char *); void res_send_setqhook(res_send_qhook); void res_send_setrhook(res_send_rhook); int __res_vinit(res_state, int); ==== //depot/projects/vap/include/string.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ + * $FreeBSD: src/include/string.h,v 1.27 2008/12/08 21:04:24 kib Exp $ */ #ifndef _STRING_H_ @@ -96,6 +96,7 @@ int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE +char *strndup(const char *, size_t); char *strnstr(const char *, const char *, size_t) __pure; #endif char *strpbrk(const char *, const char *) __pure; ==== //depot/projects/vap/kerberos5/include/config.h#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* include/config.h. Generated from config.h.in by configure. */ /* include/config.h.in. Generated from configure.in by autoheader. */ -/* $FreeBSD: src/kerberos5/include/config.h,v 1.16 2008/05/07 13:53:03 dfr Exp $ */ +/* $FreeBSD: src/kerberos5/include/config.h,v 1.17 2008/12/08 21:04:24 kib Exp $ */ #include @@ -785,7 +785,7 @@ #define HAVE_STRNCASECMP 1 /* Define if you have the function `strndup'. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define if you have the function `strnlen'. */ /* #undef HAVE_STRNLEN */ ==== //depot/projects/vap/lib/bind/bind/port_after.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.3 2006/12/10 07:11:03 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.4 2008/12/08 21:04:24 kib Exp $ */ #ifndef port_after_h #define port_after_h @@ -30,7 +30,7 @@ #undef HAS_IN_ADDR6 #define HAVE_SOCKADDR_STORAGE 1 #undef NEED_GETTIMEOFDAY -#undef HAVE_STRNDUP +#define HAVE_STRNDUP 1 #undef USE_FIONBIO_IOCTL #undef USE_SYSERROR_LIST #undef INNETGR_ARGS ==== //depot/projects/vap/lib/libarchive/test/main.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ #define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) #define EXTRA_VERSION archive_version() #define KNOWNREF "test_compat_gtar_1.tgz.uu" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.14 2008/08/31 07:06:02 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.15 2008/12/08 17:22:44 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -897,6 +897,7 @@ time_t now; char *refdir_alloc = NULL; char *progname, *p; + char *tmp; char tmpdir[256]; char tmpdir_timestamp[256]; @@ -916,6 +917,17 @@ testprog = getenv(ENVBASE); #endif + if (getenv("TMPDIR") != NULL) + tmp = getenv("TMPDIR"); + else if (getenv("TMP") != NULL) + tmp = getenv("TMP"); + else if (getenv("TEMP") != NULL) + tmp = getenv("TEMP"); + else if (getenv("TEMPDIR") != NULL) + tmp = getenv("TEMPDIR"); + else + tmp = "/tmp"; + /* Allow -d to be controlled through the environment. */ if (getenv(ENVBASE "_DEBUG") != NULL) dump_on_failure = 1; @@ -976,7 +988,8 @@ strftime(tmpdir_timestamp, sizeof(tmpdir_timestamp), "%Y-%m-%dT%H.%M.%S", localtime(&now)); - sprintf(tmpdir, "/tmp/%s.%s-%03d", progname, tmpdir_timestamp, i); + sprintf(tmpdir, "%s/%s.%s-%03d", tmp, progname, + tmpdir_timestamp, i); if (mkdir(tmpdir,0755) == 0) break; if (errno == EEXIST) ==== //depot/projects/vap/lib/libc/include/isc/eventlib.h#3 (text) ==== @@ -18,7 +18,7 @@ /* eventlib.h - exported interfaces for eventlib * vix 09sep95 [initial] * - * $Id: eventlib.h,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $ + * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $ */ #ifndef _EVENTLIB_H @@ -29,6 +29,8 @@ #include #include +#include + #ifndef __P # define __EVENTLIB_P_DEFINED # ifdef __STDC__ ==== //depot/projects/vap/lib/libc/inet/inet_net_pton.c#3 (text) ==== @@ -16,10 +16,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.1 2005/04/27 05:00:53 sra Exp $"; +static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.3 2007/06/03 17:20:26 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.4 2008/12/14 19:39:53 ume Exp $"); #include "port_before.h" @@ -135,11 +135,11 @@ assert(n >= 0 && n <= 9); bits *= 10; bits += n; + if (bits > 32) + goto enoent; } while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch)); if (ch != '\0') goto enoent; - if (bits > 32) - goto emsgsize; } /* Firey death and destruction unless we prefetched EOS. */ ==== //depot/projects/vap/lib/libc/net/rcmd.3#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.26 2007/01/09 00:28:02 imp Exp $ +.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.27 2008/12/14 22:48:48 murray Exp $ .\" .Dd March 3, 2000 .Dt RCMD 3 @@ -238,6 +238,13 @@ .Fn rcmd_af , .Dv PF_UNSPEC is also allowed. +.Sh ENVIRONMENT +.Bl -tag -width RSH +.It Ev RSH +When using the +.Fn rcmd +function, this variable is used as the program to run instead of +.Xr rsh 1 . .Sh DIAGNOSTICS The .Fn rcmd ==== //depot/projects/vap/lib/libc/resolv/res_debug.c#3 (text) ==== @@ -91,10 +91,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $"; +static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.6 2008/04/03 23:15:15 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_debug.c,v 1.5 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_debug.c,v 1.6 2008/12/14 19:39:53 ume Exp $"); #include "port_before.h" @@ -187,10 +187,56 @@ p_type(ns_rr_type(rr)), p_class(ns_rr_class(rr))); else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) { + u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr); u_int32_t ttl = ns_rr_ttl(rr); + fprintf(file, "; EDNS: version: %u, udp=%u, flags=%04x\n", (ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff); + + while (rdatalen >= 4) { + const u_char *cp = ns_rr_rdata(rr); + int i; + + GETSHORT(optcode, cp); + GETSHORT(optlen, cp); + + if (optcode == NS_OPT_NSID) { + fputs("; NSID: ", file); + if (optlen == 0) { + fputs("; NSID\n", file); + } else { + fputs("; NSID: ", file); + for (i = 0; i < optlen; i++) + fprintf(file, "%02x ", + cp[i]); + fputs(" (",file); + for (i = 0; i < optlen; i++) + fprintf(file, "%c", + isprint(cp[i])? + cp[i] : '.'); + fputs(")\n", file); + } + } else { + if (optlen == 0) { + fprintf(file, "; OPT=%u\n", + optcode); + } else { + fprintf(file, "; OPT=%u: ", + optcode); + for (i = 0; i < optlen; i++) + fprintf(file, "%02x ", + cp[i]); + fputs(" (",file); + for (i = 0; i < optlen; i++) + fprintf(file, "%c", + isprint(cp[i]) ? + cp[i] : '.'); + fputs(")\n", file); + } + } + rdatalen -= 4 + optlen; + } } else { n = ns_sprintrr(handle, &rr, NULL, NULL, buf, buflen); @@ -202,7 +248,7 @@ buf = malloc(buflen += 1024); if (buf == NULL) { fprintf(file, - ";; memory allocation failure\n"); + ";; memory allocation failure\n"); return; } continue; @@ -379,7 +425,7 @@ {ns_s_an, "ANSWER", (char *)0}, {ns_s_ns, "AUTHORITY", (char *)0}, {ns_s_ar, "ADDITIONAL", (char *)0}, - {0, (char *)0, (char *)0} + {0, (char *)0, (char *)0} }; static const struct res_sym __p_update_section_syms[] = { @@ -387,7 +433,7 @@ {S_PREREQ, "PREREQUISITE", (char *)0}, {S_UPDATE, "UPDATE", (char *)0}, {S_ADDT, "ADDITIONAL", (char *)0}, - {0, (char *)0, (char *)0} + {0, (char *)0, (char *)0} }; const struct res_sym __p_key_syms[] = { @@ -615,6 +661,7 @@ case RES_USE_INET6: return "inet6"; #ifdef RES_USE_EDNS0 /*%< KAME extension */ case RES_USE_EDNS0: return "edns0"; + case RES_NSID: return "nsid"; #endif #ifdef RES_USE_DNAME case RES_USE_DNAME: return "dname"; ==== //depot/projects/vap/lib/libc/resolv/res_mkquery.c#3 (text) ==== @@ -66,10 +66,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp $"; +static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.4 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.5 2008/12/14 19:39:53 ume Exp $"); #include "port_before.h" #include @@ -201,9 +201,6 @@ #ifdef RES_USE_EDNS0 /* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */ -#ifndef T_OPT -#define T_OPT 41 -#endif int res_nopt(res_state statp, @@ -228,15 +225,16 @@ if ((ep - cp) < 1 + RRFIXEDSZ) return (-1); - *cp++ = 0; /*%< "." */ - ns_put16(T_OPT, cp); /*%< TYPE */ + *cp++ = 0; /*%< "." */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 15 07:41:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59E771065673; Mon, 15 Dec 2008 07:41: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 04A0C1065672 for ; Mon, 15 Dec 2008 07:41:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3AAC8FC1B for ; Mon, 15 Dec 2008 07:41:11 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF7f1hc008745 for ; Mon, 15 Dec 2008 07:41:01 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF7ex5v008735 for perforce@freebsd.org; Mon, 15 Dec 2008 07:40:59 GMT (envelope-from zec@icir.org) Date: Mon, 15 Dec 2008 07:40:59 GMT Message-Id: <200812150740.mBF7ex5v008735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 07:41:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=154691 Change 154691 by zec@zec_tca51 on 2008/12/15 07:40:15 IFC @ 154690 (arpv2 & ng multithread) Affected files ... .. //depot/projects/vimage/src/sys/conf/NOTES#38 integrate .. //depot/projects/vimage/src/sys/conf/files#50 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#20 integrate .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#35 integrate .. //depot/projects/vimage/src/sys/modules/ath/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_amrr/Makefile#7 delete .. //depot/projects/vimage/src/sys/modules/ath_rate_onoe/Makefile#7 delete .. //depot/projects/vimage/src/sys/modules/ath_rate_sample/Makefile#7 delete .. //depot/projects/vimage/src/sys/modules/cxgb/Makefile#10 integrate .. //depot/projects/vimage/src/sys/net/if.c#58 integrate .. //depot/projects/vimage/src/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#35 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/vimage/src/sys/net/if_llatbl.c#1 branch .. //depot/projects/vimage/src/sys/net/if_llatbl.h#1 branch .. //depot/projects/vimage/src/sys/net/if_var.h#26 integrate .. //depot/projects/vimage/src/sys/net/radix_mpath.c#5 integrate .. //depot/projects/vimage/src/sys/net/route.c#38 integrate .. //depot/projects/vimage/src/sys/net/route.h#7 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#25 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#25 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/vimage/src/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/if_atm.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#47 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#62 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#45 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#70 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#38 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#26 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#33 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#44 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#18 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#41 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#14 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#32 integrate .. //depot/projects/vimage/src/sys/sys/param.h#38 integrate .. //depot/projects/vimage/src/sys/sys/vtoc.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/conf/NOTES#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1516 2008/11/12 09:52:06 yongari Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1517 2008/12/15 06:10:57 qingli Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1958,7 +1958,7 @@ device hatm #Fore/Marconi HE155/622 device patm #IDT77252 cards (ProATM and IDT) device utopia #ATM PHY driver -options NATM #native ATM +#options NATM #native ATM options LIBMBPOOL #needed by patm, iatm ==== //depot/projects/vimage/src/sys/conf/files#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1355 2008/12/10 23:12:39 zec Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1356 2008/12/15 06:10:57 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2172,6 +2172,7 @@ net/if_iso88025subr.c optional token net/if_lagg.c optional lagg net/if_loop.c optional loop +net/if_llatbl.c standard net/if_media.c standard net/if_mib.c standard net/if_ppp.c optional ppp ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#20 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.59 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.60 2008/12/15 06:10:57 qingli Exp $"); #endif #ifdef __FreeBSD__ @@ -3162,7 +3162,7 @@ #ifdef RTF_PRCLONING rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - in_rtalloc_ign(&ro, RTF_CLONING, 0); + in_rtalloc_ign(&ro, 0, 0); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone(&ro, NO_CLONING); @@ -3183,7 +3183,7 @@ rtalloc_ign((struct route *)&ro6, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - rtalloc_ign((struct route *)&ro6, RTF_CLONING); + rtalloc_ign((struct route *)&ro6, 0); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro6, NO_CLONING); @@ -5986,9 +5986,9 @@ #ifdef __FreeBSD__ /* XXX MRT not always INET */ /* stick with table 0 though */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, 0, 0); else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + rtalloc_ign((struct route *)&ro, 0); #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); #endif @@ -6068,9 +6068,9 @@ rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING)); # else /* !RTF_PRCLONING */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, 0, 0); else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + rtalloc_ign((struct route *)&ro, 0); # endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); ==== //depot/projects/vimage/src/sys/contrib/rdma/rdma_addr.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_addr.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_addr.c,v 1.2 2008/12/15 06:10:57 qingli Exp $"); #include #include @@ -163,6 +163,7 @@ struct route iproute; struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst; char dmac[ETHER_ADDR_LEN]; + struct llentry *lle; bzero(&iproute, sizeof iproute); *dst = *dst_in; @@ -172,7 +173,7 @@ return; arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, - rt_key(iproute.ro_rt), dmac); + rt_key(iproute.ro_rt), dmac, &lle); RTFREE(iproute.ro_rt); } @@ -186,6 +187,7 @@ struct route iproute; struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst; char dmac[ETHER_ADDR_LEN]; + struct llentry *lle; bzero(&iproute, sizeof iproute); *dst = *dst_in; @@ -202,7 +204,7 @@ goto put; } ret = arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, - rt_key(iproute.ro_rt), dmac); + rt_key(iproute.ro_rt), dmac, &lle); if (ret) { goto put; } ==== //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.2 2008/12/13 03:45:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.3 2008/12/15 00:29:26 sam Exp $ */ #include "opt_ah.h" @@ -122,7 +122,7 @@ /* setup common ini data; rf backends handle remainder */ HAL_INI_INIT(&ahp->ah_ini_modes, ar5212Modes, 6); - HAL_INI_INIT(&ahp->ah_ini_common, ar5212Common, 6); + HAL_INI_INIT(&ahp->ah_ini_common, ar5212Common, 2); if (!ar5312ChipReset(ah, AH_NULL)) { /* reset chip */ HALDEBUG(ah, HAL_DEBUG_ANY, "%s: chip reset failed\n", __func__); ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c,v 1.4 2008/09/24 01:19:08 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c,v 1.5 2008/12/15 06:10:57 qingli Exp $"); #include #include @@ -93,15 +93,15 @@ } static inline void -neigh_replace(struct l2t_entry *e, struct rtentry *rt) +neigh_replace(struct l2t_entry *e, struct llentry *neigh) { - RT_LOCK(rt); - RT_ADDREF(rt); - RT_UNLOCK(rt); + LLE_WLOCK(neigh); + LLE_ADDREF(neigh); + LLE_WUNLOCK(neigh); if (e->neigh) - RTFREE(e->neigh); - e->neigh = rt; + LLE_FREE(e->neigh); + e->neigh = neigh; } /* @@ -164,7 +164,7 @@ int t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { - struct rtentry *rt = e->neigh; + struct llentry *lle = e->neigh; struct sockaddr_in sin; bzero(&sin, sizeof(struct sockaddr_in)); @@ -177,7 +177,7 @@ switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -201,7 +201,7 @@ * entries when there's no memory. */ if (arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac) == 0) { + (struct sockaddr *)&sin, e->dmac, &lle) == 0) { CTR6(KTR_CXGB, "mac=%x:%x:%x:%x:%x:%x\n", e->dmac[0], e->dmac[1], e->dmac[2], e->dmac[3], e->dmac[4], e->dmac[5]); @@ -222,12 +222,12 @@ void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e) { - struct rtentry *rt; struct mbuf *m0; struct sockaddr_in sin; sin.sin_family = AF_INET; sin.sin_len = sizeof(struct sockaddr_in); sin.sin_addr.s_addr = e->addr; + struct llentry *lle; if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return; @@ -237,7 +237,7 @@ switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -263,7 +263,7 @@ * entries when there's no memory. */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); } return; @@ -321,18 +321,18 @@ void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e) { - struct rtentry *rt = NULL; - + struct llentry *lle; + mtx_lock(&e->lock); if (atomic_load_acq_int(&e->refcnt) == 0) { /* hasn't been recycled */ - rt = e->neigh; + lle = e->neigh; e->neigh = NULL; } mtx_unlock(&e->lock); atomic_add_int(&d->nfree, 1); - if (rt) - RTFREE(rt); + if (lle) + LLE_FREE(lle); } @@ -341,11 +341,8 @@ * Must be called with softirqs disabled. */ static inline void -reuse_entry(struct l2t_entry *e, struct rtentry *neigh) +reuse_entry(struct l2t_entry *e, struct llentry *neigh) { - struct llinfo_arp *la; - - la = (struct llinfo_arp *)neigh->rt_llinfo; mtx_lock(&e->lock); /* avoid race with t3_l2t_free */ if (neigh != e->neigh) @@ -362,13 +359,13 @@ } struct l2t_entry * -t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, struct ifnet *ifp, +t3_l2t_get(struct t3cdev *dev, struct llentry *neigh, struct ifnet *ifp, struct sockaddr *sa) { struct l2t_entry *e; struct l2t_data *d = L2DATA(dev); u32 addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; - int ifidx = neigh->rt_ifp->if_index; + int ifidx = ifp->if_index; int hash = arp_hash(addr, ifidx, d); unsigned int smt_idx = ((struct port_info *)ifp->if_softc)->port_id; @@ -448,20 +445,19 @@ } void -t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh, +t3_l2t_update(struct t3cdev *dev, struct llentry *neigh, uint8_t *enaddr, struct sockaddr *sa) { struct l2t_entry *e; struct mbuf *arpq = NULL; struct l2t_data *d = L2DATA(dev); u32 addr = *(u32 *) &((struct sockaddr_in *)sa)->sin_addr; - int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) - if (e->addr == addr && e->ifindex == ifidx) { + if (e->addr == addr) { mtx_lock(&e->lock); goto found; } ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h,v 1.2 2008/09/23 03:16:54 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h,v 1.3 2008/12/15 06:10:57 qingli Exp $ ***************************************************************************/ #ifndef _CHELSIO_L2T_H @@ -68,7 +68,7 @@ int ifindex; /* neighbor's net_device's ifindex */ uint16_t smt_idx; /* SMT index */ uint16_t vlan; /* VLAN TCI (id: bits 0-11, prio: 13-15 */ - struct rtentry *neigh; /* associated neighbour */ + struct llentry *neigh; /* associated neighbour */ struct l2t_entry *first; /* start of hash chain */ struct l2t_entry *next; /* next l2t_entry on chain */ struct mbuf *arpq_head; /* queue of packets awaiting resolution */ ==== //depot/projects/vimage/src/sys/dev/usb/ucom.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.70 2008/10/23 19:16:57 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.72 2008/12/14 23:24:00 phk Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -700,6 +700,26 @@ return (USBD_NORMAL_COMPLETION); } +void +ucomrxchars(struct ucom_softc *sc, u_char *cp, u_int32_t cc) +{ + struct tty *tp = sc->sc_tty; + + /* Give characters to tty layer. */ + while (cc > 0) { + DPRINTFN(7, ("ucomreadcb: char = 0x%02x\n", *cp)); + if (ttydisc_rint(tp, *cp, 0) == -1) { + /* XXX what should we do? */ + printf("%s: lost %d chars\n", + device_get_nameunit(sc->sc_dev), cc); + break; + } + cc--; + cp++; + } + ttydisc_rint_done(tp); +} + static void ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status) { @@ -709,6 +729,7 @@ u_int32_t cc; u_char *cp; + (void)tp; /* Used for debugging */ DPRINTF(("ucomreadcb: status = %d\n", status)); if (status != USBD_NORMAL_COMPLETION) { @@ -737,22 +758,8 @@ device_get_nameunit(sc->sc_dev), cc); goto resubmit; } - if (cc < 1) - goto resubmit; - - /* Give characters to tty layer. */ - while (cc > 0) { - DPRINTFN(7, ("ucomreadcb: char = 0x%02x\n", *cp)); - if (ttydisc_rint(tp, *cp, 0) == -1) { - /* XXX what should we do? */ - printf("%s: lost %d chars\n", - device_get_nameunit(sc->sc_dev), cc); - break; - } - cc--; - cp++; - } - ttydisc_rint_done(tp); + if (cc > 0) + ucomrxchars(sc, cp, cc); resubmit: err = ucomstartread(sc); ==== //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.13 2008/09/27 08:51:18 ed Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.14 2008/12/14 20:03:46 phk Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -166,3 +166,4 @@ int ucom_attach(struct ucom_softc *); int ucom_detach(struct ucom_softc *); void ucom_status_change(struct ucom_softc *); +void ucomrxchars(struct ucom_softc *sc, u_char *cp, u_int32_t cc); ==== //depot/projects/vimage/src/sys/dev/usb/uftdi.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.39 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.40 2008/12/14 20:05:03 phk Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -100,7 +100,7 @@ * These are the maximum number of bytes transferred per frame. * The output buffer size cannot be increased due to the size encoding. */ -#define UFTDIIBUFSIZE 64 +#define UFTDIIBUFSIZE 256 #define UFTDIOBUFSIZE 64 struct uftdi_softc { @@ -458,32 +458,33 @@ { struct uftdi_softc *sc = vsc; u_char msr, lsr; + unsigned l; - DPRINTFN(15,("uftdi_read: sc=%p, port=%d count=%d\n", sc, portno, - *count)); + DPRINTFN(15,("uftdi_read: sc=%p, port=%d count=%d\n", + sc, portno, *count)); + while (*count > 0) { + l = *count; + if (l > 64) + l = 64; - msr = FTDI_GET_MSR(*ptr); - lsr = FTDI_GET_LSR(*ptr); + msr = FTDI_GET_MSR(*ptr); + lsr = FTDI_GET_LSR(*ptr); -#ifdef USB_DEBUG - if (*count != 2) - DPRINTFN(10,("uftdi_read: sc=%p, port=%d count=%d data[0]=" - "0x%02x\n", sc, portno, *count, (*ptr)[2])); -#endif + if (sc->sc_msr != msr || + (sc->sc_lsr & FTDI_LSR_MASK) != (lsr & FTDI_LSR_MASK)) { + DPRINTF(("uftdi_read: status change msr=0x%02x(0x%02x) " + "lsr=0x%02x(0x%02x)\n", msr, sc->sc_msr, + lsr, sc->sc_lsr)); + sc->sc_msr = msr; + sc->sc_lsr = lsr; + ucom_status_change(&sc->sc_ucom); + } - if (sc->sc_msr != msr || - (sc->sc_lsr & FTDI_LSR_MASK) != (lsr & FTDI_LSR_MASK)) { - DPRINTF(("uftdi_read: status change msr=0x%02x(0x%02x) " - "lsr=0x%02x(0x%02x)\n", msr, sc->sc_msr, - lsr, sc->sc_lsr)); - sc->sc_msr = msr; - sc->sc_lsr = lsr; - ucom_status_change(&sc->sc_ucom); + if (l > 2) + ucomrxchars(&sc->sc_ucom, (*ptr) + 2, l - 2); + *ptr += l; + *count -= l; } - - /* Pick up status and adjust data part. */ - *ptr += 2; - *count -= 2; } static size_t ==== //depot/projects/vimage/src/sys/modules/Makefile#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.597 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.598 2008/12/14 22:26:57 sam Exp $ .include @@ -30,9 +30,6 @@ ${_asr} \ ata \ ath \ - ath_rate_amrr \ - ath_rate_onoe \ - ath_rate_sample \ aue \ ${_auxio} \ axe \ ==== //depot/projects/vimage/src/sys/modules/ath/Makefile#4 (text+ko) ==== @@ -26,47 +26,83 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ +# $FreeBSD: src/sys/modules/ath/Makefile,v 1.8 2008/12/14 22:26:57 sam Exp $ # -.PATH: ${.CURDIR}/../../dev/ath \ - ${.CURDIR}/../../dev/ath/ath_hal \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +ATH_RATE?= sample # tx rate control algorithm + +.PATH: ${.CURDIR}/../../dev/ath +.PATH: ${.CURDIR}/../../dev/ath/ath_hal + +KMOD= if_ath +SRCS= if_ath.c if_ath_pci.c +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h -AR5210_SRCS=ah_eeprom_v1.c \ +# +# AR5210 support; these are first generation 11a-only devices. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210 +SRCS+= ah_eeprom_v1.c \ ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ ar5210_recv.c ar5210_reset.c ar5210_xmit.c -AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ + +# +# AR5211 support; these are second generation 11b/g/a devices +# (but 11g was OFDM only and is not supported). +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211 +SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ ar5211_recv.c ar5211_reset.c ar5211_xmit.c -AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ + +# +# AR5212 support; this covers all other pci/cardbus legacy parts. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212 +SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ - ar5212_rfgain.c ar5212_xmit.c \ - ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c -AR5416_SRCS=ah_eeprom_v14.c \ + ar5212_rfgain.c ar5212_xmit.c +# RF backends +SRCS+= ar5111.c +SRCS+= ar5112.c +SRCS+= ar2413.c +SRCS+= ar2425.c +SRCS+= ar5413.c + +# +# AR5416, AR9160 support; these are 11n parts but only really +# supported (right now) operating in legacy mode. Note enabling +# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h +# so the 11n tx/rx descriptor format is handled. +# +# NB: 9160 depends on 5416 but 5416 does not require 9160 +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +SRCS+= ah_eeprom_v14.c \ ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ - ar5416_reset.c ar5416_xmit.c \ - ar2133.c -AR9160_SRCS=ar9160_attach.c + ar5416_reset.c ar5416_xmit.c +SRCS+= ar9160_attach.c +# RF backend for 5416 and 9160 +SRCS+= ar2133.c -KMOD= if_ath -SRCS= if_ath.c if_ath_pci.c -# NB: v3 eeprom support used by both AR5211 and AR5212; just include it -SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c -SRCS+= ${AR5210_SRCS} -SRCS+= ${AR5211_SRCS} -SRCS+= ${AR5212_SRCS} -SRCS+= ${AR5416_SRCS} -SRCS+= ${AR9160_SRCS} -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h +# NB: rate control is bound to the driver by symbol names so only pick one +.if ${ATH_RATE} == "sample" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample +SRCS+= sample.c opt_wlan.h +.elif ${ATH_RATE} == "onoe" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe +SRCS+= onoe.c +.elif ${ATH_RATE} == "amrr" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr +SRCS+= amrr.c +.endif CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal ==== //depot/projects/vimage/src/sys/modules/cxgb/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.16 2008/09/24 01:19:08 kmacy Exp $ +# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.17 2008/12/15 06:10:57 qingli Exp $ SUBDIR= cxgb SUBDIR+= ${_toecore} SUBDIR+= ${_tom} @@ -25,7 +25,7 @@ .if exists(${_toe_header}) _toecore = toecore -_tom = tom +#_tom = tom .endif .if ${MACHINE_ARCH} == "i386" && exists(${_toe_header}) ==== //depot/projects/vimage/src/sys/net/if.c#58 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.300 2008/12/11 15:42:59 bz Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.301 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_compat.h" @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -1445,6 +1446,9 @@ return (ifa); } +#include +#include + /* * Default action when installing a route with a Link Level gateway. * Lookup an appropriate real ifa to point to. ==== //depot/projects/vimage/src/sys/net/if_arcsubr.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.32 2008/11/05 11:43:01 bz Exp $ */ +/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.33 2008/12/15 06:10:57 qingli Exp $ */ /*- * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -64,6 +64,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include @@ -108,6 +109,7 @@ u_int8_t atype, adst; int loop_copy = 0; int isphds; + struct llentry *lle; if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))) @@ -127,7 +129,7 @@ else if (ifp->if_flags & IFF_NOARP) adst = ntohl(SIN(dst)->sin_addr.s_addr) & 0xFF; else { - error = arpresolve(ifp, rt0, m, dst, &adst); + error = arpresolve(ifp, rt0, m, dst, &adst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } @@ -165,7 +167,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst, &lle); if (error) return (error); atype = ARCTYPE_INET6; ==== //depot/projects/vimage/src/sys/net/if_atmsubr.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.48 2008/09/14 08:19:48 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.49 2008/12/15 06:10:57 qingli Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -153,22 +153,11 @@ case AF_INET: case AF_INET6: { - struct rtentry *rt = NULL; - /* - * check route - */ - if (rt0 != NULL) { - error = rt_check(&rt, &rt0, dst); - if (error) - goto bad; - RT_UNLOCK(rt); - } - if (dst->sa_family == AF_INET6) etype = ETHERTYPE_IPV6; else etype = ETHERTYPE_IP; - if (!atmresolve(rt, m, dst, &atmdst)) { + if (!atmresolve(rt0, m, dst, &atmdst)) { m = NULL; /* XXX: atmresolve already free'd it */ senderr(EHOSTUNREACH); ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#35 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.254 2008/12/10 23:12:39 zec Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.255 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_atalk.h" @@ -64,6 +64,7 @@ #include #include #include +#include #include #include @@ -87,6 +88,7 @@ #include #include #endif + int (*ef_inputp)(struct ifnet*, struct ether_header *eh, struct mbuf *m); int (*ef_outputp)(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, int *hlen); @@ -151,6 +153,7 @@ #endif #endif + /* * Ethernet output routine. * Encapsulate a packet of type family for the local net. @@ -164,6 +167,7 @@ short type; int error, hdrcmplt = 0; u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN]; + struct llentry *lle = NULL; struct ether_header *eh; struct pf_mtag *t; int loop_copy = 1; @@ -186,7 +190,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -221,7 +225,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return error; type = htons(ETHERTYPE_IPV6); @@ -289,6 +293,17 @@ senderr(EAFNOSUPPORT); } + if (lle != NULL && (lle->la_flags & LLE_IFADDR)) { + int csum_flags = 0; + if (m->m_pkthdr.csum_flags & CSUM_IP) + csum_flags |= (CSUM_IP_CHECKED|CSUM_IP_VALID); + if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) + csum_flags |= (CSUM_DATA_VALID|CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_flags |= csum_flags; + m->m_pkthdr.csum_data = 0xffff; + return (if_simloop(ifp, m, dst->sa_family, 0)); + } + /* * Add local net header. If no space in first mbuf, * allocate another. ==== //depot/projects/vimage/src/sys/net/if_fddisubr.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.109 2008/11/22 07:35:45 kmacy Exp $ + * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.110 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_atalk.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -120,6 +121,7 @@ int loop_copy = 0, error = 0, hdrcmplt = 0; u_char esrc[FDDI_ADDR_LEN], edst[FDDI_ADDR_LEN]; struct fddi_header *fh; + struct llentry *lle; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); @@ -137,7 +139,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: { - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -173,7 +175,7 @@ #endif /* INET */ #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return (error); /* Something bad happened */ type = htons(ETHERTYPE_IPV6); ==== //depot/projects/vimage/src/sys/net/if_fwsubr.c#9 (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/net/if_fwsubr.c,v 1.29 2008/11/22 07:35:45 kmacy Exp $ + * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.30 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_inet.h" @@ -51,6 +51,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 15 07:43:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAC071065675; Mon, 15 Dec 2008 07:43: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 36B421065672 for ; Mon, 15 Dec 2008 07:43:14 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 233AB8FC14 for ; Mon, 15 Dec 2008 07:43:14 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF7hDIQ008891 for ; Mon, 15 Dec 2008 07:43:13 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF7hDZg008887 for perforce@freebsd.org; Mon, 15 Dec 2008 07:43:13 GMT (envelope-from zec@icir.org) Date: Mon, 15 Dec 2008 07:43:13 GMT Message-Id: <200812150743.mBF7hDZg008887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 07:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=154692 Change 154692 by zec@zec_tca51 on 2008/12/15 07:42:16 IFC @ 154690 Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#14 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#21 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#14 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_amrr/Makefile#5 delete .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_onoe/Makefile#4 delete .. //depot/projects/vimage-commit2/src/sys/modules/ath_rate_sample/Makefile#4 delete .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/radix_mpath.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_regdomain.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_atm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#25 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vtoc.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1516 2008/11/12 09:52:06 yongari Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1517 2008/12/15 06:10:57 qingli Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1958,7 +1958,7 @@ device hatm #Fore/Marconi HE155/622 device patm #IDT77252 cards (ProATM and IDT) device utopia #ATM PHY driver -options NATM #native ATM +#options NATM #native ATM options LIBMBPOOL #needed by patm, iatm ==== //depot/projects/vimage-commit2/src/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1355 2008/12/10 23:12:39 zec Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1356 2008/12/15 06:10:57 qingli Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2172,6 +2172,7 @@ net/if_iso88025subr.c optional token net/if_lagg.c optional lagg net/if_loop.c optional loop +net/if_llatbl.c standard net/if_media.c standard net/if_mib.c standard net/if_ppp.c optional ppp ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#12 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.59 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.60 2008/12/15 06:10:57 qingli Exp $"); #endif #ifdef __FreeBSD__ @@ -3162,7 +3162,7 @@ #ifdef RTF_PRCLONING rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - in_rtalloc_ign(&ro, RTF_CLONING, 0); + in_rtalloc_ign(&ro, 0, 0); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone(&ro, NO_CLONING); @@ -3183,7 +3183,7 @@ rtalloc_ign((struct route *)&ro6, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - rtalloc_ign((struct route *)&ro6, RTF_CLONING); + rtalloc_ign((struct route *)&ro6, 0); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro6, NO_CLONING); @@ -5986,9 +5986,9 @@ #ifdef __FreeBSD__ /* XXX MRT not always INET */ /* stick with table 0 though */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, 0, 0); else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + rtalloc_ign((struct route *)&ro, 0); #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); #endif @@ -6068,9 +6068,9 @@ rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING)); # else /* !RTF_PRCLONING */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, 0, 0); else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + rtalloc_ign((struct route *)&ro, 0); # endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_addr.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_addr.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_addr.c,v 1.2 2008/12/15 06:10:57 qingli Exp $"); #include #include @@ -163,6 +163,7 @@ struct route iproute; struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst; char dmac[ETHER_ADDR_LEN]; + struct llentry *lle; bzero(&iproute, sizeof iproute); *dst = *dst_in; @@ -172,7 +173,7 @@ return; arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, - rt_key(iproute.ro_rt), dmac); + rt_key(iproute.ro_rt), dmac, &lle); RTFREE(iproute.ro_rt); } @@ -186,6 +187,7 @@ struct route iproute; struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst; char dmac[ETHER_ADDR_LEN]; + struct llentry *lle; bzero(&iproute, sizeof iproute); *dst = *dst_in; @@ -202,7 +204,7 @@ goto put; } ret = arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, - rt_key(iproute.ro_rt), dmac); + rt_key(iproute.ro_rt), dmac, &lle); if (ret) { goto put; } ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.2 2008/12/13 03:45:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c,v 1.3 2008/12/15 00:29:26 sam Exp $ */ #include "opt_ah.h" @@ -122,7 +122,7 @@ /* setup common ini data; rf backends handle remainder */ HAL_INI_INIT(&ahp->ah_ini_modes, ar5212Modes, 6); - HAL_INI_INIT(&ahp->ah_ini_common, ar5212Common, 6); + HAL_INI_INIT(&ahp->ah_ini_common, ar5212Common, 2); if (!ar5312ChipReset(ah, AH_NULL)) { /* reset chip */ HALDEBUG(ah, HAL_DEBUG_ANY, "%s: chip reset failed\n", __func__); ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c,v 1.4 2008/09/24 01:19:08 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c,v 1.5 2008/12/15 06:10:57 qingli Exp $"); #include #include @@ -93,15 +93,15 @@ } static inline void -neigh_replace(struct l2t_entry *e, struct rtentry *rt) +neigh_replace(struct l2t_entry *e, struct llentry *neigh) { - RT_LOCK(rt); - RT_ADDREF(rt); - RT_UNLOCK(rt); + LLE_WLOCK(neigh); + LLE_ADDREF(neigh); + LLE_WUNLOCK(neigh); if (e->neigh) - RTFREE(e->neigh); - e->neigh = rt; + LLE_FREE(e->neigh); + e->neigh = neigh; } /* @@ -164,7 +164,7 @@ int t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { - struct rtentry *rt = e->neigh; + struct llentry *lle = e->neigh; struct sockaddr_in sin; bzero(&sin, sizeof(struct sockaddr_in)); @@ -177,7 +177,7 @@ switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -201,7 +201,7 @@ * entries when there's no memory. */ if (arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac) == 0) { + (struct sockaddr *)&sin, e->dmac, &lle) == 0) { CTR6(KTR_CXGB, "mac=%x:%x:%x:%x:%x:%x\n", e->dmac[0], e->dmac[1], e->dmac[2], e->dmac[3], e->dmac[4], e->dmac[5]); @@ -222,12 +222,12 @@ void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e) { - struct rtentry *rt; struct mbuf *m0; struct sockaddr_in sin; sin.sin_family = AF_INET; sin.sin_len = sizeof(struct sockaddr_in); sin.sin_addr.s_addr = e->addr; + struct llentry *lle; if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return; @@ -237,7 +237,7 @@ switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -263,7 +263,7 @@ * entries when there's no memory. */ arpresolve(rt->rt_ifp, rt, NULL, - (struct sockaddr *)&sin, e->dmac); + (struct sockaddr *)&sin, e->dmac, &lle); } return; @@ -321,18 +321,18 @@ void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e) { - struct rtentry *rt = NULL; - + struct llentry *lle; + mtx_lock(&e->lock); if (atomic_load_acq_int(&e->refcnt) == 0) { /* hasn't been recycled */ - rt = e->neigh; + lle = e->neigh; e->neigh = NULL; } mtx_unlock(&e->lock); atomic_add_int(&d->nfree, 1); - if (rt) - RTFREE(rt); + if (lle) + LLE_FREE(lle); } @@ -341,11 +341,8 @@ * Must be called with softirqs disabled. */ static inline void -reuse_entry(struct l2t_entry *e, struct rtentry *neigh) +reuse_entry(struct l2t_entry *e, struct llentry *neigh) { - struct llinfo_arp *la; - - la = (struct llinfo_arp *)neigh->rt_llinfo; mtx_lock(&e->lock); /* avoid race with t3_l2t_free */ if (neigh != e->neigh) @@ -362,13 +359,13 @@ } struct l2t_entry * -t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, struct ifnet *ifp, +t3_l2t_get(struct t3cdev *dev, struct llentry *neigh, struct ifnet *ifp, struct sockaddr *sa) { struct l2t_entry *e; struct l2t_data *d = L2DATA(dev); u32 addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; - int ifidx = neigh->rt_ifp->if_index; + int ifidx = ifp->if_index; int hash = arp_hash(addr, ifidx, d); unsigned int smt_idx = ((struct port_info *)ifp->if_softc)->port_id; @@ -448,20 +445,19 @@ } void -t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh, +t3_l2t_update(struct t3cdev *dev, struct llentry *neigh, uint8_t *enaddr, struct sockaddr *sa) { struct l2t_entry *e; struct mbuf *arpq = NULL; struct l2t_data *d = L2DATA(dev); u32 addr = *(u32 *) &((struct sockaddr_in *)sa)->sin_addr; - int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) - if (e->addr == addr && e->ifindex == ifidx) { + if (e->addr == addr) { mtx_lock(&e->lock); goto found; } ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h,v 1.2 2008/09/23 03:16:54 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h,v 1.3 2008/12/15 06:10:57 qingli Exp $ ***************************************************************************/ #ifndef _CHELSIO_L2T_H @@ -68,7 +68,7 @@ int ifindex; /* neighbor's net_device's ifindex */ uint16_t smt_idx; /* SMT index */ uint16_t vlan; /* VLAN TCI (id: bits 0-11, prio: 13-15 */ - struct rtentry *neigh; /* associated neighbour */ + struct llentry *neigh; /* associated neighbour */ struct l2t_entry *first; /* start of hash chain */ struct l2t_entry *next; /* next l2t_entry on chain */ struct mbuf *arpq_head; /* queue of packets awaiting resolution */ ==== //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.70 2008/10/23 19:16:57 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.72 2008/12/14 23:24:00 phk Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -700,6 +700,26 @@ return (USBD_NORMAL_COMPLETION); } +void +ucomrxchars(struct ucom_softc *sc, u_char *cp, u_int32_t cc) +{ + struct tty *tp = sc->sc_tty; + + /* Give characters to tty layer. */ + while (cc > 0) { + DPRINTFN(7, ("ucomreadcb: char = 0x%02x\n", *cp)); + if (ttydisc_rint(tp, *cp, 0) == -1) { + /* XXX what should we do? */ + printf("%s: lost %d chars\n", + device_get_nameunit(sc->sc_dev), cc); + break; + } + cc--; + cp++; + } + ttydisc_rint_done(tp); +} + static void ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status) { @@ -709,6 +729,7 @@ u_int32_t cc; u_char *cp; + (void)tp; /* Used for debugging */ DPRINTF(("ucomreadcb: status = %d\n", status)); if (status != USBD_NORMAL_COMPLETION) { @@ -737,22 +758,8 @@ device_get_nameunit(sc->sc_dev), cc); goto resubmit; } - if (cc < 1) - goto resubmit; - - /* Give characters to tty layer. */ - while (cc > 0) { - DPRINTFN(7, ("ucomreadcb: char = 0x%02x\n", *cp)); - if (ttydisc_rint(tp, *cp, 0) == -1) { - /* XXX what should we do? */ - printf("%s: lost %d chars\n", - device_get_nameunit(sc->sc_dev), cc); - break; - } - cc--; - cp++; - } - ttydisc_rint_done(tp); + if (cc > 0) + ucomrxchars(sc, cp, cc); resubmit: err = ucomstartread(sc); ==== //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.13 2008/09/27 08:51:18 ed Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.14 2008/12/14 20:03:46 phk Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -166,3 +166,4 @@ int ucom_attach(struct ucom_softc *); int ucom_detach(struct ucom_softc *); void ucom_status_change(struct ucom_softc *); +void ucomrxchars(struct ucom_softc *sc, u_char *cp, u_int32_t cc); ==== //depot/projects/vimage-commit2/src/sys/dev/usb/uftdi.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.39 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.40 2008/12/14 20:05:03 phk Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -100,7 +100,7 @@ * These are the maximum number of bytes transferred per frame. * The output buffer size cannot be increased due to the size encoding. */ -#define UFTDIIBUFSIZE 64 +#define UFTDIIBUFSIZE 256 #define UFTDIOBUFSIZE 64 struct uftdi_softc { @@ -458,32 +458,33 @@ { struct uftdi_softc *sc = vsc; u_char msr, lsr; + unsigned l; - DPRINTFN(15,("uftdi_read: sc=%p, port=%d count=%d\n", sc, portno, - *count)); + DPRINTFN(15,("uftdi_read: sc=%p, port=%d count=%d\n", + sc, portno, *count)); + while (*count > 0) { + l = *count; + if (l > 64) + l = 64; - msr = FTDI_GET_MSR(*ptr); - lsr = FTDI_GET_LSR(*ptr); + msr = FTDI_GET_MSR(*ptr); + lsr = FTDI_GET_LSR(*ptr); -#ifdef USB_DEBUG - if (*count != 2) - DPRINTFN(10,("uftdi_read: sc=%p, port=%d count=%d data[0]=" - "0x%02x\n", sc, portno, *count, (*ptr)[2])); -#endif + if (sc->sc_msr != msr || + (sc->sc_lsr & FTDI_LSR_MASK) != (lsr & FTDI_LSR_MASK)) { + DPRINTF(("uftdi_read: status change msr=0x%02x(0x%02x) " + "lsr=0x%02x(0x%02x)\n", msr, sc->sc_msr, + lsr, sc->sc_lsr)); + sc->sc_msr = msr; + sc->sc_lsr = lsr; + ucom_status_change(&sc->sc_ucom); + } - if (sc->sc_msr != msr || - (sc->sc_lsr & FTDI_LSR_MASK) != (lsr & FTDI_LSR_MASK)) { - DPRINTF(("uftdi_read: status change msr=0x%02x(0x%02x) " - "lsr=0x%02x(0x%02x)\n", msr, sc->sc_msr, - lsr, sc->sc_lsr)); - sc->sc_msr = msr; - sc->sc_lsr = lsr; - ucom_status_change(&sc->sc_ucom); + if (l > 2) + ucomrxchars(&sc->sc_ucom, (*ptr) + 2, l - 2); + *ptr += l; + *count -= l; } - - /* Pick up status and adjust data part. */ - *ptr += 2; - *count -= 2; } static size_t ==== //depot/projects/vimage-commit2/src/sys/modules/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.597 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.598 2008/12/14 22:26:57 sam Exp $ .include @@ -30,9 +30,6 @@ ${_asr} \ ata \ ath \ - ath_rate_amrr \ - ath_rate_onoe \ - ath_rate_sample \ aue \ ${_auxio} \ axe \ ==== //depot/projects/vimage-commit2/src/sys/modules/ath/Makefile#3 (text+ko) ==== @@ -26,47 +26,83 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ +# $FreeBSD: src/sys/modules/ath/Makefile,v 1.8 2008/12/14 22:26:57 sam Exp $ # -.PATH: ${.CURDIR}/../../dev/ath \ - ${.CURDIR}/../../dev/ath/ath_hal \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +ATH_RATE?= sample # tx rate control algorithm + +.PATH: ${.CURDIR}/../../dev/ath +.PATH: ${.CURDIR}/../../dev/ath/ath_hal + +KMOD= if_ath +SRCS= if_ath.c if_ath_pci.c +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h -AR5210_SRCS=ah_eeprom_v1.c \ +# +# AR5210 support; these are first generation 11a-only devices. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210 +SRCS+= ah_eeprom_v1.c \ ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ ar5210_recv.c ar5210_reset.c ar5210_xmit.c -AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ + +# +# AR5211 support; these are second generation 11b/g/a devices +# (but 11g was OFDM only and is not supported). +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211 +SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ ar5211_recv.c ar5211_reset.c ar5211_xmit.c -AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ + +# +# AR5212 support; this covers all other pci/cardbus legacy parts. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212 +SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ - ar5212_rfgain.c ar5212_xmit.c \ - ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c -AR5416_SRCS=ah_eeprom_v14.c \ + ar5212_rfgain.c ar5212_xmit.c +# RF backends +SRCS+= ar5111.c +SRCS+= ar5112.c +SRCS+= ar2413.c +SRCS+= ar2425.c +SRCS+= ar5413.c + +# +# AR5416, AR9160 support; these are 11n parts but only really +# supported (right now) operating in legacy mode. Note enabling +# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h +# so the 11n tx/rx descriptor format is handled. +# +# NB: 9160 depends on 5416 but 5416 does not require 9160 +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +SRCS+= ah_eeprom_v14.c \ ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ - ar5416_reset.c ar5416_xmit.c \ - ar2133.c -AR9160_SRCS=ar9160_attach.c + ar5416_reset.c ar5416_xmit.c +SRCS+= ar9160_attach.c +# RF backend for 5416 and 9160 +SRCS+= ar2133.c -KMOD= if_ath -SRCS= if_ath.c if_ath_pci.c -# NB: v3 eeprom support used by both AR5211 and AR5212; just include it -SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c -SRCS+= ${AR5210_SRCS} -SRCS+= ${AR5211_SRCS} -SRCS+= ${AR5212_SRCS} -SRCS+= ${AR5416_SRCS} -SRCS+= ${AR9160_SRCS} -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h +# NB: rate control is bound to the driver by symbol names so only pick one +.if ${ATH_RATE} == "sample" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample +SRCS+= sample.c opt_wlan.h +.elif ${ATH_RATE} == "onoe" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe +SRCS+= onoe.c +.elif ${ATH_RATE} == "amrr" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr +SRCS+= amrr.c +.endif CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal ==== //depot/projects/vimage-commit2/src/sys/modules/cxgb/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.16 2008/09/24 01:19:08 kmacy Exp $ +# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.17 2008/12/15 06:10:57 qingli Exp $ SUBDIR= cxgb SUBDIR+= ${_toecore} SUBDIR+= ${_tom} @@ -25,7 +25,7 @@ .if exists(${_toe_header}) _toecore = toecore -_tom = tom +#_tom = tom .endif .if ${MACHINE_ARCH} == "i386" && exists(${_toe_header}) ==== //depot/projects/vimage-commit2/src/sys/net/if.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.300 2008/12/11 15:42:59 bz Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.301 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_compat.h" @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -1366,6 +1367,9 @@ return (ifa); } +#include +#include + /* * Default action when installing a route with a Link Level gateway. * Lookup an appropriate real ifa to point to. ==== //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.32 2008/11/05 11:43:01 bz Exp $ */ +/* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.33 2008/12/15 06:10:57 qingli Exp $ */ /*- * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -64,6 +64,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include @@ -108,6 +109,7 @@ u_int8_t atype, adst; int loop_copy = 0; int isphds; + struct llentry *lle; if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))) @@ -127,7 +129,7 @@ else if (ifp->if_flags & IFF_NOARP) adst = ntohl(SIN(dst)->sin_addr.s_addr) & 0xFF; else { - error = arpresolve(ifp, rt0, m, dst, &adst); + error = arpresolve(ifp, rt0, m, dst, &adst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } @@ -165,7 +167,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst, &lle); if (error) return (error); atype = ARCTYPE_INET6; ==== //depot/projects/vimage-commit2/src/sys/net/if_atmsubr.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.48 2008/09/14 08:19:48 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.49 2008/12/15 06:10:57 qingli Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -153,22 +153,11 @@ case AF_INET: case AF_INET6: { - struct rtentry *rt = NULL; - /* - * check route - */ - if (rt0 != NULL) { - error = rt_check(&rt, &rt0, dst); - if (error) - goto bad; - RT_UNLOCK(rt); - } - if (dst->sa_family == AF_INET6) etype = ETHERTYPE_IPV6; else etype = ETHERTYPE_IP; - if (!atmresolve(rt, m, dst, &atmdst)) { + if (!atmresolve(rt0, m, dst, &atmdst)) { m = NULL; /* XXX: atmresolve already free'd it */ senderr(EHOSTUNREACH); ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.254 2008/12/10 23:12:39 zec Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.255 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_atalk.h" @@ -64,6 +64,7 @@ #include #include #include +#include #include #include @@ -87,6 +88,7 @@ #include #include #endif + int (*ef_inputp)(struct ifnet*, struct ether_header *eh, struct mbuf *m); int (*ef_outputp)(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, int *hlen); @@ -151,6 +153,7 @@ #endif #endif + /* * Ethernet output routine. * Encapsulate a packet of type family for the local net. @@ -164,6 +167,7 @@ short type; int error, hdrcmplt = 0; u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN]; + struct llentry *lle = NULL; struct ether_header *eh; struct pf_mtag *t; int loop_copy = 1; @@ -186,7 +190,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -221,7 +225,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return error; type = htons(ETHERTYPE_IPV6); @@ -289,6 +293,17 @@ senderr(EAFNOSUPPORT); } + if (lle != NULL && (lle->la_flags & LLE_IFADDR)) { + int csum_flags = 0; + if (m->m_pkthdr.csum_flags & CSUM_IP) + csum_flags |= (CSUM_IP_CHECKED|CSUM_IP_VALID); + if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) + csum_flags |= (CSUM_DATA_VALID|CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_flags |= csum_flags; + m->m_pkthdr.csum_data = 0xffff; + return (if_simloop(ifp, m, dst->sa_family, 0)); + } + /* * Add local net header. If no space in first mbuf, * allocate another. ==== //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp - * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.109 2008/11/22 07:35:45 kmacy Exp $ + * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.110 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_atalk.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -120,6 +121,7 @@ int loop_copy = 0, error = 0, hdrcmplt = 0; u_char esrc[FDDI_ADDR_LEN], edst[FDDI_ADDR_LEN]; struct fddi_header *fh; + struct llentry *lle; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); @@ -137,7 +139,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: { - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -173,7 +175,7 @@ #endif /* INET */ #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return (error); /* Something bad happened */ type = htons(ETHERTYPE_IPV6); ==== //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#5 (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/net/if_fwsubr.c,v 1.29 2008/11/22 07:35:45 kmacy Exp $ + * $FreeBSD: src/sys/net/if_fwsubr.c,v 1.30 2008/12/15 06:10:57 qingli Exp $ */ #include "opt_inet.h" @@ -51,6 +51,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include @@ -80,7 +81,6 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 15 09:03:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325E0106567A; Mon, 15 Dec 2008 09:03: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 E903E1065672 for ; Mon, 15 Dec 2008 09:03:35 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C15F58FC1C for ; Mon, 15 Dec 2008 09:03:35 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF93ZPV026616 for ; Mon, 15 Dec 2008 09:03:35 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF93Zkh026614 for perforce@freebsd.org; Mon, 15 Dec 2008 09:03:35 GMT (envelope-from zec@icir.org) Date: Mon, 15 Dec 2008 09:03:35 GMT Message-Id: <200812150903.mBF93Zkh026614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 09:03:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=154694 Change 154694 by zec@zec_tca51 on 2008/12/15 09:03:03 Fix misintegration. Affected files ... .. //depot/projects/vimage/src/sys/netinet/if_ether.c#33 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#33 (text+ko) ==== @@ -110,8 +110,8 @@ static void arp_init(void); void arprequest(struct ifnet *, + struct in_addr *, struct in_addr *, u_char *); static int arp_iattach(const void *); - struct in_addr *, struct in_addr *, u_char *); static void arpintr(struct mbuf *); static void arptimer(void *); #ifdef INET From owner-p4-projects@FreeBSD.ORG Mon Dec 15 09:09:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A85611065675; Mon, 15 Dec 2008 09:09: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 6BF081065672 for ; Mon, 15 Dec 2008 09:09:42 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D7B98FC19 for ; Mon, 15 Dec 2008 09:09:42 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBF99gVc027115 for ; Mon, 15 Dec 2008 09:09:42 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBF99g3X027113 for perforce@freebsd.org; Mon, 15 Dec 2008 09:09:42 GMT (envelope-from zec@icir.org) Date: Mon, 15 Dec 2008 09:09:42 GMT Message-Id: <200812150909.mBF99g3X027113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 09:09:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=154696 Change 154696 by zec@zec_tca51 on 2008/12/15 09:09:01 Unbreak VIMAGE build. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/nd6.c#42 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#28 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#42 (text+ko) ==== @@ -873,7 +873,6 @@ struct llentry * nd6_lookup(struct in6_addr *addr6, int flags, struct ifnet *ifp) { - INIT_VNET_INET6(curvnet); struct sockaddr_in6 sin6; struct llentry *ln; int llflags = 0; ==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#28 (text+ko) ==== @@ -1536,6 +1536,7 @@ int nd6_prefix_onlink(struct nd_prefix *pr) { + INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); struct ifaddr *ifa; struct ifnet *ifp = pr->ndpr_ifp; From owner-p4-projects@FreeBSD.ORG Mon Dec 15 12:43:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 744B61065672; Mon, 15 Dec 2008 12:43: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 35BCA1065670 for ; Mon, 15 Dec 2008 12:43:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C9CC8FC12 for ; Mon, 15 Dec 2008 12:43:23 +0000 (UTC) (envelope-from bz@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 mBFChMC6051902 for ; Mon, 15 Dec 2008 12:43:22 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFChMnm051900 for perforce@freebsd.org; Mon, 15 Dec 2008 12:43:22 GMT (envelope-from bz@freebsd.org) Date: Mon, 15 Dec 2008 12:43:22 GMT Message-Id: <200812151243.mBFChMnm051900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 12:43:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=154699 Change 154699 by bz@bz_dumpster on 2008/12/15 12:42:58 Branch kdump as well. Affected files ... .. //depot/projects/vimage/src/usr.bin/kdump/Makefile#1 branch .. //depot/projects/vimage/src/usr.bin/kdump/kdump.1#1 branch .. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#1 branch .. //depot/projects/vimage/src/usr.bin/kdump/kdump_subr.h#1 branch .. //depot/projects/vimage/src/usr.bin/kdump/mkioctls#1 branch .. //depot/projects/vimage/src/usr.bin/kdump/mksubr#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 15 12:44:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CEA1065678; Mon, 15 Dec 2008 12:44: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 5DBA61065670 for ; Mon, 15 Dec 2008 12:44:24 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34F928FC14 for ; Mon, 15 Dec 2008 12:44:24 +0000 (UTC) (envelope-from bz@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 mBFCiO2s051998 for ; Mon, 15 Dec 2008 12:44:24 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFCiOfU051996 for perforce@freebsd.org; Mon, 15 Dec 2008 12:44:24 GMT (envelope-from bz@freebsd.org) Date: Mon, 15 Dec 2008 12:44:24 GMT Message-Id: <200812151244.mBFCiOfU051996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 12:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=154700 Change 154700 by bz@bz_dumpster on 2008/12/15 12:44:18 Add sys/vimage.h to make kdump compile. Affected files ... .. //depot/projects/vimage/src/usr.bin/kdump/mkioctls#2 edit Differences ... ==== //depot/projects/vimage/src/usr.bin/kdump/mkioctls#2 (text+ko) ==== @@ -40,6 +40,7 @@ print "#include " print "#include " print "#include " + print "#include " print "#include " print "#include " print "#include " From owner-p4-projects@FreeBSD.ORG Mon Dec 15 15:32:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F2021065676; Mon, 15 Dec 2008 15:32:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C78451065670 for ; Mon, 15 Dec 2008 15:32:15 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 995308FC14 for ; Mon, 15 Dec 2008 15:32:15 +0000 (UTC) (envelope-from bz@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 mBFFWFUu078869 for ; Mon, 15 Dec 2008 15:32:15 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFFWFQo078867 for perforce@freebsd.org; Mon, 15 Dec 2008 15:32:15 GMT (envelope-from bz@freebsd.org) Date: Mon, 15 Dec 2008 15:32:15 GMT Message-Id: <200812151532.mBFFWFQo078867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 15:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=154705 Change 154705 by bz@bz_dumpster on 2008/12/15 15:31:50 Use proper #ifdef to avoid cicrular module registration resulting in: panic: attempt to register an already registered vnet module Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#59 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#59 (text+ko) ==== @@ -402,7 +402,7 @@ { INIT_VNET_NET(curvnet); -#ifndef VIMAGE_GLOBALS +#ifndef VIMAGE vnet_mod_register(&vnet_net_modinfo); #endif From owner-p4-projects@FreeBSD.ORG Mon Dec 15 15:52:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E4CA1065672; Mon, 15 Dec 2008 15:52:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6B831065676 for ; Mon, 15 Dec 2008 15:52:12 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 80BB48FC17 for ; Mon, 15 Dec 2008 15:52:12 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id D2E9A1CC77; Mon, 15 Dec 2008 16:52:10 +0100 (CET) Date: Mon, 15 Dec 2008 16:52:10 +0100 From: Ed Schouten To: "M. Warner Losh" Message-ID: <20081215155210.GR1176@hoeg.nl> References: <200812032046.mB3KkUBx016516@repoman.freebsd.org> <20081214.121720.-861029116.imp@bsdimp.com> <20081214192057.GP1176@hoeg.nl> <20081214.143851.-494097696.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gV1yUYniiDLxW66s" Content-Disposition: inline In-Reply-To: <20081214.143851.-494097696.imp@bsdimp.com> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 15:52:13 -0000 --gV1yUYniiDLxW66s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * M. Warner Losh wrote: > No Problem. glad I could help. I've been trying to shrink > kern.post.mk for years, so I have a visceral reaction when I see > people adding to it... I see we're generating vnode_if* in sys/conf/kern.post.mk right now. Maybe we could move it to sys/conf/files as well? --=20 Ed Schouten WWW: http://80386.nl/ --gV1yUYniiDLxW66s Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAklGfSoACgkQ52SDGA2eCwUU2ACeOm3OYCaIBMs4D0o9yj+erA8z 330Amwd/xJR8GTYnCPsHuZvM9IofDXsr =GLgI -----END PGP SIGNATURE----- --gV1yUYniiDLxW66s-- From owner-p4-projects@FreeBSD.ORG Mon Dec 15 16:22:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5A271065675; Mon, 15 Dec 2008 16:22: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 89E131065672 for ; Mon, 15 Dec 2008 16:22:06 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7581B8FC1C for ; Mon, 15 Dec 2008 16:22:06 +0000 (UTC) (envelope-from bz@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 mBFGM68n083761 for ; Mon, 15 Dec 2008 16:22:06 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFGM6Rn083759 for perforce@freebsd.org; Mon, 15 Dec 2008 16:22:06 GMT (envelope-from bz@freebsd.org) Date: Mon, 15 Dec 2008 16:22:06 GMT Message-Id: <200812151622.mBFGM6Rn083759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 16:22:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=154707 Change 154707 by bz@bz_dumpster on 2008/12/15 16:21:20 Add support for compiling with NFS_LEGACYRPC (untested). Does not help to avoid the panic in the !NFS_LEGACYRPC case. Affected files ... .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#24 edit Differences ... ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#24 (text+ko) ==== @@ -1412,7 +1412,11 @@ if (v3) { tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED); if (fmode & O_EXCL) { +#ifdef NFS_LEGACYRPC + CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_so->so_vnet); +#else CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_rpcclnt.rc_so->so_vnet); +#endif *tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE); tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF); #ifdef INET From owner-p4-projects@FreeBSD.ORG Mon Dec 15 16:40:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8513C106567D; Mon, 15 Dec 2008 16:40: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 44DAF1065677 for ; Mon, 15 Dec 2008 16:40:26 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E2688FC1C for ; Mon, 15 Dec 2008 16:40:26 +0000 (UTC) (envelope-from ed@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 mBFGePAu085164 for ; Mon, 15 Dec 2008 16:40:25 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFGePoT085162 for perforce@freebsd.org; Mon, 15 Dec 2008 16:40:25 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 15 Dec 2008 16:40:25 GMT Message-Id: <200812151640.mBFGePoT085162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 16:40:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=154709 Change 154709 by ed@ed_flippo on 2008/12/15 16:40:10 IFC, so I can do some more hacking. Affected files ... .. //depot/projects/mpsafetty/UPDATING#16 integrate .. //depot/projects/mpsafetty/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/mpsafetty/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/mpsafetty/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/mpsafetty/etc/regdomain.xml#2 integrate .. //depot/projects/mpsafetty/include/arpa/nameser.h#2 integrate .. //depot/projects/mpsafetty/include/resolv.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/include/isc/eventlib.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/mpsafetty/lib/libc/inet/inet_net_pton.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/mpsafetty/lib/libfetch/fetch.3#2 integrate .. //depot/projects/mpsafetty/lib/libfetch/fetch.h#2 integrate .. //depot/projects/mpsafetty/lib/libfetch/http.c#3 integrate .. //depot/projects/mpsafetty/lib/libstand/if_ether.h#2 integrate .. //depot/projects/mpsafetty/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/mpsafetty/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/regdomain.c#4 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/mpsafetty/sbin/route/route.c#2 integrate .. //depot/projects/mpsafetty/sbin/routed/table.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#16 integrate .. //depot/projects/mpsafetty/share/man/man4/fxp.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/route.4#2 integrate .. //depot/projects/mpsafetty/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/rtentry.9#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#19 integrate .. //depot/projects/mpsafetty/sys/conf/files#35 integrate .. //depot/projects/mpsafetty/sys/conf/files.sparc64#10 integrate .. //depot/projects/mpsafetty/sys/conf/files.sun4v#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/mpsafetty/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#11 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucomvar.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#19 integrate .. //depot/projects/mpsafetty/sys/modules/ath/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/ath_rate_amrr/Makefile#4 delete .. //depot/projects/mpsafetty/sys/modules/ath_rate_onoe/Makefile#4 delete .. //depot/projects/mpsafetty/sys/modules/ath_rate_sample/Makefile#4 delete .. //depot/projects/mpsafetty/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#13 integrate .. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_llatbl.c#1 branch .. //depot/projects/mpsafetty/sys/net/if_llatbl.h#1 branch .. //depot/projects/mpsafetty/sys/net/if_var.h#7 integrate .. //depot/projects/mpsafetty/sys/net/radix_mpath.c#4 integrate .. //depot/projects/mpsafetty/sys/net/route.c#12 integrate .. //depot/projects/mpsafetty/sys/net/route.h#6 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#10 integrate .. //depot/projects/mpsafetty/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#8 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#8 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_regdomain.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/if_atm.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/mpsafetty/sys/netinet/in_proto.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/in_var.h#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_output.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/vinet6.h#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/param.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/gracklevar.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorthvar.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/ofw_bus.h#2 delete .. //depot/projects/mpsafetty/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/ofw_bus.c#2 delete .. //depot/projects/mpsafetty/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/include/ofw_bus.h#2 delete .. //depot/projects/mpsafetty/sys/sys/param.h#23 integrate .. //depot/projects/mpsafetty/sys/sys/vtoc.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/route.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/tar/util.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ppp/route.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#16 (text+ko) ==== @@ -22,6 +22,15 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081214: + __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. + RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. + The new code reduced struct rtentry{} by 16 bytes on 32-bit + architecture and 40 bytes on 64-bit architecture. The userland + applications "arp" and "ndp" have been updated accordingly. + The output from "netstat -r" shows only routing entries and + none of the L2 information. + 20081130: __FreeBSD_version 800057 marks the switchover from the binary ath hal to source code. Users must add the line: @@ -1178,4 +1187,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $ ==== //depot/projects/mpsafetty/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -48,8 +48,7 @@ /* if-index allocator */ static uint32_t next_if_index = 1; -/* re-fetch arp table */ -static int update_arp; +/* currently fetching the arp table */ static int in_update_arp; /* OR registrations */ @@ -911,36 +910,6 @@ } /* - * Process a new ARP entry - */ -static void -process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl, - const struct sockaddr_in *sa) -{ - struct mibif *ifp; - struct mibarp *at; - - /* IP arp table entry */ - if (sdl->sdl_alen == 0) { - update_arp = 1; - return; - } - if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL) - return; - /* have a valid entry */ - if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL && - (at = mib_arp_create(ifp, sa->sin_addr, - sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL) - return; - - if (rtm->rtm_rmx.rmx_expire == 0) - at->flags |= MIBARP_PERM; - else - at->flags &= ~MIBARP_PERM; - at->flags |= MIBARP_FOUND; -} - -/* * Handle a routing socket message. */ static void @@ -1080,46 +1049,12 @@ } break; #endif - case RTM_GET: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_ADD: + case RTM_DELETE: mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_DELETE: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO)) + if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) mib_sroute_process(rtm, addrs[RTAX_GATEWAY], addrs[RTAX_DST], addrs[RTAX_NETMASK]); break; @@ -1289,7 +1224,8 @@ /* * Update arp table - */ + * +*/ void mib_arp_update(void) { @@ -1305,11 +1241,11 @@ TAILQ_FOREACH(at, &mibarp_list, link) at->flags &= ~MIBARP_FOUND; - if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) { + if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) { in_update_arp = 0; return; } - + next = buf; while (next < buf + needed) { rtm = (struct rt_msghdr *)(void *)next; @@ -1326,7 +1262,6 @@ at = at1; } mibarpticks = get_ticks(); - update_arp = 0; in_update_arp = 0; } @@ -1634,8 +1569,8 @@ mib_arp_update(); mib_iflist_bad = 0; } - if (update_arp) - mib_arp_update(); + + mib_arp_update(); } ==== //depot/projects/mpsafetty/contrib/bsnmp/snmp_mibII/mibII_route.c#2 (text+ko) ==== @@ -186,8 +186,7 @@ memcpy(r->index, key.index, sizeof(r->index)); r->ifindex = (ifp == NULL) ? 0 : ifp->index; - r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 : - (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; + r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; /* cannot really know, what protocol it runs */ r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 : ==== //depot/projects/mpsafetty/contrib/ipfilter/ipsend/44arp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.3 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.4 2008/12/15 06:10:57 qingli Exp $ */ /* * Based upon 4.4BSD's /usr/sbin/arp @@ -88,7 +88,12 @@ mib[2] = 0; mib[3] = AF_INET; mib[4] = NET_RT_FLAGS; +#ifdef RTF_LLINFO mib[5] = RTF_LLINFO; +#else + mib[5] = 0; +#endif + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) { perror("route-sysctl-estimate"); ==== //depot/projects/mpsafetty/etc/regdomain.xml#2 (text+ko) ==== @@ -22,7 +22,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/etc/regdomain.xml,v 1.1 2008/04/20 20:37:02 sam Exp $ + $FreeBSD: src/etc/regdomain.xml,v 1.2 2008/12/15 01:18:11 sam Exp $ --> @@ -39,7 +39,7 @@ --> DEBUG - 0 + 0x1ff @@ -1080,6 +1080,75 @@ + + + SR9 + 0x0298 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + XR9 + 0x299 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + GZ901 + 0x29a + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + @@ -1201,6 +1270,9 @@ 320 Guatemala + + 5002 ZComax GZ-901 + 340 Honduras @@ -1396,6 +1468,12 @@ 792 Turkey + + 5000 Ubiquiti SR9 + + + 5001 Ubiquiti XR9 + 804 Ukraine @@ -1426,6 +1504,10 @@ 716 Zimbabwe + + + 0 Debug + + @@ -79,11 +79,6 @@ device. AUTO is the default as of &os; 6.0. - Alternatively, the dump device can be hard-coded via the - dump clause in the &man.config.5; line of - a kernel configuration file. This approach is deprecated and should - be used only if a kernel is crashing before &man.dumpon.8; can be executed. - Check /etc/fstab or &man.swapinfo.8; for a list of swap devices. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -9,11 +9,11 @@ The rapid pace of FreeBSD progress makes print media impractical as a means of following the latest developments. Electronic resources are the - best, if not often the only, way stay informed of the latest advances. + best, if not often the only, way to stay informed of the latest advances. Since FreeBSD is a volunteer effort, the user community itself also generally serves as a technical support department of sorts, - with electronic mail and USENET news being the most effective way of - reaching that community. + with electronic mail, web forums, and USENET news being the most + effective way of reaching that community. The most important points of contact with the FreeBSD user community are outlined below. If you are aware of other resources not mentioned @@ -23,13 +23,12 @@ Mailing Lists - Though many of the FreeBSD development members read USENET, we - cannot always guarantee that we will get to your questions in a timely - fashion (or at all) if you post them only to one of the - comp.unix.bsd.freebsd.* groups. By addressing your - questions to the appropriate mailing list you will reach both us and a - concentrated FreeBSD audience, invariably assuring a better (or at least - faster) response. + The mailing lists are the most direct way of addressing + questions or opening a technical discussion to a concentrated + FreeBSD audience. There are a wide variety of lists on a number + of different FreeBSD topics. Addressing your questions to the + most appropriate mailing list will invariably assure a faster + and more accurate response. The charters for the various lists are given at the bottom of this document. Please read the charter before joining or sending @@ -59,7 +58,11 @@ using the FreeBSD World Wide Web server. The keyword searchable archive offers an excellent way of finding answers to frequently asked questions and - should be consulted before posting a question. + should be consulted before posting a question. Note that this + also means that messages sent to FreeBSD mailing lists are + archived in perpetuity. When protecting privacy is a + concern, consider using a disposable secondary email address and + posting only public information. List Summary @@ -1924,7 +1927,35 @@ World Wide Web Servers - &chap.eresources.www.inc; + + Forums, Blogs, and Social Networks + + + The + FreeBSD Forums provide a web based discussion forum + for FreeBSD questions and technical + discussion. + + Planet FreeBSD + offers an aggregation feed of dozens of blogs written by + FreeBSD developers. Many developers use this to post quick + notes about what they are working on, new patches, and other + works in progress. + + The BSDConferences + YouTube Channel provides a collection of high + quality videos from BSD Conferences around the world. This + is a great way to watch key developers give presentations + about new work in FreeBSD. + + + + + Official Mirrors + &chap.eresources.www.inc; + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4292,6 +4292,28 @@ possible. + + + + + color + contrast + + + When sysinstall is used + in an xterm, the yellow font is difficult to read + against the light gray background. Is there a way to + provide higher contrast for this application? + + + If you already have X11 installed and the default + colors chosen by sysinstall + make text illegible while using xterm or rxvt, add the + following to your ~/.Xdefaults to + get a darker background gray: XTerm*color7: + #c0c0c0 + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -370,6 +370,18 @@ Using the Packages System + There are several different tools used to manage packages on + FreeBSD: + + + sysinstall can be invoked on a + running system to install, delete, and list available and + installed packages. For more information, see , Post-Installation. + The package management command line tools, which are + the subject of the rest of this section. + + Installing a Package ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ 800058 + + 8.0-CURRENT incorporates the + new arp-v2 rewrite. + 800059 + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ +
@@ -267,4 +281,30 @@ + + + + + + + + +
  • + events.html + +
    • +     + + + + +     + +
  • + events.html + +
    • +     +     +     From owner-p4-projects@FreeBSD.ORG Mon Dec 15 19:49:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF0F1065677; Mon, 15 Dec 2008 19:49: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 B1C641065670 for ; Mon, 15 Dec 2008 19:49:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A07C28FC0C for ; Mon, 15 Dec 2008 19:49:38 +0000 (UTC) (envelope-from ed@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 mBFJncf7012488 for ; Mon, 15 Dec 2008 19:49:38 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFJncAs012486 for perforce@freebsd.org; Mon, 15 Dec 2008 19:49:38 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 15 Dec 2008 19:49:38 GMT Message-Id: <200812151949.mBFJncAs012486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 19:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=154718 Change 154718 by ed@ed_flippo on 2008/12/15 19:49:15 Small improvements: - Add support for per-terminal default attributes. - Print kernel messages in a different color again. - Add new keyword to sequences file to mark commands whose arguments should be set to 1 whose value is 0. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#18 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#2 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#5 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#7 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#10 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#12 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#18 (text+ko) ==== @@ -48,10 +48,13 @@ #include +static void scteken_revattr(unsigned char, teken_attr_t *); + static sc_term_init_t scteken_init; static sc_term_term_t scteken_term; static sc_term_puts_t scteken_puts; static sc_term_ioctl_t scteken_ioctl; +static sc_term_default_attr_t scteken_default_attr; static sc_term_clear_t scteken_clear; static sc_term_input_t scteken_input; static void scteken_nop(void); @@ -75,7 +78,7 @@ scteken_puts, scteken_ioctl, (sc_term_reset_t *)scteken_nop, - (sc_term_default_attr_t *)scteken_nop, + scteken_default_attr, scteken_clear, (sc_term_notify_t *)scteken_nop, scteken_input, @@ -120,9 +123,15 @@ ts->ts_busy = 1; teken_init(&ts->ts_teken, &scteken_funcs, scp); + tp.tp_row = scp->ysize; tp.tp_col = scp->xsize; - teken_winsize(&ts->ts_teken, &tp); + teken_set_winsize(&ts->ts_teken, &tp); + + tp.tp_row = scp->cursor_pos / scp->xsize; + tp.tp_col = scp->cursor_pos % scp->xsize; + teken_set_cursor(&ts->ts_teken, &tp); + break; case SC_TE_WARM_INIT: /* XXX */ @@ -184,6 +193,16 @@ } static void +scteken_default_attr(scr_stat *scp, int color, int rev_color) +{ + teken_stat *ts = scp->ts; + teken_attr_t ta; + + scteken_revattr(color, &ta); + teken_set_defattr(&ts->ts_teken, &ta); +} + +static void scteken_clear(scr_stat *scp) { @@ -209,21 +228,61 @@ * libteken routines. */ -static const unsigned char fgcolors_normal[8] = { +static const unsigned char fgcolors_normal[TC_NCOLORS] = { FG_BLACK, FG_RED, FG_GREEN, FG_BROWN, FG_BLUE, FG_MAGENTA, FG_CYAN, FG_LIGHTGREY, }; -static const unsigned char fgcolors_bold[8] = { +static const unsigned char fgcolors_bold[TC_NCOLORS] = { FG_DARKGREY, FG_LIGHTRED, FG_LIGHTGREEN, FG_YELLOW, FG_LIGHTBLUE, FG_LIGHTMAGENTA, FG_LIGHTCYAN, FG_WHITE, }; -static const unsigned char bgcolors[8] = { +static const unsigned char bgcolors[TC_NCOLORS] = { BG_BLACK, BG_RED, BG_GREEN, BG_BROWN, BG_BLUE, BG_MAGENTA, BG_CYAN, BG_LIGHTGREY, }; +static void +scteken_revattr(unsigned char color, teken_attr_t *a) +{ + teken_color_t fg, bg; + + /* + * XXX: Reverse conversion of syscons to teken attributes. Not + * realiable. Maybe we should turn it into a 1:1 mapping one of + * these days? + */ + + a->ta_format = 0; + a->ta_fgcolor = TC_WHITE; + a->ta_bgcolor = TC_BLACK; + +#ifdef FG_BLINK + if (color & FG_BLINK) { + a->ta_format |= TF_BLINK; + color &= ~FG_BLINK; + } +#endif /* FG_BLINK */ + + for (fg = 0; fg < TC_NCOLORS; fg++) { + for (bg = 0; bg < TC_NCOLORS; bg++) { + if ((fgcolors_normal[fg] | bgcolors[bg]) == color) { + a->ta_fgcolor = fg; + a->ta_bgcolor = bg; + return; + } + + if ((fgcolors_bold[fg] | bgcolors[bg]) == color) { + a->ta_fgcolor = fg; + a->ta_bgcolor = bg; + a->ta_format |= TF_BOLD; + return; + } + } + } +} + static inline unsigned int scteken_attr(const teken_attr_t *a) { ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#2 (text+ko) ==== @@ -115,8 +115,12 @@ } else { printf "\t\t%s(t", l_cmd_c_name[c]; split(l_cmd_args[c], args, " "); - for (a = 1; args[a] != ""; a++) - printf ", t->t_curnum < %d ? %d : t->t_nums[%d]", a, args[a], (a - 1); + for (a = 1; args[a] != ""; a++) { + if (args[a] == "n") + printf ", (t->t_curnum < %d || t->t_nums[%d] == 0) ? 1 : t->t_nums[%d]", a, (a - 1), (a - 1); + else + printf ", t->t_curnum < %d ? %d : t->t_nums[%d]", a, args[a], (a - 1); + } print ");"; } print "\t\tbreak;"; ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#5 (text+ko) ==== @@ -23,23 +23,31 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# Abbr Name Sequence Default args -CBT Cursor Backward Tabulation ^[ [ Z 1 -CHT Cursor Forward Tabulation ^[ [ I 1 -CNL Cursor Next Line ^[ [ E 1 -CPL Cursor Previous Line ^[ [ F 1 +# File format is as follows: +# Abbr Abbreviation of sequence name +# Name Sequence name (will be converted to C function name) +# Sequence Bytes that form the sequence +# Arguments Standard value of arguments passed to this sequence +# - `variable' means a variable number of arguments +# - `n' converts 0 to 1 + +# Abbr Name Sequence Arguments +CBT Cursor Backward Tabulation ^[ [ Z n +CHT Cursor Forward Tabulation ^[ [ I n +CNL Cursor Next Line ^[ [ E n +CPL Cursor Previous Line ^[ [ F n CPR Cursor Position Report ^[ [ n 0 -CUB Cursor Backward ^[ [ D 1 -CUD Cursor Down ^[ [ B 1 -CUD Cursor Down ^[ [ e 1 -CUF Cursor Forward ^[ [ C 1 -CUF Cursor Forward ^[ [ a 1 +CUB Cursor Backward ^[ [ D n +CUD Cursor Down ^[ [ B n +CUD Cursor Down ^[ [ e n +CUF Cursor Forward ^[ [ C n +CUF Cursor Forward ^[ [ a n CUP Cursor Position ^[ [ H 1 1 CUP Cursor Position ^[ [ f 1 1 -CUU Cursor Up ^[ [ A 1 +CUU Cursor Up ^[ [ A n DA1 Primary Device Attributes ^[ [ c 0 DA2 Secondary Device Attributes ^[ [ > c 0 -DC Delete character ^[ [ P 1 +DC Delete character ^[ [ P n DCS Device Control String ^[ P DECALN Alignment test ^[ # 8 DECDHL Double Height Double Width Line Top ^[ # 3 @@ -55,16 +63,16 @@ DECSM Set DEC mode ^[ [ ? h 0 DECSTBM Set top and bottom margins ^[ [ r 0 0 DECSWL Single Height Single Width Line ^[ # 5 -DL Delete line ^[ [ M 1 +DL Delete line ^[ [ M n DSR Device Status Report ^[ [ ? n 0 -ECH Erase character ^[ [ X 1 +ECH Erase character ^[ [ X n ED Erase display ^[ [ J 0 EL Erase line ^[ [ K 0 HPA Horizontal Position Absolute ^[ [ G 1 HPA Horizontal Position Absolute ^[ [ ` 1 HTS Horizontal Tab Set ^[ H -ICH Insert character ^[ [ @ 1 -IL Insert line ^[ [ L 1 +ICH Insert character ^[ [ @ n +IL Insert line ^[ [ L n IND Index ^[ D NEL Next line ^[ E RI Reverse index ^[ M @@ -80,11 +88,11 @@ SCS SCS ^[ ) 2 SCS SCS ^[ ) A SCS SCS ^[ ) B -SD Pan Up ^[ [ T 1 +SD Pan Up ^[ [ T n SGR Set Graphic Rendition ^[ [ m variable SM Set Mode ^[ [ h 0 ST String Terminator ^[ \\ -SU Pan Down ^[ [ S 1 +SU Pan Down ^[ [ S n TBC Tab Clear ^[ [ g 0 VPA Vertical Position Absolute ^[ [ d 1 ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#7 (text+ko) ==== @@ -74,12 +74,6 @@ static teken_state_t teken_state_init; -static const teken_attr_t teken_defattr = { - .ta_format = 0, - .ta_fgcolor = TC_WHITE, - .ta_bgcolor = TC_BLACK, -}; - /* * Wrappers for hooks. */ @@ -194,13 +188,16 @@ t->t_nextstate = teken_state_init; + t->t_defattr.ta_format = 0; + t->t_defattr.ta_fgcolor = TC_WHITE; + t->t_defattr.ta_bgcolor = TC_BLACK; teken_subr_do_reset(t); #ifdef TEKEN_UTF8 t->t_utf8_left = 0; #endif /* TEKEN_UTF8 */ - teken_winsize(t, &tp); + teken_set_winsize(t, &tp); } static void @@ -241,8 +238,11 @@ teken_assert(t->t_saved_cursor.tp_col < t->t_winsize.tp_col); teken_assert(t->t_scrollreg.ts_end <= t->t_winsize.tp_row); teken_assert(t->t_scrollreg.ts_begin < t->t_scrollreg.ts_end); - teken_assert(t->t_originreg.ts_end <= t->t_winsize.tp_row); - teken_assert(t->t_originreg.ts_begin < t->t_originreg.ts_end); + /* Origin region has to be window size or the same as scrollreg. */ + teken_assert((t->t_originreg.ts_begin == t->t_scrollreg.ts_begin && + t->t_originreg.ts_end == t->t_scrollreg.ts_end) || + (t->t_originreg.ts_begin == 0 && + t->t_originreg.ts_end == t->t_winsize.tp_row)); } static void @@ -294,23 +294,34 @@ } void -teken_winsize(teken_t *t, const teken_pos_t *p) +teken_set_cursor(teken_t *t, const teken_pos_t *p) +{ + + /* XXX: bounds checking with originreg! */ + teken_assert(p->tp_row < t->t_winsize.tp_row); + teken_assert(p->tp_col < t->t_winsize.tp_col); + + t->t_cursor = *p; +} + +void +teken_set_defattr(teken_t *t, const teken_attr_t *a) +{ + + t->t_curattr = t->t_saved_curattr = t->t_defattr = *a; +} + +void +teken_set_winsize(teken_t *t, const teken_pos_t *p) { - teken_rect_t tr; teken_assert(p->tp_col <= T_NUMCOL); t->t_winsize = *p; - /* XXX: discards active scroll region. */ + /* XXX: bounds checking with cursor/etc! */ t->t_scrollreg.ts_begin = 0; t->t_scrollreg.ts_end = t->t_winsize.tp_row; t->t_originreg = t->t_scrollreg; - - /* Blank screen. */ - tr.tr_begin.tp_row = 0; - tr.tr_begin.tp_col = 0; - tr.tr_end = t->t_winsize; - teken_funcs_fill(t, &tr, BLANK, &teken_defattr); } /* ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#10 (text+ko) ==== @@ -61,6 +61,7 @@ #define TC_MAGENTA 5 #define TC_CYAN 6 #define TC_WHITE 7 +#define TC_NCOLORS 8 typedef struct { teken_unit_t tp_row; @@ -117,6 +118,7 @@ /* * Terminal state. */ + struct __teken { const teken_funcs_t *t_funcs; void *t_softc; @@ -133,6 +135,7 @@ teken_pos_t t_saved_cursor; teken_attr_t t_saved_curattr; + teken_attr_t t_defattr; teken_pos_t t_winsize; /* For DECSTBM. */ @@ -149,8 +152,15 @@ #endif /* TEKEN_UTF8 */ }; +/* Initialize teken structure. */ void teken_init(teken_t *, const teken_funcs_t *, void *); + +/* Deliver character input. */ void teken_input(teken_t *, const void *, size_t); -void teken_winsize(teken_t *, const teken_pos_t *); + +/* Set teken attributes. */ +void teken_set_cursor(teken_t *, const teken_pos_t *); +void teken_set_defattr(teken_t *, const teken_attr_t *); +void teken_set_winsize(teken_t *, const teken_pos_t *); #endif /* !_TEKEN_H_ */ ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#12 (text+ko) ==== @@ -183,7 +183,7 @@ tr.tr_begin.tp_row = 0; tr.tr_begin.tp_col = 0; tr.tr_end = t->t_winsize; - teken_funcs_fill(t, &tr, 'E', &teken_defattr); + teken_funcs_fill(t, &tr, 'E', &t->t_defattr); } static void @@ -219,8 +219,6 @@ teken_subr_cursor_backward(teken_t *t, unsigned int ncols) { - if (ncols == 0) - ncols = 1; if (ncols > t->t_cursor.tp_col) t->t_cursor.tp_col = 0; else @@ -233,9 +231,6 @@ teken_subr_cursor_backward_tabulation(teken_t *t, unsigned int ntabs) { - if (ntabs == 0) - ntabs = 1; - do { /* Stop when we've reached the beginning of the line. */ if (t->t_cursor.tp_col == 0) @@ -253,9 +248,6 @@ teken_subr_cursor_down(teken_t *t, unsigned int nrows) { - if (nrows == 0) - nrows = 1; - teken_assert(t->t_cursor.tp_row < t->t_scrollreg.ts_end); if (nrows >= t->t_scrollreg.ts_end - t->t_cursor.tp_row) t->t_cursor.tp_row = t->t_scrollreg.ts_end - 1; @@ -269,8 +261,6 @@ teken_subr_cursor_forward(teken_t *t, unsigned int ncols) { - if (ncols == 0) - ncols = 1; if (ncols >= t->t_winsize.tp_col - t->t_cursor.tp_col) t->t_cursor.tp_col = t->t_winsize.tp_col - 1; else @@ -283,9 +273,6 @@ teken_subr_cursor_forward_tabulation(teken_t *t, unsigned int ntabs) { - if (ntabs == 0) - ntabs = 1; - do { /* Stop when we've reached the end of the line. */ if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) @@ -343,9 +330,6 @@ teken_subr_cursor_up(teken_t *t, unsigned int nrows) { - if (nrows == 0) - nrows = 1; - if (nrows > ((int)t->t_cursor.tp_row - t->t_scrollreg.ts_begin)) t->t_cursor.tp_row = t->t_scrollreg.ts_begin; else @@ -359,9 +343,6 @@ { teken_rect_t tr; - if (ncols == 0) - ncols = 1; - tr.tr_begin.tp_row = t->t_cursor.tp_row; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; tr.tr_end.tp_col = t->t_winsize.tp_col; @@ -385,9 +366,6 @@ { teken_rect_t tr; - if (nrows == 0) - nrows = 1; - tr.tr_begin.tp_col = 0; tr.tr_end.tp_row = t->t_scrollreg.ts_end; tr.tr_end.tp_col = t->t_winsize.tp_col; @@ -445,9 +423,6 @@ { teken_rect_t tr; - if (ncols == 0) - ncols = 1; - tr.tr_begin = t->t_cursor; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; @@ -572,9 +547,6 @@ { teken_rect_t tr; - if (ncols == 0) - ncols = 1; - tr.tr_begin = t->t_cursor; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; @@ -601,9 +573,6 @@ { teken_rect_t tr; - if (nrows == 0) - nrows = 1; - tr.tr_begin.tp_row = t->t_cursor.tp_row; tr.tr_begin.tp_col = 0; tr.tr_end.tp_col = t->t_winsize.tp_col; @@ -672,10 +641,6 @@ teken_subr_pan_down(teken_t *t, unsigned int nrows) { - if (nrows == 0) - nrows = 1; - - teken_subr_do_scroll(t, (int)nrows); } @@ -683,9 +648,6 @@ teken_subr_pan_up(teken_t *t, unsigned int nrows) { - if (nrows == 0) - nrows = 1; - teken_subr_do_scroll(t, -(int)nrows); } @@ -837,7 +799,7 @@ teken_subr_do_reset(teken_t *t) { - t->t_curattr = t->t_saved_curattr = teken_defattr; + t->t_curattr = t->t_saved_curattr = t->t_defattr; t->t_cursor.tp_row = t->t_cursor.tp_col = 0; t->t_saved_cursor = t->t_cursor; t->t_stateflags = TS_AUTOWRAP; @@ -975,7 +937,7 @@ /* No attributes means reset. */ if (ncmds == 0) { - t->t_curattr = teken_defattr; + t->t_curattr = t->t_defattr; return; } @@ -984,7 +946,7 @@ switch (n) { case 0: /* Reset. */ - t->t_curattr = teken_defattr; + t->t_curattr = t->t_defattr; break; case 1: /* Bold. */ t->t_curattr.ta_format |= TF_BOLD; @@ -1021,7 +983,7 @@ t->t_curattr.ta_fgcolor = n - 30; break; case 39: /* Set default foreground color. */ - t->t_curattr.ta_fgcolor = teken_defattr.ta_fgcolor; + t->t_curattr.ta_fgcolor = t->t_defattr.ta_fgcolor; break; case 40: /* Set background color: black */ case 41: /* Set background color: red */ @@ -1034,7 +996,7 @@ t->t_curattr.ta_bgcolor = n - 40; break; case 49: /* Set default background color. */ - t->t_curattr.ta_bgcolor = teken_defattr.ta_bgcolor; + t->t_curattr.ta_bgcolor = t->t_defattr.ta_bgcolor; break; default: teken_printf("unsupported attribute %u\n", n); From owner-p4-projects@FreeBSD.ORG Mon Dec 15 21:29:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5FC8106567A; Mon, 15 Dec 2008 21:29: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 8157D1065676 for ; Mon, 15 Dec 2008 21:29:20 +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 6FC358FC1F for ; Mon, 15 Dec 2008 21:29:20 +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 mBFLTKx2033721 for ; Mon, 15 Dec 2008 21:29:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFLTKTL033719 for perforce@freebsd.org; Mon, 15 Dec 2008 21:29:20 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 15 Dec 2008 21:29:20 GMT Message-Id: <200812152129.mBFLTKTL033719@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 154727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 21:29:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=154727 Change 154727 by rene@rene_self on 2008/12/15 21:28:24 MFen handbook/eresources 1.195 -> 1.196 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#14 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.195 + %SRCID% 1.196 --> @@ -18,7 +18,7 @@ van de laatste ontwikkelingen. Omdat &os; draait op de inzet van vrijwilligers, is de gebruikersgemeenschap vaak een soort technische ondersteuningsgroep, die heeft ontdekt dat - email en USENET de meeste effectieve manieren zijn om de + email, webfora, en USENET de meeste effectieve manieren zijn om de gebruikersgemeenschap te bereiken. Hieronder staan de meest belangrijke contactmogelijkheden met de @@ -29,13 +29,13 @@ Mailinglijsten - Hoewel veel van de ontwikkelaars van &os; USENET lezen, kan - niet altijd gegarandeerd worden dat vragen die in een van de - groepen binnen comp.unix.bsd.freebsd.* gesteld - worden, op tijd beantwoord worden - als ze al beantwoord worden. - Door vragen op de daarvoor bestemde mailinglijsten te stellen, - wordt het gewenste &os; publiek bereikt, waardoor een beter, of in - ieder geval tijdiger, antwoord is gegarandaard. + De mailinglijsten zijn de meest directe manier om vragen te + stellen aan of een technische discussie te beginnen met een + geconcentreerd &os;-publiek. Er is een grote verscheidenheid aan + lijsten met betrekking tot verschillende &os;-onderwerpen. Door + uw vragen aan de meest geschikte mailinglijst te stellen bent u + ongetwijfeld verzekerd van een sneller en accurater + antwoord. De doelstellingen van de verschillende lijsten staan onderaan dit document. Lees alstublieft de doelstellingen @@ -72,7 +72,12 @@ server. De met sleutelwoorden te doorzoeken archieven bieden een voortreffelijke methode om antwoorden te vinden op vaak gestelde vragen en horen geraadpleegd te worden voordat er vragen - op een lijst worden gesteld. + op een lijst worden gesteld. Merk op dat dit ook betekent dat + berichten die naar de mailinglijsten van &os; worden verzonden tot + in de oneindigheid worden gearchiveerd. Overweeg, wanneer het + beschermen van privacy belangrijk is, om een tweede emailadres dat + weggegooid kan worden te gebruiken en om alleen publieke + informatie te posten. Lijstsamenvatting @@ -2154,13 +2159,47 @@ World wide webservers - - Onderstaande lijst met World Wide Webservers wordt - automatisch samengesteld om zo actueel mogelijk te zijn en is - daarom niet vertaald. - + + Fora, blogs, en sociale netwerken + + + + The &os; + Forums bieden een webgebaseerd discussieforum voor + vragen en technische discussies over &os;. + + + + Planet + &os; biedt een samengestelde feed van tientallen + blogs geschreven door &os;-ontwikkelaars. Vele + ontwikkelaars gebruiken dit om korte notities te posten over + waaraan ze werken, nieuwe patches, en ander werk in + uitvoering. + + + + Het BSDConferences + YouTube Channel biedt een verzameling van video's + van hoge kwaliteit van wereldwijde BSD-conferenties. Dit is + een prima manier om presentaties van hoofdontwikkelaars over + nieuw werk in &os; te zien. + + + + + + Officiële spiegels + + + Onderstaande lijst met World Wide Webservers wordt + automatisch samengesteld om zo actueel mogelijk te zijn en is + daarom niet vertaald. + - &chap.eresources.www.inc; + &chap.eresources.www.inc; + From owner-p4-projects@FreeBSD.ORG Mon Dec 15 21:50:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C30F31065676; Mon, 15 Dec 2008 21:50: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 874A91065673 for ; Mon, 15 Dec 2008 21:50:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75AB48FC1E for ; Mon, 15 Dec 2008 21:50:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBFLogqO035852 for ; Mon, 15 Dec 2008 21:50:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFLogs9035850 for perforce@freebsd.org; Mon, 15 Dec 2008 21:50:42 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 15 Dec 2008 21:50:42 GMT Message-Id: <200812152150.mBFLogs9035850@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 154730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 21:50:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154730 Change 154730 by rene@rene_self on 2008/12/15 21:50:30 MFen handbook/install 1.390 -> 1.391 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml,v 1.55 2006/08/24 23:15:43 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml - %SRCID% 1.390 + %SRCID% 1.391 --> @@ -4546,6 +4546,31 @@ mogelijk. + + + + kleur + + contrast + + + + Wanneer sysinstall in een + xterm wordt gebruikt, is het moeilijk om het gele font op + de lichtgrijze achtergrond te lezen. Is er een manier om + het contrast van deze applicatie te verhogen? + + + + Als X11 reeds geïnstalleerd is en de kleuren die + standaard door sysinstall + worden gekozen de tekst onleesbaar maken wanneer xterm of + rxvt wordt gebruikt, voeg dan het volgende aan + ~/.Xdefaults toe om een donkerder + grijs als achtergrond te krijgen: XTerm*color7: + #c0c0c0 + + From owner-p4-projects@FreeBSD.ORG Mon Dec 15 22:16:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BEFC10656DC; Mon, 15 Dec 2008 22:16:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 061C010656B7 for ; Mon, 15 Dec 2008 22:16:12 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 65D508FC23 for ; Mon, 15 Dec 2008 22:16:12 +0000 (UTC) (envelope-from ed@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 mBFMGCb4039114 for ; Mon, 15 Dec 2008 22:16:12 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFMGC9x039112 for perforce@freebsd.org; Mon, 15 Dec 2008 22:16:12 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 15 Dec 2008 22:16:12 GMT Message-Id: <200812152216.mBFMGC9x039112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 22:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=154740 Change 154740 by ed@ed_flippo on 2008/12/15 22:15:48 Don't start at row 0 column 0 during boot. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#9 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#9 (text+ko) ==== @@ -2741,6 +2741,16 @@ init_scp(sc, sc->first_vty, scp); sc_vtb_init(&scp->vtb, VTB_MEMORY, scp->xsize, scp->ysize, (void *)sc_buffer, FALSE); + + /* move cursors to the initial positions */ + if (col >= scp->xsize) + col = 0; + if (row >= scp->ysize) + row = scp->ysize - 1; + scp->xpos = col; + scp->ypos = row; + scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col; + if (sc_init_emulator(scp, SC_DFLT_TERM)) sc_init_emulator(scp, "*"); (*scp->tsw->te_default_attr)(scp, @@ -2764,15 +2774,6 @@ sc_vtb_copy(&scp->scr, 0, &scp->vtb, 0, scp->xsize*scp->ysize); #endif - /* move cursors to the initial positions */ - if (col >= scp->xsize) - col = 0; - if (row >= scp->ysize) - row = scp->ysize - 1; - scp->xpos = col; - scp->ypos = row; - scp->cursor_pos = scp->cursor_oldpos = row*scp->xsize + col; - if (bios_value.cursor_end < scp->font_size) sc->dflt_curs_attr.base = scp->font_size - bios_value.cursor_end - 1; From owner-p4-projects@FreeBSD.ORG Mon Dec 15 22:16:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EFA11065771; Mon, 15 Dec 2008 22:16:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09B1710656BB for ; Mon, 15 Dec 2008 22:16:13 +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 8799C8FC18 for ; Mon, 15 Dec 2008 22:16:12 +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 mBFMGCxu039119 for ; Mon, 15 Dec 2008 22:16:12 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBFMGCMS039117 for perforce@freebsd.org; Mon, 15 Dec 2008 22:16:12 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 15 Dec 2008 22:16:12 GMT Message-Id: <200812152216.mBFMGCMS039117@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 154741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 15 Dec 2008 22:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=154741 Change 154741 by rene@rene_self on 2008/12/15 22:16:00 MFen handbook/ports 1.284 -> 1.285 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#8 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.284 + %SRCID% 1.285 --> @@ -405,6 +405,24 @@ Het pakkettensysteem gebruiken + Er zijn verschillende gereedschappen die gebruikt worden om + pakketten op &os; te beheren: + + + + sysinstall kan op een draaiend systeem + worden gebruikt om beschikbare en geïnstalleerde + pakketten te installeren, te verwijderen, en weer te geven. + Zie voor meer informatie Instellingen na de installatie. + + + + De opdrachtregelgereedschappen om pakketten te beheren, + welke het onderwerp van de rest van deze sectie zijn. + + + Pakketten installeren From owner-p4-projects@FreeBSD.ORG Tue Dec 16 00:42:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 130A51065673; Tue, 16 Dec 2008 00:42: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 CBAB51065670 for ; Tue, 16 Dec 2008 00:42:42 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7E2D8FC0C for ; Tue, 16 Dec 2008 00:42:42 +0000 (UTC) (envelope-from piso@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 mBG0gg58055185 for ; Tue, 16 Dec 2008 00:42:42 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBG0ggnt055183 for perforce@freebsd.org; Tue, 16 Dec 2008 00:42:42 GMT (envelope-from piso@freebsd.org) Date: Tue, 16 Dec 2008 00:42:42 GMT Message-Id: <200812160042.mBG0ggnt055183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 00:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154755 Change 154755 by piso@piso_newluxor on 2008/12/16 00:42:17 leave a comment about a bug left in UdpAliasIn: the return code from find_handler() should be checked instead of a always 0 variable. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#86 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#86 (text+ko) ==== @@ -789,6 +789,7 @@ &original_address, &pip->ip_dst, 2); pip->ip_dst = original_address; + // XXX should check error instead of r - see pre modules version rev=1.53 /* * If we cannot figure out the packet, ignore it. */ From owner-p4-projects@FreeBSD.ORG Tue Dec 16 00:43:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 558F2106567A; Tue, 16 Dec 2008 00:43: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 013C01065677 for ; Tue, 16 Dec 2008 00:43:44 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E08698FC1B for ; Tue, 16 Dec 2008 00:43:43 +0000 (UTC) (envelope-from piso@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 mBG0hhxU055249 for ; Tue, 16 Dec 2008 00:43:43 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBG0hhOS055247 for perforce@freebsd.org; Tue, 16 Dec 2008 00:43:43 GMT (envelope-from piso@freebsd.org) Date: Tue, 16 Dec 2008 00:43:43 GMT Message-Id: <200812160043.mBG0hhOS055247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 00:43:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=154756 Change 154756 by piso@piso_newluxor on 2008/12/16 00:43:06 add some bits i left out in the lastest round of IFCs. Affected files ... .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/coff-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/cpu-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf32-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elf64-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfn32-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/elfxx-mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsbsd.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/mipsmach3.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/hosts/news-mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/mipsbsd.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pe-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/pei-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipsecoff.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/e-mipself.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/itbl-mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/te-tmips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gas/doc/c-mips.texi#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/gprof/mips.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/include/coff/mipspe.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/include/opcode/mips.h#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmip.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmip.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64btsmip.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf64ltsmip.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbig.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsbsd.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidt.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipsidtl.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslit.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipslnews.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/mipspe.sh#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipsecoff.em#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emultempl/mipself.em#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mips.sc#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/ld/scripttempl/mipsbsd.sc#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-dis.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips-opc.c#3 branch .. //depot/projects/soc2005/libalias/contrib/binutils/opcodes/mips16-opc.c#3 branch .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/sbni.4#4 branch .. //depot/projects/soc2005/libalias/share/syscons/keymaps/colemak.iso15.acc.kbd#3 branch .. //depot/projects/soc2005/libalias/sys/dev/sbni/if_sbni.c#6 branch .. //depot/projects/soc2005/libalias/sys/dev/sbni/if_sbni_isa.c#5 branch .. //depot/projects/soc2005/libalias/sys/dev/sbni/if_sbni_pci.c#5 branch .. //depot/projects/soc2005/libalias/sys/dev/sbni/if_sbnireg.h#4 branch .. //depot/projects/soc2005/libalias/sys/dev/sbni/if_sbnivar.h#4 branch .. //depot/projects/soc2005/libalias/sys/i386/compile/.cvsignore#3 branch .. //depot/projects/soc2005/libalias/sys/modules/sbni/Makefile#6 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 16 00:51:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E20431065675; Tue, 16 Dec 2008 00:51: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 A694B1065670 for ; Tue, 16 Dec 2008 00:51:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 798708FC1A for ; Tue, 16 Dec 2008 00:51:52 +0000 (UTC) (envelope-from piso@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 mBG0pqEF065610 for ; Tue, 16 Dec 2008 00:51:52 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBG0pqjM065608 for perforce@freebsd.org; Tue, 16 Dec 2008 00:51:52 GMT (envelope-from piso@freebsd.org) Date: Tue, 16 Dec 2008 00:51:52 GMT Message-Id: <200812160051.mBG0pqjM065608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 00:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=154757 Change 154757 by piso@piso_newluxor on 2008/12/16 00:51:11 remove a duplicated check/return code. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#87 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#87 (text+ko) ==== @@ -1078,8 +1078,6 @@ lnk = FindUdpTcpOut(la, pip->ip_src, pip->ip_dst, tc->th_sport, tc->th_dport, IPPROTO_TCP, create); - if (lnk == NULL) - return (PKT_ALIAS_IGNORED); if (lnk != NULL) { u_short alias_port; struct in_addr alias_address; From owner-p4-projects@FreeBSD.ORG Tue Dec 16 04:32:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEAFC1065670; Tue, 16 Dec 2008 04:32: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 66FFC1065673 for ; Tue, 16 Dec 2008 04:32:38 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FBE98FC12 for ; Tue, 16 Dec 2008 04:32:38 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBG4WbOA086453 for ; Tue, 16 Dec 2008 04:32:38 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBG4WbdG086451 for perforce@freebsd.org; Tue, 16 Dec 2008 04:32:37 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 16 Dec 2008 04:32:37 GMT Message-Id: <200812160432.mBG4WbdG086451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 04:32:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=154768 Change 154768 by nwhitehorn@nwhitehorn_trantor on 2008/12/16 04:32:16 IFC to merge in OFW sync round 1 Affected files ... .. //depot/projects/ppc-g5/UPDATING#7 integrate .. //depot/projects/ppc-g5/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/ppc-g5/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/ppc-g5/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/ppc-g5/etc/regdomain.xml#2 integrate .. //depot/projects/ppc-g5/include/arpa/nameser.h#2 integrate .. //depot/projects/ppc-g5/include/resolv.h#2 integrate .. //depot/projects/ppc-g5/lib/libc/include/isc/eventlib.h#2 integrate .. //depot/projects/ppc-g5/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/ppc-g5/lib/libc/inet/inet_net_pton.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/ppc-g5/lib/libfetch/fetch.3#2 integrate .. //depot/projects/ppc-g5/lib/libfetch/fetch.h#2 integrate .. //depot/projects/ppc-g5/lib/libfetch/http.c#3 integrate .. //depot/projects/ppc-g5/lib/libstand/if_ether.h#2 integrate .. //depot/projects/ppc-g5/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/ppc-g5/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/ppc-g5/sbin/route/route.c#2 integrate .. //depot/projects/ppc-g5/sbin/routed/table.c#2 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#7 integrate .. //depot/projects/ppc-g5/share/man/man4/fxp.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/route.4#2 integrate .. //depot/projects/ppc-g5/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/rtentry.9#2 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#7 integrate .. //depot/projects/ppc-g5/sys/conf/files#9 integrate .. //depot/projects/ppc-g5/sys/conf/files.sparc64#7 integrate .. //depot/projects/ppc-g5/sys/conf/files.sun4v#4 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/ppc-g5/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/isp/isp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_bus_subr.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#8 integrate .. //depot/projects/ppc-g5/sys/modules/ath/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/ath_rate_amrr/Makefile#4 delete .. //depot/projects/ppc-g5/sys/modules/ath_rate_onoe/Makefile#4 delete .. //depot/projects/ppc-g5/sys/modules/ath_rate_sample/Makefile#4 delete .. //depot/projects/ppc-g5/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/net/if.c#7 integrate .. //depot/projects/ppc-g5/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/ppc-g5/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_llatbl.c#1 branch .. //depot/projects/ppc-g5/sys/net/if_llatbl.h#1 branch .. //depot/projects/ppc-g5/sys/net/if_var.h#5 integrate .. //depot/projects/ppc-g5/sys/net/radix_mpath.c#4 integrate .. //depot/projects/ppc-g5/sys/net/route.c#7 integrate .. //depot/projects/ppc-g5/sys/net/route.h#5 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_regdomain.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/ppc-g5/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/if_atm.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/in_proto.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/in_var.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_output.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/ppc-g5/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/ppc-g5/sys/netipsec/key.c#4 integrate .. //depot/projects/ppc-g5/sys/pci/if_rl.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/param.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#10 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#8 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#9 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#7 integrate .. //depot/projects/ppc-g5/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/ppc-g5/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/ofw_machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#7 integrate .. //depot/projects/ppc-g5/sys/sys/vtoc.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/route.c#4 integrate .. //depot/projects/ppc-g5/usr.bin/tar/util.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/jls/jls.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/ppp/route.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/route6d/route6d.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/dispatch.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.h#4 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/ppc-g5/UPDATING#7 (text+ko) ==== @@ -22,6 +22,15 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081214: + __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. + RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. + The new code reduced struct rtentry{} by 16 bytes on 32-bit + architecture and 40 bytes on 64-bit architecture. The userland + applications "arp" and "ndp" have been updated accordingly. + The output from "netstat -r" shows only routing entries and + none of the L2 information. + 20081130: __FreeBSD_version 800057 marks the switchover from the binary ath hal to source code. Users must add the line: @@ -1178,4 +1187,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $ ==== //depot/projects/ppc-g5/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ==== @@ -48,8 +48,7 @@ /* if-index allocator */ static uint32_t next_if_index = 1; -/* re-fetch arp table */ -static int update_arp; +/* currently fetching the arp table */ static int in_update_arp; /* OR registrations */ @@ -911,36 +910,6 @@ } /* - * Process a new ARP entry - */ -static void -process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl, - const struct sockaddr_in *sa) -{ - struct mibif *ifp; - struct mibarp *at; - - /* IP arp table entry */ - if (sdl->sdl_alen == 0) { - update_arp = 1; - return; - } - if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL) - return; - /* have a valid entry */ - if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL && - (at = mib_arp_create(ifp, sa->sin_addr, - sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL) - return; - - if (rtm->rtm_rmx.rmx_expire == 0) - at->flags |= MIBARP_PERM; - else - at->flags &= ~MIBARP_PERM; - at->flags |= MIBARP_FOUND; -} - -/* * Handle a routing socket message. */ static void @@ -1080,46 +1049,12 @@ } break; #endif - case RTM_GET: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_ADD: + case RTM_DELETE: mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_DELETE: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO)) + if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) mib_sroute_process(rtm, addrs[RTAX_GATEWAY], addrs[RTAX_DST], addrs[RTAX_NETMASK]); break; @@ -1289,7 +1224,8 @@ /* * Update arp table - */ + * +*/ void mib_arp_update(void) { @@ -1305,11 +1241,11 @@ TAILQ_FOREACH(at, &mibarp_list, link) at->flags &= ~MIBARP_FOUND; - if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) { + if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) { in_update_arp = 0; return; } - + next = buf; while (next < buf + needed) { rtm = (struct rt_msghdr *)(void *)next; @@ -1326,7 +1262,6 @@ at = at1; } mibarpticks = get_ticks(); - update_arp = 0; in_update_arp = 0; } @@ -1634,8 +1569,8 @@ mib_arp_update(); mib_iflist_bad = 0; } - if (update_arp) - mib_arp_update(); + + mib_arp_update(); } ==== //depot/projects/ppc-g5/contrib/bsnmp/snmp_mibII/mibII_route.c#2 (text+ko) ==== @@ -186,8 +186,7 @@ memcpy(r->index, key.index, sizeof(r->index)); r->ifindex = (ifp == NULL) ? 0 : ifp->index; - r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 : - (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; + r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; /* cannot really know, what protocol it runs */ r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 : ==== //depot/projects/ppc-g5/contrib/ipfilter/ipsend/44arp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.3 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.4 2008/12/15 06:10:57 qingli Exp $ */ /* * Based upon 4.4BSD's /usr/sbin/arp @@ -88,7 +88,12 @@ mib[2] = 0; mib[3] = AF_INET; mib[4] = NET_RT_FLAGS; +#ifdef RTF_LLINFO mib[5] = RTF_LLINFO; +#else + mib[5] = 0; +#endif + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) { perror("route-sysctl-estimate"); ==== //depot/projects/ppc-g5/etc/regdomain.xml#2 (text+ko) ==== @@ -22,7 +22,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/etc/regdomain.xml,v 1.1 2008/04/20 20:37:02 sam Exp $ + $FreeBSD: src/etc/regdomain.xml,v 1.2 2008/12/15 01:18:11 sam Exp $ --> @@ -39,7 +39,7 @@ --> DEBUG - 0 + 0x1ff @@ -1080,6 +1080,75 @@ + + + SR9 + 0x0298 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + XR9 + 0x299 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + GZ901 + 0x29a + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + @@ -1201,6 +1270,9 @@ 320 Guatemala + + 5002 ZComax GZ-901 + 340 Honduras @@ -1396,6 +1468,12 @@ 792 Turkey + + 5000 Ubiquiti SR9 + + + 5001 Ubiquiti XR9 + 804 Ukraine @@ -1426,6 +1504,10 @@ 716 Zimbabwe + + + 0 Debug + + ==== //depot/projects/docproj_hu/www/en/multimedia/multimedia.pl#5 (text+ko) ==== @@ -2,7 +2,7 @@ # # $Id$ -# $FreeBSD: www/en/multimedia/multimedia.pl,v 1.5 2008/12/06 06:25:37 hrs Exp $ +# $FreeBSD: www/en/multimedia/multimedia.pl,v 1.6 2008/12/07 06:12:06 edwin Exp $ # use strict; @@ -157,7 +157,7 @@ # Note that $items[$ci]{fc} gets incremented in xml_start $items[$ci]{files}{$items[$ci]{fc}}{url} = "" if (!defined $items[$ci]{files}{$items[$ci]{fc}}{url}); - $items[$ci]{files}{$items[$ci]{fc}}{url} .= htmlentities($value); + $items[$ci]{files}{$items[$ci]{fc}}{url} .= $value; return; } if ($tree[5] eq "size") { @@ -204,7 +204,7 @@ return; } if ($tree[3] eq "url") { - $sources{$sid}{url} = htmlentities($value); + $sources{$sid}{url} = $value; return; } goto error; @@ -307,9 +307,9 @@ my %file = %{$item{files}{$m}}; print $fhandle ", " if ($c++); if (defined $item{prefix}) { - print $fhandle "$file{desc}"; + print $fhandle "$file{desc}"; } else { - print $fhandle "$file{desc}"; + print $fhandle "$file{desc}"; } if (defined $file{size} || defined $file{length}) { my $s = ""; ==== //depot/projects/docproj_hu/www/en/news/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/Makefile,v 1.50 2008/01/16 08:21:47 murray Exp $ +# $FreeBSD: www/en/news/Makefile,v 1.51 2008/12/08 09:10:44 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -46,6 +46,7 @@ SUBDIR+= 2004 SUBDIR+= 2005 SUBDIR+= 2006 +SUBDIR+= 2007 SUBDIR+= status .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_hu/www/en/news/news.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -19,8 +19,7 @@
  • -

    Press Releases: Press - releases from the project and other related organizations.

    +

    Foundation Press Releases: Press releases from the FreeBSD Foundation (also see archived pre-2005 press releases).

  • ==== //depot/projects/docproj_hu/www/en/news/pressreleases.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -13,6 +13,8 @@

    --> +

    Most press releases are now handled by the FreeBSD Foundation

    . +
    November 25, 2005
    ==== //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -122,7 +122,7 @@ RC1 builds 15 September 2008 - -- + 8 December 2008 Begin RC1 builds. ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#11 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -122,9 +122,8 @@ RELENG_6_4 Frozen - &contact.re; - A branch for FreeBSD 6.4 release candidate - (to be the FreeBSD 6.4 supported errata fix branch). + &contact.so; + FreeBSD 6.4 supported errata fix branch. ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#31 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.212 2008/12/04 05:01:36 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.214 2008/12/13 19:09:59 danger Exp $ @@ -36,6 +36,21 @@ 12 + 9 + + + FreeBSD 7.1-RC1 Available + +

    The first release candidate of &os; 7.1 is now available. + ISO images for Tier-1 architectures are now available on + most of the &os; + mirror sites.

    +     +     + + 3 @@ -857,813 +872,4 @@ - - 2007 - - - 12 - - - 31 - - FreeBSD 6.3-RC2 Available - -

    The second release candidate of FreeBSD 6.3 has been announced. - ISO images and distributions for Tier-1 architectures are - now available on most of the - FreeBSD mirror sites.

    -     -     - - - 30 - - FreeBSD 7.0-RC1 Available - -

    The first release candidate of FreeBSD 7.0 is now available. - ISO images for Tier-1 architectures are now available on most of the - - FreeBSD mirror sites.

    -     -     - - - 28 - -

    New committer: Weongyo Jeong - (src)

    -     -     - - - 26 - -

    New committer: Rafal Jaworowski - (src)

    -     -     - - - 25 - - Juniper Networks, Inc has donated a reference FreeBSD - port to the MIPS architecture - -

    Juniper Networks, Inc. (http://www.juniper.net) has donated a - reference FreeBSD port to the MIPS architecture to The FreeBSD - Project. - This code will be used as one reference for creating an official - project-supported FreeBSD/MIPS offering.

    -

    Information about the code drop can be found here.

    -     -     - - - 10 - - End-of-Year Fund Raising Drive - -

    The FreeBSD - Foundation has announced an End-of-Year Fund Raising - Drive. The goal this year is to raise over $250,000. - This money is used for sponsoring FreeBSD related conferences, - providing travel grants to developers to attend these conferences, - providing grants for projects that improve FreeBSD, and - providing legal support on issues like understanding - the GPLv3 impact on FreeBSD, trademarks, and other legal - issues that come up.

    - -

    Donations can be made online from http://www.freebsdfoundation.org/donate/.

    -     -     - - - 5 - - &os; 7.0-BETA4 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA4 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs, as this will presumably be the last BETA - release before the first RC release.

    -     -     -     - - - 11 - - - 29 - - - FreeBSD 6.3-RC1 Available - -

    The first release candidate of FreeBSD 6.3 has been announced. - ISO images and distributions for Tier-1 architectures are now available on most of the - - FreeBSD mirror sites.

    -     -     - - - 19 - - &os; 7.0-BETA3 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA3 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs.

    -     -     - - - 4 - - &os; 7.0-BETA2 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA2 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs, as this will presumably be the last BETA - release before the first RC release.

    -     -     - - - 1 - -

    New committer: Henrik Brix Andersen - (ports)

    -     -     -     - - - 10 - - - 27 - - The FreeBSD Foundation auctions the first copy of the book - "Absolute &os;, 2nd Edition" - -

    The &os; Foundation has started its Fall Fund-Raising - Campaign with an auction of the first copy of the book - "Absolute &os;, 2nd Edition" which was graciously - donated by the author Michael Lucas. The winner of this - auction will get a laser-printed Certificate of Authenticity - together with a signed bookplate. All proceeds will go to - The &os; Foundation! The bidding ends on November 2nd. - More information is available on eBay.

    -     -     - - - 26 - -

    Enhanced commit privileges: Martin Wilke - (ports, doc)

    -     -     - - - 25 - - New committer: <a href="mailto:lulf@FreeBSD.org">Ulf Lilleengen</a> - (src). SoC2007 alumnus. - -

    Ulf Lilleengen is now a src/ - committer. He participated in the Summer of Code program, where he - worked on gvinum. In FreeBSD, Ulf will continue to work on gvinum, - as well as csup and filesystem-related parts.

    -     -     - - 22 - - &os; 7.0-BETA1 Available - -

    The final stage of the &os;-7.0 Release cycle has begun - with the first beta release. The &os; 7.0-BETA1 ISO images - for Tier-1 architectures are now available - for download on most of the - &os; mirror sites. The more people that test and - report bugs, the better &os; 7.0-RELEASE will be. For more - information about the &os; 7.0 release process, please check - the official schedule - and the todo - list.

    -     -     - - 10 - - July-October, 2007 Status Reports - -

    The July-October, 2007 Status Reports is now - available with 21 entries.

    -     -     - - 3 - - PC-BSD 1.4 Released - -

    PC-BSD 1.4 has just been released. PC-BSD is a - successful desktop operating system based on FreeBSD that - focuses on providing an easy to use desktop system for - casual computer users. The release may be downloaded or purchased on CD.

    -     -     -     - - - 9 - - - 28 - - New committer: <a href="mailto:kaiw@FreeBSD.org">Kai Wang</a> - (src). SoC2007 alumnus. - -

    Kai Wang, a - student in the Summer of Code program, is now a - src/ committer.

    -     -     - - 25 - - New committer: <a href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a> - (src). SoC2007 alumnus. - -

    Rui Paulo, a - student in the Summer of Code program, is now a full - src/ committer.

    -     -     - - 17 - - Summer of Code Projects Completed - -

    We are happy to report that 22 students successfully - completed their FreeBSD Summer of - Code projects. Congratulations to both mentors and - students, and thanks to Google for running - this program and providing funding.

    - -     -     -     - - - 8 - - - 29 - - FreeBSD Foundation August 2007 newsletter - -

    The FreeBSD Foundation has published their - - August 2007 newsletter which summarizes their activities - so far this year.

    -     -     - - - 20 - -

    New committer: Thomas Abthorpe - (ports)

    -     -     - - - 2 - - IPv6 live at the FreeBSD.org cluster - -

    Most of the machines and services in the FreeBSD.org cluster - are now available through IPv6. This includes www, mail and - developer ssh access. Connectivity is provided from ISC using - a tunnel.

    -     - - -

    New committer: Fukang Chen - (doc)

    -     -     -     - - - 7 - - - 10 - - April-June, 2007 Status Report - -

    The April-June, 2007 Status Report is now - available with 49 entries.

    -     -     - - - 9 - -

    New committer: Lars Engels - (ports)

    -     -     -     - - - 6 - - - 25 - -

    Enhanced commit privileges: Edwin Groothuis - (src, ports)

    -     -     - - - 24 - -

    New committer: Sean C. Farley - (src)

    -     -     - - - 12 - -

    New committer: Timur I. Bakeyev - (ports)

    -     - - -

    Enhanced commit privileges: Chin-San Huang - (doc, ports)

    -     -     - - - 7 - - FreeBSD Project Integrates Support for the Camellia Block Cipher - -

    Support for the Camellia block cipher has been integrated - into FreeBSD 7-CURRENT and will be part of the upcoming - FreeBSD 7-RELEASE. For more information, please refer to the - press release.

    -     -     - - - 4 - - -

    Enhanced commit privileges: Johann Kois - (full doc/www)

    -     -     -     - - - 5 - - - 30 - -

    New committer: Beech Rintoul - (ports)

    -     -     - - - 29 - - New committer: <a href="mailto:attilio@FreeBSD.org">Attilio Rao</a> - (src). SoC2007 alumnus. - -

    Attilio Rao, a - student in the Summer of Code program, is now a full - src/ committer.

    -     -     - - - 19 - - Xorg 7.2 imported into the ports collection. -

    Thanks to the hard work of - Florent Thoumie (and - others), the FreeBSD ports collection now uses the modular - Xorg 7.2 as its default X server. i386 and AMD64 6.2-STABLE - packages are available and other architectures/releases - will be available later, or you can compile it from - source. In both cases, see - the 20070519 entry in /usr/ports/UPDATING on how to upgrade. Please track -ports - for last minute information. -

    -     -     -     - - - 4 - - - 26 - -

    New committer: Marcelo Araujo - (ports)

    -     -     - - - 25 - -

    New committer: Tong Liu - (ports)

    -     -     - - - 13 - - - Funded Summer of Code Projects Announced - -

    The FreeBSD Project received over 120 applications for Google's - Summer of Code program, amongst which 25 were selected - for funding. Unfortunately, there were far more first rate - applications than available spots for students. However, - we encourage students to work together with us all year - round. The FreeBSD Project is always willing to help - mentor students learn more about operating system - development through our normal community mailing lists and - development forums. Contributing to an open source - software project is a valuable component of a computer - science education and great preparation for a career in - software development.

    - -

    A complete list of the winning students and projects is - available here. -A Summer -of Code wiki is also available with additional information.

    -     - - -

    New committer: Edward Tomasz Napierala - (ports)

    -     - - Mongolian FreeBSD Documentation Project Launches - -

    Under the supervision of Ganbold Tsagaankhuu the - Mongolian translation goes live. The official translation of the - FreeBSD Handbook, completed by the Mongolian FreeBSD Documentation - Project, adds support for documentation in another language. For - more information about the ongoing work of the MFDP, please refer - to the Translations page - of the FreeBSD Documentation Project.

    -     -     - - - 12 - -

    New committer: Alexander Motin - (src)

    -     -     - - - 9 - - January-March, 2007 Status Report - -

    The January-March, 2007 Status Report is now - available with 19 entries.

    -     -     - - - 6 - - ZFS Now Part of FreeBSD - -

    Support for Sun's - ZFS has been committed - to the FreeBSD 7-CURRENT development branch and will be available - as an experimental feature in FreeBSD 7.0-RELEASE. For more - information please refer to the - announcement.

    -     -     - - - 4 - -

    New committer: Martin Matuska - (ports)

    -     -     - - - 3 - -

    New committer: Li-Wen Hsu - (ports)

    -     -     -     - - - 3 - - - 28 - -

    New committer: Sepherosa Ziehau - (src)

    -     -     - - - 14 - - Accepting Applications for Summer of Code - -

    The FreeBSD Project is now accepting applications for - the Google Summer - of Code 2007 program. This program will provide - funding for students to spend the summer contributing to - open source software projects. A list of FreeBSD specific - projects and potential mentors is available here.

    - -

    Once a suitable project and mentor have been identified, - interested students should complete a proposal and submit - it to Google. Proposals are now being accepted and the - final deadline is March 24, 2007. Please see the Google - FAQ for more information.

    -     -     - - - 12 - - March 2007 Snapshot Releases Available - -

    FreeBSD 7-CURRENT and 6-STABLE snapshot releases for - March 2007 now available. The FreeBSD Release Engineering - Team issues snapshot releases to encourage users to test - new features and improve the reliability. For more - details, please visit - the snapshots - page.

    -     -     - - - 11 - - New committer: <a - href="mailto:bushman@FreeBSD.org">Michael Bushkov</a> - (src). An SoC2006 alumnus. - -

    Michael Bushkov, a - successful student from last year's Summer of Code - program, has continued working with the FreeBSD Project - and is now a full src/ committer.

    -     -     - - - 10 - - Progress on scaling of FreeBSD on 8 CPU systems - -

    Recently there has been significant progress on optimizing - FreeBSD 7.0 for MySQL running an 8-core amd64 system. Under the - test workload FreeBSD has peak performance consistent with Linux, - and outperforms it by a factor of 4 under higher loads. Continue - reading for a more detailed - report here.

    -     -     - - - 7 - - FreeBSD Announces Intel Approval for Redistribution of Wireless Firmware - -

    The FreeBSD project has reached an agreement with Intel about the redistribution - of firmware images for Intel wireless cards. Please refer to the press release - for more information.

    -     -     -     - - - 2 - - - 27 - -

    Information - about how the change in Daylight Savings Time for some - time zones affects FreeBSD releases.

    -     -     - - - 23 - -

    Enhanced commit privileges: >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 16 12:24:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89FC8106567A; Tue, 16 Dec 2008 12:24: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 4DB1D1065677 for ; Tue, 16 Dec 2008 12:24:43 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 442158FC1C for ; Tue, 16 Dec 2008 12:24:43 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBGCOhmB052441 for ; Tue, 16 Dec 2008 12:24:43 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGCOhQ7052439 for perforce@freebsd.org; Tue, 16 Dec 2008 12:24:43 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 16 Dec 2008 12:24:43 GMT Message-Id: <200812161224.mBGCOhQ7052439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 154785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 12:24:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154785 Change 154785 by weongyo@weongyo_ws on 2008/12/16 12:24:28 it's better to return USBD_STATUS_XACT_ERROR when we encounter I/O errors because Windows's doing as like this if SURPRISE_REMOVAL is happened. USBD_STATUS_DEVICE_GONE looks strictly. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#23 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#23 (text+ko) ==== @@ -282,7 +282,7 @@ case USBD_SHORT_XFER: return (USBD_STATUS_ERROR_SHORT_TRANSFER); case USBD_IOERROR: - return (USBD_STATUS_DEVICE_GONE); + return (USBD_STATUS_XACT_ERROR); case USBD_NOMEM: return (USBD_STATUS_NO_MEMORY); case USBD_INVAL: From owner-p4-projects@FreeBSD.ORG Tue Dec 16 12:37:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11A0B1065673; Tue, 16 Dec 2008 12:37: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 CA1971065670 for ; Tue, 16 Dec 2008 12:37:56 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C08588FC1C for ; Tue, 16 Dec 2008 12:37:56 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBGCbuLP053433 for ; Tue, 16 Dec 2008 12:37:56 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGCbuWE053431 for perforce@freebsd.org; Tue, 16 Dec 2008 12:37:56 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 16 Dec 2008 12:37:56 GMT Message-Id: <200812161237.mBGCbuWE053431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 154786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 12:37:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=154786 Change 154786 by weongyo@weongyo_ws on 2008/12/16 12:37:32 if the Interrupt IN pipe was already set we don't need to re-initialize it again. In the previous it returned USBD_STATUS_SUCCESS which is bad indicating a transaction had done. While I'm here fix it to USBD_STATUS_PENDING to indicate a transaction is ready. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#24 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#24 (text+ko) ==== @@ -328,6 +328,9 @@ switch (urb->uu_hdr.uuh_func) { case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: status = usbd_func_bulkintr(ip); + if (status != USBD_STATUS_SUCCESS && + status != USBD_STATUS_PENDING) + USBD_URB_STATUS(urb) = status; break; case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: @@ -665,17 +668,17 @@ static irp *debug_irp = NULL; #endif + urb = usbd_geturb(ip); + if (sc->ndisusb_ep[NDISUSB_ENDPT_IIN] != NULL) { #ifdef NDISUSB_DEBUG if (debug_irp != NULL && debug_irp != ip) device_printf(dev, "trying to re-initialize IIN with other IRP\n"); #endif - /* - * if we already set the endpoint for Interrupt IN, we doesn't - * set again so just behave like we did good operations. - */ - return usbd_usb2urb(USBD_NORMAL_COMPLETION); + /* don't need to open the NDISUSB_ENDPT_IIN pipe again. */ + USBD_URB_STATUS(urb) = USBD_STATUS_PENDING; + return (USBD_STATUS_PENDING); } status = usbd_device2interface_handle(uaa->device, NDISUSB_IFACE_INDEX, @@ -685,7 +688,6 @@ return usbd_usb2urb(status); } - urb = usbd_geturb(ip); ubi = &urb->uu_bulkintr; ep = ubi->ubi_epdesc; From owner-p4-projects@FreeBSD.ORG Tue Dec 16 14:31:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17AAB1065675; Tue, 16 Dec 2008 14:31: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 AD6451065670 for ; Tue, 16 Dec 2008 14:31:52 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98EFD8FC08 for ; Tue, 16 Dec 2008 14:31:52 +0000 (UTC) (envelope-from bz@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 mBGEVq1b074547 for ; Tue, 16 Dec 2008 14:31:52 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGEVqY1074545 for perforce@freebsd.org; Tue, 16 Dec 2008 14:31:52 GMT (envelope-from bz@freebsd.org) Date: Tue, 16 Dec 2008 14:31:52 GMT Message-Id: <200812161431.mBGEVqY1074545@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 14:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=154789 Change 154789 by bz@bz_dumpster on 2008/12/16 14:31:46 Branch off man pages. (seriously thinking if we should branch the entire src/ soon) Affected files ... .. //depot/projects/vimage/src/share/man/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man1/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man1/builtin.1#1 branch .. //depot/projects/vimage/src/share/man/man1/intro.1#1 branch .. //depot/projects/vimage/src/share/man/man3/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man3/assert.3#1 branch .. //depot/projects/vimage/src/share/man/man3/bitstring.3#1 branch .. //depot/projects/vimage/src/share/man/man3/end.3#1 branch .. //depot/projects/vimage/src/share/man/man3/fpgetround.3#1 branch .. //depot/projects/vimage/src/share/man/man3/intro.3#1 branch .. //depot/projects/vimage/src/share/man/man3/makedev.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_atfork.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_attr.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_attr_get_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_barrier_destroy.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_barrierattr.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cancel.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cleanup_pop.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cleanup_push.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_broadcast.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_destroy.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_init.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_signal.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_timedwait.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_cond_wait.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_condattr.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_create.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_detach.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_equal.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_exit.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_getconcurrency.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_getspecific.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_join.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_key_create.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_key_delete.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_kill.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_main_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_multi_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_destroy.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_init.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_lock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_timedlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_trylock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutex_unlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutexattr.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_mutexattr_getkind_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_once.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_resume_all_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_resume_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_destroy.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_init.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_rdlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_timedrdlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_timedwrlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_unlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlock_wrlock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlockattr_destroy.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlockattr_getpshared.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlockattr_init.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_rwlockattr_setpshared.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_schedparam.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_self.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_set_name_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_setspecific.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_sigmask.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_spin_init.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_spin_lock.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_suspend_all_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_suspend_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_switch_add_np.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_testcancel.3#1 branch .. //depot/projects/vimage/src/share/man/man3/pthread_yield.3#1 branch .. //depot/projects/vimage/src/share/man/man3/queue.3#1 branch .. //depot/projects/vimage/src/share/man/man3/siginfo.3#1 branch .. //depot/projects/vimage/src/share/man/man3/stdarg.3#1 branch .. //depot/projects/vimage/src/share/man/man3/sysexits.3#1 branch .. //depot/projects/vimage/src/share/man/man3/tgmath.3#1 branch .. //depot/projects/vimage/src/share/man/man3/timeradd.3#1 branch .. //depot/projects/vimage/src/share/man/man3/tree.3#1 branch .. //depot/projects/vimage/src/share/man/man4/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man4/aac.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_aiboost.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_asus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_fujitsu.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_ibm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_panasonic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_sony.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_thermal.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_toshiba.4#1 branch .. //depot/projects/vimage/src/share/man/man4/acpi_video.4#1 branch .. //depot/projects/vimage/src/share/man/man4/adv.4#1 branch .. //depot/projects/vimage/src/share/man/man4/adw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ae.4#1 branch .. //depot/projects/vimage/src/share/man/man4/age.4#1 branch .. //depot/projects/vimage/src/share/man/man4/agp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/aha.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ahb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ahc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ahd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/aio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ale.4#1 branch .. //depot/projects/vimage/src/share/man/man4/altq.4#1 branch .. //depot/projects/vimage/src/share/man/man4/amd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/amdsmb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/amr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/an.4#1 branch .. //depot/projects/vimage/src/share/man/man4/arcmsr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/asmc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/asr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ata.4#1 branch .. //depot/projects/vimage/src/share/man/man4/atapicam.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ataraid.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ath.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ath_hal.4#1 branch .. //depot/projects/vimage/src/share/man/man4/atkbd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/atkbdc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/audit.4#1 branch .. //depot/projects/vimage/src/share/man/man4/auditpipe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/aue.4#1 branch .. //depot/projects/vimage/src/share/man/man4/axe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bce.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bfe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bktr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/blackhole.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bpf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/bt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cardbus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/carp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ccd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cdce.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ch.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ciss.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cmx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/coda.4#1 branch .. //depot/projects/vimage/src/share/man/man4/coretemp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cpuctl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cpufreq.4#1 branch .. //depot/projects/vimage/src/share/man/man4/crypto.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cue.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cxgb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/cy.4#1 branch .. //depot/projects/vimage/src/share/man/man4/da.4#1 branch .. //depot/projects/vimage/src/share/man/man4/dc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/dcons.4#1 branch .. //depot/projects/vimage/src/share/man/man4/dcons_crom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ddb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/de.4#1 branch .. //depot/projects/vimage/src/share/man/man4/devctl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/digi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/disc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/divert.4#1 branch .. //depot/projects/vimage/src/share/man/man4/dpt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/dummynet.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ed.4#1 branch .. //depot/projects/vimage/src/share/man/man4/edsc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ef.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ehci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/em.4#1 branch .. //depot/projects/vimage/src/share/man/man4/en.4#1 branch .. //depot/projects/vimage/src/share/man/man4/enc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/esp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/et.4#1 branch .. //depot/projects/vimage/src/share/man/man4/exca.4#1 branch .. //depot/projects/vimage/src/share/man/man4/faith.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fatm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fdc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/firewire.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fla.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fpa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fwe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fwip.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fwohci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/fxp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/gbde.4#1 branch .. //depot/projects/vimage/src/share/man/man4/gdb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/gem.4#1 branch .. //depot/projects/vimage/src/share/man/man4/geom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/geom_fox.4#1 branch .. //depot/projects/vimage/src/share/man/man4/geom_linux_lvm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/geom_uzip.4#1 branch .. //depot/projects/vimage/src/share/man/man4/gif.4#1 branch .. //depot/projects/vimage/src/share/man/man4/gre.4#1 branch .. //depot/projects/vimage/src/share/man/man4/harp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hatm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hfa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hifn.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hme.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hptiop.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hptmv.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/hwpmc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ichsmb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ichwd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/icmp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/icmp6.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ida.4#1 branch .. //depot/projects/vimage/src/share/man/man4/idt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ieee80211.4#1 branch .. //depot/projects/vimage/src/share/man/man4/if_bridge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ifmib.4#1 branch .. //depot/projects/vimage/src/share/man/man4/igb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iicbb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iicbus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iicsmb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iir.4#1 branch .. //depot/projects/vimage/src/share/man/man4/inet.4#1 branch .. //depot/projects/vimage/src/share/man/man4/inet6.4#1 branch .. //depot/projects/vimage/src/share/man/man4/intpm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/intro.4#1 branch .. //depot/projects/vimage/src/share/man/man4/io.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ip.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ip6.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ipfirewall.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ipmi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ips.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ipsec.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ipw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#1 branch .. //depot/projects/vimage/src/share/man/man4/isp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ispfw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iwi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/iwn.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ixgb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ixgbe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/jme.4#1 branch .. //depot/projects/vimage/src/share/man/man4/joy.4#1 branch .. //depot/projects/vimage/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/kbdmux.4#1 branch .. //depot/projects/vimage/src/share/man/man4/keyboard.4#1 branch .. //depot/projects/vimage/src/share/man/man4/kld.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ktr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/kue.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lagg.4#1 branch .. //depot/projects/vimage/src/share/man/man4/le.4#1 branch .. //depot/projects/vimage/src/share/man/man4/led.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/linux.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lmc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lpbb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/lpt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_biba.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_bsdextended.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_ifoff.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_lomac.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_mls.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_none.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_partition.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_portacl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_seeotheruids.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_stub.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mac_test.4#1 branch .. //depot/projects/vimage/src/share/man/man4/malo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.arm/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.arm/npe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/CPU_ELAN.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/alpm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/amdpm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/apm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ar.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/cp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/cs.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ct.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ctau.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/cx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/dpms.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ep.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ex.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/fe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ie.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/longrun.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/mcd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/mse.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/npx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/padlock.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/pae.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/pbio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/pcf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/perfmon.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/pnp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/pnpbios.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/ray.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/sbni.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/scd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/smapi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/snc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/sr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/streams.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/svr4.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/viapm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/vpd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/vx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.i386/wl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/auxio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/central.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/clkbrd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/creator.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/ebus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/eeprom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/fhc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/machfb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/ofw_console.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/openfirm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/openprom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/rtc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/sbus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch .. //depot/projects/vimage/src/share/man/man4/md.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mem.4#1 branch .. //depot/projects/vimage/src/share/man/man4/meteor.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mfi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/miibus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mlx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mly.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mmc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mmcsd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mn.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mouse.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mpt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/msk.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mtio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/multicast.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mxge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/my.4#1 branch .. //depot/projects/vimage/src/share/man/man4/natm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/natmip.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ncr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ncv.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ndis.4#1 branch .. //depot/projects/vimage/src/share/man/man4/netgraph.4#1 branch .. //depot/projects/vimage/src/share/man/man4/netintro.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nfe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nfsmb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_UI.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_async.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_atm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_atmllc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_bluetooth.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_bpf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_bridge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_bt3c.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_btsocket.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_car.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ccatm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_cisco.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_deflate.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_device.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_echo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_eiface.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_etf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ether.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_fec.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_frame_relay.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_gif.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_gif_demux.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_h4.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_hci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_hole.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_hub.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_iface.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ip_input.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ipfw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ksocket.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_l2cap.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_l2tp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_lmi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_mppc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_nat.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_netflow.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_one2many.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ppp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_pppoe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_pptpgre.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_pred1.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_rfc1490.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_socket.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_source.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_split.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_sppp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_sscfu.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_sscop.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_tag.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_tcpmss.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_tee.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_tty.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ubt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_uni.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_vjc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_vlan.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nmdm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nsp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/null.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nve.4#1 branch .. //depot/projects/vimage/src/share/man/man4/nxge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ohci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/orm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pass.4#1 branch .. //depot/projects/vimage/src/share/man/man4/patm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pccard.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pccbb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pcib.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pcic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pcm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pcn.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pim.4#1 branch .. //depot/projects/vimage/src/share/man/man4/polling.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ppbus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ppc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ppi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ppp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/psm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pst.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pts.4#1 branch .. //depot/projects/vimage/src/share/man/man4/pty.4#1 branch .. //depot/projects/vimage/src/share/man/man4/puc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ral.4#1 branch .. //depot/projects/vimage/src/share/man/man4/random.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/re.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rndtest.4#1 branch .. //depot/projects/vimage/src/share/man/man4/route.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rue.4#1 branch .. //depot/projects/vimage/src/share/man/man4/rum.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/safe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sbp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sbp_targ.4#1 branch .. //depot/projects/vimage/src/share/man/man4/scc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sched_4bsd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sched_ule.4#1 branch .. //depot/projects/vimage/src/share/man/man4/screen.4#1 branch .. //depot/projects/vimage/src/share/man/man4/scsi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sctp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sdhci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sem.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ses.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/si.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sis.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sk.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/smb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/smbus.4#1 branch .. //depot/projects/vimage/src/share/man/man4/smp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sn.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_ad1816.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_als4000.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_atiixp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_cmi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_cs4281.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_csa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_ds1.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_emu10k1.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_envy24.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_envy24ht.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_es137x.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_ess.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_fm801.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_gusc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_hda.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_ich.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_maestro.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_maestro3.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_mss.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_neomagic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_sbc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_solo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_spicds.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_t4dwave.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_uaudio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_via8233.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_via82c686.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snd_vibes.4#1 branch .. //depot/projects/vimage/src/share/man/man4/snp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/spic.4#1 branch .. //depot/projects/vimage/src/share/man/man4/spkr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/splash.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sppp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ste.4#1 branch .. //depot/projects/vimage/src/share/man/man4/stf.4#1 branch .. //depot/projects/vimage/src/share/man/man4/stg.4#1 branch .. //depot/projects/vimage/src/share/man/man4/stge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sym.4#1 branch .. //depot/projects/vimage/src/share/man/man4/syncache.4#1 branch .. //depot/projects/vimage/src/share/man/man4/syncer.4#1 branch .. //depot/projects/vimage/src/share/man/man4/syscons.4#1 branch .. //depot/projects/vimage/src/share/man/man4/sysmouse.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tap.4#1 branch .. //depot/projects/vimage/src/share/man/man4/targ.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tcp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tdfx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/termios.4#1 branch .. //depot/projects/vimage/src/share/man/man4/textdump.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ti.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/trm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tty.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tun.4#1 branch .. //depot/projects/vimage/src/share/man/man4/twa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/twe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/tx.4#1 branch .. //depot/projects/vimage/src/share/man/man4/txp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/u3g.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uark.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uart.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ubsa.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ubsec.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ubser.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ubtbcmfw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uchcom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ucom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ucycom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/udav.4#1 branch .. //depot/projects/vimage/src/share/man/man4/udbp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/udp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ufm.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ufoma.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uftdi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ugen.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uhci.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uhid.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uipaq.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ukbd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ulpt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/umass.4#1 branch .. //depot/projects/vimage/src/share/man/man4/umct.4#1 branch .. //depot/projects/vimage/src/share/man/man4/umodem.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ums.4#1 branch .. //depot/projects/vimage/src/share/man/man4/unix.4#1 branch .. //depot/projects/vimage/src/share/man/man4/upgt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uplcom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ural.4#1 branch .. //depot/projects/vimage/src/share/man/man4/urio.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_bluetooth.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_controller.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_core.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_ethernet.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_image.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_input.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_misc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_ndis.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_quirk.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_serial.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_sound.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_storage.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_template.4#1 branch .. //depot/projects/vimage/src/share/man/man4/usb2_wlan.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uscanner.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uslcom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/utopia.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uvisor.4#1 branch .. //depot/projects/vimage/src/share/man/man4/uvscom.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vga.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vge.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vinum.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vkbd.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vlan.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vpo.4#1 branch .. //depot/projects/vimage/src/share/man/man4/vr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/watchdog.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wb.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/witness.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_acl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_amrr.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_ccmp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_tkip.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_wep.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wlan_xauth.4#1 branch .. //depot/projects/vimage/src/share/man/man4/wpi.4#1 branch .. //depot/projects/vimage/src/share/man/man4/xe.4#1 branch .. //depot/projects/vimage/src/share/man/man4/xl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/xpt.4#1 branch .. //depot/projects/vimage/src/share/man/man4/zero.4#1 branch .. //depot/projects/vimage/src/share/man/man4/zyd.4#1 branch .. //depot/projects/vimage/src/share/man/man5/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man5/a.out.5#1 branch .. //depot/projects/vimage/src/share/man/man5/acct.5#1 branch .. //depot/projects/vimage/src/share/man/man5/ar.5#1 branch .. //depot/projects/vimage/src/share/man/man5/bluetooth.device.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/bluetooth.hosts.5#1 branch .. //depot/projects/vimage/src/share/man/man5/bluetooth.protocols.5#1 branch .. //depot/projects/vimage/src/share/man/man5/boot.config.5#1 branch .. //depot/projects/vimage/src/share/man/man5/core.5#1 branch .. //depot/projects/vimage/src/share/man/man5/devfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/devfs.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/devfs.rules.5#1 branch .. //depot/projects/vimage/src/share/man/man5/device.hints.5#1 branch .. //depot/projects/vimage/src/share/man/man5/dir.5#1 branch .. //depot/projects/vimage/src/share/man/man5/disktab.5#1 branch .. //depot/projects/vimage/src/share/man/man5/elf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/ethers.5#1 branch .. //depot/projects/vimage/src/share/man/man5/eui64.5#1 branch .. //depot/projects/vimage/src/share/man/man5/ext2fs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/fbtab.5#1 branch .. //depot/projects/vimage/src/share/man/man5/fdescfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/forward.5#1 branch .. //depot/projects/vimage/src/share/man/man5/freebsd-update.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/fs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/fstab.5#1 branch .. //depot/projects/vimage/src/share/man/man5/group.5#1 branch .. //depot/projects/vimage/src/share/man/man5/hesiod.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/hosts.5#1 branch .. //depot/projects/vimage/src/share/man/man5/hosts.equiv.5#1 branch .. //depot/projects/vimage/src/share/man/man5/hosts.lpd.5#1 branch .. //depot/projects/vimage/src/share/man/man5/intro.5#1 branch .. //depot/projects/vimage/src/share/man/man5/libmap.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/link.5#1 branch .. //depot/projects/vimage/src/share/man/man5/linprocfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/linsysfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/mailer.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/make.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/moduli.5#1 branch .. //depot/projects/vimage/src/share/man/man5/motd.5#1 branch .. //depot/projects/vimage/src/share/man/man5/mqueuefs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/msdosfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/networks.5#1 branch .. //depot/projects/vimage/src/share/man/man5/nsmb.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/nsswitch.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/nullfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/passwd.5#1 branch .. //depot/projects/vimage/src/share/man/man5/pbm.5#1 branch .. //depot/projects/vimage/src/share/man/man5/periodic.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/phones.5#1 branch .. //depot/projects/vimage/src/share/man/man5/portsnap.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/procfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/protocols.5#1 branch .. //depot/projects/vimage/src/share/man/man5/quota.user.5#1 branch .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/regdomain.5#1 branch .. //depot/projects/vimage/src/share/man/man5/reiserfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/remote.5#1 branch .. //depot/projects/vimage/src/share/man/man5/resolver.5#1 branch .. //depot/projects/vimage/src/share/man/man5/services.5#1 branch .. //depot/projects/vimage/src/share/man/man5/shells.5#1 branch .. //depot/projects/vimage/src/share/man/man5/src.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/stab.5#1 branch .. //depot/projects/vimage/src/share/man/man5/style.Makefile.5#1 branch .. //depot/projects/vimage/src/share/man/man5/sysctl.conf.5#1 branch .. //depot/projects/vimage/src/share/man/man5/tmpfs.5#1 branch .. //depot/projects/vimage/src/share/man/man5/utmp.5#1 branch .. //depot/projects/vimage/src/share/man/man5/xfs.5#1 branch .. //depot/projects/vimage/src/share/man/man6/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man6/intro.6#1 branch .. //depot/projects/vimage/src/share/man/man7/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man7/ascii.7#1 branch .. //depot/projects/vimage/src/share/man/man7/bsd.snmpmod.mk.7#1 branch .. //depot/projects/vimage/src/share/man/man7/build.7#1 branch .. //depot/projects/vimage/src/share/man/man7/clocks.7#1 branch .. //depot/projects/vimage/src/share/man/man7/development.7#1 branch .. //depot/projects/vimage/src/share/man/man7/environ.7#1 branch .. //depot/projects/vimage/src/share/man/man7/ffs.7#1 branch .. //depot/projects/vimage/src/share/man/man7/firewall.7#1 branch .. //depot/projects/vimage/src/share/man/man7/hier.7#1 branch .. //depot/projects/vimage/src/share/man/man7/hostname.7#1 branch .. //depot/projects/vimage/src/share/man/man7/intro.7#1 branch .. //depot/projects/vimage/src/share/man/man7/maclabel.7#1 branch .. //depot/projects/vimage/src/share/man/man7/mailaddr.7#1 branch .. //depot/projects/vimage/src/share/man/man7/operator.7#1 branch .. //depot/projects/vimage/src/share/man/man7/ports.7#1 branch .. //depot/projects/vimage/src/share/man/man7/release.7#1 branch .. //depot/projects/vimage/src/share/man/man7/sdoc.7#1 branch .. //depot/projects/vimage/src/share/man/man7/security.7#1 branch .. //depot/projects/vimage/src/share/man/man7/sprog.7#1 branch .. //depot/projects/vimage/src/share/man/man7/stdint.7#1 branch .. //depot/projects/vimage/src/share/man/man7/tuning.7#1 branch .. //depot/projects/vimage/src/share/man/man8/MAKEDEV.8#1 branch .. //depot/projects/vimage/src/share/man/man8/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man8/adding_user.8#1 branch .. //depot/projects/vimage/src/share/man/man8/crash.8#1 branch .. //depot/projects/vimage/src/share/man/man8/diskless.8#1 branch .. //depot/projects/vimage/src/share/man/man8/intro.8#1 branch .. //depot/projects/vimage/src/share/man/man8/nanobsd.8#1 branch .. //depot/projects/vimage/src/share/man/man8/picobsd.8#1 branch .. //depot/projects/vimage/src/share/man/man8/rc.8#1 branch .. //depot/projects/vimage/src/share/man/man8/rc.sendmail.8#1 branch .. //depot/projects/vimage/src/share/man/man8/rc.subr.8#1 branch .. //depot/projects/vimage/src/share/man/man8/rescue.8#1 branch .. //depot/projects/vimage/src/share/man/man8/sticky.8#1 branch .. //depot/projects/vimage/src/share/man/man8/yp.8#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_LOCK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_LOCKFREE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_LOCKINIT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_TIMELOCK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUF_UNLOCK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUS_ADD_CHILD.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUS_CONFIG_INTR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUS_PRINT_CHILD.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUS_READ_IVAR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/BUS_SETUP_INTR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/CTASSERT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DECLARE_GEOM_CLASS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DECLARE_MODULE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DELAY.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEVICE_ATTACH.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEVICE_DETACH.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEVICE_IDENTIFY.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEVICE_PROBE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEVICE_SHUTDOWN.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DEV_MODULE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/DRIVER_MODULE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/EVENTHANDLER.9#1 branch .. //depot/projects/vimage/src/share/man/man9/KASSERT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/vimage/src/share/man/man9/MD5.9#1 branch .. //depot/projects/vimage/src/share/man/man9/MODULE_DEPEND.9#1 branch .. //depot/projects/vimage/src/share/man/man9/MODULE_VERSION.9#1 branch .. //depot/projects/vimage/src/share/man/man9/Makefile#1 branch .. //depot/projects/vimage/src/share/man/man9/SYSCALL_MODULE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_CHECKEXP.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_FHTOVP.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_LOCK_GIANT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_MOUNT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_QUOTACTL.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_ROOT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_SET.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_STATFS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_SYNC.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_UNMOUNT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VFS_VGET.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_ACLCHECK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_ADVLOCK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_ATTRIB.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_BWRITE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_CREATE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_FSYNC.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_GETACL.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_GETEXTATTR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_GETPAGES.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_GETVOBJECT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_INACTIVE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_IOCTL.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_LEASE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_LINK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_LOCK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_LOOKUP.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_OPENCLOSE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_PATHCONF.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_PRINT.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_RDWR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_READDIR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_READLINK.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_REALLOCBLKS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_REMOVE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_RENAME.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_REVOKE.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_SETACL.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_SETEXTATTR.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_STRATEGY.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOFH.9#1 branch .. //depot/projects/vimage/src/share/man/man9/accept_filter.9#1 branch .. //depot/projects/vimage/src/share/man/man9/accf_data.9#1 branch .. //depot/projects/vimage/src/share/man/man9/accf_dns.9#1 branch .. //depot/projects/vimage/src/share/man/man9/accf_http.9#1 branch .. //depot/projects/vimage/src/share/man/man9/acl.9#1 branch .. //depot/projects/vimage/src/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/vimage/src/share/man/man9/alq.9#1 branch .. //depot/projects/vimage/src/share/man/man9/altq.9#1 branch .. //depot/projects/vimage/src/share/man/man9/atomic.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bios.9#1 branch .. //depot/projects/vimage/src/share/man/man9/boot.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bpf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/buf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_activate_resource.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_alloc_resource.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_child_present.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_dma.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_generic_attach.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_generic_detach.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_generic_print_child.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_generic_read_ivar.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_generic_shutdown.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_release_resource.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_set_resource.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_space.9#1 branch .. //depot/projects/vimage/src/share/man/man9/byteorder.9#1 branch .. //depot/projects/vimage/src/share/man/man9/cd.9#1 branch .. //depot/projects/vimage/src/share/man/man9/condvar.9#1 branch .. //depot/projects/vimage/src/share/man/man9/config_intrhook.9#1 branch .. //depot/projects/vimage/src/share/man/man9/contigmalloc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/copy.9#1 branch .. //depot/projects/vimage/src/share/man/man9/cr_cansee.9#1 branch .. //depot/projects/vimage/src/share/man/man9/cr_seeothergids.9#1 branch .. //depot/projects/vimage/src/share/man/man9/cr_seeotheruids.9#1 branch .. //depot/projects/vimage/src/share/man/man9/critical_enter.9#1 branch .. //depot/projects/vimage/src/share/man/man9/crypto.9#1 branch .. //depot/projects/vimage/src/share/man/man9/dev_clone.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_add_driver.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_find.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_count.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_device.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_devices.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_drivers.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_maxunit.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_name.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_get_softc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devfs_set_cdevpriv.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_add_child.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_delete_child.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_enable.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_find_child.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_children.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_devclass.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_driver.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_ivars.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_name.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_parent.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_softc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_state.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_get_unit.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_printf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_probe_and_attach.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_quiet.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_set_desc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_set_driver.9#1 branch .. //depot/projects/vimage/src/share/man/man9/device_set_flags.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devstat.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devtoname.9#1 branch .. //depot/projects/vimage/src/share/man/man9/disk.9#1 branch .. //depot/projects/vimage/src/share/man/man9/domain.9#1 branch .. //depot/projects/vimage/src/share/man/man9/driver.9#1 branch .. //depot/projects/vimage/src/share/man/man9/extattr.9#1 branch .. //depot/projects/vimage/src/share/man/man9/fetch.9#1 branch .. //depot/projects/vimage/src/share/man/man9/firmware.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_access.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_attach.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_bio.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_consumer.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_data.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_event.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_geom.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_provider.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_provider_by_name.9#1 branch .. //depot/projects/vimage/src/share/man/man9/g_wither_geom.9#1 branch .. //depot/projects/vimage/src/share/man/man9/get_cyclecount.9#1 branch .. //depot/projects/vimage/src/share/man/man9/getnewvnode.9#1 branch .. //depot/projects/vimage/src/share/man/man9/groupmember.9#1 branch .. //depot/projects/vimage/src/share/man/man9/hash.9#1 branch .. //depot/projects/vimage/src/share/man/man9/hashinit.9#1 branch .. //depot/projects/vimage/src/share/man/man9/hexdump.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_crypto.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_input.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_ioctl.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_node.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_output.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_proto.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ieee80211_radiotap.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ifnet.9#1 branch .. //depot/projects/vimage/src/share/man/man9/inittodr.9#1 branch .. //depot/projects/vimage/src/share/man/man9/insmntque.9#1 branch .. //depot/projects/vimage/src/share/man/man9/intro.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ithread.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kernacc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kernel_mount.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kobj.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kproc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kqueue.9#1 branch .. //depot/projects/vimage/src/share/man/man9/kthread.9#1 branch .. //depot/projects/vimage/src/share/man/man9/ktr.9#1 branch .. //depot/projects/vimage/src/share/man/man9/lock.9#1 branch .. //depot/projects/vimage/src/share/man/man9/locking.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mac.9#1 branch .. //depot/projects/vimage/src/share/man/man9/make_dev.9#1 branch .. //depot/projects/vimage/src/share/man/man9/malloc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mbchain.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mbpool.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mbuf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mbuf_tags.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mdchain.9#1 branch .. //depot/projects/vimage/src/share/man/man9/memguard.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mi_switch.9#1 branch .. //depot/projects/vimage/src/share/man/man9/microseq.9#1 branch .. //depot/projects/vimage/src/share/man/man9/microtime.9#1 branch .. //depot/projects/vimage/src/share/man/man9/microuptime.9#1 branch .. //depot/projects/vimage/src/share/man/man9/module.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mtx_pool.9#1 branch .. //depot/projects/vimage/src/share/man/man9/mutex.9#1 branch .. //depot/projects/vimage/src/share/man/man9/namei.9#1 branch .. //depot/projects/vimage/src/share/man/man9/p_candebug.9#1 branch .. //depot/projects/vimage/src/share/man/man9/p_cansee.9#1 branch .. //depot/projects/vimage/src/share/man/man9/panic.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pbuf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pci.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pfil.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pfind.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pgfind.9#1 branch .. //depot/projects/vimage/src/share/man/man9/physio.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_activate.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_change_wiring.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_clear_modify.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_copy.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_enter.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_extract.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_growkernel.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_init.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_is_modified.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_is_prefaultable.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_map.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_mincore.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_object_init_pt.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_page_exists_quick.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_page_protect.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_pinit.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_qenter.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_release.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_remove.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_resident_count.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pmap_zero_page.9#1 branch .. //depot/projects/vimage/src/share/man/man9/printf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/prison_check.9#1 branch .. //depot/projects/vimage/src/share/man/man9/priv.9#1 branch .. //depot/projects/vimage/src/share/man/man9/pseudofs.9#1 branch .. //depot/projects/vimage/src/share/man/man9/psignal.9#1 branch .. //depot/projects/vimage/src/share/man/man9/random.9#1 branch .. //depot/projects/vimage/src/share/man/man9/random_harvest.9#1 branch .. //depot/projects/vimage/src/share/man/man9/redzone.9#1 branch .. //depot/projects/vimage/src/share/man/man9/resettodr.9#1 branch .. //depot/projects/vimage/src/share/man/man9/resource_int_value.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rijndael.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rman.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rmlock.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rtalloc.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rtentry.9#1 branch .. //depot/projects/vimage/src/share/man/man9/runqueue.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rwlock.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sbuf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/scheduler.9#1 branch .. //depot/projects/vimage/src/share/man/man9/securelevel_gt.9#1 branch .. //depot/projects/vimage/src/share/man/man9/selrecord.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sema.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sf_buf.9#1 branch .. //depot/projects/vimage/src/share/man/man9/signal.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sleep.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sleepqueue.9#1 branch .. //depot/projects/vimage/src/share/man/man9/socket.9#1 branch .. //depot/projects/vimage/src/share/man/man9/spl.9#1 branch .. //depot/projects/vimage/src/share/man/man9/stack.9#1 branch .. //depot/projects/vimage/src/share/man/man9/store.9#1 branch .. //depot/projects/vimage/src/share/man/man9/style.9#1 branch .. //depot/projects/vimage/src/share/man/man9/swi.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sx.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sysctl.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sysctl_add_oid.9#1 branch .. //depot/projects/vimage/src/share/man/man9/sysctl_ctx_init.9#1 branch .. //depot/projects/vimage/src/share/man/man9/taskqueue.9#1 branch .. //depot/projects/vimage/src/share/man/man9/thread_exit.9#1 branch .. //depot/projects/vimage/src/share/man/man9/time.9#1 branch .. //depot/projects/vimage/src/share/man/man9/timeout.9#1 branch .. //depot/projects/vimage/src/share/man/man9/tvtohz.9#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 16 14:37:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 422F61065675; Tue, 16 Dec 2008 14:37: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 060621065672 for ; Tue, 16 Dec 2008 14:37:59 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E723F8FC17 for ; Tue, 16 Dec 2008 14:37:58 +0000 (UTC) (envelope-from bz@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 mBGEbwNZ075148 for ; Tue, 16 Dec 2008 14:37:58 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGEbw7R075146 for perforce@freebsd.org; Tue, 16 Dec 2008 14:37:58 GMT (envelope-from bz@freebsd.org) Date: Tue, 16 Dec 2008 14:37:58 GMT Message-Id: <200812161437.mBGEbw7R075146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 14:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=154790 Change 154790 by bz@bz_dumpster on 2008/12/16 14:37:17 Add if_epair(4) without if_reassign (will add that once I could test). Needs: netisr simulated hw queue re-thinking with rwatson's work in progres in the netisr branch and man page review. Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#2 edit .. //depot/projects/vimage/src/share/man/man4/altq.4#2 edit .. //depot/projects/vimage/src/share/man/man4/epair.4#1 add .. //depot/projects/vimage/src/sys/conf/NOTES#39 edit .. //depot/projects/vimage/src/sys/conf/files#51 edit .. //depot/projects/vimage/src/sys/modules/Makefile#36 edit .. //depot/projects/vimage/src/sys/modules/if_epair/Makefile#1 add .. //depot/projects/vimage/src/sys/net/if_epair.c#1 add .. //depot/projects/vimage/src/sys/net/netisr.c#13 edit .. //depot/projects/vimage/src/sys/net/netisr.h#4 edit Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#2 (text+ko) ==== @@ -86,6 +86,7 @@ em.4 \ en.4 \ enc.4 \ + epair.4 \ esp.4 \ et.4 \ exca.4 \ @@ -474,6 +475,7 @@ MLINKS+=em.4 if_em.4 MLINKS+=en.4 if_en.4 MLINKS+=enc.4 if_enc.4 +MLINKS+=epair.4 if_epair.4 MLINKS+=et.4 if_et.4 MLINKS+=faith.4 if_faith.4 MLINKS+=fatm.4 if_fatm.4 ==== //depot/projects/vimage/src/share/man/man4/altq.4#2 (text+ko) ==== @@ -129,6 +129,7 @@ .Xr ed 4 , .Xr em 4 , .Xr ep 4 , +.Xr epair 4 , .Xr fxp 4 , .Xr gem 4 , .Xr hme 4 , ==== //depot/projects/vimage/src/sys/conf/NOTES#39 (text+ko) ==== @@ -794,6 +794,7 @@ device carp #Common Address Redundancy Protocol device enc #IPsec interface device lagg #Link aggregation interface +device epair #Virtual cross-over Ethernet device ef # Multiple ethernet frames support options ETHER_II # enable Ethernet_II frame ==== //depot/projects/vimage/src/sys/conf/files#51 (text+ko) ==== @@ -2162,6 +2162,7 @@ net/if_edsc.c optional edsc net/if_ef.c optional ef net/if_enc.c optional enc +net/if_epair.c optional epair net/if_ethersubr.c optional ether \ compile-with "${NORMAL_C} -I$S/contrib/pf" net/if_faith.c optional faith ==== //depot/projects/vimage/src/sys/modules/Makefile#36 (text+ko) ==== @@ -111,6 +111,7 @@ if_disc \ if_edsc \ if_ef \ + if_epair \ if_faith \ if_gif \ if_gre \ ==== //depot/projects/vimage/src/sys/net/netisr.c#13 (text+ko) ==== @@ -62,6 +62,7 @@ netisr_t *ni_handler; struct ifqueue *ni_queue; int ni_flags; + void (*ni_handler_drained)(void); } netisrs[32]; static void *net_ih; @@ -73,7 +74,8 @@ } void -netisr_register(int num, netisr_t *handler, struct ifqueue *inq, int flags) +netisr_register2(int num, netisr_t *handler, void (*handler_drained)(void), + struct ifqueue *inq, int flags) { KASSERT(!(num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs))), @@ -83,9 +85,16 @@ netisrs[num].ni_handler = handler; netisrs[num].ni_queue = inq; netisrs[num].ni_flags = flags; + netisrs[num].ni_handler_drained = handler_drained; } void +netisr_register(int num, netisr_t *handler, struct ifqueue *inq, int flags) +{ + netisr_register2(num, handler, NULL, inq, flags); +} + +void netisr_unregister(int num) { struct netisr *ni; @@ -148,6 +157,8 @@ ni->ni_handler(m); CURVNET_RESTORE(); } + if (ni->ni_handler_drained) + ni->ni_handler_drained(); } /* ==== //depot/projects/vimage/src/sys/net/netisr.h#4 (text+ko) ==== @@ -45,6 +45,7 @@ * now implemented via a software ithread (SWI). */ #define NETISR_POLL 0 /* polling callback, must be first */ +#define NETISR_EPAIR 1 /* if_epair(4) soft interrupt */ #define NETISR_IP 2 /* same as AF_INET */ #define NETISR_ROUTE 14 /* routing socket */ #define NETISR_AARP 15 /* Appletalk ARP */ @@ -84,6 +85,7 @@ void netisr_dispatch(int, struct mbuf *); int netisr_queue(int, struct mbuf *); #define NETISR_FORCEQUEUE 0x0002 /* Force queued dispatch. */ +void netisr_register2(int, netisr_t *, void (*)(void), struct ifqueue *, int); void netisr_register(int, netisr_t *, struct ifqueue *, int); void netisr_unregister(int); From owner-p4-projects@FreeBSD.ORG Tue Dec 16 15:07:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58058106567C; Tue, 16 Dec 2008 15:07: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 1A5BA1065679 for ; Tue, 16 Dec 2008 15:07:29 +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 0586C8FC1C for ; Tue, 16 Dec 2008 15:07:29 +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 mBGF7SXV078326 for ; Tue, 16 Dec 2008 15:07:28 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGF7SMU078324 for perforce@freebsd.org; Tue, 16 Dec 2008 15:07:28 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 16 Dec 2008 15:07:28 GMT Message-Id: <200812161507.mBGF7SMU078324@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 154791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 15:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=154791 Change 154791 by pgj@kolbasz on 2008/12/16 15:06:36 MFen (doc): 1.415 -> 1.417 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.67 -> 1.68 hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml 1.84 -> 1.85 hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml 1.195 -> 1.196 hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml 1.390 -> 1.391 hu_HU.ISO8859-2/books/handbook/install/chapter.sgml 1.284 -> 1.285 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.43 -> 1.44 hu_HU.ISO8859-2/books/handbook/preface/preface.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#21 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#20 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#21 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -504,7 +504,7 @@ - + Kettõs hálózatú gépek @@ -594,6 +594,10 @@ állítsuk a változó értékét 0-ra. + BGP + RIP + OSPF + Az új útválasztónak nem árt arról sem tudnia, hogy merre továbbítsa a forgalmat. Ha elég @@ -610,14 +614,9 @@ feladatokhoz olyan kereskedelmi termékek is elérhetõek, mint például a &gated;. - - BGP - RIP - OSPF - - + @@ -785,11 +784,10 @@ static_routes="net1 net2" route_net1="-net 192.168.0.0/24 192.168.0.1" route_net2="-net 192.168.1.0/24 192.168.1.1" - - + Az útvonalak terjedése útvonalterjedés @@ -846,10 +844,9 @@ útként) beregisztálja magát a gerinchálózat gépein. Ezt nevezik az útvonal terjedésének. - - + Hibaelhárítás traceroute @@ -878,10 +875,9 @@ mûködésérõl részletesebb információkat a &man.traceroute.8; man oldalán találunk. - - + Útválasztás multicast esetén ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml - %SRCID% 1.67 + %SRCID% 1.68 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#12 (text+ko) ==== @@ -6,7 +6,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.84 + %SRCID% 1.85 --> @@ -329,8 +329,23 @@ &realplayer; pluginjait is használhatóvá teszi. + + A most következõ részben a &flash; + 9.X + telepítését tárgyaljuk a + legfrissebb &os; -STABLE és 7.1-RELEASE + változatok esetén. Ha a &os; valamelyik + korábbi változatát használjuk + és problémákba + ütköznénk, javasolt inkább a www/linux-flashplugin7 port + telepítése és a &man.linprocfs.5; + beállítására vonatkozó + rész kihagyása. + + Telepítsük a www/nspluginwrapper portot. A port + role="package">www/nspluginwrapper portot. A port telepítése viszont maga után vonja a emulators/linux_base telepítését is, amely viszont egy nagyobb @@ -338,7 +353,7 @@ A következõ lépésben telepítsük a www/linux-flashplugin7 portot. + role="package">www/linux-flashplugin9 portot. Miután felkerült, a hozzátartozó plugint minden felhasználónak külön telepítenie kell az nspluginwrapper @@ -346,6 +361,23 @@ &prompt.user; nspluginwrapper -v -a -i + Ha &flash; animációkat szeretnénk + lejátszani, akkor ehhez a /usr/compat/linux/proc + könyvtárba csatlakoztatnunk kell egy + &man.linprocfs.5; típusú linuxos proc + állományrendszert. Ezt a következõ + paranccsal tehetjük meg: + + &prompt.root; mount -t linprocfs linproc /usr/compat/linux/proc + + Az /etc/fstab állományban + az alábbi sor hozzáadásával azonban + ennek csatlakoztatása akár automatikussá is + tehetõ a rendszerindítás során: + + linproc /usr/compat/linux/proc linprocfs rw 0 0 + Ezután indítsuk el a böngészõt, majd gépeljük be a about:plugins szöveget a címsorba ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#20 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -25,8 +25,8 @@ közösség önmaga is egyfajta szakmai segélynyújtó egyletként funkcionál, amelyet leghatékonyabban elektronikus - levelében vagy USENET hírcsoportokon keresztül - érhetünk el. + levélben, webes fórumokon vagy USENET + hírcsoportokon keresztül érhetünk el. A továbbiakban a &os; felhasználók közösségének különbözõ @@ -41,17 +41,18 @@ Levelezési listák - Habár sok &os; fejlesztõ olvas USENET-et, nem - tudjuk mindig szavatolni, hogy a - comp.unix.bsd.freebsd.* csoportok - valamelyikére küldött levelek idõben (vagy - egyáltalán) megválaszolásra - kerülnek. A megfelelõ levelezési listák - címére küldött levelekkel a - fejlesztõk mellett a &os; közönségét - is egyaránt el tudjuk érni, ami változatlanul - jobb (de legalább is gyorsabb) válaszokkal - kecsegtet. + A &os; köré csoportosulókat + levelezési listákon keresztül tudjuk + közvetlenül elérni, ezen a módon + tehetünk fel kérdéseket, vethetünk fel + témákat. Ezek között több + különbözõ területtel foglalkozó + listát találhatunk. Ezért + célszerû mindig a + hozzászólásainkat a témánkhoz + legközelebb álló listára küldeni, + mert enélkül szinte biztos, hogy nem kapunk pontos + vagy gyors választ. A különbözõ listák témájának rövid leírása a @@ -103,8 +104,15 @@ nyújtja a gyakran felmerülõ kérdések egyszerû és gyors megválaszolásának, ezért ilyen - esetekben elõször mindig ezt javasolt - használni. + esetekben elõször mindig ezt javasolt használni. + Ez egyben mellesleg azt is jelenti, hogy a &os; levelezési + listáira küldött üzenetek fennmaradnak az + örökkévalóságig. Ha a + beküldendõ üzenet bizalmas + információkat tartalmaz, érdemes megfontolni + egy eldobható anonim e-mail cím + használatát és kizárólag csak a + publikus részet beküldeni. A listák összefoglalása @@ -2454,8 +2462,52 @@ Világhálós szolgáltatások - &chap.eresources.www.inc; + + Fórumok, blogok és ismertségi + hálózatok + + + + A &os; + fórumok a &os; kapcsán + felmerülõ kérdések és szakmai + témák megvitatásához egy webes + felületet kínálnak fel. + + + + A Planet + &os; honlapján fejlesztõk által + vezetett tucatnyi webes naplót és + hozzájuk tartozó RSS feedeket + találhatunk. Sok fejlesztõ ezen a módon + készít rövid feljegyzéseket a + jelenlegi munkájáról, az új + javításokról és más + egyéb terveirõl. + + + + A Youtube-on keresztül elérhetõ BSDConferences + csatornán a világ minden táján + tartott különbözõ BSD + témájú konferenciák + videoanyagait találhatjuk meg. + Segítségével megtekinthetjük a + fontosabb fejlesztõk által a saját + munkájukról tartott + különbözõ + elõadásokat. + + + + + + Hivatalos tükrözések + &chap.eresources.www.inc; + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -6254,8 +6254,39 @@ és 9-es IRQ-kat. + + + + színek + kontraszt + + + + Amikor a sysinstall + programot xterm alatt futtatom, + a sárga színû betûket viszonylag + nehéz olvasni a világosszürke + háttérrel. Esetleg lehet valahogy + növelni a kontrasztot az alkalmazás + használatakor? + + + + Ha az X11 telepítése után a + sysinstall által + választott színekkel nem olvasható a + szöveg xterm vagy + rxvt terminálokban, + akkor vegyük fel a következõ sort a + felhasználói könyvtárunkban + levõ .Xdefaults + konfigurációs állományunkba: + XTerm*color7:#c0c0c0. Ezzel majd egy + sötétebb szürke hátteret + kapunk. + + - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -512,6 +512,27 @@ A csomagrendszer használata + &os; alatt több különbözõ + módon tudunk csomagokat használni: + + + + A sysinstall + használatán keresztül a futó + rendszeren tudjuk megnézni a telepített + csomagokat, tudunk vele csomagokat telepíteni vagy + törölni. Ezzel részletesebben a telepítés utáni + teendõket tartalmazó része foglalkozik. + + + + A szakasz további részében + ismertetett egyéb parancssoros csomagkezelõ + segédprogramok. + + + Csomagok telepítése ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#8 (text+ko) ==== @@ -4,7 +4,7 @@ @@ -38,14 +38,53 @@ További információkért olvassuk át a et. + Változtatások a harmadik kiadás + óta + + A kézikönyv jelenleg interneten elérhetõ + változata számtalan önkéntes által az + utóbbi 10 évben végzett együttes + erõfeszítéseinek eredményeit + tükrözi. A 2004-ben két kötetben + megjelentetett harmadik kiadás óta a + következõ fontosabb változások + történtek: + + + + : készült egy új + fejezet a &dtrace; nevû + teljesítmény-elemzõ + eszközrõl. + + + + : ebben a fejezetben a &os; + és a különbözõ más rendszerekhez + fejlesztett állományrendszerek viszonyát + mutatjuk be, többek a &sun; ZFS + megoldását. + + + + : ebben az új + fejezetben a &os; rendszerhez és rajta elérhetõ + különbözõ virtualizációs + technológiákról szólunk. + + + Változtatások a harmadik - kiadásban + renderas=sect1>Változtatások a második + kiadás (2004) óta A harmadik kiadás a &os; Dokumentációs Projekt tagjainak két évi kemény - munkájának gyümölcse. Az alábbi - fontosabb változtatások jelennek meg ebben az + munkájának gyümölcse. A nyomtatott + változat már olyan nagyra nõtt, hogy két + külön kötetben kellett kiadnunk. Az alábbi + fontosabb változtatások jelentek meg ebben az új kiadásban: @@ -56,7 +95,7 @@ bõvítettük az ACPI energia- és erõforrás gazdálkodásról szóló részekkel, a cron - rendszerprogrammal, ill. még több, a rendszermag + rendszerprogrammal, illetve még több, a rendszermag finomhangolását elõsegítõ opció leírásával. @@ -167,8 +206,8 @@ Változtatások a második - kiadásban + renderas=sect1>Változtatások az elsõ + kiadás óta A második kiadás a &os; Dokumentációs Projekt tagjainak két évi From owner-p4-projects@FreeBSD.ORG Tue Dec 16 15:23:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CBAD1065675; Tue, 16 Dec 2008 15:23: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 C45871065672 for ; Tue, 16 Dec 2008 15:23:45 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B11888FC1C for ; Tue, 16 Dec 2008 15:23:45 +0000 (UTC) (envelope-from bz@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 mBGFNjxN079542 for ; Tue, 16 Dec 2008 15:23:45 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGFNjp5079540 for perforce@freebsd.org; Tue, 16 Dec 2008 15:23:45 GMT (envelope-from bz@freebsd.org) Date: Tue, 16 Dec 2008 15:23:45 GMT Message-Id: <200812161523.mBGFNjp5079540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 15:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=154793 Change 154793 by bz@bz_dumpster on 2008/12/16 15:22:50 Try to make what I comitted at least compile again. Affected files ... .. //depot/projects/vimage/src/sys/net/if_epair.c#2 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_epair.c#2 (text+ko) ==== @@ -171,7 +171,7 @@ */ STAILQ_FOREACH_SAFE(elm, &epair_ifp_drain_list, ifp_next, tvar) { ifp = elm->ifp; - epair_drv_flags &= ~IFF_DRV_OACTIVE + epair_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; epair_start_locked(ifp); @@ -257,7 +257,7 @@ /* Someone else received the packet. */ oifp->if_ipackets++; } else { - epair_drv_flags |= IFF_DRV_OACTIVE + epair_drv_flags |= IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_OACTIVE; ADD_IFQ_FOR_DRAINING(ifp); refcount_release(&sc->refcount); @@ -380,7 +380,7 @@ } else { /* The packet was freed already. */ refcount_release(&sc->refcount); - epair_drv_flags |= IFF_DRV_OACTIVE + epair_drv_flags |= IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_OACTIVE; } From owner-p4-projects@FreeBSD.ORG Tue Dec 16 15:34:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B03E106567D; Tue, 16 Dec 2008 15:34: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 3F1EB1065675 for ; Tue, 16 Dec 2008 15:34:57 +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 2BD6E8FC2A for ; Tue, 16 Dec 2008 15:34:57 +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 mBGFYvFQ080357 for ; Tue, 16 Dec 2008 15:34:57 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGFYvfj080355 for perforce@freebsd.org; Tue, 16 Dec 2008 15:34:57 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 16 Dec 2008 15:34:57 GMT Message-Id: <200812161534.mBGFYvfj080355@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 154794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 15:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=154794 Change 154794 by pgj@kolbasz on 2008/12/16 15:34:23 MFen (www): 1.164 -> 1.165 hu/index.xsl 1.50 -> 1.51 hu/news/news.sgml 1.13 -> 1.14 hu/news/pressreleases.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/index.xsl#11 edit .. //depot/projects/docproj_hu/www/hu/news/news.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/index.xsl#11 (text+ko) ==== @@ -9,7 +9,7 @@ ==== //depot/projects/docproj_hu/www/hu/news/news.sgml#9 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -28,14 +28,18 @@

  • -

    Sajtókiadványok: - A projekt és a hozzákapcsolódó - szervezetek sajtókiadványai

    +

    Alapítványi + sajtóközlemények: A &os; + Alapítvány sajtóközleményei + (lásd még a 2005 + elõtti sajtóközlemények + archívumát)

  • Cikkek a sajtóban: - A &os;, ahogy a sajtóban feltûnik

    + A &os; megjelenése a sajtóban

  • ==== //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#8 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -20,6 +20,10 @@

    --> +

    A legfrissebb sajtóközleményeket most már + a &os; + Alapítvány honlapján olvashatjuk.

    +
    2005. november 25.
    From owner-p4-projects@FreeBSD.ORG Tue Dec 16 15:55:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BAB91065678; Tue, 16 Dec 2008 15:55: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 0FBF4106564A for ; Tue, 16 Dec 2008 15:55:23 +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 F0B608FC22 for ; Tue, 16 Dec 2008 15:55:22 +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 mBGFtM6H081932 for ; Tue, 16 Dec 2008 15:55:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGFtMHB081930 for perforce@freebsd.org; Tue, 16 Dec 2008 15:55:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 16 Dec 2008 15:55:22 GMT Message-Id: <200812161555.mBGFtMHB081930@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 154796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 15:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=154796 Change 154796 by hselasky@hselasky_laptop001 on 2008/12/16 15:55:15 Bugfix for USB devices without any configuration. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#37 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#37 (text+ko) ==== @@ -1588,11 +1588,19 @@ err = usb2_set_config_index(udev, config_index); sx_unlock(udev->default_sx + 1); if (err) { - DPRINTFN(0, "Failure selecting " - "configuration index %u: %s, port %u, addr %u\n", - config_index, usb2_errstr(err), udev->port_no, - udev->address); - + if (udev->ddesc.bNumConfigurations != 0) { + DPRINTFN(0, "Failure selecting " + "configuration index %u: %s, port %u, " + "addr %u (ignored)\n", + config_index, usb2_errstr(err), udev->port_no, + udev->address); + } + /* + * Some USB devices does not have any + * configurations. Ignore any set config + * failures! + */ + err = 0; } else if (config_quirk) { /* user quirk selects configuration index */ } else if ((config_index + 1) < udev->ddesc.bNumConfigurations) { From owner-p4-projects@FreeBSD.ORG Tue Dec 16 16:19:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 750461065679; Tue, 16 Dec 2008 16:19: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 3870A1065675; Tue, 16 Dec 2008 16:19:51 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe02.swip.net [212.247.154.33]) by mx1.freebsd.org (Postfix) with ESMTP id 984A88FC1C; Tue, 16 Dec 2008 16:19:50 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=9QZaWaqL03AA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=JwsCuao6HAr3gVu8b8UA:9 a=Pju8YYTqiUvOEwMV_9EA:7 a=MmvEefsuTRvbGtg5jSGfzk_DaNAA:4 a=LY0hPdMaydYA:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe02.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1169680489; Tue, 16 Dec 2008 17:19:48 +0100 From: Hans Petter Selasky To: Sam Leffler Date: Tue, 16 Dec 2008 17:22:05 +0100 User-Agent: KMail/1.9.7 References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812141623.51473.hselasky@c2i.net> <494598B0.9090501@freebsd.org> In-Reply-To: <494598B0.9090501@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812161722.06337.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 16:19:51 -0000 On Monday 15 December 2008, Sam Leffler wrote: > Hans Petter Selasky wrote: > > On Saturday 13 December 2008, Sam Leffler wrote: > >> Hans Petter Selasky wrote: > >>> On Saturday 13 December 2008, Sam Leffler wrote: > >> > >> No. But if you are interested in helping debug the problem I'm happy to > >> send you debug output. The controller rejects all cmds setting the > >> ERRINT status bit. The qTD contents and xfer contents look fine but I > >> haven't been able to identify the cause given the overlay qTD contents. > >> I'm in the process of collecting comparative traces from linux where usb > >> works. > > > > Send me the EHCI traces and I will have a look at it. Have you tried > > USB2? The patches which you need to apply should be similar. > > This is what I get w/ sysctl hw.usb.ehci.debug=6 for the first cmd > submitted after card insert: > > > Subsequent cmds fail similarly. I don't see the issue and don't > understand how to use the overlay qTD information to pinpoint the reason > the controller is rejecting the request. > > This happens w/ either of the 2 USB ports (1 port / controller): > Hi Sam, The overlay qTD is a copy of the last processed QTD. You might need to do a cache invalidate on the memory region before reading it. What I see: - The first TD completed successfully, and that TD had a lower physical memory adddress than the one that failed. buffer[0]=0x01091fc8 vs: buffer[0]=0x014b8a3c - Halted usually means that that you had a STALL token sent from the device to the host, which indicates that the contents of the SETUP packet (PID=2), in the first TD did not contain valid data, possible due to a missing cache flush. return ((status & EHCI_QTD_HALTED) ? USB_ERR_STALLED : USB_ERR_NORMAL_COMPLETION); --HPS From owner-p4-projects@FreeBSD.ORG Tue Dec 16 17:07:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5397D1065676; Tue, 16 Dec 2008 17:07: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 17D6A1065673 for ; Tue, 16 Dec 2008 17:07:37 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05C3F8FC13 for ; Tue, 16 Dec 2008 17:07:37 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBGH7ab3099079 for ; Tue, 16 Dec 2008 17:07:36 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGH7a3T099077 for perforce@freebsd.org; Tue, 16 Dec 2008 17:07:36 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 16 Dec 2008 17:07:36 GMT Message-Id: <200812161707.mBGH7a3T099077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 154803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 17:07:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=154803 Change 154803 by sson@sson_amd64 on 2008/12/16 17:06:52 Additional changes for compile time warnings: - Added missing prototypes for au_notify_initialize(), au_notify_terminate() and au_to_header32_ex(). - Included in libbsm/bsm_errno.c. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#39 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#8 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#39 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#39 $ */ #ifndef _LIBBSM_H_ @@ -937,6 +937,19 @@ * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int au_get_state(void); + +/* + * Initialize the audit notification. If it has not already been initialized + * it will automatically on the first call of au_get_state(). + */ +uint32_t au_notify_initialize(void); + +/* + * Cancel audit notification and free the resources associated with it. + * Responsible code that no longer needs to use au_get_state() should call + * this. + */ +int au_notify_terminate(void); __END_DECLS /* OpenSSH compatibility */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#8 $ */ #include @@ -48,6 +48,7 @@ #endif /* !HAVE_SYS_ENDIAN_H */ #include +#include #include #include ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#8 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -206,6 +206,7 @@ token_t *au_to_header_ex(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header32_ex(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif token_t *au_to_me(void); From owner-p4-projects@FreeBSD.ORG Tue Dec 16 17:18:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCBEA1065675; Tue, 16 Dec 2008 17:18: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 810461065670 for ; Tue, 16 Dec 2008 17:18:48 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EE178FC20 for ; Tue, 16 Dec 2008 17:18:48 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBGHImfZ099892 for ; Tue, 16 Dec 2008 17:18:48 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGHImfO099890 for perforce@freebsd.org; Tue, 16 Dec 2008 17:18:48 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 16 Dec 2008 17:18:48 GMT Message-Id: <200812161718.mBGHImfO099890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 17:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=154804 Change 154804 by nwhitehorn@nwhitehorn_trantor on 2008/12/16 17:17:59 Drop the static buffer. We can get away without it, using pmap_kextract(), on the assumption that memory in this critical time will still have a physical address in the 32-bit range. This issue should be revisited in future. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_real.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_real.c#5 (text+ko) ==== @@ -157,14 +157,8 @@ static struct mtx of_bounce_mtx; /* - * We need a statically allocated bounce buffer to handle the case when - * there are Open Firmware calls after the MMU has been enabled but before - * the VM has been initialized to the point that we can allocate memory. - * Make it 256 bytes and 8 byte aligned and hope for the best. - * - * After the VM is up, allocate more memory. + * After the VM is up, allocate a wired, low memory bounce page. */ -static uint64_t of_static_bounce_buffer[32]; static void ofw_real_bounce_alloc(void *); @@ -220,10 +214,14 @@ if (!pmap_bootstrapped) return (cell_t)buf; - of_bounce_virt = (caddr_t)of_static_bounce_buffer; - of_bounce_size = sizeof(of_static_bounce_buffer); - - of_bounce_phys = vtophys(of_static_bounce_buffer); + /* + * XXX: It is possible for us to get called before the VM has + * come online, but after the MMU is up. We don't have the + * bounce buffer yet, but can no longer presume a 1:1 mapping. + * Grab the physical address of the buffer, and hope it is + * in range if this happens. + */ + return (cell_t)vtophys(buf); } /* From owner-p4-projects@FreeBSD.ORG Tue Dec 16 18:27:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C76021065675; Tue, 16 Dec 2008 18:27: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 89DF7106564A for ; Tue, 16 Dec 2008 18:27:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 4D57A8FC18 for ; Tue, 16 Dec 2008 18:27:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id mBGIRSKF015261 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Dec 2008 10:27:29 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <4947F310.5050403@freebsd.org> Date: Tue, 16 Dec 2008 10:27:28 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Hans Petter Selasky References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812141623.51473.hselasky@c2i.net> <494598B0.9090501@freebsd.org> <200812161722.06337.hselasky@c2i.net> In-Reply-To: <200812161722.06337.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC--Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 18:27:34 -0000 Hans Petter Selasky wrote: > On Monday 15 December 2008, Sam Leffler wrote: > >> Hans Petter Selasky wrote: >> >>> On Saturday 13 December 2008, Sam Leffler wrote: >>> >>>> Hans Petter Selasky wrote: >>>> >>>>> On Saturday 13 December 2008, Sam Leffler wrote: >>>>> >>>> No. But if you are interested in helping debug the problem I'm happy to >>>> send you debug output. The controller rejects all cmds setting the >>>> ERRINT status bit. The qTD contents and xfer contents look fine but I >>>> haven't been able to identify the cause given the overlay qTD contents. >>>> I'm in the process of collecting comparative traces from linux where usb >>>> works. >>>> >>> Send me the EHCI traces and I will have a look at it. Have you tried >>> USB2? The patches which you need to apply should be similar. >>> >> This is what I get w/ sysctl hw.usb.ehci.debug=6 for the first cmd >> submitted after card insert: >> >> > > >> Subsequent cmds fail similarly. I don't see the issue and don't >> understand how to use the overlay qTD information to pinpoint the reason >> the controller is rejecting the request. >> >> This happens w/ either of the 2 USB ports (1 port / controller): >> >> > > Hi Sam, > > The overlay qTD is a copy of the last processed QTD. You might need to do a > cache invalidate on the memory region before reading it. > Yes, this is what the docs says about the overlay qTD but what do the 2nd and later words mean? They went from: buffer[0]=0x014b8a3c buffer[1]=0x00000000 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 to: buffer[0]=0x014b8a3c buffer[1]=0x00000008 buffer[2]=0x00000000 buffer[3]=0x00000000 buffer[4]=0x00000000 All memory allocated to hold usb data structures are allocated coherent so should not require an invalidate. I have also inserted explicit dcache invalidates while debugging this issue "just in case". USB works fine on another xscale platform where the usb controller is on the pci bus so I'd expect any cache coherency issues to already be dealt with (I found the PIO cache invalidate issue I fixed a while back on this other board). > What I see: > > - The first TD completed successfully, and that TD had a lower physical memory > adddress than the one that failed. > > buffer[0]=0x01091fc8 > > vs: > > buffer[0]=0x014b8a3c > > - Halted usually means that that you had a STALL token sent from the device to > the host, which indicates that the contents of the SETUP packet (PID=2), in > the first TD did not contain valid data, possible due to a missing cache > flush. > > return ((status & EHCI_QTD_HALTED) ? > USB_ERR_STALLED : USB_ERR_NORMAL_COMPLETION); > > So maybe this answers one question I have; is this error from the device or the controller? Am I actually talking to the device? It appears the controller is functional as I get interrupts, get status for things like ports, etc. Remember this is a big-endian host. On another xscale platform the usb controller is on the pci bus and we setup xfers (dma+pio) to be swizzled by the byte lane hardware so everything just works wrt little-endian-ness. I've been searching for something byte-order related that is missing. The linux usb code swizzles descriptor contents on the host but I don't see it doing anything to the data sent to the device; it's still little-endian. Sam From owner-p4-projects@FreeBSD.ORG Tue Dec 16 18:44:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6B51065677; Tue, 16 Dec 2008 18:44: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 5EE721065673 for ; Tue, 16 Dec 2008 18:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 1F8868FC17 for ; Tue, 16 Dec 2008 18:44:26 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id mBGIiN9j015405 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Dec 2008 10:44:23 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <4947F707.4090309@freebsd.org> Date: Tue, 16 Dec 2008 10:44:23 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Hans Petter Selasky References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812141623.51473.hselasky@c2i.net> <494598B0.9090501@freebsd.org> <200812161722.06337.hselasky@c2i.net> <4947F310.5050403@freebsd.org> In-Reply-To: <4947F310.5050403@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC--Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 18:44:26 -0000 Sam Leffler wrote: > Hans Petter Selasky wrote: >> On Monday 15 December 2008, Sam Leffler wrote: >> >>> Hans Petter Selasky wrote: >>> >>>> On Saturday 13 December 2008, Sam Leffler wrote: >>>> >>>>> Hans Petter Selasky wrote: >>>>> >>>>>> On Saturday 13 December 2008, Sam Leffler wrote: >>>>>> >>>>> No. But if you are interested in helping debug the problem I'm >>>>> happy to >>>>> send you debug output. The controller rejects all cmds setting the >>>>> ERRINT status bit. The qTD contents and xfer contents look fine >>>>> but I >>>>> haven't been able to identify the cause given the overlay qTD >>>>> contents. >>>>> I'm in the process of collecting comparative traces from linux >>>>> where usb >>>>> works. >>>>> >>>> Send me the EHCI traces and I will have a look at it. Have you tried >>>> USB2? The patches which you need to apply should be similar. >>>> >>> This is what I get w/ sysctl hw.usb.ehci.debug=6 for the first cmd >>> submitted after card insert: >>> >>> >> >> >>> Subsequent cmds fail similarly. I don't see the issue and don't >>> understand how to use the overlay qTD information to pinpoint the >>> reason >>> the controller is rejecting the request. >>> >>> This happens w/ either of the 2 USB ports (1 port / controller): >>> >>> >> >> Hi Sam, >> >> The overlay qTD is a copy of the last processed QTD. You might need >> to do a cache invalidate on the memory region before reading it. >> > > Yes, this is what the docs says about the overlay qTD but what do the > 2nd and later words mean? They went from: > > buffer[0]=0x014b8a3c > buffer[1]=0x00000000 > buffer[2]=0x00000000 > buffer[3]=0x00000000 > buffer[4]=0x00000000 > > to: > > buffer[0]=0x014b8a3c > buffer[1]=0x00000008 > buffer[2]=0x00000000 > buffer[3]=0x00000000 > buffer[4]=0x00000000 > > All memory allocated to hold usb data structures are allocated > coherent so should not require an invalidate. I have also inserted > explicit dcache invalidates while debugging this issue "just in case". > > USB works fine on another xscale platform where the usb controller is > on the pci bus so I'd expect any cache coherency issues to already be > dealt with (I found the PIO cache invalidate issue I fixed a while > back on this other board). > >> What I see: >> >> - The first TD completed successfully, and that TD had a lower >> physical memory adddress than the one that failed. >> >> buffer[0]=0x01091fc8 >> >> vs: >> >> buffer[0]=0x014b8a3c >> >> - Halted usually means that that you had a STALL token sent from the >> device to the host, which indicates that the contents of the SETUP >> packet (PID=2), in the first TD did not contain valid data, possible >> due to a missing cache flush. >> >> return ((status & EHCI_QTD_HALTED) ? >> USB_ERR_STALLED : USB_ERR_NORMAL_COMPLETION); >> >> > So maybe this answers one question I have; is this error from the > device or the controller? Am I actually talking to the device? It > appears the controller is functional as I get interrupts, get status > for things like ports, etc. Remember this is a big-endian host. On > another xscale platform the usb controller is on the pci bus and we > setup xfers (dma+pio) to be swizzled by the byte lane hardware so > everything just works wrt little-endian-ness. I've been searching for > something byte-order related that is missing. The linux usb code > swizzles descriptor contents on the host but I don't see it doing > anything to the data sent to the device; it's still little-endian. > Er, scratch the "dma" byte swizzle comment, it's just pio that's handled by the byte lane h/w in the pci-ahb bus glue. Sam From owner-p4-projects@FreeBSD.ORG Tue Dec 16 19:49:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 011851065677; Tue, 16 Dec 2008 19:49: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 9FF35106564A; Tue, 16 Dec 2008 19:49:40 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe16.tele2.se [212.247.155.225]) by mx1.freebsd.org (Postfix) with ESMTP id D574D8FC1F; Tue, 16 Dec 2008 19:49:39 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=9QZaWaqL03AA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=6qg7fpzqtNTjt-6BxOgA:9 a=ZMOo19WPgtzKbKUQDrUA:7 a=lp1h9MYjMOLdfV-ewx9a6K9jSOkA:4 a=50e4U0PicR4A:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe16.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 424047508; Tue, 16 Dec 2008 19:49:36 +0100 From: Hans Petter Selasky To: Sam Leffler Date: Tue, 16 Dec 2008 19:51:52 +0100 User-Agent: KMail/1.9.7 References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812161722.06337.hselasky@c2i.net> <4947F310.5050403@freebsd.org> In-Reply-To: <4947F310.5050403@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200812161951.54051.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 19:49:41 -0000 Hi Sam, On Tuesday 16 December 2008, Sam Leffler wrote: > > > Hi Sam, > > > > The overlay qTD is a copy of the last processed QTD. You might need to = do > > a cache invalidate on the memory region before reading it. > > Yes, this is what the docs says about the overlay qTD but what do the > 2nd and later words mean? They went from: > > buffer[0]=3D0x014b8a3c > buffer[1]=3D0x00000000 > buffer[2]=3D0x00000000 > buffer[3]=3D0x00000000 > buffer[4]=3D0x00000000 > > to: > > buffer[0]=3D0x014b8a3c > buffer[1]=3D0x00000008 > buffer[2]=3D0x00000000 > buffer[3]=3D0x00000000 > buffer[4]=3D0x00000000 > The other 32-bit words are used to store subsequent 4K memory pages that=20 should be part of the transfer. In your case only one field is initialised= =20 because the length is less than "0x1000 - (0x014b8a3c & 0xFFF)" bytes. > All memory allocated to hold usb data structures are allocated coherent > so should not require an invalidate. I have also inserted explicit > dcache invalidates while debugging this issue "just in case". Ok. > > USB works fine on another xscale platform where the usb controller is on > the pci bus so I'd expect any cache coherency issues to already be dealt > with (I found the PIO cache invalidate issue I fixed a while back on > this other board). > > > What I see: > > > > - The first TD completed successfully, and that TD had a lower physical > > memory adddress than the one that failed. > > > > buffer[0]=3D0x01091fc8 > > > > vs: > > > > buffer[0]=3D0x014b8a3c > > > > - Halted usually means that that you had a STALL token sent from the > > device to the host, which indicates that the contents of the SETUP pack= et > > (PID=3D2), in the first TD did not contain valid data, possible due to a > > missing cache flush. > > > > return ((status & EHCI_QTD_HALTED) ? > > USB_ERR_STALLED : USB_ERR_NORMAL_COMPLETION); > > So maybe this answers one question I have; is this error from the device > or the controller? =20 =46rom the USB device. I guess something is wrong with the request being se= nt. > Am I actually talking to the device? =20 Most likely. Check the EHCI specification when the QTD_HALTED bit is set. A= n=20 USB cable analyzer would answer this question for sure. For example there a= re=20 some from Beagle that can be used with Linux. > It appears the =20 > controller is functional as I get interrupts, get status for things like > ports, etc. Remember this is a big-endian host. On another xscale > platform the usb controller is on the pci bus and we setup xfers > (dma+pio) to be swizzled by the byte lane hardware so everything just > works wrt little-endian-ness. I've been searching for something > byte-order related that is missing. The linux usb code swizzles > descriptor contents on the host but I don't see it doing anything to the > data sent to the device; it's still little-endian. =2D-HPS From owner-p4-projects@FreeBSD.ORG Tue Dec 16 22:41:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE6341065676; Tue, 16 Dec 2008 22:41: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 7F9C01065673 for ; Tue, 16 Dec 2008 22:41:25 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CC898FC12 for ; Tue, 16 Dec 2008 22:41:25 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBGMfP10047988 for ; Tue, 16 Dec 2008 22:41:25 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGMfNL2047982 for perforce@freebsd.org; Tue, 16 Dec 2008 22:41:23 GMT (envelope-from peter@wemm.org) Date: Tue, 16 Dec 2008 22:41:23 GMT Message-Id: <200812162241.mBGMfNL2047982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 154819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 22:41:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=154819 Change 154819 by peter@peter_overcee on 2008/12/16 22:41:09 IFC @154816 Affected files ... .. //depot/projects/hammer/UPDATING#127 integrate .. //depot/projects/hammer/contrib/binutils/bfd/config.bfd#5 integrate .. //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/hammer/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#12 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_route.c#7 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/44arp.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/CREDITS#1 branch .. //depot/projects/hammer/contrib/openbsm/HISTORY#7 delete .. //depot/projects/hammer/contrib/openbsm/INSTALL#1 branch .. //depot/projects/hammer/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/NEWS#1 branch .. //depot/projects/hammer/contrib/openbsm/README#6 integrate .. //depot/projects/hammer/contrib/openbsm/TODO#5 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#5 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/auditfilterd.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.1#4 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/hammer/contrib/openbsm/bin/praudit/praudit.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/hammer/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/hammer/contrib/openbsm/config/config.h#7 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h.in#5 integrate .. //depot/projects/hammer/contrib/openbsm/configure#7 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#8 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/audit_submit.3#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#7 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_wrappers.c#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit.2#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit.log.5#5 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_control.5#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/auditctl.2#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/auditon.2#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/getaudit.2#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/getauid.2#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/setaudit.2#3 integrate .. //depot/projects/hammer/contrib/openbsm/man/setauid.2#3 integrate .. //depot/projects/hammer/contrib/openbsm/modules/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/hammer/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/bsm/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#4 integrate .. //depot/projects/hammer/etc/newsyslog.conf#12 integrate .. //depot/projects/hammer/etc/regdomain.xml#2 integrate .. //depot/projects/hammer/etc/syslog.conf#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/bfd.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/hammer/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#32 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/config.h#7 integrate .. //depot/projects/hammer/include/arpa/nameser.h#6 integrate .. //depot/projects/hammer/include/resolv.h#12 integrate .. //depot/projects/hammer/include/string.h#11 integrate .. //depot/projects/hammer/kerberos5/include/config.h#10 integrate .. //depot/projects/hammer/lib/bind/bind/port_after.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#27 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_private.h#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_empty.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#45 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#20 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#16 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#14 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse.c#9 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_pax_truncated.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_perms.c#11 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#6 integrate .. //depot/projects/hammer/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/hammer/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/hammer/lib/libc/net/rcmd.3#6 integrate .. //depot/projects/hammer/lib/libc/resolv/res_debug.c#5 integrate .. //depot/projects/hammer/lib/libc/resolv/res_mkquery.c#4 integrate .. //depot/projects/hammer/lib/libc/resolv/res_query.c#5 integrate .. //depot/projects/hammer/lib/libc/resolv/res_send.c#6 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#27 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#24 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libc/string/Symbol.map#5 integrate .. //depot/projects/hammer/lib/libc/string/strdup.3#3 integrate .. //depot/projects/hammer/lib/libc/string/strndup.c#1 branch .. //depot/projects/hammer/lib/libc/string/strsep.3#5 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#16 integrate .. //depot/projects/hammer/lib/libfetch/fetch.h#3 integrate .. //depot/projects/hammer/lib/libfetch/http.c#18 integrate .. //depot/projects/hammer/lib/libmagic/config.h#6 integrate .. //depot/projects/hammer/lib/libmd/Makefile#6 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#13 integrate .. //depot/projects/hammer/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/hammer/lib/libstand/bootp.c#3 integrate .. //depot/projects/hammer/lib/libstand/if_ether.h#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#8 integrate .. //depot/projects/hammer/lib/libutil/Makefile#22 integrate .. //depot/projects/hammer/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/hammer/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/hammer/libexec/bootpd/rtmsg.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.h#5 integrate .. //depot/projects/hammer/release/picobsd/tinyware/ns/ns.c#3 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#12 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#23 integrate .. //depot/projects/hammer/sbin/devd/devd.conf.5#5 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#38 integrate .. //depot/projects/hammer/sbin/ifconfig/ifvlan.c#12 integrate .. //depot/projects/hammer/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/hammer/sbin/newfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#24 integrate .. //depot/projects/hammer/sbin/newfs/newfs.8#16 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#18 integrate .. //depot/projects/hammer/sbin/newfs/newfs.h#11 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.8#8 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.c#9 integrate .. //depot/projects/hammer/sbin/route/route.c#16 integrate .. //depot/projects/hammer/sbin/routed/table.c#7 integrate .. //depot/projects/hammer/share/man/man4/Makefile#114 integrate .. //depot/projects/hammer/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/hammer/share/man/man4/bce.4#6 integrate .. //depot/projects/hammer/share/man/man4/cxgb.4#3 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#23 integrate .. //depot/projects/hammer/share/man/man4/fxp.4#16 integrate .. //depot/projects/hammer/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/hammer/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/hammer/share/man/man4/route.4#6 integrate .. //depot/projects/hammer/share/man/man4/upgt.4#3 integrate .. //depot/projects/hammer/share/man/man7/ports.7#23 integrate .. //depot/projects/hammer/share/man/man9/Makefile#90 integrate .. //depot/projects/hammer/share/man/man9/VOP_STRATEGY.9#6 integrate .. //depot/projects/hammer/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/hammer/share/man/man9/ifnet.9#24 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#7 integrate .. //depot/projects/hammer/share/man/man9/rtentry.9#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#56 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#65 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#54 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#84 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#185 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#117 integrate .. //depot/projects/hammer/sys/amd64/include/apicreg.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#48 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#33 integrate .. //depot/projects/hammer/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/hammer/sys/boot/Makefile#25 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#30 integrate .. //depot/projects/hammer/sys/boot/forth/support.4th#4 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#12 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/hammer/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/hammer/sys/bsm/audit.h#11 integrate .. //depot/projects/hammer/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#12 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#9 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#24 integrate .. //depot/projects/hammer/sys/cam/cam_sim.c#7 integrate .. //depot/projects/hammer/sys/cam/cam_sim.h#4 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#40 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#48 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#62 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#62 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#59 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#59 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#59 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#64 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#46 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#36 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#35 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sockio.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#155 integrate .. //depot/projects/hammer/sys/conf/files#193 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#49 integrate .. //depot/projects/hammer/sys/conf/files.sun4v#9 integrate .. //depot/projects/hammer/sys/conf/options#137 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#10 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#12 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#13 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#42 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#15 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#34 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_subr.c#7 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_table.c#8 integrate .. //depot/projects/hammer/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/hammer/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/hammer/sys/crypto/rc4/rc4.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#5 integrate .. //depot/projects/hammer/sys/dev/adb/adb.h#2 integrate .. //depot/projects/hammer/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/hammer/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/hammer/sys/dev/adb/adb_mouse.c#3 integrate .. //depot/projects/hammer/sys/dev/adb/adbvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/hammer/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#50 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#60 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#66 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#37 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#15 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#18 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#86 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#13 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#10 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#30 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#17 integrate .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#10 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#68 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#16 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_intel.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#14 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#28 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#12 integrate .. //depot/projects/hammer/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#28 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/hammer/sys/dev/jme/if_jmereg.h#5 integrate .. //depot/projects/hammer/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#68 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#19 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#9 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/hammer/sys/dev/ofw/openfirm.h#8 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#51 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#15 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#65 integrate .. //depot/projects/hammer/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/hammer/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/hammer/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#30 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#31 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#12 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#24 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#114 integrate .. //depot/projects/hammer/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/hammer/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/hammer/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#63 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#30 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#43 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#27 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#34 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#42 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#11 integrate .. //depot/projects/hammer/sys/geom/journal/g_journal.c#9 integrate .. //depot/projects/hammer/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#10 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#76 integrate .. //depot/projects/hammer/sys/i386/conf/XEN#5 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#17 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#49 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#41 integrate .. //depot/projects/hammer/sys/i386/include/apicreg.h#5 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#24 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#16 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#22 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#38 integrate .. //depot/projects/hammer/sys/kern/kern_cpu.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#86 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#77 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#76 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#79 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#36 integrate .. //depot/projects/hammer/sys/kern/kern_uuid.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_vimage.c#1 branch .. //depot/projects/hammer/sys/kern/subr_param.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#46 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#79 integrate .. //depot/projects/hammer/sys/kern/tty.c#66 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#90 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#57 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#57 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#23 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#31 integrate .. //depot/projects/hammer/sys/libkern/iconv.c#11 integrate .. //depot/projects/hammer/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#2 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/hammer/sys/modules/Makefile#137 integrate .. //depot/projects/hammer/sys/modules/ae/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/aio/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ath/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#9 delete .. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#9 delete .. //depot/projects/hammer/sys/modules/ath_rate_sample/Makefile#9 delete .. //depot/projects/hammer/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cxgb/Makefile#12 integrate .. //depot/projects/hammer/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/if_ef/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/if_vlan/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/ip_mroute_mod/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/ipfw/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/linprocfs/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/linux/Makefile#13 integrate .. //depot/projects/hammer/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/ether/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/netgraph/gif/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/pf/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/wlan/Makefile#12 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#20 integrate .. //depot/projects/hammer/sys/net/if.c#84 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#23 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#24 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#45 integrate .. //depot/projects/hammer/sys/net/if_ef.c#20 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#77 integrate .. //depot/projects/hammer/sys/net/if_faith.c#27 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#27 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#24 integrate .. //depot/projects/hammer/sys/net/if_gif.c#35 integrate .. //depot/projects/hammer/sys/net/if_gif.h#12 integrate .. //depot/projects/hammer/sys/net/if_gre.c#41 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#26 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#19 integrate .. //depot/projects/hammer/sys/net/if_llatbl.c#1 branch .. //depot/projects/hammer/sys/net/if_llatbl.h#1 branch .. //depot/projects/hammer/sys/net/if_loop.c#40 integrate .. //depot/projects/hammer/sys/net/if_mib.c#11 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#30 integrate .. //depot/projects/hammer/sys/net/if_stf.c#33 integrate .. //depot/projects/hammer/sys/net/if_tun.c#38 integrate .. //depot/projects/hammer/sys/net/if_var.h#52 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#47 integrate .. //depot/projects/hammer/sys/net/pfil.c#11 integrate .. //depot/projects/hammer/sys/net/pfil.h#9 integrate .. //depot/projects/hammer/sys/net/radix.c#13 integrate .. //depot/projects/hammer/sys/net/radix.h#8 integrate .. //depot/projects/hammer/sys/net/radix_mpath.c#7 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#18 integrate .. //depot/projects/hammer/sys/net/raw_cb.h#7 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#21 integrate .. //depot/projects/hammer/sys/net/route.c#41 integrate .. //depot/projects/hammer/sys/net/route.h#24 integrate .. //depot/projects/hammer/sys/net/rtsock.c#43 integrate .. //depot/projects/hammer/sys/net/vnet.h#3 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ddb.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#45 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#42 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#51 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#41 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#39 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#17 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#20 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#39 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#66 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#30 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#32 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#29 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_mppc.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#17 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#12 integrate .. //depot/projects/hammer/sys/netinet/icmp_var.h#7 integrate .. //depot/projects/hammer/sys/netinet/if_atm.c#10 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#52 integrate .. //depot/projects/hammer/sys/netinet/if_ether.h#9 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#19 integrate .. //depot/projects/hammer/sys/netinet/in.c#34 integrate .. //depot/projects/hammer/sys/netinet/in.h#30 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#24 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#65 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#46 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#27 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#21 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#19 integrate .. //depot/projects/hammer/sys/netinet/ip6.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#32 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#47 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#49 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#37 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#39 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#103 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#44 integrate .. //depot/projects/hammer/sys/netinet/ip_id.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#78 integrate .. //depot/projects/hammer/sys/netinet/ip_ipsec.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#45 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#11 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#74 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#33 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#10 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#60 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.h#10 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_header.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#25 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#28 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#19 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.h#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#17 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#16 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#92 integrate .. //depot/projects/hammer/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#56 integrate .. //depot/projects/hammer/sys/netinet/tcp_reass.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#33 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#89 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#67 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.h#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#36 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#62 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#58 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#63 integrate .. //depot/projects/hammer/sys/netinet/udp_var.h#8 integrate .. //depot/projects/hammer/sys/netinet/vinet.h#3 integrate .. //depot/projects/hammer/sys/netinet6/dest6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#18 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#40 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#36 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#18 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#28 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#43 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#26 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#19 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#34 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#19 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#25 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#40 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#27 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#54 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#26 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#27 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#40 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#12 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#30 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#23 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#43 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#12 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#14 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#20 integrate .. //depot/projects/hammer/sys/netinet6/tcp6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#45 integrate .. //depot/projects/hammer/sys/netinet6/vinet6.h#3 integrate .. //depot/projects/hammer/sys/netipsec/ipip_var.h#3 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#27 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#18 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_output.c#18 integrate .. //depot/projects/hammer/sys/netipsec/key.c#26 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#21 integrate .. //depot/projects/hammer/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#18 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#16 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#25 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#67 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#47 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#58 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#64 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#40 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#45 integrate .. //depot/projects/hammer/sys/powerpc/conf/NOTES#12 integrate .. //depot/projects/hammer/sys/powerpc/include/param.h#12 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#7 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#12 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macgpio.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macgpiovar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#17 integrate .. //depot/projects/hammer/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#18 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorthvar.h#6 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_token.c#10 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#68 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#21 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#7 delete .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#13 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#12 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#10 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#10 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#21 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#44 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#32 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#10 delete .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_machdep.c#13 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/sun4v/include/ofw_bus.h#2 delete .. //depot/projects/hammer/sys/sys/aio.h#5 integrate .. //depot/projects/hammer/sys/sys/kernel.h#30 integrate .. //depot/projects/hammer/sys/sys/module.h#7 integrate .. //depot/projects/hammer/sys/sys/param.h#124 integrate .. //depot/projects/hammer/sys/sys/pmc.h#16 integrate .. //depot/projects/hammer/sys/sys/proc.h#127 integrate .. //depot/projects/hammer/sys/sys/resource.h#16 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#14 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#46 integrate .. //depot/projects/hammer/sys/sys/ttyhook.h#2 integrate .. //depot/projects/hammer/sys/sys/vimage.h#4 integrate .. //depot/projects/hammer/sys/sys/vnode.h#87 integrate .. //depot/projects/hammer/sys/sys/vtoc.h#2 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#27 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#29 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#60 integrate .. //depot/projects/hammer/sys/xen/gnttab.c#3 integrate .. //depot/projects/hammer/sys/xen/gnttab.h#3 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_comms.h#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_if.m#1 branch .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_xs.c#3 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbusvar.h#1 branch .. //depot/projects/hammer/tools/test/pthread_vfork/pthread_vfork_test.c#1 branch .. //depot/projects/hammer/tools/tools/ath/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/ath/Makefile.inc#1 branch .. //depot/projects/hammer/tools/tools/ath/athdebug/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/ath/athkey/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athkey/athkey.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athpow/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athpow/athpow.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/athprom.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/eeprom-14#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/eeprom-3#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/eeprom-4#1 branch .. //depot/projects/hammer/tools/tools/ath/athprom/eeprom-5#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs.h#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5210.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5211.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5212.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5416.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/ath/common/ah_osdep.h#1 branch .. //depot/projects/hammer/tools/tools/ath/common/diag.h#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#21 integrate .. //depot/projects/hammer/usr.bin/cpio/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/cpio/cmdline.c#4 integrate .. //depot/projects/hammer/usr.bin/cpio/config_freebsd.h#3 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#9 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.h#5 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#5 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.1#15 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#20 integrate .. //depot/projects/hammer/usr.bin/file/config.h#9 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#13 integrate .. //depot/projects/hammer/usr.bin/netstat/route.c#19 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_vm.c#7 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#29 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#31 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#25 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#17 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#18 integrate .. //depot/projects/hammer/usr.bin/wc/wc.1#10 integrate .. //depot/projects/hammer/usr.bin/wc/wc.c#5 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#19 integrate .. //depot/projects/hammer/usr.sbin/audit/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/auditd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#13 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#12 integrate .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#16 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwmpegts.c#2 integrate .. //depot/projects/hammer/usr.sbin/jexec/jexec.c#8 integrate .. //depot/projects/hammer/usr.sbin/jls/jls.c#5 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.c#12 integrate .. //depot/projects/hammer/usr.sbin/ppp/route.c#7 integrate .. //depot/projects/hammer/usr.sbin/route6d/route6d.c#9 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/cdrom.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#30 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#36 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#16 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#31 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#20 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/main.c#12 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#50 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#32 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#12 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#5 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#16 integrate Differences ... ==== //depot/projects/hammer/UPDATING#127 (text+ko) ==== @@ -22,6 +22,15 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081214: + __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. + RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. + The new code reduced struct rtentry{} by 16 bytes on 32-bit + architecture and 40 bytes on 64-bit architecture. The userland + applications "arp" and "ndp" have been updated accordingly. + The output from "netstat -r" shows only routing entries and + none of the L2 information. + 20081130: __FreeBSD_version 800057 marks the switchover from the binary ath hal to source code. Users must add the line: @@ -38,11 +47,11 @@ and thereby the code size); consult ath_hal(4) for details. 20081121: - __FreeBSD_version 800054 adds memory barriers to - , new interfaces to ifnet to facilitate + __FreeBSD_version 800054 adds memory barriers to + , new interfaces to ifnet to facilitate multiple hardware transmit queues for cards that support them, and a lock-less ring-buffer implementation to - enable drivers to more efficiently manage queueing of + enable drivers to more efficiently manage queueing of packets. 20081117: @@ -287,11 +296,11 @@ be recompiled; this includes the hal and xorg-server ports. 20070928: - The caching daemon (cached) was renamed to nscd. nscd.conf - configuration file should be used instead of cached.conf and - nscd_enable, nscd_pidfile and nscd_flags options should be used - instead of cached_enable, cached_pidfile and cached_flags in - rc.conf. + The caching daemon (cached) was renamed to nscd. nscd.conf + configuration file should be used instead of cached.conf and + nscd_enable, nscd_pidfile and nscd_flags options should be used + instead of cached_enable, cached_pidfile and cached_flags in + rc.conf. 20070921: The getfacl(1) utility now prints owning user and group name @@ -299,7 +308,7 @@ This is the same behavior as getfacl(1) on Solaris and Linux. 20070704: - The new IPsec code is now compiled in using the IPSEC option. The + The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel configuration. The FAST_IPSEC kernel option is now deprecated. @@ -602,10 +611,10 @@ If you have such a file, you need old utility to decrypt it. 20060709: - The interface version of the i4b kernel part has changed. So - after updating the kernel sources and compiling a new kernel, - the i4b user space tools in "/usr/src/usr.sbin/i4b" must also - be rebuilt, and vice versa. + The interface version of the i4b kernel part has changed. So + after updating the kernel sources and compiling a new kernel, + the i4b user space tools in "/usr/src/usr.sbin/i4b" must also + be rebuilt, and vice versa. 20060627: The XBOX kernel now defaults to the nfe(4) driver instead of @@ -1071,7 +1080,7 @@ - + To upgrade in-place from 5.x-stable to current @@ -1178,4 +1187,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $ +$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $ ==== //depot/projects/hammer/contrib/binutils/bfd/config.bfd#5 (text+ko) ==== @@ -768,6 +768,10 @@ targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; + mips*-*-freebsd*) + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ==== //depot/projects/hammer/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ==== @@ -281,6 +281,9 @@ #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI) +/* True if relocations are stored in-place. */ +#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI) + /* We can only have 64bit addresses if the object file format supports it. */ #define HAVE_32BIT_ADDRESSES \ @@ -13020,6 +13023,26 @@ if (fixp->fx_addsy == NULL) return 1; + /* If symbol SYM is in a mergeable section, relocations of the form + SYM + 0 can usually be made section-relative. The mergeable data + is then identified by the section offset rather than by the symbol. + + However, if we're generating REL LO16 relocations, the offset is split + between the LO16 and parterning high part relocation. The linker will + need to recalculate the complete offset in order to correctly identify + the merge data. + + The linker has traditionally not looked for the parterning high part + relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be + placed anywhere. Rather than break backwards compatibility by changing + this, it seems better not to force the issue, and instead keep the + original symbol. This will work with either linker behavior. */ + if ((fixp->fx_r_type == BFD_RELOC_LO16 + || reloc_needs_lo_p (fixp->fx_r_type)) + && HAVE_IN_PLACE_ADDENDS + && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 16 22:59:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEE321065672; Tue, 16 Dec 2008 22:59: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 A3923106564A for ; Tue, 16 Dec 2008 22:59:44 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78FEF8FC12 for ; Tue, 16 Dec 2008 22:59:44 +0000 (UTC) (envelope-from piso@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 mBGMxiWO049310 for ; Tue, 16 Dec 2008 22:59:44 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGMxi8e049308 for perforce@freebsd.org; Tue, 16 Dec 2008 22:59:44 GMT (envelope-from piso@freebsd.org) Date: Tue, 16 Dec 2008 22:59:44 GMT Message-Id: <200812162259.mBGMxi8e049308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 22:59:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=154823 Change 154823 by piso@piso_newluxor on 2008/12/16 22:59:40 fix a mismerge Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#88 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#88 (text+ko) ==== @@ -1505,7 +1505,6 @@ }; /* Walk out chain. */ error = find_handler(OUT, IP, la, pip, &ad); - error = 0; if (error == 0) iresult = PKT_ALIAS_OK; else From owner-p4-projects@FreeBSD.ORG Tue Dec 16 23:18:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A50AB1065672; Tue, 16 Dec 2008 23:18: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 697CB106564A for ; Tue, 16 Dec 2008 23:18:03 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DEFD8FC17 for ; Tue, 16 Dec 2008 23:18:03 +0000 (UTC) (envelope-from piso@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 mBGNI3lo053048 for ; Tue, 16 Dec 2008 23:18:03 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBGNI3Vp053046 for perforce@freebsd.org; Tue, 16 Dec 2008 23:18:03 GMT (envelope-from piso@freebsd.org) Date: Tue, 16 Dec 2008 23:18:03 GMT Message-Id: <200812162318.mBGNI3Vp053046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 23:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=154825 Change 154825 by piso@piso_newluxor on 2008/12/16 23:17:07 white space change Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#89 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#89 (text+ko) ==== @@ -1489,7 +1489,7 @@ case IPPROTO_UDP: iresult = UdpAliasOut(la, ptr, maxpacketsize, create); break; - case IPPROTO_TCP: + case IPPROTO_TCP: iresult = TcpAliasOut(la, ptr, maxpacketsize, create); break; case IPPROTO_GRE: { From owner-p4-projects@FreeBSD.ORG Tue Dec 16 23:27:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DC671065674; Tue, 16 Dec 2008 23:27:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 521DA106564A for ; Tue, 16 Dec 2008 23:27:52 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id EC4F68FC08 for ; Tue, 16 Dec 2008 23:27:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBGNQLnW066418; Tue, 16 Dec 2008 16:26:22 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 16 Dec 2008 16:26:25 -0700 (MST) Message-Id: <20081216.162625.1555329119.imp@bsdimp.com> To: ed@80386.nl From: "M. Warner Losh" In-Reply-To: <20081215155210.GR1176@hoeg.nl> References: <20081214192057.GP1176@hoeg.nl> <20081214.143851.-494097696.imp@bsdimp.com> <20081215155210.GR1176@hoeg.nl> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 16 Dec 2008 23:27:52 -0000 In message: <20081215155210.GR1176@hoeg.nl> Ed Schouten writes: : * M. Warner Losh wrote: : > No Problem. glad I could help. I've been trying to shrink : > kern.post.mk for years, so I have a visceral reaction when I see : > people adding to it... : : I see we're generating vnode_if* in sys/conf/kern.post.mk right now. : Maybe we could move it to sys/conf/files as well? Maybe. I'll be happy to review changes. I think that it was done initially because of the large number of dependencies... Warner From owner-p4-projects@FreeBSD.ORG Wed Dec 17 00:02:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D6E61065677; Wed, 17 Dec 2008 00: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 4C0AA1065673 for ; Wed, 17 Dec 2008 00:02:52 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3530E8FC14 for ; Wed, 17 Dec 2008 00:02:52 +0000 (UTC) (envelope-from piso@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 mBH02p95056990 for ; Wed, 17 Dec 2008 00:02:51 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBH02o74056987 for perforce@freebsd.org; Wed, 17 Dec 2008 00:02:50 GMT (envelope-from piso@freebsd.org) Date: Wed, 17 Dec 2008 00:02:50 GMT Message-Id: <200812170002.mBH02o74056987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Dec 2008 00:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=154838 Change 154838 by piso@piso_newluxor on 2008/12/17 00:02:16 IFC@154826 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#32 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.c#4 integrate .. //depot/projects/soc2005/libalias/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/soc2005/libalias/etc/regdomain.xml#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/bfd.h#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/soc2005/libalias/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/sort/config.h#3 integrate .. //depot/projects/soc2005/libalias/include/arpa/nameser.h#3 integrate .. //depot/projects/soc2005/libalias/include/resolv.h#3 integrate .. //depot/projects/soc2005/libalias/include/string.h#3 integrate .. //depot/projects/soc2005/libalias/kerberos5/include/config.h#3 integrate .. //depot/projects/soc2005/libalias/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/soc2005/libalias/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_debug.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_mkquery.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_query.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_send.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdio/vfwprintf.c#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/strdup.3#4 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/fetch.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/fetch.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libfetch/http.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libmagic/config.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libstand/if_ether.h#3 integrate .. //depot/projects/soc2005/libalias/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/soc2005/libalias/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/atacontrol/atacontrol.8#5 integrate .. //depot/projects/soc2005/libalias/sbin/devd/devd.cc#3 integrate .. //depot/projects/soc2005/libalias/sbin/devd/devd.conf.5#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/newfs.c#6 integrate .. //depot/projects/soc2005/libalias/sbin/route/route.c#6 integrate .. //depot/projects/soc2005/libalias/sbin/routed/table.c#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#24 integrate .. //depot/projects/soc2005/libalias/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/cxgb.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#14 integrate .. //depot/projects/soc2005/libalias/share/man/man4/fxp.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/route.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#20 integrate .. //depot/projects/soc2005/libalias/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/soc2005/libalias/share/man/man9/ifnet.9#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rtentry.9#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/genassym.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/soc2005/libalias/sys/boot/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_periph.c#7 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_sim.c#3 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_sim.h#3 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#37 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#44 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sparc64#12 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.sun4v#10 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#35 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/soc2005/libalias/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/soc2005/libalias/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/atkbdc/psm.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#22 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp.c#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/md/md.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#21 integrate .. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_pci.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#21 integrate .. //depot/projects/soc2005/libalias/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/snp/snp.c#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ucomvar.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/soc2005/libalias/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/soc2005/libalias/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/soc2005/libalias/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/reiserfs/reiserfs_vnops.c#4 integrate .. //depot/projects/soc2005/libalias/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/exception.s#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/genassym.c#10 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/local_apic.c#15 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/apicvar.h#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpu.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_jail.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_linker.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_poll.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_proc.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_prot.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_rwlock.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_vimage.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/subr_prf.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_trap.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty.c#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pts.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_default.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#22 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/soc2005/libalias/sys/kern/vnode_if.src#8 integrate .. //depot/projects/soc2005/libalias/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/mips/include/elf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#33 integrate .. //depot/projects/soc2005/libalias/sys/modules/aio/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_amrr/Makefile#9 delete .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_onoe/Makefile#10 delete .. //depot/projects/soc2005/libalias/sys/modules/ath_rate_sample/Makefile#10 delete .. //depot/projects/soc2005/libalias/sys/modules/cxgb/Makefile#10 integrate .. //depot/projects/soc2005/libalias/sys/net/if.c#17 integrate .. //depot/projects/soc2005/libalias/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#19 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/soc2005/libalias/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net/if_fwsubr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#11 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.h#4 integrate .. //depot/projects/soc2005/libalias/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net/if_lagg.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net/if_llatbl.c#1 branch .. //depot/projects/soc2005/libalias/sys/net/if_llatbl.h#1 branch .. //depot/projects/soc2005/libalias/sys/net/if_tun.c#10 integrate .. //depot/projects/soc2005/libalias/sys/net/if_var.h#12 integrate .. //depot/projects/soc2005/libalias/sys/net/pfil.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/pfil.h#4 integrate .. //depot/projects/soc2005/libalias/sys/net/radix.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net/radix_mpath.c#6 integrate .. //depot/projects/soc2005/libalias/sys/net/raw_cb.h#3 integrate .. //depot/projects/soc2005/libalias/sys/net/route.c#9 integrate .. //depot/projects/soc2005/libalias/sys/net/route.h#6 integrate .. //depot/projects/soc2005/libalias/sys/net/rtsock.c#10 integrate .. //depot/projects/soc2005/libalias/sys/net/vnet.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/_ieee80211.h#11 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#15 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_crypto.h#9 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#16 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#14 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.c#14 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/icmp6.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/if_atm.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/if_ether.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/if_ether.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_proto.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_var.h#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#59 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_input.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_output.c#18 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_var.h#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#36 integrate .. //depot/projects/soc2005/libalias/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_os_bsd.h#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#22 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/soc2005/libalias/sys/netinet/udp_var.h#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_var.h#6 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_var.h#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6.c#13 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6.h#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6_rtr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/raw_ip6.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/tcp6_var.h#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipip_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/key.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netipx/ipx_usrreq.c#8 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rl.c#12 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#15 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/param.h#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/cuda.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/gracklevar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/uninorth.c#6 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/uninorthvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/ofw_bus.h#2 delete .. //depot/projects/soc2005/libalias/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcib_subr.c#5 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sbus/sbus.c#8 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/ofw_bus.c#2 delete .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/ofw_bus.h#2 delete .. //depot/projects/soc2005/libalias/sys/sys/aio.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#12 integrate .. //depot/projects/soc2005/libalias/sys/sys/mount.h#14 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#29 integrate .. //depot/projects/soc2005/libalias/sys/sys/pmc.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/resource.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#11 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#13 integrate .. //depot/projects/soc2005/libalias/sys/sys/ttyhook.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/vimage.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/vnode.h#16 integrate .. //depot/projects/soc2005/libalias/sys/sys/vtoc.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/soc2005/libalias/tools/tools/nanobsd/nanobsd.sh#11 integrate .. //depot/projects/soc2005/libalias/usr.bin/cpuset/cpuset.1#5 integrate .. //depot/projects/soc2005/libalias/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/file/config.h#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/ipcs/ipcs.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/netstat/route.c#10 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/util.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fwcontrol/fwcontrol.c#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fwcontrol/fwmpegts.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/jexec/jexec.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/jls/jls.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ndp/ndp.c#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/route.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/route6d/route6d.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/cdrom.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/dispatch.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/dist.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/dist.h#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/install.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/label.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/menus.c#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/sysinstall.8#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/sysinstall.h#8 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/system.c#6 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sysinstall/user.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#32 (text+ko) ==== @@ -22,6 +22,15 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081214: + __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. + RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. + The new code reduced struct rtentry{} by 16 bytes on 32-bit + architecture and 40 bytes on 64-bit architecture. The userland + applications "arp" and "ndp" have been updated accordingly. + The output from "netstat -r" shows only routing entries and + none of the L2 information. + 20081130: __FreeBSD_version 800057 marks the switchover from the binary ath hal to source code. Users must add the line: @@ -1178,4 +1187,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $ ==== //depot/projects/soc2005/libalias/contrib/binutils/bfd/config.bfd#2 (text+ko) ==== @@ -768,6 +768,10 @@ targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; + mips*-*-freebsd*) + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ==== //depot/projects/soc2005/libalias/contrib/binutils/gas/config/tc-mips.c#4 (text+ko) ==== @@ -281,6 +281,9 @@ #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI) +/* True if relocations are stored in-place. */ +#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI) + /* We can only have 64bit addresses if the object file format supports it. */ #define HAVE_32BIT_ADDRESSES \ @@ -13020,6 +13023,26 @@ if (fixp->fx_addsy == NULL) return 1; + /* If symbol SYM is in a mergeable section, relocations of the form + SYM + 0 can usually be made section-relative. The mergeable data + is then identified by the section offset rather than by the symbol. + + However, if we're generating REL LO16 relocations, the offset is split + between the LO16 and parterning high part relocation. The linker will + need to recalculate the complete offset in order to correctly identify + the merge data. + + The linker has traditionally not looked for the parterning high part + relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be + placed anywhere. Rather than break backwards compatibility by changing + this, it seems better not to force the issue, and instead keep the + original symbol. This will work with either linker behavior. */ + if ((fixp->fx_r_type == BFD_RELOC_LO16 + || reloc_needs_lo_p (fixp->fx_r_type)) + && HAVE_IN_PLACE_ADDENDS + && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0) + return 0; + #ifdef OBJ_ELF if (OUTPUT_FLAVOR == bfd_target_elf_flavour && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16 ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII.c#3 (text+ko) ==== @@ -48,8 +48,7 @@ /* if-index allocator */ static uint32_t next_if_index = 1; -/* re-fetch arp table */ -static int update_arp; +/* currently fetching the arp table */ static int in_update_arp; /* OR registrations */ @@ -911,36 +910,6 @@ } /* - * Process a new ARP entry - */ -static void -process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl, - const struct sockaddr_in *sa) -{ - struct mibif *ifp; - struct mibarp *at; - - /* IP arp table entry */ - if (sdl->sdl_alen == 0) { - update_arp = 1; - return; - } - if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL) - return; - /* have a valid entry */ - if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL && - (at = mib_arp_create(ifp, sa->sin_addr, - sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL) - return; - - if (rtm->rtm_rmx.rmx_expire == 0) - at->flags |= MIBARP_PERM; - else - at->flags &= ~MIBARP_PERM; - at->flags |= MIBARP_FOUND; -} - -/* * Handle a routing socket message. */ static void @@ -1080,46 +1049,12 @@ } break; #endif - case RTM_GET: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_ADD: + case RTM_DELETE: mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_flags & RTF_LLINFO) { - if (addrs[RTAX_DST] == NULL || - addrs[RTAX_GATEWAY] == NULL || - addrs[RTAX_DST]->sa_family != AF_INET || - addrs[RTAX_GATEWAY]->sa_family != AF_LINK) - break; - process_arp(rtm, - (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY], - (struct sockaddr_in *)(void *)addrs[RTAX_DST]); - } else { - if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) - mib_sroute_process(rtm, addrs[RTAX_GATEWAY], - addrs[RTAX_DST], addrs[RTAX_NETMASK]); - } - break; - case RTM_DELETE: - mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs); - if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO)) + if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP)) mib_sroute_process(rtm, addrs[RTAX_GATEWAY], addrs[RTAX_DST], addrs[RTAX_NETMASK]); break; @@ -1289,7 +1224,8 @@ /* * Update arp table - */ + * +*/ void mib_arp_update(void) { @@ -1305,11 +1241,11 @@ TAILQ_FOREACH(at, &mibarp_list, link) at->flags &= ~MIBARP_FOUND; - if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) { + if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) { in_update_arp = 0; return; } - + next = buf; while (next < buf + needed) { rtm = (struct rt_msghdr *)(void *)next; @@ -1326,7 +1262,6 @@ at = at1; } mibarpticks = get_ticks(); - update_arp = 0; in_update_arp = 0; } @@ -1634,8 +1569,8 @@ mib_arp_update(); mib_iflist_bad = 0; } - if (update_arp) - mib_arp_update(); + + mib_arp_update(); } ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmp_mibII/mibII_route.c#2 (text+ko) ==== @@ -186,8 +186,7 @@ memcpy(r->index, key.index, sizeof(r->index)); r->ifindex = (ifp == NULL) ? 0 : ifp->index; - r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 : - (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; + r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4; /* cannot really know, what protocol it runs */ r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 : ==== //depot/projects/soc2005/libalias/contrib/ipfilter/ipsend/44arp.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.3 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/44arp.c,v 1.4 2008/12/15 06:10:57 qingli Exp $ */ /* * Based upon 4.4BSD's /usr/sbin/arp @@ -88,7 +88,12 @@ mib[2] = 0; mib[3] = AF_INET; mib[4] = NET_RT_FLAGS; +#ifdef RTF_LLINFO mib[5] = RTF_LLINFO; +#else + mib[5] = 0; +#endif + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) { perror("route-sysctl-estimate"); ==== //depot/projects/soc2005/libalias/etc/regdomain.xml#2 (text+ko) ==== @@ -22,7 +22,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/etc/regdomain.xml,v 1.1 2008/04/20 20:37:02 sam Exp $ + $FreeBSD: src/etc/regdomain.xml,v 1.2 2008/12/15 01:18:11 sam Exp $ --> @@ -39,7 +39,7 @@ --> DEBUG - 0 + 0x1ff @@ -1080,6 +1080,75 @@ + + + SR9 + 0x0298 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + XR9 + 0x299 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + GZ901 + 0x29a + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + @@ -1201,6 +1270,9 @@ 320 Guatemala + + 5002 ZComax GZ-901 + 340 Honduras @@ -1396,6 +1468,12 @@ 792 Turkey + + 5000 Ubiquiti SR9 + + + 5001 Ubiquiti XR9 + 804 Ukraine @@ -1426,6 +1504,10 @@ 716 Zimbabwe + + + 0 Debug + @@ -39,7 +39,7 @@ --> DEBUG - 0 + 0x1ff @@ -1080,6 +1080,75 @@ + + + SR9 + 0x0298 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + XR9 + 0x299 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + + + GZ901 + 0x29a + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 17 13:23:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C14D41065675; Wed, 17 Dec 2008 13:23: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 8412B1065674 for ; Wed, 17 Dec 2008 13:23:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 72E5B8FC08 for ; Wed, 17 Dec 2008 13:23:49 +0000 (UTC) (envelope-from piso@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 mBHDNnkV080172 for ; Wed, 17 Dec 2008 13:23:49 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBHDNnnL080170 for perforce@freebsd.org; Wed, 17 Dec 2008 13:23:49 GMT (envelope-from piso@freebsd.org) Date: Wed, 17 Dec 2008 13:23:49 GMT Message-Id: <200812171323.mBHDNnnL080170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154869 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Dec 2008 13:23:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154869 Change 154869 by piso@piso_ferret on 2008/12/17 13:23:25 Try again to reduce diff against HEAD... Affected files ... .. //depot/projects/soc2005/libalias/bin/sh/parser.c#7 edit .. //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#4 edit .. //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#7 edit .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#4 edit .. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#5 edit .. //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#5 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#15 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#5 edit .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#8 edit .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#7 edit .. //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#8 edit .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#10 edit .. //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#6 edit .. //depot/projects/soc2005/libalias/share/sendmail/Makefile#4 edit .. //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#6 edit .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#6 edit .. //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#8 edit .. //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#5 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#4 edit .. //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#4 edit .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#7 edit .. //depot/projects/soc2005/libalias/sys/dev/xe/if_xe_pccard.c#5 edit .. //depot/projects/soc2005/libalias/sys/kern/tty_tty.c#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#12 edit .. //depot/projects/soc2005/libalias/sys/powerpc/aim/trap.c#6 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.1#5 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest.cc#6 edit .. //depot/projects/soc2005/libalias/tools/tools/mctest/mctest_run.sh#4 edit .. //depot/projects/soc2005/libalias/usr.bin/comm/comm.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/add/pkg_add.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/create/pkg_create.1#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/main.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/delete/pkg_delete.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/main.c#6 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/info/pkg_info.1#7 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/updating/pkg_updating.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/main.c#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/pkg_version.1#5 edit .. //depot/projects/soc2005/libalias/usr.sbin/timed/timed/timed.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/tzsetup/tzsetup.c#4 edit .. //depot/projects/soc2005/libalias/usr.sbin/wlandebug/wlandebug.c#6 edit Differences ... ==== //depot/projects/soc2005/libalias/bin/sh/parser.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.59 2008/05/15 19:55:27 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); #include #include @@ -1188,6 +1188,7 @@ int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ int i; int linno; + int length; c = pgetc(); if (c != '(' && c != '{' && (is_eof(c) || !is_name(c)) && @@ -1220,12 +1221,14 @@ subtype = 0; } if (!is_eof(c) && is_name(c)) { - p = out; + length = 0; do { STPUTC(c, out); c = pgetc(); + length++; } while (!is_eof(c) && is_in_name(c)); - if (out - p == 6 && strncmp(p, "LINENO", 6) == 0) { + if (length == 6 && + strncmp(out - length, "LINENO", length) == 0) { /* Replace the variable name with the * current line number. */ linno = plinno; ==== //depot/projects/soc2005/libalias/etc/defaults/bluetooth.device.conf#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.1 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/defaults/bluetooth.device.conf,v 1.2 2008/05/27 17:46:32 emax Exp $ # The authentication_enable parameter controls if the device requires to # authenticate the remote device at connection setup. At connection setup, @@ -39,8 +39,7 @@ # The class parameter is used to indicate the capabilities of the device to # other devices. # -# For more details see -# https://www.bluetooth.org/foundry/assignnumb/document/baseband +# For more details see "Assigned Numbers - Bluetooth Baseband" document # # Possible value: # @@ -101,7 +100,7 @@ # The role_switch parameter controls whether the local device should perform # role switch. By default, if role switch is supported, the local device will # try to perform role switch and become Master on incoming connection. Some -# devices do not support role switch and thus incomming connections from such +# devices do not support role switch and thus incoming connections from such # devices will fail. If role switch is disabled then accepting device will # remain Slave. # ==== //depot/projects/soc2005/libalias/games/fortune/datfiles/freebsd-tips#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.45 2007/12/08 00:20:33 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.46 2008/05/31 18:07:16 remko Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -402,16 +402,6 @@ as root. This will install a collection of packages that is appropriate for running a "generic" server. % -You can get a good standard workstation install by using the -instant-workstation port/package. If you have ports installed, you can -install it by doing - - # cd /usr/ports/misc/instant-workstation - # make install && make clean - -as root. This will install a collection of packages that is convenient to -have on a workstation. -% You can install extra packages for FreeBSD by using the ports system. If you have installed it, you can download, compile, and install software by just typing ==== //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.1 2008/04/04 09:43:03 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.3 2008/05/30 14:47:40 dfr Exp $"); #include #include @@ -34,8 +34,10 @@ #include #include "libc_private.h" +__weak_reference(__fcntl_compat, fcntl); + int -fcntl(int fd, int cmd, ...) +__fcntl_compat(int fd, int cmd, ...) { va_list args; long arg; ==== //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_fcntl.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.17 2008/05/30 14:47:41 dfr Exp $ */ #include #include @@ -36,6 +36,8 @@ __weak_reference(__fcntl, fcntl); +extern int __fcntl_compat(int fd, int cmd, ...); + int _fcntl(int fd, int cmd,...) { @@ -124,7 +126,7 @@ break; default: /* Might want to make va_arg use a union */ - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); break; } ==== //depot/projects/soc2005/libalias/lib/libkse/thread/thr_fcntl.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.24 2007/12/16 23:29:55 deischen Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.25 2008/05/30 14:47:42 dfr Exp $ */ #include "namespace.h" @@ -37,6 +37,7 @@ #include "thr_private.h" int __fcntl(int fd, int cmd,...); +extern int __fcntl_compat(int fd, int cmd,...); __weak_reference(__fcntl, fcntl); @@ -68,7 +69,7 @@ ret = __sys_fcntl(fd, cmd); break; default: - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.50 2008/04/16 03:19:11 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.51 2008/05/29 07:57:33 davidxu Exp $ */ #include "namespace.h" @@ -89,8 +89,7 @@ struct pthread_mutex_attr _pthread_mutexattr_default = { .m_type = PTHREAD_MUTEX_DEFAULT, .m_protocol = PTHREAD_PRIO_NONE, - .m_ceiling = 0, - .m_flags = 0 + .m_ceiling = 0 }; /* Default condition variable attributes: */ ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_once.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.6 2007/10/16 07:46:15 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.7 2008/05/30 00:02:59 davidxu Exp $ * */ @@ -38,11 +38,8 @@ #define ONCE_NEVER_DONE PTHREAD_NEEDS_INIT #define ONCE_DONE PTHREAD_DONE_INIT #define ONCE_IN_PROGRESS 0x02 -#define ONCE_MASK 0x03 +#define ONCE_WAIT 0x03 -static pthread_mutex_t _thr_once_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_cond_t _thr_once_cv = PTHREAD_COND_INITIALIZER; - /* * POSIX: * The pthread_once() function is not a cancellation point. However, @@ -55,47 +52,46 @@ { pthread_once_t *once_control = arg; - _pthread_mutex_lock(&_thr_once_lock); - once_control->state = ONCE_NEVER_DONE; - _pthread_mutex_unlock(&_thr_once_lock); - _pthread_cond_broadcast(&_thr_once_cv); + if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_NEVER_DONE)) + return; + atomic_store_rel_int(&once_control->state, ONCE_NEVER_DONE); + _thr_umtx_wake(&once_control->state, INT_MAX, 0); } int _pthread_once(pthread_once_t *once_control, void (*init_routine) (void)) { struct pthread *curthread; - int wakeup = 0; + int state; + + for (;;) { + state = once_control->state; + if (state == ONCE_DONE) + return (0); + if (state == ONCE_NEVER_DONE) { + if (atomic_cmpset_acq_int(&once_control->state, state, ONCE_IN_PROGRESS)) + break; + } else if (state == ONCE_IN_PROGRESS) { + if (atomic_cmpset_acq_int(&once_control->state, state, ONCE_WAIT)) + _thr_umtx_wait_uint(&once_control->state, ONCE_WAIT, NULL, 0); + } else if (state == ONCE_WAIT) { + _thr_umtx_wait_uint(&once_control->state, state, NULL, 0); + } else + return (EINVAL); + } - if (once_control->state == ONCE_DONE) + curthread = _get_curthread(); + THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); + init_routine(); + THR_CLEANUP_POP(curthread, 0); + if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_DONE)) return (0); - _pthread_mutex_lock(&_thr_once_lock); - while (*(volatile int *)&(once_control->state) == ONCE_IN_PROGRESS) - _pthread_cond_wait(&_thr_once_cv, &_thr_once_lock); - /* - * If previous thread was canceled, then the state still - * could be ONCE_NEVER_DONE, we need to check it again. - */ - if (*(volatile int *)&(once_control->state) == ONCE_NEVER_DONE) { - once_control->state = ONCE_IN_PROGRESS; - _pthread_mutex_unlock(&_thr_once_lock); - curthread = _get_curthread(); - THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); - init_routine(); - THR_CLEANUP_POP(curthread, 0); - _pthread_mutex_lock(&_thr_once_lock); - once_control->state = ONCE_DONE; - wakeup = 1; - } - _pthread_mutex_unlock(&_thr_once_lock); - if (wakeup) - _pthread_cond_broadcast(&_thr_once_cv); + atomic_store_rel_int(&once_control->state, ONCE_DONE); + _thr_umtx_wake(&once_control->state, INT_MAX, 0); return (0); } void _thr_once_init() { - _thr_once_lock = PTHREAD_MUTEX_INITIALIZER; - _thr_once_cv = PTHREAD_COND_INITIALIZER; } ==== //depot/projects/soc2005/libalias/lib/libthr/thread/thr_syscalls.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.17 2007/12/20 04:32:28 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.18 2008/05/30 14:47:42 dfr Exp $ */ /* @@ -132,6 +132,7 @@ int __close(int); int __connect(int, const struct sockaddr *, socklen_t); int __fcntl(int, int,...); +extern int __fcntl_compat(int, int,...); int __fsync(int); int __msync(void *, size_t, int); int __nanosleep(const struct timespec *, struct timespec *); @@ -252,7 +253,7 @@ ret = __sys_fcntl(fd, cmd); break; default: - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/readme/article.sgml#7 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.40 2007/08/18 17:11:14 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.41 2008/05/31 13:45:35 hrs Exp $ 2000 @@ -23,6 +23,7 @@ 2005 2006 2007 + 2008 The &os; Documentation Project @@ -58,8 +59,8 @@ Intel Itanium Processor based computers (&arch.ia64;), NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;), and &ultrasparc; machines (&arch.sparc64;). Versions - for the &powerpc; (&arch.powerpc;), and &mips; (mips) - architectures are currently under + for the &arm; (&arch.arm;), &mips; (&arch.mips;), and + &powerpc; (&arch.powerpc;) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything from software development to games to Internet Service ==== //depot/projects/soc2005/libalias/release/doc/share/sgml/release.ent#8 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -54,6 +54,7 @@ + ==== //depot/projects/soc2005/libalias/sbin/mount/mount.8#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.87 2008/03/12 02:09:22 tmclaugh Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.89 2008/06/03 09:43:28 ru Exp $ .\" .Dd March 11, 2008 .Dt MOUNT 8 @@ -522,6 +522,19 @@ The minimum permissions for the mount point for traversal across the mount point in both directions to be possible for all users is 0111 (execute for all). +.Pp +Use of the +.Nm +is preferred over the use of the file system specific +.Pa mount_ Ns Sy XXX +commands. +In particular, +.Xr mountd 8 +gets a +.Dv SIGHUP +signal (that causes an update of the export list) +only when the file system is mounted via +.Nm . .Sh HISTORY A .Nm ==== //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.3 2007/10/31 16:05:21 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/bluetooth.device.conf.5,v 1.4 2008/05/27 17:46:32 emax Exp $ .\" -.Dd December 1, 2005 +.Dd May 27, 2008 .Dt BLUETOOTH.DEVICE.CONF 5 .Os .Sh NAME @@ -90,7 +90,8 @@ parameter is used to indicate the capabilities of the device to other devices. For more details see -.Pa https://www.bluetooth.org/foundry/\:assignnumb/document/\:baseband . +.Dq Assigned Numbers - Bluetooth Baseband +document. .It Va connectable .Pq Vt bool The ==== //depot/projects/soc2005/libalias/share/sendmail/Makefile#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/share/sendmail/Makefile,v 1.10 2004/12/21 08:46:54 ru Exp $ +# $FreeBSD: src/share/sendmail/Makefile,v 1.11 2008/05/31 19:15:15 remko Exp $ # # Doing a make install builds /usr/share/sendmail/ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail CFDIR= cf -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print) +CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) +CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) DDIR= ${DESTDIR}/usr/share/sendmail ==== //depot/projects/soc2005/libalias/share/syscons/keymaps/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.72 2007/07/13 08:29:24 roberto Exp $ +# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.73 2008/05/27 13:19:06 philip Exp $ FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ @@ -6,6 +6,7 @@ br275.iso.kbd br275.iso.acc.kbd br275.cp850.kbd \ by.cp1131.kbd by.cp1251.kbd by.iso5.kbd \ ce.iso2.kbd \ + colemak.iso15.acc.kbd \ cs.latin2.qwertz.kbd \ cz.iso2.kbd \ danish.iso.kbd danish.cp865.kbd dutch.iso.acc.kbd \ ==== //depot/projects/soc2005/libalias/sys/compat/linux/linux_mib.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.29 2007/01/14 16:07:01 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.30 2008/06/03 17:50:13 rdivacky Exp $"); #include #include @@ -82,8 +82,8 @@ 0, 0, linux_sysctl_osname, "A", "Linux kernel OS name"); -static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; -static int linux_use_linux26 = 0; +static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.6.16"; +static int linux_use_linux26 = 1; static int linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS) ==== //depot/projects/soc2005/libalias/sys/dev/ieee488/upd7210.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.10 2006/03/11 15:39:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ieee488/upd7210.c,v 1.11 2008/05/29 12:50:45 ed Exp $"); # define GPIB_DEBUG # undef GPIB_DEBUG @@ -277,7 +277,7 @@ struct cdev *dev; if (units == NULL) - units = new_unrhdr(0, minor2unit(MAXMINOR), NULL); + units = new_unrhdr(0, INT_MAX, NULL); u->unit = alloc_unr(units); mtx_init(&u->mutex, "gpib", NULL, MTX_DEF); u->cdev = make_dev(&gpib_l_cdevsw, u->unit, ==== //depot/projects/soc2005/libalias/sys/dev/nve/if_nve.c#8 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.29 2007/11/22 02:44:59 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.30 2008/05/31 14:17:36 remko Exp $"); #include #include @@ -211,32 +211,52 @@ DRIVER_MODULE(miibus, nve, miibus_driver, miibus_devclass, 0, 0); static struct nve_type nve_devs[] = { - {NVIDIA_VENDORID, NFORCE_MCPNET1_DEVICEID, - "NVIDIA nForce MCP Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET2_DEVICEID, - "NVIDIA nForce MCP2 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET3_DEVICEID, - "NVIDIA nForce MCP3 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET4_DEVICEID, - "NVIDIA nForce MCP4 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET5_DEVICEID, - "NVIDIA nForce MCP5 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET6_DEVICEID, - "NVIDIA nForce MCP6 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET7_DEVICEID, - "NVIDIA nForce MCP7 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET8_DEVICEID, - "NVIDIA nForce MCP8 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET9_DEVICEID, - "NVIDIA nForce MCP9 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET10_DEVICEID, - "NVIDIA nForce MCP10 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET11_DEVICEID, - "NVIDIA nForce MCP11 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET12_DEVICEID, - "NVIDIA nForce MCP12 Networking Adapter"}, - {NVIDIA_VENDORID, NFORCE_MCPNET13_DEVICEID, - "NVIDIA nForce MCP13 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_LAN, + "NVIDIA nForce MCP Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_LAN, + "NVIDIA nForce2 MCP2 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1, + "NVIDIA nForce2 400 MCP4 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2, + "NVIDIA nForce2 400 MCP5 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN1, + "NVIDIA nForce3 MCP3 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN, + "NVIDIA nForce3 250 MCP6 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_LAN4, + "NVIDIA nForce3 MCP7 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN1, + "NVIDIA nForce4 CK804 MCP8 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_LAN2, + "NVIDIA nForce4 CK804 MCP9 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN1, + "NVIDIA nForce MCP04 Networking Adapter"}, // MCP10 + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP04_LAN2, + "NVIDIA nForce MCP04 Networking Adapter"}, // MCP11 + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN1, + "NVIDIA nForce 430 MCP12 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE430_LAN2, + "NVIDIA nForce 430 MCP13 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN1, + "NVIDIA nForce MCP55 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_LAN2, + "NVIDIA nForce MCP55 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN1, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN2, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN3, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_LAN4, + "NVIDIA nForce MCP61 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN1, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN2, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN3, + "NVIDIA nForce MCP65 Networking Adapter"}, + {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_LAN4, + "NVIDIA nForce MCP65 Networking Adapter"}, {0, 0, NULL} }; ==== //depot/projects/soc2005/libalias/sys/dev/nve/if_nvereg.h#5 (text+ko) ==== @@ -25,29 +25,47 @@ * SUCH DAMAGE. * * $Id: if_nvreg.h,v 1.6 2004/08/12 14:00:05 q Exp $ - * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.8 2006/12/05 15:31:05 jhb Exp $ + * $FreeBSD: src/sys/dev/nve/if_nvereg.h,v 1.9 2008/05/31 14:17:36 remko Exp $ */ #ifndef _IF_NVEREG_H_ #define _IF_NVEREG_H_ -#ifndef NVIDIA_VENDORID -#define NVIDIA_VENDORID 0x10DE +#ifndef PCI_VENDOR_NVIDIA +#define PCI_VENDOR_NVIDIA 0x10DE #endif -#define NFORCE_MCPNET1_DEVICEID 0x01C3 -#define NFORCE_MCPNET2_DEVICEID 0x0066 -#define NFORCE_MCPNET3_DEVICEID 0x00D6 -#define NFORCE_MCPNET4_DEVICEID 0x0086 -#define NFORCE_MCPNET5_DEVICEID 0x008C -#define NFORCE_MCPNET6_DEVICEID 0x00E6 -#define NFORCE_MCPNET7_DEVICEID 0x00DF -#define NFORCE_MCPNET8_DEVICEID 0x0056 -#define NFORCE_MCPNET9_DEVICEID 0x0057 -#define NFORCE_MCPNET10_DEVICEID 0x0037 -#define NFORCE_MCPNET11_DEVICEID 0x0038 -#define NFORCE_MCPNET12_DEVICEID 0x0268 -#define NFORCE_MCPNET13_DEVICEID 0x0269 +#define PCI_PRODUCT_NVIDIA_NFORCE_LAN 0x01C3 +#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00D6 +#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 0x0086 +#define PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 0x008C +#define PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN 0x00E6 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00DF +#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 0x0056 +#define PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 0x0057 +#define PCI_PRODUCT_NVIDIA_MCP04_LAN1 0x0037 +#define PCI_PRODUCT_NVIDIA_MCP04_LAN2 0x0038 +#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 0x0268 +#define PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 0x0269 +#define PCI_PRODUCT_NVIDIA_MCP55_LAN1 0x0372 +#define PCI_PRODUCT_NVIDIA_MCP55_LAN2 0x0373 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN1 0x03e5 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN2 0x03e6 +#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee +#define PCI_PRODUCT_NVIDIA_MCP61_LAN4 0x03ef +#define PCI_PRODUCT_NVIDIA_MCP65_LAN1 0x0450 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN2 0x0451 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN3 0x0452 +#define PCI_PRODUCT_NVIDIA_MCP65_LAN4 0x0453 + +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2 +#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 PCI_PRODUCT_NVIDIA_NFORCE3_250_LAN +#define PCI_PRODUCT_NVIDIA_CK804_LAN1 PCI_PRODUCT_NVIDIA_NFORCE4_LAN1 +#define PCI_PRODUCT_NVIDIA_CK804_LAN2 PCI_PRODUCT_NVIDIA_NFORCE4_LAN2 +#define PCI_PRODUCT_NVIDIA_MCP51_LAN1 PCI_PRODUCT_NVIDIA_NFORCE430_LAN1 +#define PCI_PRODUCT_NVIDIA_MCP51_LAN2 PCI_PRODUCT_NVIDIA_NFORCE430_LAN2 #define NV_RID 0x10 ==== //depot/projects/soc2005/libalias/sys/dev/snc/dp83932subr.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.7 2005/01/06 01:43:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.8 2008/05/30 21:48:05 jhb Exp $"); /* * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda. @@ -56,15 +56,6 @@ #include #include -#ifdef INET -#include -#include -#include -#include -#include -#endif - - #include #include @@ -73,7 +64,7 @@ #include #include -integrate u_int16_t snc_nec16_select_bank +static __inline u_int16_t snc_nec16_select_bank (struct snc_softc *, u_int32_t, u_int32_t); /* @@ -131,27 +122,27 @@ p = SOALIGN(sc, p); - if ((p - pp) > NBPG) { + if ((p - pp) > PAGE_SIZE) { device_printf (sc->sc_dev, "sizeof RRA (%ld) + CDA (%ld) +" - "TDA (%ld) > NBPG (%d). Punt!\n", - (ulong)sc->v_cda - (ulong)sc->v_rra[0], - (ulong)sc->mtda[0].mtd_vtxp - (ulong)sc->v_cda, - (ulong)p - (ulong)sc->mtda[0].mtd_vtxp, - NBPG); + "TDA (%ld) > PAGE_SIZE (%d). Punt!\n", + (u_long)sc->v_cda - (u_long)sc->v_rra[0], + (u_long)sc->mtda[0].mtd_vtxp - (u_long)sc->v_cda, + (u_long)p - (u_long)sc->mtda[0].mtd_vtxp, + PAGE_SIZE); return(1); } - p = pp + NBPG; + p = pp + PAGE_SIZE; pp = p; - sc->sc_nrda = NBPG / RXPKT_SIZE(sc); + sc->sc_nrda = PAGE_SIZE / RXPKT_SIZE(sc); sc->v_rda = SONIC_GETDMA(p); - p = pp + NBPG; + p = pp + PAGE_SIZE; for (i = 0; i < NRBA; i++) { sc->rbuf[i] = p; - p += NBPG; + p += PAGE_SIZE; } pp = p; @@ -161,10 +152,10 @@ mtdp->mtd_vbuf = SONIC_GETDMA(p); offset += TXBSIZE; - if (offset < NBPG) { + if (offset < PAGE_SIZE) { p += TXBSIZE; } else { - p = pp + NBPG; + p = pp + PAGE_SIZE; pp = p; offset = TXBSIZE; } @@ -396,7 +387,7 @@ /* select SONIC register SNCR_CR */ bus_space_write_1(iot, ioh, SNEC_ADDR, SNCR_CR); bus_space_write_2(iot, ioh, SNEC_CTRL, CR_RXDIS | CR_STP | CR_RST); - delay(400); + DELAY(400); cr = bus_space_read_2(iot, ioh, SNEC_CTRL); if (cr != (CR_RXDIS | CR_STP | CR_RST)) { @@ -535,7 +526,7 @@ * select memory bank and map * where exists specified (internal buffer memory) offset. */ -integrate u_int16_t +static __inline u_int16_t snc_nec16_select_bank(sc, base, offset) struct snc_softc *sc; u_int32_t base; @@ -757,61 +748,61 @@ bus_space_write_1(iot, ioh, SNEC_ADDR, SNECR_EEP); bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Start EEPROM access. */ bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Pass the iteration count to the chip. */ for (bit = 0x20; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | ((n & bit) ? SNECR_EEP_DI : 0x00)); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK | ((n & bit) ? SNECR_EEP_DI : 0x00)); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); } bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); (void) bus_space_read_1(iot, ioh, SNEC_CTRLB); /* ACK */ - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); /* Read a byte. */ val = 0; for (bit = 0x80; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); @@ -825,7 +816,7 @@ for (bit = 0x80; bit != 0x00; bit >>= 1) { bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS | SNECR_EEP_SK); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS); @@ -835,7 +826,7 @@ *data++ = val; bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00); - delay(SNEC_EEP_DELAY); + DELAY(SNEC_EEP_DELAY); } #ifdef SNCDEBUG @@ -871,7 +862,7 @@ for (n = 0; n < SNC_NREGS; n++) { /* select required SONIC register */ bus_space_write_1(iot, ioh, SNEC_ADDR, n); - delay(10); + DELAY(10); val = bus_space_read_2(iot, ioh, SNEC_CTRL); if ((n % 0x10) == 0) printf("\n%04x ", val); @@ -884,7 +875,7 @@ for (n = SNECR_MEMBS; n <= SNECR_IDENT; n += 2) { /* select required SONIC register */ bus_space_write_1(iot, ioh, SNEC_ADDR, n); - delay(10); + DELAY(10); val = (u_int16_t) bus_space_read_1(iot, ioh, SNEC_CTRLB); printf("%04x ", val); } ==== //depot/projects/soc2005/libalias/sys/dev/snc/if_sncreg.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.2 2005/01/06 01:43:15 imp Exp $ */ +/* $FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.3 2008/05/30 21:48:05 jhb Exp $ */ /* $NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -57,7 +57,7 @@ #define SNEC_NREGS 6 /* bank memory size */ -#define SNEC_NMEMS (NBPG * 2) +#define SNEC_NMEMS (PAGE_SIZE * 2) /* how many bank */ #define SNEC_NBANK 0x10 /* internal buffer size */ ==== //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.28 2008/03/12 19:09:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.29 2008/05/30 01:57:13 benno Exp $"); #include #include @@ -258,7 +258,12 @@ ns8250_param(bas, baudrate, databits, stopbits, parity); /* Disable all interrupt sources. */ - ier = uart_getreg(bas, REG_IER) & 0xf0; + /* + * We use 0xe0 instead of 0xf0 as the mask because the XScale PXA + * UARTs split the receive time-out interrupt bit out separately as + * 0x10. This gets handled by ier_mask and ier_rxbits below. + */ + ier = uart_getreg(bas, REG_IER) & 0xe0; uart_setreg(bas, REG_IER, ier); uart_barrier(bas); @@ -332,6 +337,9 @@ uint8_t fcr; uint8_t ier; uint8_t mcr; + + uint8_t ier_mask; + uint8_t ier_rxbits; }; static int ns8250_bus_attach(struct uart_softc *); @@ -400,6 +408,19 @@ ns8250->fcr |= FCR_RX_MEDH; } else ns8250->fcr |= FCR_RX_MEDH; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 17 15:17:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A0A1065676; Wed, 17 Dec 2008 15:17: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 B8ED11065672 for ; Wed, 17 Dec 2008 15:17:45 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8DCE8FC0C for ; Wed, 17 Dec 2008 15:17:45 +0000 (UTC) (envelope-from bz@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 mBHFHjfL090903 for ; Wed, 17 Dec 2008 15:17:45 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBHFHjFB090901 for perforce@freebsd.org; Wed, 17 Dec 2008 15:17:45 GMT (envelope-from bz@freebsd.org) Date: Wed, 17 Dec 2008 15:17:45 GMT Message-Id: <200812171517.mBHFHjFB090901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Dec 2008 15:17:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=154874 Change 154874 by bz@bz_dumpster on 2008/12/17 15:16:51 Forced submit to note (the relevant files themselves had this already): Sponsored by: The FreeBSD Foundation The original CH was 154790. Since then it has been tested sucessfully with multiple virtual network stacks. Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#3 edit .. //depot/projects/vimage/src/share/man/man4/altq.4#3 edit .. //depot/projects/vimage/src/share/man/man4/epair.4#2 edit .. //depot/projects/vimage/src/sys/conf/NOTES#40 edit .. //depot/projects/vimage/src/sys/conf/files#52 edit .. //depot/projects/vimage/src/sys/modules/Makefile#37 edit .. //depot/projects/vimage/src/sys/modules/if_epair/Makefile#2 edit .. //depot/projects/vimage/src/sys/net/if_epair.c#3 edit .. //depot/projects/vimage/src/sys/net/netisr.c#14 edit .. //depot/projects/vimage/src/sys/net/netisr.h#5 edit Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#3 (text+ko) ==== ==== //depot/projects/vimage/src/share/man/man4/altq.4#3 (text+ko) ==== ==== //depot/projects/vimage/src/share/man/man4/epair.4#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/conf/NOTES#40 (text+ko) ==== ==== //depot/projects/vimage/src/sys/conf/files#52 (text+ko) ==== ==== //depot/projects/vimage/src/sys/modules/Makefile#37 (text+ko) ==== ==== //depot/projects/vimage/src/sys/modules/if_epair/Makefile#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if_epair.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/netisr.c#14 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/netisr.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Dec 17 15:43:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E99B106567F; Wed, 17 Dec 2008 15:43: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 129031065670 for ; Wed, 17 Dec 2008 15:43:12 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 020888FC28 for ; Wed, 17 Dec 2008 15:43:12 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBHFhBlC096963 for ; Wed, 17 Dec 2008 15:43:11 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBHFhBIG096961 for perforce@freebsd.org; Wed, 17 Dec 2008 15:43:11 GMT (envelope-from peter@wemm.org) Date: Wed, 17 Dec 2008 15:43:11 GMT Message-Id: <200812171543.mBHFhBIG096961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 154877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Dec 2008 15:43:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=154877 Change 154877 by peter@peter_daintree on 2008/12/17 15:42:53 The nuker has nuked. Affected files ... .. //depot/doc/obliterate#23 edit Differences ... ==== //depot/doc/obliterate#23 (text+ko) ==== @@ -1,26 +1,6 @@ # Add any obliterate requests here, we'll do a sweep every now and then and # purge unwanted stuff in one go. -//depot/user/des/pam/... -//depot/user/pjd/geom/... -//depot/user/pjd/vpncore/... -//depot/user/flz/src/... -//depot/projects/kmacy_sun4v/doc/... -//depot/projects/kmacy_sun4v/www/... -//depot/projects/peter/pmap/... -//depot/projects/vimage-commit3/... -//depot/projects/pmap/... -//depot/projects/opensolaris/... -//depot/user/ceri/css/... -//depot/user/ceri/playpen/... -//depot/user/jb/cons/... -//depot/user/jb/sun4v/... -//depot/user/jb/kse_opt/... -//depot/user/maxim/advl/... -//depot/user/maxim/wip/... -//depot/user/julian/julian_ipi -//depot/user/julian/julian_nokseg -//depot/user/julian/nsched2 -//depot/user/julian/nsched3 -//depot/user/julian/rmkseg +# //depot/path/to/nuke/... # clients/dead machines: +# peter_nukeme From owner-p4-projects@FreeBSD.ORG Wed Dec 17 21:28:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5757F1065675; Wed, 17 Dec 2008 21:28: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 15A88106567B for ; Wed, 17 Dec 2008 21:28:04 +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 F12EA8FC18 for ; Wed, 17 Dec 2008 21:28:03 +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 mBHLS3EW050177 for ; Wed, 17 Dec 2008 21:28:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBHLS3cD050175 for perforce@freebsd.org; Wed, 17 Dec 2008 21:28:03 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 17 Dec 2008 21:28:03 GMT Message-Id: <200812172128.mBHLS3cD050175@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 154899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 17 Dec 2008 21:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=154899 Change 154899 by rene@rene_self on 2008/12/17 21:27:03 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2553,7 +2553,7 @@ - Case 2: You Set the Flags to 0x30 for sio0 + Case 2: You Set the Flags to 0x30 for <devicename>sio0</devicename> device sio0 at isa? port IO_COM1 flags 0x30 irq 4 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ - From owner-p4-projects@FreeBSD.ORG Thu Dec 18 06:44:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA0A51065676; Thu, 18 Dec 2008 06:44: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 6E5F01065670 for ; Thu, 18 Dec 2008 06:44:32 +0000 (UTC) (envelope-from maxim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E4238FC19 for ; Thu, 18 Dec 2008 06:44:32 +0000 (UTC) (envelope-from maxim@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 mBI6iWkd062165 for ; Thu, 18 Dec 2008 06:44:32 GMT (envelope-from maxim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBI6iWEc062163 for perforce@freebsd.org; Thu, 18 Dec 2008 06:44:32 GMT (envelope-from maxim@freebsd.org) Date: Thu, 18 Dec 2008 06:44:32 GMT Message-Id: <200812180644.mBI6iWEc062163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to maxim@freebsd.org using -f From: Maxim Konovalov To: Perforce Change Reviews Cc: Subject: PERFORCE change 154914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 06:44:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=154914 Change 154914 by maxim@maxim_mp2 on 2008/12/18 06:44:18 Added dead clients. Affected files ... .. //depot/doc/obliterate#24 edit Differences ... ==== //depot/doc/obliterate#24 (text+ko) ==== @@ -4,3 +4,6 @@ # clients/dead machines: # peter_nukeme +maxim_sonnie +maxim_fujic +maxim_mp2 From owner-p4-projects@FreeBSD.ORG Thu Dec 18 06:46:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC4C51065678; Thu, 18 Dec 2008 06:46: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 8520F1065670 for ; Thu, 18 Dec 2008 06:46:34 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E8728FC13 for ; Thu, 18 Dec 2008 06:46:34 +0000 (UTC) (envelope-from rfrench@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 mBI6kYKi062511 for ; Thu, 18 Dec 2008 06:46:34 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBI6kYlb062509 for perforce@freebsd.org; Thu, 18 Dec 2008 06:46:34 GMT (envelope-from rfrench@FreeBSD.org) Date: Thu, 18 Dec 2008 06:46:34 GMT Message-Id: <200812180646.mBI6kYlb062509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 154915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 06:46:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154915 Change 154915 by rfrench@rfrench_mpls2 on 2008/12/18 06:45:50 No Changes just tidying up an open client as per the nag lis Affected files ... .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#15 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#15 (text+ko) ==== @@ -58,10 +58,23 @@ void create_fake_entry(struct sockaddr_mpls *smpls) { - if (MPLS_LABEL_GET(smpls->smpls_in_label) == 44) { +>>>> ORIGINAL //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12 + if (MPLS_LABEL_GET(smpls->smpls_in_label) == 66) { + smpls->smpls_operation = 3; +==== THEIRS //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13 smpls->smpls_operation = 3; +==== YOURS //rfrench_mpls2/netmpls/mpls_input.c + if (MPLS_LABEL_GET(smpls->smpls_in_label) == 100) { + smpls->smpls_operation = 2; +<<<< smpls->smpls_out_exp = 14; +>>>> ORIGINAL //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#12 + smpls->smpls_out_label = MPLS_LABEL_SET(1000); +==== THEIRS //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13 smpls->smpls_out_label = MPLS_LABEL_SET(100); +==== YOURS //rfrench_mpls2/netmpls/mpls_input.c + smpls->smpls_out_label = MPLS_LABEL_SET(0); +<<<< smpls->smpls_out_ifindex = smpls->smpls_in_ifindex; } } From owner-p4-projects@FreeBSD.ORG Thu Dec 18 07:03:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75673106568A; Thu, 18 Dec 2008 07:03: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 395051065687 for ; Thu, 18 Dec 2008 07:03:52 +0000 (UTC) (envelope-from maxim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19C658FC0C for ; Thu, 18 Dec 2008 07:03:52 +0000 (UTC) (envelope-from maxim@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 mBI73pT2064845 for ; Thu, 18 Dec 2008 07:03:51 GMT (envelope-from maxim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBI73pT3064843 for perforce@freebsd.org; Thu, 18 Dec 2008 07:03:51 GMT (envelope-from maxim@freebsd.org) Date: Thu, 18 Dec 2008 07:03:51 GMT Message-Id: <200812180703.mBI73pT3064843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to maxim@freebsd.org using -f From: Maxim Konovalov To: Perforce Change Reviews Cc: Subject: PERFORCE change 154916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 07:03:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=154916 Change 154916 by maxim@maxim_mp2 on 2008/12/18 07:03:29 Backout previous. You can delete a dead client by p4 client -d Affected files ... .. //depot/doc/obliterate#25 edit Differences ... ==== //depot/doc/obliterate#25 (text+ko) ==== @@ -4,6 +4,3 @@ # clients/dead machines: # peter_nukeme -maxim_sonnie -maxim_fujic -maxim_mp2 From owner-p4-projects@FreeBSD.ORG Thu Dec 18 11:48:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C167B106567F; Thu, 18 Dec 2008 11:48: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 84EA61065674 for ; Thu, 18 Dec 2008 11:48:57 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 741F58FC22 for ; Thu, 18 Dec 2008 11:48:57 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBIBmv6O026719 for ; Thu, 18 Dec 2008 11:48:57 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBIBmvXv026717 for perforce@freebsd.org; Thu, 18 Dec 2008 11:48:57 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 18 Dec 2008 11:48:57 GMT Message-Id: <200812181148.mBIBmvXv026717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 154926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 11:48:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=154926 Change 154926 by weongyo@weongyo_ws on 2008/12/18 11:48:21 it's better to return STATUS_DEVICE_NOT_CONNECTED as IRP status code if URB status is USBD_STATUS_DEVICE_GONE. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#5 edit .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#26 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#5 (text+ko) ==== @@ -1222,6 +1222,7 @@ #define STATUS_NOT_SUPPORTED 0xC00000BB #define STATUS_INVALID_PARAMETER_2 0xC00000F0 #define STATUS_INSUFFICIENT_RESOURCES 0xC000009A +#define STATUS_DEVICE_NOT_CONNECTED 0xC000009D #define STATUS_CANCELLED 0xC0000120 #define STATUS_NOT_FOUND 0xC0000225 #define STATUS_DEVICE_REMOVED 0xC00002B6 ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#26 (text+ko) ==== @@ -251,7 +251,7 @@ case USBD_STATUS_SUCCESS: return (STATUS_SUCCESS); case USBD_STATUS_DEVICE_GONE: - return (STATUS_DEVICE_REMOVED); + return (STATUS_DEVICE_NOT_CONNECTED); case USBD_STATUS_PENDING: return (STATUS_PENDING); case USBD_STATUS_NOT_SUPPORTED: From owner-p4-projects@FreeBSD.ORG Thu Dec 18 11:58:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 448FB1065670; Thu, 18 Dec 2008 11:58: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 087521065674 for ; Thu, 18 Dec 2008 11:58:07 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D26498FC1C for ; Thu, 18 Dec 2008 11:58:06 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBIBw6kZ029748 for ; Thu, 18 Dec 2008 11:58:06 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBIBw6Lj029746 for perforce@freebsd.org; Thu, 18 Dec 2008 11:58:06 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 18 Dec 2008 11:58:06 GMT Message-Id: <200812181158.mBIBw6Lj029746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 154927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 11:58:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=154927 Change 154927 by weongyo@weongyo_ws on 2008/12/18 11:57:57 fix a fault that sometimes ndis_getstate_80211() function is called just after the attach is done. Should be committed into HEAD. Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#10 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#10 (text+ko) ==== @@ -2699,6 +2699,8 @@ ifp = sc->ifp; ic = ifp->if_l2com; vap = TAILQ_FIRST(&ic->ic_vaps); + if (vap == NULL) + return; ni = vap->iv_bss; if (!NDIS_INITIALIZED(sc)) From owner-p4-projects@FreeBSD.ORG Thu Dec 18 12:35:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39D371065675; Thu, 18 Dec 2008 12:35: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 F1AD11065674 for ; Thu, 18 Dec 2008 12:35:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E116A8FC08 for ; Thu, 18 Dec 2008 12:35:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBICZoSp036407 for ; Thu, 18 Dec 2008 12:35:50 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBICZobT036405 for perforce@freebsd.org; Thu, 18 Dec 2008 12:35:50 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 18 Dec 2008 12:35:50 GMT Message-Id: <200812181235.mBICZobT036405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 154931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 12:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=154931 Change 154931 by weongyo@weongyo_ws on 2008/12/18 12:34:53 IMO if the USB framework returns USBD_CANCELLED then we also should set USBD_URB_STATUS(urb) as USBD_STATUS_CANCELED not USBD_STATUS_SUCCESS. I've looked lots for NDIS driver; it looks most drivers set USBD_STATUS_CANCELED. In ndiswrapper they try to set USBD_STATUS_SUCCESS but it looks it's incorrect. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#27 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#27 (text+ko) ==== @@ -1051,7 +1051,7 @@ case USBD_CANCELLED: ip->irp_iostat.isb_info = 0; ip->irp_iostat.isb_status = STATUS_CANCELLED; - USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; + USBD_URB_STATUS(urb) = USBD_STATUS_CANCELED; break; default: ip->irp_iostat.isb_info = 0; From owner-p4-projects@FreeBSD.ORG Thu Dec 18 13:14:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2F971065674; Thu, 18 Dec 2008 13:14: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 76BF9106564A for ; Thu, 18 Dec 2008 13:14:30 +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 6661A8FC16 for ; Thu, 18 Dec 2008 13:14:30 +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 mBIDEU9s051189 for ; Thu, 18 Dec 2008 13:14:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBIDEUVY051187 for perforce@freebsd.org; Thu, 18 Dec 2008 13:14:30 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 18 Dec 2008 13:14:30 GMT Message-Id: <200812181314.mBIDEUVY051187@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 154936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 13:14:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=154936 Change 154936 by rene@rene_self on 2008/12/18 13:13:33 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#6 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1719,7 +1719,7 @@ IBSS mode, also called ad-hoc mode, is designed for point to point connections. For example, to establish an ad-hoc network between the machine A and the machine - B we will just need to choose two IP adresses + B we will just need to choose two IP addresses and a SSID. On the box A: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -399,6 +399,11 @@ Yahoo! + Yandex/primary> + + Yandex + + Apache Apache ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4175,7 +4175,7 @@ www/mod_perl and a statically compiled version is available in www/apache13-modperl. - mod_perl 2.0 is avaliable in + mod_perl 2.0 is available in www/mod_perl2. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2203,7 +2203,11 @@ not to probe for a keyboard at power-on. Your BIOS should not complain if the keyboard is absent. You can leave the keyboard plugged in even with this flag set to Not - installed and the keyboard will still work. + installed and the keyboard will still work. If the + above option is not present in the BIOS, look for an + Halt on Error option instead. Setting this to + All but Keyboard or even to + No Errors, will have the same effect. From owner-p4-projects@FreeBSD.ORG Thu Dec 18 13:49:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EB6B1065677; Thu, 18 Dec 2008 13:49: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 0F3191065673 for ; Thu, 18 Dec 2008 13:49:53 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from mail-qy0-f18.google.com (mail-qy0-f18.google.com [209.85.221.18]) by mx1.freebsd.org (Postfix) with ESMTP id A08F68FC16 for ; Thu, 18 Dec 2008 13:49:52 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: by qyk11 with SMTP id 11so509391qyk.19 for ; Thu, 18 Dec 2008 05:49:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type; bh=BTV3YtN08n8gBZP1wqCUfH8Xfamf33DHybaaPjmcf6I=; b=fLIcyXp0CQyyebVmuG6ii34NsNZD2pfk5FT66Yhhf8W+ylBSCASCYViiI0o4NcWsYu c21BXR2TIX5Tp83iHovCQ61LFZMrnOH4XDhvHaFbtcFvpgw3KNcBegiAjZ1IXVfYTOWR 7CukNFHe/kKAtrVkMsR+kyq0WDDYGvjAB4YIM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type; b=t++azbrtgKx1uDRXOe3GXcIW/XwrGQ7VAbLqPyLL/tzQ/9AlDWD7voiF/hrXSdlUoW hDHrxEpV7hwGeETVlGeMU6sjB3TQu9n/g4g2bRfAa2F6UiljdcQXK5uDRAbkeoFwttyG Nrl8A5BZB1Z2e362t4AyeKshL/1tauB4GXlOg= Received: by 10.215.101.20 with SMTP id d20mr2358724qam.50.1229606310542; Thu, 18 Dec 2008 05:18:30 -0800 (PST) Received: from kan.dnsalias.net (c-98-217-224-113.hsd1.ma.comcast.net [98.217.224.113]) by mx.google.com with ESMTPS id 9sm3279351yxs.35.2008.12.18.05.18.29 (version=SSLv3 cipher=RC4-MD5); Thu, 18 Dec 2008 05:18:29 -0800 (PST) Date: Thu, 18 Dec 2008 08:18:24 -0500 From: Alexander Kabaev To: Ryan French Message-ID: <20081218081824.35bd1979@kan.dnsalias.net> In-Reply-To: <200812180646.mBI6kYlb062509@repoman.freebsd.org> References: <200812180646.mBI6kYlb062509@repoman.freebsd.org> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.11; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3NaU3rW.e8=mhhyoPsFGvSU"; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 13:49:53 -0000 --Sig_/3NaU3rW.e8=mhhyoPsFGvSU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 18 Dec 2008 06:46:34 GMT Ryan French wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D154915 >=20 > Change 154915 by rfrench@rfrench_mpls2 on 2008/12/18 06:45:50 >=20 > No Changes just tidying up an open client as per the nag lis >=20 "No Changes" looks suspiciously like a couple of merge conflicts to me. This is most likely not what you wanted. -- Alexander Kabaev --Sig_/3NaU3rW.e8=mhhyoPsFGvSU Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iD8DBQFJSk2gQ6z1jMm+XZYRAmkOAKCjJ0GHtMQGAFTNn5CvJnKiUezfawCgpHR/ RBusbMtQpKDtQA+RmAD9owY= =5BRu -----END PGP SIGNATURE----- --Sig_/3NaU3rW.e8=mhhyoPsFGvSU-- From owner-p4-projects@FreeBSD.ORG Thu Dec 18 17:27:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31EFA1065676; Thu, 18 Dec 2008 17:27: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 E06CA1065674 for ; Thu, 18 Dec 2008 17:27:40 +0000 (UTC) (envelope-from peter@wemm.org) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.168]) by mx1.freebsd.org (Postfix) with ESMTP id BE1DB8FC0C for ; Thu, 18 Dec 2008 17:27:40 +0000 (UTC) (envelope-from peter@wemm.org) Received: by wf-out-1314.google.com with SMTP id 24so717194wfg.7 for ; Thu, 18 Dec 2008 09:27:40 -0800 (PST) Received: by 10.142.140.14 with SMTP id n14mr889824wfd.292.1229621260387; Thu, 18 Dec 2008 09:27:40 -0800 (PST) Received: by 10.142.255.21 with HTTP; Thu, 18 Dec 2008 09:27:40 -0800 (PST) Message-ID: Date: Thu, 18 Dec 2008 09:27:40 -0800 From: "Peter Wemm" To: "Maxim Konovalov" In-Reply-To: <200812180644.mBI6iWEc062163@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200812180644.mBI6iWEc062163@repoman.freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 17:27:41 -0000 On Wed, Dec 17, 2008 at 10:44 PM, Maxim Konovalov wrote: > http://perforce.freebsd.org/chv.cgi?CH=154914 > > Change 154914 by maxim@maxim_mp2 on 2008/12/18 06:44:18 > > Added dead clients. > > Affected files ... > > .. //depot/doc/obliterate#24 edit > > Differences ... > > ==== //depot/doc/obliterate#24 (text+ko) ==== > > @@ -4,3 +4,6 @@ > > # clients/dead machines: > # peter_nukeme > +maxim_sonnie > +maxim_fujic > +maxim_mp2 > With the client that you used to commit this to, try this: $ p4 client -d maxim_sonnie $ p4 client -d maxim_fujic $ p4 client -d maxim_mp2 You don't need admin intervention to do this. You might be able to commit p4-suicide with 'p4 user -d maxim' yourself, if you want. If not, I can make a /usr/local/bin/p4deluser. -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6FJV "All of this is for nothing if we don't go to the stars" - JMS/B5 "If Java had true garbage collection, most programs would delete themselves upon execution." -- Robert Sewell From owner-p4-projects@FreeBSD.ORG Thu Dec 18 19:40:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14CA81065677; Thu, 18 Dec 2008 19:40: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 CD67C1065675 for ; Thu, 18 Dec 2008 19:40:14 +0000 (UTC) (envelope-from maxim@macomnet.ru) Received: from mp2.macomnet.net (cl-2958.ham-01.de.sixxs.net [IPv6:2001:6f8:900:b8d::2]) by mx1.freebsd.org (Postfix) with ESMTP id 5DAE98FC25 for ; Thu, 18 Dec 2008 19:40:14 +0000 (UTC) (envelope-from maxim@macomnet.ru) Received: from localhost (localhost [127.0.0.1]) by mp2.macomnet.net (8.14.2/8.14.2) with ESMTP id mBIJeC0k034218; Thu, 18 Dec 2008 22:40:12 +0300 (MSK) (envelope-from maxim@macomnet.ru) Date: Thu, 18 Dec 2008 22:40:12 +0300 (MSK) From: Maxim Konovalov To: Peter Wemm In-Reply-To: Message-ID: <20081218223929.M51605@mp2.macomnet.net> References: <200812180644.mBI6iWEc062163@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 19:40:15 -0000 On Thu, 18 Dec 2008, 09:27-0800, Peter Wemm wrote: > On Wed, Dec 17, 2008 at 10:44 PM, Maxim Konovalov wrote: > > http://perforce.freebsd.org/chv.cgi?CH=154914 > > > > Change 154914 by maxim@maxim_mp2 on 2008/12/18 06:44:18 > > > > Added dead clients. > > > > Affected files ... > > > > .. //depot/doc/obliterate#24 edit > > > > Differences ... > > > > ==== //depot/doc/obliterate#24 (text+ko) ==== > > > > @@ -4,3 +4,6 @@ > > > > # clients/dead machines: > > # peter_nukeme > > +maxim_sonnie > > +maxim_fujic > > +maxim_mp2 > > > > > With the client that you used to commit this to, try this: > > $ p4 client -d maxim_sonnie > $ p4 client -d maxim_fujic > $ p4 client -d maxim_mp2 > > You don't need admin intervention to do this. > > You might be able to commit p4-suicide with 'p4 user -d maxim' > yourself, if you want. If not, I can make a > /usr/local/bin/p4deluser. > Yes, I've already backouted this change and killed dead clients. -- Maxim Konovalov From owner-p4-projects@FreeBSD.ORG Thu Dec 18 20:35:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86BA81065676; Thu, 18 Dec 2008 20:35: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 49CE9106564A for ; Thu, 18 Dec 2008 20:35:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F9CE8FC17 for ; Thu, 18 Dec 2008 20:35:59 +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 mBIKZx19038487 for ; Thu, 18 Dec 2008 20:35:59 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBIKZxMM038485 for perforce@freebsd.org; Thu, 18 Dec 2008 20:35:59 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 18 Dec 2008 20:35:59 GMT Message-Id: <200812182035.mBIKZxMM038485@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 154951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 20:35:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=154951 Change 154951 by rene@rene_self on 2008/12/18 20:35:34 MFen handbook: * advanced-networking 1.416 -> 1.418 (whitespace fix only) * introdcution 1.126 -> 1.128 (plus whitespace fixes) * network-servers 1.110 -> 1.111 (SRCID bump only) * serialcomms 1.131 -> 1.132 (plus local fixes) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#21 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#5 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#21 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.7 2008/12/10 19:31:52 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.416 + %SRCID% 1.418 --> @@ -1794,7 +1794,7 @@ Hier wordt de derde sleutel gebruikt. Dit dient overeen te komen met de instelling in het toegangspunt. Indien onbekend is welke sleutel door het toegangspunt - wordt gebruikt, dient geprobeerd te worden om + wordt gebruikt, dient geprobeerd te worden om 1 (i.e. de eerste sleutel) voor deze waarde te gebruiken. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.126 + %SRCID% 1.128 --> @@ -488,6 +488,12 @@ url="http://www.yahoo.com/">Yahoo! + Yandex + + + Yandex + + Apache @@ -918,7 +924,7 @@ Wide Web, en Ports-archieven gebruiken nog steeds CVS. Het primaire - archief staat op een systeem in Santa Clara, + archief staat op een systeem in Santa Clara, Californië, in de VS, waar het wordt gesynchroniseerd met verschillende mirrors over de hele wereld. De boomstructuur van @@ -927,7 +933,7 @@ -STABLE is te vinden, kan ook makkelijk met die op een eigen systeem gesynchroniseerd worden. Synchroniseren van broncode + linkend="synching">Synchroniseren van broncode bevat meer informatie over dit onderwerp. @@ -981,8 +987,8 @@ bijzondere verantwoordelijkheid, wat wil zeggen dat zij er speciaal op toezien dat een bepaald deel van het systeem werkt zoals het hoort. In de lijst - van medewerkers staat een complete lijst van + url="&url.articles.contributors;/article.html">lijst + van medewerkers staat een complete lijst van ontwikkelaars en hun verantwoordelijkheden. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 (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.110 + %SRCID% 1.111 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#4 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.15 2006/01/08 10:06:51 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml - %SRCID% 1.131 + %SRCID% 1.132 --> @@ -2522,15 +2522,19 @@ Stel het toetsenbord in op Niet - geïnstalleerd in de BIOS-instellingen. - Het is dan nog steeds mogelijk om het toetsenbord te + geïnstalleerd in de BIOS-instellingen. Het + is dan nog steeds mogelijk om het toetsenbord te gebruiken. Dit zorgt er alleen voor dat het BIOS niet naar een toetsenbord zoekt tijdens het aanzetten. Het BIOS dient niet te klagen als het toetsenbord ontbreekt. Het is mogelijk om het toetsenbord aangesloten te laten, zelfs als deze vlag is ingesteld op Niet geïnstalleerd en het toetsenbord werkt nog - steeds. + steeds. Kijk, als de bovenstaande optie niet in het BIOS + aanwezig is, naar een optie Halt on Error. + Het instellen van deze optie op All but + keyboard of zelfs op No Errors + zal hetzelfde effect hebben. @@ -3055,15 +3059,15 @@ options CONSPEED=19200 - + Gebruik de opstartoptie van de - kernel. De optie kan worden toegevoegd - aan het /boot.config bestand. Zie - de &man.boot.8; handleiding voor een beschrijving over hoe - opties kunnen worden toegevoegd aan - /boot.conf, en welke opties - ondersteund worden. + kernel. De optie kan worden + toegevoegd aan het bestand + /boot.config. Zie de handleiding + &man.boot.8; voor een beschrijving over hoe opties kunnen + worden toegevoegd aan /boot.conf, en + welke opties ondersteund worden. From owner-p4-projects@FreeBSD.ORG Thu Dec 18 21:41:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DF1E1065679; Thu, 18 Dec 2008 21:41: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 189691065675 for ; Thu, 18 Dec 2008 21:41:06 +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 0D34E8FC2B for ; Thu, 18 Dec 2008 21:41:06 +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 mBILf6XD061560 for ; Thu, 18 Dec 2008 21:41:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBILf5w6061558 for perforce@freebsd.org; Thu, 18 Dec 2008 21:41:05 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 18 Dec 2008 21:41:05 GMT Message-Id: <200812182141.mBILf5w6061558@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 154956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 21:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=154956 Change 154956 by pgj@kolbasz on 2008/12/18 21:40:29 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#22 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#21 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#9 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#9 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#12 integrate .. //depot/projects/docproj_hu/www/hu/news/news.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/news/pressreleases.sgml#9 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#22 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -399,7 +399,7 @@ Yahoo! - Yandex/primary> + Yandex Yandex ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -390,7 +390,32 @@ large sites running &os; - &os; is used to power some of the biggest sites on the + &os; is used as a platform for devices and products from + many of the world's largest IT companies, including: + + + Apple + + Apple + + + Cisco + + Cisco + + + Juniper + + Juniper + + + NetApp + + NetApp + + + + &os; is also used to power some of the biggest sites on the Internet, including: @@ -409,10 +434,9 @@ Apache - Blue Mountain Arts + Rambler - Blue Mountain - Arts + Rambler Pair Networks @@ -435,12 +459,6 @@ Weathernews - Supervalu - - Supervalu - - TELEHOUSE America TELEHOUSE @@ -453,10 +471,6 @@ Anti-Virus - JMA Wired - - JMA Wired - and many more. From owner-p4-projects@FreeBSD.ORG Thu Dec 18 22:35:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F3131065676; Thu, 18 Dec 2008 22:35: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 E7A731065673 for ; Thu, 18 Dec 2008 22:35:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DADBE8FC20 for ; Thu, 18 Dec 2008 22:35:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBIMZFRU071209 for ; Thu, 18 Dec 2008 22:35:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBIMZFlW071207 for perforce@freebsd.org; Thu, 18 Dec 2008 22:35:15 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 18 Dec 2008 22:35:15 GMT Message-Id: <200812182235.mBIMZFlW071207@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 154964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 22:35:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=154964 Change 154964 by rene@rene_self on 2008/12/18 22:35:06 MFen handbook/introduction 1.128 -> 1.129 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#7 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.128 + %SRCID% 1.129 --> @@ -477,8 +477,37 @@ grote sites die &os; draaien - &os; is de drijvende kracht achter enkele van de grootste - sites die het Internet kent, zoals: + &os; wordt gebruikt als platform voor apparaten en producten + van vele van 's werelds grootste IT-bedrijven, waaronder: + + + Apple + + + Apple + + + Cisco + + + Cisco + + + Juniper + + + Juniper + + + NetApp + + + NetApp + + + + &os; wordt ook gebruikt om sommige van de grootste sites op + het Internet te draaien, waaronder: Yahoo! @@ -501,11 +530,10 @@ url="http://www.apache.org/">Apache - Blue Mountain Arts + Rambler - Blue - Mountain Arts + Rambler Pair Networks @@ -536,15 +564,6 @@ url="http://www.wni.com/">Weathernews - - Supervalu - - - - Supervalu - - TELEHOUSE America @@ -558,13 +577,6 @@ Sophos Anti-Virus - - JMA Wired - - - JMA Wired - en nog veel meer sites. From owner-p4-projects@FreeBSD.ORG Thu Dec 18 23:41:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3082F1065670; Thu, 18 Dec 2008 23:41: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 E83B51065675 for ; Thu, 18 Dec 2008 23:41:27 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D9E478FC1D for ; Thu, 18 Dec 2008 23:41:27 +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 mBINfQwk080373 for ; Thu, 18 Dec 2008 23:41:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBINfN02080371 for perforce@freebsd.org; Thu, 18 Dec 2008 23:41:23 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 18 Dec 2008 23:41:23 GMT Message-Id: <200812182341.mBINfN02080371@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 154968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 18 Dec 2008 23:41:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=154968 Change 154968 by pgj@kolbasz on 2008/12/18 23:40:36 Add Hungarian translation of chapter "Writing Style" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#2 (text+ko) ==== @@ -31,377 +31,549 @@ --> - Writing style - - In order to promote consistency between the myriad authors of the - FreeBSD documentation, some guidelines have been drawn up for authors to - follow. - + A fogalmazás stílusa + + A &os; dokumentációját + készítõ rengeteg író + munkájának összehangolására ebben a + fejezetben megadunk néhány követendõ + alapelvet. + - Use American English spelling + Az angol nyelvû dokumentáció + írásakor az amerikai angol szerinti + helyesírást használjuk! - There are several variants of English, with different spellings - for the same word. Where spellings differ, use the American English - variant. color, not colour, - rationalize, not rationalise, and so - on. + A szavak helyesírását tekintve az + angolnak több különbözõ + változata létezik. Vitás helyzetekben az + egységesség kedvéért ezért + mindig az amerikai helyesírást tekintsük + irányadónak. Ennek megfelelõen + tehát color és nem + colour, rationalize és + nem rationalise, stb. - The use of British English may be accepted in the case - of a contributed article, however the spelling must be - consistent within the whole document. The other documents - such as books, web site, manual pages, etc. will have to use - American English. + A brit angol használata elfogadott lehet + beküldött cikkek esetében, viszont ilyenkor a + helyesírásnak egységesnek kell lennie a + teljes dokumentumon belül. Az összes többi + dokumentum, tehát könyvek, honlapok, man oldalak + stb. esetén azonban mindig amerikai angolt kell + alkalmazni. - Do not use contractions - + Ne rövidítsünk! + - Do not use contractions. Always spell the phrase out in full. - Don't use contractions would be wrong. + Ne alkalmazzunk rövidítéseket a + szövegben. Mindig minden kifejezést, szót + írjunk ki teljes alakjában. Pl. ez a + példa tehát nem helyes. Angol nyelven + mindez az összevonások + elkerülésére vonatkozik, tehát a + formális fogalmazási stílusra. - Avoiding contractions makes for a more formal tone, is more - precise, and is slightly easier for translators. + A rövidítések + elhagyásával könnyebb a szövegnek + formális jelleget adni, így sokkal + precízebben megfogalmazott, a fordítók + számára is érthetõbb mondatokat + nyerünk. - + - Use the serial comma - + A felsorolásoknál tegyünk ki + vesszõket! + - In a list of items within a paragraph, separate each item from - the others with a comma. Separate the last item from the others with - a comma and the word and. + Angol nyelven, ha több elemet sorolunk fel egyetlen + bekezdésben, akkor ezeket mindig vesszõkkel kell + tagolnunk. Az utolsó elemnél mindezt + egészítsük ki még egy + and (és) szóval. + A magyarban figyeljünk arra, hogy ez elé + már nem kell vesszõ. + + Például tekintsük a következõ + mondatot: - For example, look at the following: -
    This is a list of one, two and three items.
    - - Is this a list of three items, one, - two, and three, or a list of two items, - one and two and three? - - It is better to be explicit and include a serial comma: - + + Magyarul: + +
    + Ez a lista egy, két és három + elembõl áll. +
    + + Az angol változat esetén felvetõdhet a + kérdés, hogy ez a lista most egy, + két és + három elembõl áll, vagy + egy, két és + három elembõl. + + Ezért itt az utolsó tag elõtt is ki + kell tenni a vesszõt: +
    This is a list of one, two, and three items.
    - + - Avoid redundant phrases - + Kerüljük a + szóismétlést! + - Try not to use redundant phrases. In particular, the - command, the file, and man - command are probably redundant. + Lehetõség szerint törekedjünk a + szóismétlések + elkerülésére. Ez konkrétan a + a parancs, az + állomány és man + parancs jellegû kifejezések + mellõzését jelenti, mert ezek sokszor + feleslegesen szerepelnek a szövegben. A magyar + fordításban azonban néha hasznosnak + bizonyulnak, különösen a + ragozásban. + + Most mutatunk két példát a + parancsokra. Ezek közül a másodikban + bemutatott stílust javasoljuk az angol szövegek + esetén. - These two examples show this for commands. The second example - is preferred. - Use the command cvsup to update your sources. - + Use cvsup to update your sources. - - These two examples show this for filenames. The second example - is preferred. - + + A magyar szövegben viszont ennek + tökéletesen elfogadott a következõ + típusú fordítása, mivel így + könnyebb ragozni a parancsot: + + + A forrásainkat a cvsup + paranccsal frissítsük. + + + Ha a magyarban is el akarjuk kerülni minden + áron az ilyen jellegû ismétléseket, + akkor próbálkozhatunk úgy írni a + mondatot, hogy ne kelljen az idegen szót + ragoznunk: + + + A cvsup + segítségével frissítsük a + forrásainkat. + + + Az alábbi példákban az + állományok neveire láthatunk + példákat, amelyek közül ismét a + másodikat javasoljuk az angol nyelv + esetén: + … in the filename /etc/rc.local… - + … in /etc/rc.local… - - These two examples show this for manual references. The second - example is preferred (the second example uses - citerefentry). - + + A magyarban szintén a korábbiak + érvényesek. + + A most következõ példákban man + hivatkozásokat láthatunk. Közülük + ismét a második lesz a javasolt: + See man csh for more information. - + See &man.csh.1;. + + A magyar fordításban: + + + Lásd &man.csh.1;. + + + Vagy: + + + Lásd a &man.csh.1; man oldalt. + + - Two spaces at the end of sentences + Mindig hagyjunk két szóközt a mondatok + között! - Always use two spaces at the end of sentences, as this - improves readability, and eases use of tools such as - Emacs. + A mondatok végén mindig hagyjunk két + szóköznyi helyet. Ezáltal javul a + szöveg olvashatósága, valamint + megkönnyíti az Emacs + és a hozzá hasonló eszközök + használatát. - While it may be argued that a capital letter following - a period denotes a new sentence, this is not the case, especially - in name usage. Jordan K. Hubbard is a good - example; it has a capital H following a - period and a space, and there certainly is not a new sentence - there. + Habár vitatható, hogy ez a + megkülönböztetés egyáltalán + szükséges-e, bizonyos esetekben valóban + hasznos lehet, különösen neveknél. Erre + remek példa Jordan K. Hubbard. Ebben a + névben középen található egy + H, amelyet a mondat végéhez + hasonlóan egy pont és egy szóköz + követ, viszont jól látható, hogy itt + nem ér véget a mondat.     - For more information about writing style, see Elements of - Style, by William Strunk. + Az angol nyelvû fogalmazási stílus + szabályairól részletesebb bemutatást + William Strunk Elements of Style + címû könyvébõl kaphatunk. - Style guide + A forráskód stílusa - To keep the source for the Handbook consistent when many different - people are editing it, please follow these style conventions. + Mivel a dokumentáció forrását + egyszerre többen szerkesztik, valamilyen módon + egységes formában kell tartani. Ennek + érdekében legyünk szívesek az + alábbiakban megadott iránymutatások szerint + dolgozni. - Letter case + Kis- és nagybetûk - Tags are entered in lower case, <para>, - not <PARA>. + A címkéket soha ne + nagybetûkkel, hanem mindig kisbetûkkel írjuk, + például para és + nem PARA. - Text that appears in SGML contexts is generally written in upper - case, <!ENTITY…>, and - <!DOCTYPE…>, not - <!entity…> and + Az SGML környezetekben megjelenõ szövegeket + viszont általában nagybetûvel kell írni, + például <!ENTITY…>, + <!DOCTYPE…>, és + nem + <!entity…> vagy <!doctype…>. - Acronyms + Mozaikszavak - Acronyms should generally be spelled out the first time - they appear in a book, as in: "Network Time Protocol (NTP)." After the - acronym has been defined, you should generally use the acronym - only (not the whole term, unless it makes more sense - contextually to use the whole term). Usually, acronyms are - defined only one per book. But if you prefer, you can also - define them the first time they appear in each chapter. + A mozaikszavakat elsõ alkalommal + általában illik rendesen kiírni, + például: Network Time Protocol (NTP). + Miután definiáltuk a mozaikszó + mögött álló jelentést, + elegendõ csak a rövidített alakot + használni (nem kell tehát a teljes + kifejezést, kivéve, ha az adott + szövegkörnyezetben annak több értelme + van). A mozaikszavakat dokumentumonként egyszer + definiáljuk. Ha viszont nekünk jobban megfelel, + akkor akár fejezetenként is kifejthetjük az + egyes mozaikszavakat. - The first three uses of an acronym should be enclosed in - <acronym> tags, with a role attribute - with the full term defined. This allows a link to the - glossary to be created, and for mouseovers to be rendered with - the fully expanded term. + A mozaikszavak elsõ három + megjelenését az acronym elemmel + kell jelölni, ahol egy role + tulajdonságban megadjuk a mögött + álló teljes kifejezést. Ennek + köszönhetõen a dokumentumok feldolgozása + során létre lehet hozni szószedetet az + alkalmazott rövidítésékhez, illetve a + honlapokon meg lehet oldani, hogy ha az egérrel + felé visszük a kurzort, megjelenjen a teljes + megnevezés. - Indentation + Tördelés - Each file starts with indentation set at column 0, - regardless of the indentation level of the file - which might contain this one. + Mindegyik forrás tördelése a nulladik + oszloptól indul, függetlenül + attól, hogy az adott állományt milyen + más állomány fogja késõbb + tartalmazni. - Opening tags increase the indentation level by 2 spaces. - Closing tags decrease the indentation level by 2 spaces. Blocks - of 8 spaces at the start of a line should be replaced with a tab. - Do not use - spaces in front of tabs, and do not add extraneous whitespace at the - end of a line. Content - within elements should be indented by two spaces if the content runs - over more than one line. + A nyitócímkék után két + szóközzel kell bentebb húzni a szöveget. + Ennek megfelelõen a zárócímkék + pedig két szóközzel csökkentik az + aktuális behúzás + mértékét. A sorok elején + szereplõ szóközöket nyolcas csoportban + cseréljünk tabulátorokra. Ne + használjunk szóközöket a + tabulátorok elõtt, és ne tegyünk + további szóközöket a sorok + végére. Ha az elemek tartalma egy sornál + hosszabb, akkor a következõ sort az elem + nyitócímkéjéhez képest mindig + két szóközzel bentebb kell kezdeni. - For example, the source for this section looks something - like: + Például ennek a szakasznak így + néz ki a szabályos tördelése: - +---]] Ez a nulladik oszlop V - - ... +<chapter> + <title>...</title> - - ... + <sect1> + <title>...</title> - - Indentation + <sect2> + <title>Tördelés</title> - Each file starts with indentation set at column 0, - regardless of the indentation level of the file - which might contain this one. + <para>Mindegyik forrás tördelése a nulladik oszloptól indul, + <emphasis>függetlenül</emphasis> attól, hogy az adott állomány + milyen más állomány fogja késõbb tartalmazni.</para> - ... - - -]]> + ... + </sect2> + </sect1> +</chapter> - If you use Emacs or - XEmacs to edit the files then - sgml-mode should be loaded automatically, and the - Emacs local variables at the bottom of each file should enforce these - styles. + Ha az Emacs vagy + XEmacs szerkesztõkkel dolgozunk, + akkor az állományok megnyitásakor + automatikusan be kellene töltõdnie az + sgml-mode + kiegészítésnek, illetve az egyes + források végén található + változók pontosan a fenti szabályok + betartatásáról gondoskodnak. - Vim users might want to configure - their editor with: + A Vim szerkesztõvel + dolgozóknak pedig a következõ + beállításokat javasoljuk: augroup sgmledit - autocmd FileType sgml set formatoptions=cq2l " Special formatting options - autocmd FileType sgml set textwidth=70 " Wrap lines at 70 columns - autocmd FileType sgml set shiftwidth=2 " Automatically indent - autocmd FileType sgml set softtabstop=2 " Tab key indents 2 spaces - autocmd FileType sgml set tabstop=8 " Replace 8 spaces with a tab - autocmd FileType sgml set autoindent " Automatic indentation + autocmd FileType sgml set formatoptions=cq2l " Speciális formázási beállítások + autocmd FileType sgml set textwidth=70 " Legfeljebb 70 oszlop széles sorok + autocmd FileType sgml set shiftwidth=2 " Az automatikus behúzás mértéke + autocmd FileType sgml set softtabstop=2 " A tabulátor 2 szóközzel visz bentebb + autocmd FileType sgml set tabstop=8 " 8 szóköz cseréje egy tabulátorra + autocmd FileType sgml set autoindent " Automatikus behúzás augroup END - - Tag style + A címkék stílusa - Tag spacing - - Tags that start at the same indent as a previous tag - should be separated by a blank line, and those that are not - at the same indent as a previous tag should not: + A címkék elrendezése + + Az egy behúzási szinten + található címkéket mindig + válasszuk el egy üres sorral, a többi esetben + viszont ne: - - - NIS + <article> + <articleinfo> + <title>NIS</title> - October 1999 + <pubdate>1999 október</pubdate> - - ... + <abstract> + <para>... ... - ... - - + ...</para> + </abstract> + </articleinfo> - - ... + <sect1> + <title>...</title> - ... - + <para>...</para> + </sect1> - - ... + <sect1> + <title>...</title> - ... - -]]> + <para>...</para> + </sect1> +</article> - Separating tags + A címkék tagolása - Tags like itemizedlist which will - always have further tags inside them, and in fact do not take - character data themselves, are always on a line by - themselves. + Bizonyos címkék, mint például + az itemizedlist, amelyekben további + címkék szerepelnek és nem karakteres + adat, mindig egyedül állnak egy sorban. - Tags like para and - term do not need other tags to contain - normal character data, and their contents begin immediately - after the tag, on the same line. + A para és + term címkék esetén + viszont szükség van további + címkékre a karakteres adatok + befoglalásához, ezért ilyenkor a tartalom + közvetlenül a címke után + következik, ugyanabban a + sorban. - The same applies to when these two types of tags - close. + Ugyanez érvényes az említett + címketípusok zárásakor. - This leads to an obvious problem when mixing these - tags. + A címketípusok keveredése egy + nyilvánvaló problémát + eredményez. - When a starting tag which cannot contain character data - directly follows a tag of the type that requires other tags - within it to use character data, they are on separate lines. - The second tag should be properly indented. + Amikor egy karakteres adatot tárolni nem + képes elemet nyitó címke + közvetlenül követ egy karakteres adatokat + bevezetõ címkét, külön sorba kell + kerülniük. A második címkét a + szabályok szerint kell behúzni. - When a tag which can contain character data closes - directly after a tag which cannot contain character data - closes, they co-exist on the same line. + Amikor egy karakteres adatokat befoglaló + címke záródik közvetlenül a + karakteres adatokat tartalmazni nem képes címke + után, szerepelhetnek ugyanabban a sorban. - White space changes + Változtatások a forrás + tördelésén + + A források változtatása során + ügyeljünk arra, hogy sose tároljunk + egyszerre a repositoryba tartalmat és + tördelést érintõ + módosításokat. - When committing changes, do not commit changes to the - content at the same time as changes to the - formatting. - - This is so that the teams that convert the Handbook to other - languages can quickly see what content has actually changed in your - commit, without having to decide whether a line has changed because of - the content, or just because it has been refilled. + Ennek köszönhetõen a + dokumentációt fordító csapatok + könnyebben észreveszik, hogy mi változott a + módosításunk nyomán. Így nem + kell azon gondolkozniuk, hogy vajon most tényleg + változott a tartalom, vagy csak + újratördeltük a sorokat. - For example, if you have added two sentences to a paragraph, such - that the line lengths on the paragraph now go over 80 columns, first - commit your change with the too-long line lengths. Then fix the line - wrapping, and commit this second change. In the commit message for - the second change, be sure to indicate that this is a whitespace-only - change, and that the translation team can ignore it. + Például ha felvettünk két mondatot + még egy bekezdéshez, és ezzel az adott + bekezdés sorainak hossza túlságosan + megnõtt, akkor elõször tároljuk a + hosszú sorokat tartalmazó változatot. + Ezután végezzük el a szükséges + tördelést és tároljuk azt a + változatot is. Ez utóbbi esetben azonban ne + felejtsük egyértelmûen jelezni a + tároláshoz tartozó üzenetben, hogy + csak a tördelésen változtattunk + (whitespace-only change). Így a + fordítók tudni fogják, hogy ezt figyelmen + kívül kell hagyniuk. - Nonbreaking space + Nem törhetõ szóközök - Avoid line breaks in places where they look ugly - or make it difficult to follow a sentence. Line breaks depend - on the width of the chosen output medium. In particular, viewing - the HTML documentation with a text browser can lead to badly - formatted paragraphs like the next one: + Lehetõleg kerüljük a sortöréseket + olyan helyeken, ahol csúnyán néznének + ki, vagy rontanának a szöveg + olvashatóságán. A sortörések + mindig a kimeneti formátum által alkalmazott + sorszélességtõl függenek. + Különösen a HTML oldalakon + található formázott bekezdések + jelennek meg ízléstelenül egy szöveges + böngészõben, mint például ez + is: - Data capacity ranges from 40 MB to 15 -GB. Hardware compression … + Az adattároló kapacitása általában 40 MB és 15 +GB között változik. Hardveres tömörítéssel … - The general entity &nbsp; prohibits - line breaks between parts belonging together. Use nonbreaking - spaces in the following places: + Az &nbsp; általános + egyed viszont megtiltja az egymáshoz szorosan + kötõdõ elemek közti sortörést. + Az ilyen nem törhetõ + szóközök használatát + elsõsorban a következõ helyeken + javasoljuk: - between numbers and units: + mennyiségek és egységek + között: - between program names and version numbers: - + program neve és verziószáma + között: + - between multiword names (use with caution when applying this - to more than 3-4 word names like The FreeBSD Brazilian - Portuguese Documentation Project): - + több szóból álló nevek + esetén (óvatosan bánjunk ezzel viszont + olyan hosszabb neveknél, mint például a + The &os; Brazilian Portugese Documentation + Project): + - Word list + Szólista - The following is a small list of words spelled the way they - should be used in the FreeBSD Documentation Project. If the - word you are looking for is not in this list, then please - consult the O'Reilly - word list. + Ebben a rövid szólistában + összefoglalunk néhány angol szót a &os; + Dokumentációs Projektben alkalmazandó + írásmódjuk szerint. Ha a keresendõ + szó nem szerepel ebben a felsorolásban, + nézzük meg az O'Reilly-féle + gyûjteményt. @@ -476,7 +648,6 @@ web server -     From owner-p4-projects@FreeBSD.ORG Fri Dec 19 00:16:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E5E91065673; Fri, 19 Dec 2008 00:16: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 02B891065674 for ; Fri, 19 Dec 2008 00:16:03 +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 E99FC8FC08 for ; Fri, 19 Dec 2008 00:16: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 mBJ0G2eG087445 for ; Fri, 19 Dec 2008 00:16:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJ0G2iu087443 for perforce@freebsd.org; Fri, 19 Dec 2008 00:16:02 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 19 Dec 2008 00:16:02 GMT Message-Id: <200812190016.mBJ0G2iu087443@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 154969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 00:16:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=154969 Change 154969 by rene@rene_self on 2008/12/19 00:15:39 IFC Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -439,6 +439,11 @@ Rambler + Sina + + Sina + + Pair Networks Pair Networks @@ -465,12 +470,6 @@ America - Sophos Anti-Virus - - Sophos - Anti-Virus - - and many more. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -43,22 +43,9 @@
    - BSD Mall by Daemon News - PO Box 161 - Nauvoo, IL 62354 - USA - Phone: +1 866 273-6255 - Fax: +1 217 453-9956 - Email: sales@bsdmall.com - WWW: -
    -     - - -
    FreeBSD Mall, Inc. - 3623 Sanford Street - Concord, CA 94520-1405 + 700 Harvest Park Ste F + Brentwood, CA 94513 USA Phone: +1 925 240-6652 Fax: +1 925 674-0821 From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:35:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BC561065674; Fri, 19 Dec 2008 11:35: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 F3C42106564A for ; Fri, 19 Dec 2008 11:35:46 +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 E26508FC0C for ; Fri, 19 Dec 2008 11:35:46 +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 mBJBZkI7090802 for ; Fri, 19 Dec 2008 11:35:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBZk1P090800 for perforce@freebsd.org; Fri, 19 Dec 2008 11:35:46 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 19 Dec 2008 11:35:46 GMT Message-Id: <200812191135.mBJBZk1P090800@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 154985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:35:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=154985 Change 154985 by rene@rene_self on 2008/12/19 11:35:10 MFen handbook/mirrors 1.453 -> 1.454 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.453 + %SRCID% 1.454 --> @@ -50,23 +50,9 @@
    - Daemon News Mall - PO Box 161 - Nauvoo, IL 62354 - Verenigde Staten - Telefoon: +1 866 273-6255 - Fax: +1 217 453-9956 - E–mail: sales@bsdmall.com - WWW: -
    -     - - -
    &os; Mall, Inc. - 3623 Sanford Street - Concord, CA 94520-1405 + 700 Harvest Park Ste F + Brentwood, CA 94513 Verenigde Staten Telefoon: +1 925 240-6652 Fax: +1 925 674-0821 From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:37:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62DEB1065676; Fri, 19 Dec 2008 11:37: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 2561C1065673 for ; Fri, 19 Dec 2008 11:37:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 105538FC08 for ; Fri, 19 Dec 2008 11:37:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBbnw1090980 for ; Fri, 19 Dec 2008 11:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBbngn090978 for perforce@freebsd.org; Fri, 19 Dec 2008 11:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:37:49 GMT Message-Id: <200812191137.mBJBbngn090978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:37:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=154986 Change 154986 by rwatson@rwatson_cinnamon on 2008/12/19 11:37:05 Make au_strerror() return const char *, and fully implement it for non-local error return values. No catalogue for non-English error text yet when the OS can't provide the error string. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#12 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#12 (text+ko) ==== @@ -20,5 +20,7 @@ - Document audit_warn event arguments. - Allow the path /etc/security to be configured at configure-time so that alternative locations can be used. +- NLS support for au_strerror(3), which provides error strings for BSM errors + not available on the local OS platform. -$P4: //depot/projects/trustedbsd/openbsm/TODO#11 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 $ */ #ifndef _LIBBSM_H_ @@ -828,7 +828,7 @@ */ int au_bsm_to_errno(u_char bsm_error, int *errorp); u_char au_errno_to_bsm(int error); -char *au_strerror(u_char bsm_error); +const char *au_strerror(u_char bsm_error); /* * The remaining APIs are associated with Apple's BSM implementation, in ==== //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_errno.3#3 $ .\" .Dd December 8, 2008 .Dt AU_BSM_TO_ERRNO 3 @@ -44,7 +44,7 @@ .Fn au_bsm_to_errno "u_char bsm_error" "int *errorp" .Ft u_char .Fn au_errno_to_bsm "int error" -.Ft char * +.Ft const char * .Fn au_strerror "int bsm_error" .Sh DESCRIPTION These interfaces may be used to convert between the local ( @@ -105,3 +105,7 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Sh BUGS +.Nm au_strerror +is unable to provide localized strings for errors not available in the local +operating system. ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#9 $ */ #include @@ -62,272 +62,525 @@ */ struct bsm_errors { - int be_bsm_error; - int be_os_error; + int be_bsm_error; + int be_os_error; + const char *be_strerror; }; +#define ERRNO_NO_LOCAL_MAPPING -600 + /* * Mapping table -- please maintain in numeric sorted order with respect to * the BSM constant. Today we do a linear lookup, but could switch to a * binary search if it makes sense. We only ifdef errors that aren't - * generally available. + * generally available, but it does make the table a lot more ugly. * * XXXRW: It would be nice to have a similar ordered table mapping to BSM * constant from local constant, but the order of local constants varies by * OS. Really we need to build that table at compile-time but don't do that * yet. + * + * XXXRW: We currently embed English-language error strings here, but should + * support catalogues; these are only used if the OS doesn't have an error + * string using strerror(3). */ static const struct bsm_errors bsm_errors[] = { - { BSM_ESUCCESS, 0 }, - { BSM_EPERM, EPERM }, - { BSM_ENOENT, ENOENT }, - { BSM_ESRCH, ESRCH }, - { BSM_EINTR, EINTR }, - { BSM_EIO, EIO }, - { BSM_ENXIO, ENXIO }, - { BSM_E2BIG, E2BIG }, - { BSM_ENOEXEC, ENOEXEC }, - { BSM_EBADF, EBADF }, - { BSM_ECHILD, ECHILD }, - { BSM_EAGAIN, EAGAIN }, - { BSM_ENOMEM, ENOMEM }, - { BSM_EACCES, EACCES }, - { BSM_EFAULT, EFAULT }, - { BSM_ENOTBLK, ENOTBLK }, - { BSM_EBUSY, EBUSY }, - { BSM_EEXIST, EEXIST }, - { BSM_EXDEV, EXDEV }, - { BSM_ENODEV, ENODEV }, - { BSM_ENOTDIR, ENOTDIR }, - { BSM_EISDIR, EISDIR }, - { BSM_EINVAL, EINVAL }, - { BSM_ENFILE, ENFILE }, - { BSM_EMFILE, EMFILE }, - { BSM_ENOTTY, ENOTTY }, - { BSM_ETXTBSY, ETXTBSY }, - { BSM_EFBIG, EFBIG }, - { BSM_ENOSPC, ENOSPC }, - { BSM_ESPIPE, ESPIPE }, - { BSM_EROFS, EROFS }, - { BSM_EMLINK, EMLINK }, - { BSM_EPIPE, EPIPE }, - { BSM_EDOM, EDOM }, - { BSM_ERANGE, ERANGE }, - { BSM_ENOMSG, ENOMSG }, - { BSM_EIDRM, EIDRM }, + { BSM_ESUCCESS, 0, "Success" }, + { BSM_EPERM, EPERM, "Operation not permitted" }, + { BSM_ENOENT, ENOENT, "No such file or directory" }, + { BSM_ESRCH, ESRCH, "No such process" }, + { BSM_EINTR, EINTR, "Interrupted system call" }, + { BSM_EIO, EIO, "Input/output error" }, + { BSM_ENXIO, ENXIO, "Device not configured" }, + { BSM_E2BIG, E2BIG, "Argument list too long" }, + { BSM_ENOEXEC, ENOEXEC, "Exec format error" }, + { BSM_EBADF, EBADF, "BAd file descriptor" }, + { BSM_ECHILD, ECHILD, "No child processes" }, + { BSM_EAGAIN, EAGAIN, "Resource temporarily unavailable" }, + { BSM_ENOMEM, ENOMEM, "Cannot allocate memory" }, + { BSM_EACCES, EACCES, "Permission denied" }, + { BSM_EFAULT, EFAULT, "Bad address" }, + { BSM_ENOTBLK, ENOTBLK, "Block device required" }, + { BSM_EBUSY, EBUSY, "Device busy" }, + { BSM_EEXIST, EEXIST, "File exists" }, + { BSM_EXDEV, EXDEV, "Cross-device link" }, + { BSM_ENODEV, ENODEV, "Operation not supported by device" }, + { BSM_ENOTDIR, ENOTDIR, "Not a directory" }, + { BSM_EISDIR, EISDIR, "Is a directory" }, + { BSM_EINVAL, EINVAL, "Invalid argument" }, + { BSM_ENFILE, ENFILE, "Too many open files in system" }, + { BSM_EMFILE, EMFILE, "Too many open files" }, + { BSM_ENOTTY, ENOTTY, "Inappropriate ioctl for device" }, + { BSM_ETXTBSY, ETXTBSY, "Text file busy" }, + { BSM_EFBIG, EFBIG, "File too large" }, + { BSM_ENOSPC, ENOSPC, "No space left on device" }, + { BSM_ESPIPE, ESPIPE, "Illegal seek" }, + { BSM_EROFS, EROFS, "Read-only file system" }, + { BSM_EMLINK, EMLINK, "Too many links" }, + { BSM_EPIPE, EPIPE, "Broken pipe" }, + { BSM_EDOM, EDOM, "Numerical argument out of domain" }, + { BSM_ERANGE, ERANGE, "Result too large" }, + { BSM_ENOMSG, ENOMSG, "No message of desired type" }, + { BSM_EIDRM, EIDRM, "Identifier removed" }, + { BSM_ECHRNG, #ifdef ECHRNG - { BSM_ECHRNG, ECHRNG }, + ECHRNG, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Channel number out of range" }, + { BSM_EL2NSYNC, #ifdef EL2NSYNC - { BSM_EL2NSYNC, EL2NSYNC }, + EL2NSYNC, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Level 2 not synchronized" }, + { BSM_EL3HLT, #ifdef EL3HLT - { BSM_EL3HLT, EL3HLT }, + EL3HLT, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Level 3 halted" }, + { BSM_EL3RST, #ifdef EL3RST - { BSM_EL3RST, EL3RST }, + EL3RST, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Level 3 reset" }, + { BSM_ELNRNG, #ifdef ELNRNG - { BSM_ELNRNG, ELNRNG }, + ELNRNG, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Link number out of range" }, + { BSM_EUNATCH, #ifdef EUNATCH - { BSM_EUNATCH, EUNATCH }, + EUNATCH, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Protocol driver not attached" }, + { BSM_ENOCSI, #ifdef ENOCSI - { BSM_ENOCSI, ENOCSI }, + ENOCSI, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "No CSI structure available" }, + { BSM_EL2HLT, #ifdef EL2HLT - { BSM_EL2HLT, EL2HLT }, + EL2HLT, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_EDEADLK, EDEADLK }, - { BSM_ENOLCK, ENOLCK }, - { BSM_ECANCELED, ECANCELED }, - { BSM_ENOTSUP, ENOTSUP }, - { BSM_EDQUOT, EDQUOT }, + "Level 2 halted" }, + { BSM_EDEADLK, EDEADLK, "Resource deadlock avoided" }, + { BSM_ENOLCK, ENOLCK, "No locks available" }, + { BSM_ECANCELED, ECANCELED, "Operation canceled" }, + { BSM_ENOTSUP, ENOTSUP, "Operation not supported" }, + { BSM_EDQUOT, EDQUOT, "Disc quota exceeded" }, + { BSM_EBADE, #ifdef EBADE - { BSM_EBADE, EBADE }, + EBADE, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Invalid exchange" }, + { BSM_EBADR, #ifdef EBADR - { BSM_EBADR, EBADR }, + EBADR, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Invalid request descriptor" }, + { BSM_EXFULL, #ifdef EXFULL - { BSM_EXFULL, EXFULL }, + EXFULL, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Exchange full" }, + { BSM_ENOANO, #ifdef ENOANO - { BSM_ENOANO, ENOANO }, + ENOANO, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "No anode" }, + { BSM_EBADRQC, #ifdef EBADRQC - { BSM_EBADRQC, EBADRQC }, + EBADRQC, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Invalid request descriptor" }, + { BSM_EBADSLT, #ifdef EBADSLT - { BSM_EBADSLT, EBADSLT }, + EBADSLT, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Invalid slot" }, + { BSM_EDEADLOCK, #ifdef EDEADLOCK - { BSM_EDEADLOCK, EDEADLOCK }, + EDEADLOCK, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Resource deadlock avoided" }, + { BSM_EBFONT, #ifdef EBFONT - { BSM_EBFONT, EBFONT }, + EBFONT, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Bad font file format" }, + { BSM_EOWNERDEAD, #ifdef EOWNERDEAD - { BSM_EOWNERDEAD, EOWNERDEAD }, + EOWNERDEAD, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Process died with the lock" }, + { BSM_ENOTRECOVERABLE, #ifdef ENOTRECOVERABLE - { BSM_ENOTRECOVERABLE, ENOTRECOVERABLE }, + ENOTRECOVERABLE, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Lock is not recoverable" }, + { BSM_ENOSTR, #ifdef ENOSTR - { BSM_ENOSTR, ENOSTR }, + ENOSTR, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Device not a stream" }, + { BSM_ENONET, #ifdef ENONET - { BSM_ENONET, ENONET }, + ENONET, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Machine is not on the network" }, + { BSM_ENOPKG, #ifdef ENOPKG - { BSM_ENOPKG, ENOPKG }, + ENOPKG, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_EREMOTE, EREMOTE }, - { BSM_ENOLINK, ENOLINK }, + "Package not installed" }, + { BSM_EREMOTE, EREMOTE, "Too many levels of remote in path" }, + { BSM_ENOLINK, ENOLINK, "Link has been severed" }, + { BSM_EADV, #ifdef EADV - { BSM_EADV, EADV }, + EADV, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Advertise error" }, + { BSM_ESRMNT, #ifdef ESRMNT - { BSM_ESRMNT, ESRMNT }, + ESRMNT +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "srmount error" }, + { BSM_ECOMM, #ifdef ECOMM - { BSM_ECOMM, ECOMM }, + ECOMM, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_EPROTO, EPROTO }, + "Communication error on send" }, + { BSM_EPROTO, EPROTO, "Protocol error" }, + { BSM_ELOCKUNMAPPED, #ifdef ELOCKUNMAPPED - { BSM_ELOCKUNMAPPED, ELOCKUNMAPPED }, + ELOCKUNMAPPED, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Locked lock was unmapped" }, + { BSM_ENOTACTIVE, #ifdef ENOTACTIVE - { BSM_ENOTACTIVE, ENOTACTIVE }, + ENOTACTIVE, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_EMULTIHOP, EMULTIHOP }, - { BSM_EBADMSG, EBADMSG }, - { BSM_ENAMETOOLONG, ENAMETOOLONG }, - { BSM_EOVERFLOW, EOVERFLOW }, + "Facility is not active" }, + { BSM_EMULTIHOP, EMULTIHOP, "Multihop attempted" }, + { BSM_EBADMSG, EBADMSG, "Bad message" }, + { BSM_ENAMETOOLONG, ENAMETOOLONG, "File name too long" }, + { BSM_EOVERFLOW, EOVERFLOW, "Value too large to be stored in data type" }, + { BSM_ENOTUNIQ, #ifdef ENOTUNIQ - { BSM_ENOTUNIQ, ENOTUNIQ }, + ENOTUNIQ, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Given log name not unique" }, + { BSM_EBADFD, #ifdef EBADFD - { BSM_EBADFD, EBADFD }, + EBADFD, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Given f.d. invalid for this operation" }, + { BSM_EREMCHG, #ifdef EREMCHG - { BSM_EREMCHG, EREMCHG }, + EREMCHG, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Remote address changed" }, + { BSM_ELIBACC, #ifdef ELIBACC - { BSM_ELIBACC, ELIBACC }, + ELIBACC, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Can't access a needed shared lib" }, + { BSM_ELIBBAD, #ifdef ELIBBAD - { BSM_ELIBBAD, ELIBBAD }, + ELIBBAD, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Accessing a corrupted shared lib" }, + { BSM_ELIBSCN, #ifdef ELIBSCN - { BSM_ELIBSCN, ELIBSCN }, + ELIBSCN, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + ".lib section in a.out corrupted" }, + { BSM_ELIBMAX, #ifdef ELIBMAX - { BSM_ELIBMAX, ELIBMAX }, + ELIBMAX, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Attempting to link in too many libs" }, + { BSM_ELIBEXEC, #ifdef ELIBEXEC - { BSM_ELIBEXEC, ELIBEXEC }, + ELIBEXEC, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_EILSEQ, EILSEQ }, - { BSM_ENOSYS, ENOSYS }, - { BSM_ELOOP, ELOOP }, + "Attempting to exec a shared library" }, + { BSM_EILSEQ, EILSEQ, "Illegal byte sequence" }, + { BSM_ENOSYS, ENOSYS, "Function not implemented" }, + { BSM_ELOOP, ELOOP, "Too many levels of symbolic links" }, + { BSM_ERESTART, #ifdef ERESTART - { BSM_ERESTART, ERESTART }, + ERESTART, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Restart syscall" }, + { BSM_ESTRPIPE, #ifdef ESTRPIPE - { BSM_ESTRPIPE, ESTRPIPE }, + ESTRPIPE, +#else + ERRNO_NO_LOCAL_MAPPING, #endif - { BSM_ENOTEMPTY, ENOTEMPTY }, - { BSM_EUSERS, EUSERS }, - { BSM_ENOTSOCK, ENOTSOCK }, - { BSM_EDESTADDRREQ, EDESTADDRREQ }, - { BSM_EMSGSIZE, EMSGSIZE }, - { BSM_EPROTOTYPE, EPROTOTYPE }, - { BSM_ENOPROTOOPT, ENOPROTOOPT }, - { BSM_EPROTONOSUPPORT, EPROTONOSUPPORT }, - { BSM_ESOCKTNOSUPPORT, ESOCKTNOSUPPORT }, - { BSM_EOPNOTSUPP, EOPNOTSUPP }, - { BSM_EPFNOSUPPORT, EPFNOSUPPORT }, - { BSM_EAFNOSUPPORT, EAFNOSUPPORT }, - { BSM_EADDRINUSE, EADDRINUSE }, - { BSM_EADDRNOTAVAIL, EADDRNOTAVAIL }, - { BSM_ENETDOWN, ENETDOWN }, - { BSM_ENETRESET, ENETRESET }, - { BSM_ECONNABORTED, ECONNABORTED }, - { BSM_ECONNRESET, ECONNRESET }, - { BSM_ENOBUFS, ENOBUFS }, - { BSM_EISCONN, EISCONN }, - { BSM_ENOTCONN, ENOTCONN }, - { BSM_ESHUTDOWN, ESHUTDOWN }, - { BSM_ETOOMANYREFS, ETOOMANYREFS }, - { BSM_ETIMEDOUT, ETIMEDOUT }, - { BSM_ECONNREFUSED, ECONNREFUSED }, - { BSM_EHOSTDOWN, EHOSTDOWN }, - { BSM_EHOSTUNREACH, EHOSTUNREACH }, - { BSM_EALREADY, EALREADY }, - { BSM_EINPROGRESS, EINPROGRESS }, - { BSM_ESTALE, ESTALE }, + "If pipe/FIFO, don't sleep in stream head" }, + { BSM_ENOTEMPTY, ENOTEMPTY, "Directory not empty" }, + { BSM_EUSERS, EUSERS, "Too many users" }, + { BSM_ENOTSOCK, ENOTSOCK, "Socket operation on non-socket" }, + { BSM_EDESTADDRREQ, EDESTADDRREQ, "Destination address required" }, + { BSM_EMSGSIZE, EMSGSIZE, "Message too long" }, + { BSM_EPROTOTYPE, EPROTOTYPE, "Protocol wrong type for socket" }, + { BSM_ENOPROTOOPT, ENOPROTOOPT, "Protocol not available" }, + { BSM_EPROTONOSUPPORT, EPROTONOSUPPORT, "Protocol not supported" }, + { BSM_ESOCKTNOSUPPORT, ESOCKTNOSUPPORT, "Socket type not supported" }, + { BSM_EOPNOTSUPP, EOPNOTSUPP, "Operation not supported" }, + { BSM_EPFNOSUPPORT, EPFNOSUPPORT, "Protocol family not supported" }, + { BSM_EAFNOSUPPORT, EAFNOSUPPORT, "Address family not supported by protocol family" }, + { BSM_EADDRINUSE, EADDRINUSE, "Address already in use" }, + { BSM_EADDRNOTAVAIL, EADDRNOTAVAIL, "Can't assign requested address" }, + { BSM_ENETDOWN, ENETDOWN, "Network is down" }, + { BSM_ENETRESET, ENETRESET, "Network dropped connection on reset" }, + { BSM_ECONNABORTED, ECONNABORTED, "Software caused connection abort" }, + { BSM_ECONNRESET, ECONNRESET, "Connection reset by peer" }, + { BSM_ENOBUFS, ENOBUFS, "No buffer space available" }, + { BSM_EISCONN, EISCONN, "Socket is already connected" }, + { BSM_ENOTCONN, ENOTCONN, "Socket is not connected" }, + { BSM_ESHUTDOWN, ESHUTDOWN, "Can't send after socket shutdown" }, + { BSM_ETOOMANYREFS, ETOOMANYREFS, "Too many references: can't splice" }, + { BSM_ETIMEDOUT, ETIMEDOUT, "Operation timed out" }, + { BSM_ECONNREFUSED, ECONNREFUSED, "Connection refused" }, + { BSM_EHOSTDOWN, EHOSTDOWN, "Host is down" }, + { BSM_EHOSTUNREACH, EHOSTUNREACH, "No route to host" }, + { BSM_EALREADY, EALREADY, "Operation already in progress" }, + { BSM_EINPROGRESS, EINPROGRESS, "Operation now in progress" }, + { BSM_ESTALE, ESTALE, "Stale NFS file handle" }, + { BSM_EPWROFF, #ifdef EPWROFF - { BSM_EPWROFF, EPWROFF }, + EPWROFF, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Device power is off" }, + { BSM_EDEVERR, #ifdef EDEVERR - { BSM_EDEVERR, EDEVERR }, + EDEVERR, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Device error" }, + { BSM_EBADEXEC, #ifdef EBADEXEC - { BSM_EBADEXEC, EBADEXEC }, + EBADEXEC, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Bad executable" }, + { BSM_EBADARCH, #ifdef EBADARCH - { BSM_EBADARCH, EBADARCH }, + EBADARCH, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Bad CPU type in executable" }, + { BSM_ESHLIBVERS, #ifdef ESHLIBVERS - { BSM_ESHLIBVERS, ESHLIBVERS }, + ESHLIBVERS, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Shared library version mismatch" }, + { BSM_EBADMACHO, #ifdef EBADMACHO - { BSM_EBADMACHO, EBADMACHO }, + EBADMACHO, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Malfored Macho file" }, + { BSM_EPOLICY, #ifdef EPOLICY - { BSM_EPOLICY, EPOLICY }, + EPOLICY, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Operation failed by policy" }, + { BSM_EDOTDOT, #ifdef EDOTDOT - { BSM_EDOTDOT, EDOTDOT }, + EDOTDOT, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "RFS specific error" }, + { BSM_EUCLEAN, #ifdef EUCLEAN - { BSM_EUCLEAN, EUCLEAN }, + EUCLEAN, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Structure needs cleaning" }, + { BSM_ENOTNAM, #ifdef ENOTNAM - { BSM_ENOTNAM, ENOTNAM }, + ENOTNAM, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Not a XENIX named type file" }, + { BSM_ENAVAIL, #ifdef ENAVAIL - { BSM_ENAVAIL, ENAVAIL }, + ENAVAIL, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "No XENIX semaphores available" }, + { BSM_EISNAM, #ifdef EISNAM - { BSM_EISNAM, EISNAM }, + EISNAM, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Is a named type file" }, + { BSM_EREMOTEIO, #ifdef EREMOTEIO - { BSM_EREMOTEIO, EREMOTEIO }, + EREMOTEIO, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Remote I/O error" }, + { BSM_ENOMEDIUM, #ifdef ENOMEDIUM - { BSM_ENOMEDIUM, ENOMEDIUM }, + ENOMEDIUM, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "No medium found" }, + { BSM_EMEDIUMTYPE, #ifdef EMEDIUMTYPE - { BSM_EMEDIUMTYPE, EMEDIUMTYPE }, + EMEDIUMTYPE, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Wrong medium type" }, + { BSM_ENOKEY, #ifdef ENOKEY - { BSM_ENOKEY, ENOKEY }, + ENOKEY, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Required key not available" }, + { BSM_EKEYEXPIRED, #ifdef EKEEXPIRED - { BSM_EKEYEXPIRED, EKEYEXPIRED }, + EKEYEXPIRED, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Key has expired" }, + { BSM_EKEYREVOKED, #ifdef EKEYREVOKED - { BSM_EKEYREVOKED, EKEYREVOKED }, + EKEYREVOKED, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Key has been revoked" }, + { BSM_EKEYREJECTED, #ifdef EKEREJECTED - { BSM_EKEYREJECTED, EKEYREJECTED }, + EKEYREJECTED, +#else + ERRNO_NO_LOCAL_MAPPING, #endif + "Key was rejected by service" }, }; static const int bsm_errors_count = sizeof(bsm_errors) / sizeof(bsm_errors[0]); +static const struct bsm_errors * +au_bsm_error_lookup_errno(int error) +{ + int i; + + if (error == ERRNO_NO_LOCAL_MAPPING) + return (NULL); + for (i = 0; i < bsm_errors_count; i++) { + if (bsm_errors[i].be_os_error == error) + return (&bsm_errors[i]); + } + return (NULL); +} + +static const struct bsm_errors * +au_bsm_error_lookup_bsm(u_char bsm_error) +{ + int i; + + for (i = 0; i < bsm_errors_count; i++) { + if (bsm_errors[i].be_bsm_error == bsm_error) + return (&bsm_errors[i]); + } + return (NULL); +} + /* * Converstion from a BSM error to a local error number may fail if either * OpenBSM doesn't recognize the error on the wire, or because there is no @@ -337,43 +590,43 @@ int au_bsm_to_errno(u_char bsm_error, int *errorp) { - int i; + const struct bsm_errors *bsme; - for (i = 0; i < bsm_errors_count; i++) { - if (bsm_errors[i].be_bsm_error == bsm_error) { - *errorp = bsm_errors[i].be_os_error; - return (0); - } - } - return (-1); + bsme = au_bsm_error_lookup_bsm(bsm_error); + if (bsme == NULL || bsme->be_os_error == ERRNO_NO_LOCAL_MAPPING) + return (-1); + *errorp = bsme->be_os_error; + return (0); } u_char au_errno_to_bsm(int error) { - int i; + const struct bsm_errors *bsme; - for (i = 0; i < bsm_errors_count; i++) { - if (bsm_errors[i].be_os_error == error) - return (bsm_errors[i].be_bsm_error); - } - return (BSM_UNKNOWNERR); + /* + * We should never be passed this libbsm-internal constant, and + * because it is ambiguous we just return an error. + */ + if (error == ERRNO_NO_LOCAL_MAPPING) + return (BSM_UNKNOWNERR); + bsme = au_bsm_error_lookup_errno(error); + if (bsme == NULL) + return (BSM_UNKNOWNERR); + return (bsme->be_bsm_error); } #if !defined(KERNEL) && !defined(_KERNEL) -char * +const char * au_strerror(u_char bsm_error) { - int error; + const struct bsm_errors *bsme; - if (au_bsm_to_errno(bsm_error, &error) == 0) - return (strerror(error)); - - /* - * We need a duplicate error->string mapping for all error numbers - * here to handle non-local ones. For now, simply generate a warning - * indicating it's non-local. - */ - return ("Foreign BSM error"); + bsme = au_bsm_error_lookup_bsm(bsm_error); + if (bsme == NULL) + return ("Unrecognized BSM error"); + if (bsme->be_os_error != ERRNO_NO_LOCAL_MAPPING) + return (strerror(bsme->be_os_error)); + return (bsme->be_strerror); } #endif From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:37:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76DF5106573D; Fri, 19 Dec 2008 11:37: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 455381065674 for ; Fri, 19 Dec 2008 11:37:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31BE68FC17 for ; Fri, 19 Dec 2008 11:37:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBbnLc090985 for ; Fri, 19 Dec 2008 11:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBbn2x090983 for perforce@freebsd.org; Fri, 19 Dec 2008 11:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:37:49 GMT Message-Id: <200812191137.mBJBbn2x090983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:37:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154987 Change 154987 by rwatson@rwatson_cinnamon on 2008/12/19 11:37:40 Generate error tokens for test purposes. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#12 $ */ /* @@ -966,6 +966,74 @@ write_record(directory, record_filename, socketex_token, AUE_NULL); } +/* + * Generate a series of error-number specific return tokens in records. + */ +static void +generate_error_record(const char *directory, const char *filename, int error) +{ + char pathname[PATH_MAX]; + token_t *return32_token; + + return32_token = au_to_return32(au_errno_to_bsm(error), -1); + if (return32_token == NULL) + err(EX_UNAVAILABLE, "au_to_return32"); + (void)snprintf(pathname, PATH_MAX, "%s_record", filename); + write_record(directory, pathname, return32_token, AUE_NULL); +} + +/* + * Not all the error numbers, just a few present on all platforms for now. + */ +const struct { + int error_number; + const char *error_name; +} error_list[] = { + { EPERM, "EPERM" }, + { ENOENT, "ENOENT" }, + { ESRCH, "ESRCH" }, + { EINTR, "EINTR" }, + { EIO, "EIO" }, + { ENXIO, "ENXIO" }, + { E2BIG, "E2BIG" }, + { ENOEXEC, "ENOEXEC" }, + { EBADF, "EBADF" }, + { ECHILD, "ECHILD" }, + { EDEADLK, "EDEADLK" }, + { ENOMEM, "ENOMEM" }, + { EACCES, "EACCES" }, + { EFAULT, "EFAULT" }, + { ENOTBLK, "ENOTBLK" }, + { EBUSY, "EBUSY" }, + { EEXIST, "EEXIST" }, + { EXDEV, "EXDEV" }, + { ENODEV, "ENODEV" }, + { ENOTDIR, "ENOTDIR" }, + { EISDIR, "EISDIR" }, + { EINVAL, "EINVAL" }, + { ENFILE, "ENFILE" }, + { EMFILE, "EMFILE" }, + { ENOTTY, "ENOTTY" }, + { ETXTBSY, "ETXTBSY" }, + { EFBIG, "EFBIG" }, + { ENOSPC, "ENOSPC" }, + { ESPIPE, "ESPIPE" }, + { EROFS, "EROFS" }, + { EMLINK, "EMLINK" }, + { EPIPE, "EPIPE" } +}; +const int error_list_count = sizeof(error_list)/sizeof(error_list[0]); + +static void +do_error_records(const char *directory) +{ + int i; + + for (i = 0; i < error_list_count; i++) + generate_error_record(directory, error_list[i].error_name, + error_list[i].error_number); +} + int main(int argc, char *argv[]) { @@ -1070,6 +1138,7 @@ generate_attr32_record(directory, "attr32_record"); generate_zonename_record(directory, "zonename_record"); generate_socketex_record(directory, "socketex_record"); + do_error_records(directory); } return (0); From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:38:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC55C1065678; Fri, 19 Dec 2008 11:38: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 6ED061065674 for ; Fri, 19 Dec 2008 11:38:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AA1C8FC0C for ; Fri, 19 Dec 2008 11:38:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBcoCR091057 for ; Fri, 19 Dec 2008 11:38:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBcoqs091055 for perforce@freebsd.org; Fri, 19 Dec 2008 11:38:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:38:50 GMT Message-Id: <200812191138.mBJBcoqs091055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:38:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=154988 Change 154988 by rwatson@rwatson_cinnamon on 2008/12/19 11:38:11 Regenerate (and in some cases add) reference tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/reference/E2BIG_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EACCES_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EBADF_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EBUSY_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ECHILD_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EDEADLK_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EEXIST_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EFAULT_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EFBIG_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EINTR_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EINVAL_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EIO_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EISDIR_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EMFILE_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EMLINK_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENFILE_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENODEV_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOENT_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOEXEC_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOMEM_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOSPC_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOTBLK_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOTDIR_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENOTTY_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ENXIO_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EPERM_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EPIPE_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EROFS_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ESPIPE_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ESRCH_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/ETXTBSY_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/EXDEV_record#1 add .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/header32_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_record#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#4 edit .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/header32_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_record#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#4 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#3 (binary) ==== From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:46:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 417151065674; Fri, 19 Dec 2008 11:46: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 05C59106567B for ; Fri, 19 Dec 2008 11:46:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E71CB8FC24 for ; Fri, 19 Dec 2008 11:46:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBkwwJ091678 for ; Fri, 19 Dec 2008 11:46:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBkwoF091676 for perforce@freebsd.org; Fri, 19 Dec 2008 11:46:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:46:58 GMT Message-Id: <200812191146.mBJBkwoF091676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=154989 Change 154989 by rwatson@rwatson_cinnamon_macosx on 2008/12/19 11:46:24 Replace include to what I think it was meant to be. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#13 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -65,7 +65,7 @@ #include #include -#include "auditd_controlUser.h" +#include "auditd_control.h" /* * XXX the following is temporary until this can be added to the kernel From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:55:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BA661065739; Fri, 19 Dec 2008 11:55: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 1B53A1065735 for ; Fri, 19 Dec 2008 11:55:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07D608FC1C for ; Fri, 19 Dec 2008 11:55:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBt6TS092287 for ; Fri, 19 Dec 2008 11:55:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBt67V092285 for perforce@freebsd.org; Fri, 19 Dec 2008 11:55:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:55:06 GMT Message-Id: <200812191155.mBJBt67V092285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:55:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=154990 Change 154990 by rwatson@rwatson_cinnamon_macosx on 2008/12/19 11:54:36 Only use ASL access control tags if they are defined in the build environment; arguably we should detect them with configure...? This allows OpenBSM to build on Leopard again. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $ */ #include @@ -103,6 +103,7 @@ au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt); au_aslmsg = asl_new(ASL_TYPE_MSG); +#ifdef ASL_KEY_READ_UID /* * Make it only so the audit administrator and members of the audit * review group (if used) have access to the auditd system log messages. @@ -110,9 +111,12 @@ asl_set(au_aslmsg, ASL_KEY_READ_UID, "0"); asprintf(&cp, "%u", gid); if (cp != NULL) { +#ifdef ASL_KEY_READ_GID asl_set(au_aslmsg, ASL_KEY_READ_GID, cp); +#endif free(cp); } +#endif /* * Set the client-side system log filtering. From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:59:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3E181065674; Fri, 19 Dec 2008 11:59: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 78413106564A for ; Fri, 19 Dec 2008 11:59:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 659CB8FC0C for ; Fri, 19 Dec 2008 11:59:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJBxBxK092550 for ; Fri, 19 Dec 2008 11:59:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJBxBRt092548 for perforce@freebsd.org; Fri, 19 Dec 2008 11:59:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 11:59:11 GMT Message-Id: <200812191159.mBJBxBRt092548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 11:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=154991 Change 154991 by rwatson@rwatson_lethe on 2008/12/19 11:59:09 Fix build on Linux by adding missing ,. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#10 $ */ #include @@ -285,7 +285,7 @@ "Advertise error" }, { BSM_ESRMNT, #ifdef ESRMNT - ESRMNT + ESRMNT, #else ERRNO_NO_LOCAL_MAPPING, #endif From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:07:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E8801065678; Fri, 19 Dec 2008 12:07: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 F38AC106564A for ; Fri, 19 Dec 2008 12:07:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0D208FC23 for ; Fri, 19 Dec 2008 12:07:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJC7J3P094142 for ; Fri, 19 Dec 2008 12:07:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJC7Jw5094140 for perforce@freebsd.org; Fri, 19 Dec 2008 12:07:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:07:19 GMT Message-Id: <200812191207.mBJC7Jw5094140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:07:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=154993 Change 154993 by rwatson@rwatson_cinnamon on 2008/12/19 12:06:47 #ifdef more errno values not present in some older OS versions, such as FreeBSD 4.x. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 $ */ #include @@ -275,7 +275,13 @@ #endif "Package not installed" }, { BSM_EREMOTE, EREMOTE, "Too many levels of remote in path" }, - { BSM_ENOLINK, ENOLINK, "Link has been severed" }, + { BSM_ENOLINK, +#ifdef ENOLINK + ENOLINK, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + "Link has been severed" }, { BSM_EADV, #ifdef EADV EADV, @@ -297,7 +303,13 @@ ERRNO_NO_LOCAL_MAPPING, #endif "Communication error on send" }, - { BSM_EPROTO, EPROTO, "Protocol error" }, + { BSM_EPROTO, +#ifdef EPROTO + EPROTO, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + "Protocol error" }, { BSM_ELOCKUNMAPPED, #ifdef ELOCKUNMAPPED ELOCKUNMAPPED, @@ -312,8 +324,20 @@ ERRNO_NO_LOCAL_MAPPING, #endif "Facility is not active" }, - { BSM_EMULTIHOP, EMULTIHOP, "Multihop attempted" }, - { BSM_EBADMSG, EBADMSG, "Bad message" }, + { BSM_EMULTIHOP, +#ifdef EMULTIHOP + EMULTIHOP, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + "Multihop attempted" }, + { BSM_EBADMSG, +#ifdef EBADMSG + EBADMSG, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + "Bad message" }, { BSM_ENAMETOOLONG, ENAMETOOLONG, "File name too long" }, { BSM_EOVERFLOW, EOVERFLOW, "Value too large to be stored in data type" }, { BSM_ENOTUNIQ, From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:23:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DCC51065677; Fri, 19 Dec 2008 12:23: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 18EB5106564A for ; Fri, 19 Dec 2008 12:23:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 052368FC1B for ; Fri, 19 Dec 2008 12:23:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCNcgh095409 for ; Fri, 19 Dec 2008 12:23:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCNbaL095407 for perforce@freebsd.org; Fri, 19 Dec 2008 12:23:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:23:37 GMT Message-Id: <200812191223.mBJCNbaL095407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:23:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=154994 Change 154994 by rwatson@rwatson_cinnamon on 2008/12/19 12:23:05 Configure now detects pthread_mutex_lock() in the default library linkage, and if present, we enable locking throughout libbsm. This may omit pthread support on some platforms that have it but where the symbols aren't in libc, but this is better than before where we couldn't build on those platforms at all. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#15 edit .. //depot/projects/trustedbsd/openbsm/configure#44 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#46 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#34 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#24 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#17 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#15 (text+ko) ==== @@ -67,6 +67,9 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET +/* Define to 1 if you have the `pthread_mutex_lock' function. */ +#undef HAVE_PTHREAD_MUTEX_LOCK + /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG ==== //depot/projects/trustedbsd/openbsm/configure#44 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#44 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#45 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # @@ -22802,7 +22802,8 @@ -for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#46 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#45 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#46 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -83,7 +83,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strlcat strlcpy strrchr strstr strtol strtoul pthread_mutex_lock]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#34 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#34 $ */ #include @@ -48,7 +48,9 @@ #include #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include @@ -65,7 +67,9 @@ */ static LIST_HEAD(, au_record) audit_free_q; +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* * This call frees a token_t and its internal data. @@ -93,7 +97,9 @@ { au_record_t *rec = NULL; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (audit_rec_count == 0) LIST_INIT(&audit_free_q); @@ -108,7 +114,9 @@ LIST_REMOVE(rec, au_rec_q); } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif if (rec == NULL) { /* @@ -125,10 +133,14 @@ return (-1); } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (audit_rec_count == MAX_AUDIT_RECORDS) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif free(rec->data); free(rec); @@ -140,7 +152,9 @@ open_desc_table[audit_rec_count] = rec; audit_rec_count++; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } @@ -301,12 +315,16 @@ rec->used = 0; rec->len = 0; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif /* Add the record to the freelist tail */ LIST_INSERT_HEAD(&audit_free_q, rec, au_rec_q); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } #ifdef HAVE_AUDIT_SYSCALLS ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#15 $ */ #include @@ -35,7 +35,9 @@ #include #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include @@ -51,7 +53,9 @@ static char linestr[AU_LINE_MAX]; static const char *classdelim = ":"; +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* * Parse a single line from the audit_class file passed in str to the struct @@ -133,9 +137,13 @@ { struct au_class_ent *cp; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif cp = getauclassent_r_locked(c); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (cp); } @@ -152,9 +160,13 @@ c.ac_name = class_ent_name; c.ac_desc = class_ent_desc; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif cp = getauclassent_r_locked(&c); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (cp); } @@ -175,9 +187,13 @@ setauclass(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauclass_locked(); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -191,15 +207,21 @@ if (name == NULL) return (NULL); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauclass_locked(); while ((cp = getauclassent_r_locked(c)) != NULL) { if (strcmp(name, cp->ac_name) == 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (cp); } } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (NULL); } @@ -230,13 +252,17 @@ { struct au_class_ent *cp; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauclass_locked(); while ((cp = getauclassent_r_locked(c)) != NULL) { if (class_number == cp->ac_class) return (cp); } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (NULL); } @@ -263,10 +289,14 @@ endauclass(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (fp != NULL) { fclose(fp); fp = NULL; } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#24 $ */ #include @@ -36,7 +36,9 @@ #include #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include @@ -58,7 +60,9 @@ static char inacdir = 0; static char ptrmoved = 0; +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* * Returns the string value corresponding to the given label from the @@ -318,9 +322,13 @@ setac(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -330,13 +338,17 @@ endac(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif ptrmoved = 1; if (fp != NULL) { fclose(fp); fp = NULL; } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -352,7 +364,9 @@ * Check if another function was called between successive calls to * getacdir. */ +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (inacdir && ptrmoved) { ptrmoved = 0; if (fp != NULL) @@ -360,19 +374,27 @@ ret = 2; } if (getstrfromtype_locked(DIR_CONTROL_ENTRY, &dir) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (dir == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-1); } if (strlen(dir) >= (size_t)len) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-3); } strlcpy(name, dir, len); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (ret); } @@ -384,18 +406,26 @@ { char *min; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(MINFREE_CONTROL_ENTRY, &min) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (min == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (1); } *min_val = atoi(min); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } @@ -408,20 +438,28 @@ char *filesz, *dummy; long long ll; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(FILESZ_CONTROL_ENTRY, &filesz) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (filesz == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif errno = EINVAL; return (1); } ll = strtoll(filesz, &dummy, 10); if (*dummy != '\0') { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif errno = EINVAL; return (-1); } @@ -430,12 +468,16 @@ * indicates no rotation size. */ if (ll < 0 || (ll > 0 && ll < MIN_AUDIT_FILE_SIZE)) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif errno = EINVAL; return (-1); } *filesz_val = ll; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } @@ -447,22 +489,32 @@ { char *str; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(FLAGS_CONTROL_ENTRY, &str) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (str == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (1); } if (strlen(str) >= (size_t)len) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-3); } strlcpy(auditstr, str, len); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } @@ -474,22 +526,32 @@ { char *str; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(NA_CONTROL_ENTRY, &str) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (str == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (1); } if (strlen(str) >= (size_t)len) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-3); } strlcpy(auditstr, str, len); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } @@ -501,22 +563,32 @@ { char *str; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(POLICY_CONTROL_ENTRY, &str) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (str == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-1); } if (strlen(str) >= len) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-3); } strlcpy(auditstr, str, len); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } @@ -525,21 +597,31 @@ { char *str; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setac_locked(); if (getstrfromtype_locked(AUDIT_HOST_CONTROL_ENTRY, &str) < 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-2); } if (str == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (1); } if (strlen(str) >= len) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-3); } strcpy(auditstr, str); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (0); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#17 $ */ #include @@ -35,7 +35,9 @@ #include #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include @@ -52,7 +54,9 @@ static char linestr[AU_LINE_MAX]; static const char *eventdelim = ":"; +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* * Parse one line from the audit_event file into the au_event_ent structure. @@ -114,9 +118,13 @@ setauevent(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauevent_locked(); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -126,12 +134,16 @@ endauevent(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (fp != NULL) { fclose(fp); fp = NULL; } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -171,9 +183,13 @@ { struct au_event_ent *ep; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif ep = getauevent_r_locked(e); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (ep); } @@ -230,9 +246,13 @@ { struct au_event_ent *ep; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif ep = getauevnam_r_locked(e, name); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (ep); } @@ -284,9 +304,13 @@ { struct au_event_ent *ep; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif ep = getauevnum_r_locked(e, event_number); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (ep); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#15 $ */ #include @@ -41,12 +41,16 @@ #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include /* MT-Safe */ +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif static int firsttime = 1; /* @@ -162,11 +166,15 @@ return (-1); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (firsttime) { firsttime = 0; if ( -1 == load_event_table()) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-1); } } @@ -174,7 +182,9 @@ case AU_PRS_REREAD: flush_cache(); if (load_event_table() == -1) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-1); } ev = read_from_cache(event); @@ -186,14 +196,18 @@ ev = NULL; } if (ev == NULL) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (-1); } if (sorf & AU_PRS_SUCCESS) effmask |= (mask_p->am_success & ev->ae_class); if (sorf & AU_PRS_FAILURE) effmask |= (mask_p->am_failure & ev->ae_class); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif if (effmask != 0) return (1); return (0); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#19 $ */ #include @@ -35,7 +35,9 @@ #include #include +#ifdef HAVE_PTHREAD_MUTEX_LOCK #include +#endif #include #include @@ -51,7 +53,9 @@ static char linestr[AU_LINE_MAX]; static const char *user_delim = ":"; +#ifdef HAVE_PTHREAD_MUTEX_LOCK static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +#endif /* * Parse one line from the audit_user file into the au_user_ent structure. @@ -97,9 +101,13 @@ setauuser(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauuser_locked(); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -109,12 +117,16 @@ endauuser(void) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif if (fp != NULL) { fclose(fp); fp = NULL; } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif } /* @@ -154,9 +166,13 @@ { struct au_user_ent *up; +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif up = getauuserent_r_locked(u); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (up); } @@ -184,17 +200,23 @@ if (name == NULL) return (NULL); +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_lock(&mutex); +#endif setauuser_locked(); while ((up = getauuserent_r_locked(u)) != NULL) { if (strcmp(name, u->au_name) == 0) { +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (u); } } +#ifdef HAVE_PTHREAD_MUTEX_LOCK pthread_mutex_unlock(&mutex); +#endif return (NULL); } From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:34:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 044191065676; Fri, 19 Dec 2008 12:34: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 BCC59106564A for ; Fri, 19 Dec 2008 12:34:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA3EF8FC16 for ; Fri, 19 Dec 2008 12:34:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCYncG096262 for ; Fri, 19 Dec 2008 12:34:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCYnLR096260 for perforce@freebsd.org; Fri, 19 Dec 2008 12:34:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:34:49 GMT Message-Id: <200812191234.mBJCYnLR096260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:34:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154995 Change 154995 by rwatson@rwatson_cinnamon on 2008/12/19 12:34:41 bsm_errno.c doesn't require endian.h since errno values on the wire are single-byte, so don't do the include magic/evil. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#12 (text+ko) ==== @@ -26,26 +26,12 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#12 $ */ #include #include -#ifdef HAVE_SYS_ENDIAN_H -#include -#else /* !HAVE_SYS_ENDIAN_H */ -#ifdef HAVE_MACHINE_ENDIAN_H -#include -#else /* !HAVE_MACHINE_ENDIAN_H */ -#ifdef HAVE_ENDIAN_H -#include -#else /* !HAVE_ENDIAN_H */ -#error "No supported endian.h" -#endif /* !HAVE_ENDIAN_H */ -#endif /* !HAVE_MACHINE_ENDIAN_H */ -#include -#endif /* !HAVE_SYS_ENDIAN_H */ #include #include From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:42:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 332BE1065675; Fri, 19 Dec 2008 12:42: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 E998A106564A for ; Fri, 19 Dec 2008 12:42:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D69578FC1F for ; Fri, 19 Dec 2008 12:42:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCgvkF097609 for ; Fri, 19 Dec 2008 12:42:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCgvYo097607 for perforce@freebsd.org; Fri, 19 Dec 2008 12:42:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:42:57 GMT Message-Id: <200812191242.mBJCgvYo097607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=154996 Change 154996 by rwatson@rwatson_cinnamon on 2008/12/19 12:42:02 Don't use sys/endian.h unless be32enc becomes available as a result of including it; FreeBSD 4.x's sys/endian.h is not capable enough to meet our requirements, so must use our compat/endian.h there. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#16 edit .. //depot/projects/trustedbsd/openbsm/configure#45 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#47 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#59 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#85 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#16 (text+ko) ==== @@ -6,6 +6,9 @@ /* Define if audit system calls present */ #undef HAVE_AUDIT_SYSCALLS +/* Define if be32enc is present */ +#undef HAVE_BE32ENC + /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO ==== //depot/projects/trustedbsd/openbsm/configure#45 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#45 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#46 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # @@ -23032,6 +23032,66 @@ fi +# +# There are a wide variety of endian macros and functions in the wild; we try +# to use the native support if it defines be32enc(), but otherwise have to +# use our own. +# +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + be32enc(NULL, 1); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BE32ENC +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + # Check to see if Mach IPC is used for trigger messages. If so, use Mach IPC # instead of the default for sending trigger messages to the audit components. { echo "$as_me:$LINENO: checking for /usr/include/mach/audit_triggers.defs" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#47 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#46 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -121,6 +121,20 @@ ]) AM_CONDITIONAL(HAVE_AUDIT_SYSCALLS, $have_audit_syscalls) +# +# There are a wide variety of endian macros and functions in the wild; we try +# to use the native support if it defines be32enc(), but otherwise have to +# use our own. +# +AC_TRY_LINK([ + #include + #include +], [ + be32enc(NULL, 1); +], [ +AC_DEFINE(HAVE_BE32ENC,, Define if be32enc is present) +]) + # Check to see if Mach IPC is used for trigger messages. If so, use Mach IPC # instead of the default for sending trigger messages to the audit components. AC_CHECK_FILE([/usr/include/mach/audit_triggers.defs], [ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#59 (text+ko) ==== @@ -32,15 +32,15 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#58 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#59 $ */ #include #include -#ifdef HAVE_SYS_ENDIAN_H +#if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BE32ENC) #include -#else /* !HAVE_SYS_ENDIAN_H */ +#else /* !HAVE_SYS_ENDIAN_H || !HAVE_BE32ENC */ #ifdef HAVE_MACHINE_ENDIAN_H #include #else /* !HAVE_MACHINE_ENDIAN_H */ @@ -51,7 +51,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIAN_H */ +#endif /* !HAVE_SYS_ENDIAN_H || !HAVE_BE32ENC */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#85 (text+ko) ==== @@ -30,15 +30,15 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#85 $ */ #include #include -#ifdef HAVE_SYS_ENDIAN_H +#if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BE32ENC) #include -#else /* !HAVE_SYS_ENDIAN_H */ +#else /* !HAVE_SYS_ENDIAN_H || !HAVE_BE32ENC */ #ifdef HAVE_MACHINE_ENDIAN_H #include #else /* !HAVE_MACHINE_ENDIAN_H */ @@ -49,7 +49,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIAN_H */ +#endif /* !HAVE_SYS_ENDIAN_H || !HAVE_BE32ENC */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:49:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03EB21065678; Fri, 19 Dec 2008 12:49: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 BB0801065674 for ; Fri, 19 Dec 2008 12:49:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A89018FC1B for ; Fri, 19 Dec 2008 12:49:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCn4Q9007966 for ; Fri, 19 Dec 2008 12:49:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCn4Tq007964 for perforce@freebsd.org; Fri, 19 Dec 2008 12:49:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:49:04 GMT Message-Id: <200812191249.mBJCn4Tq007964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=154998 Change 154998 by rwatson@rwatson_cinnamon on 2008/12/19 12:48:20 Use stddef.h for NULL. Detect stdint.h and include it in compat/endian.h if present. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/endian.h#8 edit .. //depot/projects/trustedbsd/openbsm/configure#46 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#48 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#8 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#8 $ */ #ifndef _COMPAT_ENDIAN_H_ @@ -35,7 +35,9 @@ * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ +#ifdef HAVE_STDINT_H #include +#endif /* * Some operating systems do not yet have the more recent endian APIs that ==== //depot/projects/trustedbsd/openbsm/configure#46 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#46 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # @@ -19852,7 +19852,8 @@ -for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h + +for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -22970,7 +22971,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include extern int auditon(int, void *, int); ==== //depot/projects/trustedbsd/openbsm/configure.ac#48 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -35,7 +35,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -106,7 +106,7 @@ # depend on them or it will generate link-time or run-time errors. Test for # just one. AC_TRY_LINK([ - #include + #include extern int auditon(int, void *, int); ], [ From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:55:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86BC6106567D; Fri, 19 Dec 2008 12:55: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 47E23106564A for ; Fri, 19 Dec 2008 12:55:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35E308FC0C for ; Fri, 19 Dec 2008 12:55:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCtAwV008486 for ; Fri, 19 Dec 2008 12:55:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCtAjC008484 for perforce@freebsd.org; Fri, 19 Dec 2008 12:55:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:55:10 GMT Message-Id: <200812191255.mBJCtAjC008484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:55:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=154999 Change 154999 by rwatson@rwatson_fledge on 2008/12/19 12:54:24 Some updates for OpenBSM 1.1 alpha 4. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#33 (text+ko) ==== @@ -1,4 +1,4 @@ -OpenBSM 1.1 alpha 1 +OpenBSM 1.1 alpha 4 Introduction @@ -19,6 +19,7 @@ bsm/ Library include files for BSM compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files + ibauditd Common audit management functions for auditd and launchd libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages modules/ Directory for auditfilterd module source @@ -55,4 +56,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#32 $ +$P4: //depot/projects/trustedbsd/openbsm/README#33 $ From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:59:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 885F11065677; Fri, 19 Dec 2008 12:59: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 4C7471065675 for ; Fri, 19 Dec 2008 12:59:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A1A88FC19 for ; Fri, 19 Dec 2008 12:59:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCxFc8008753 for ; Fri, 19 Dec 2008 12:59:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCxF1v008751 for perforce@freebsd.org; Fri, 19 Dec 2008 12:59:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:59:15 GMT Message-Id: <200812191259.mBJCxF1v008751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 12:59:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=155000 Change 155000 by rwatson@rwatson_fledge on 2008/12/19 12:58:20 Fix typo. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#34 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#34 (text+ko) ==== @@ -19,7 +19,7 @@ bsm/ Library include files for BSM compat/ Compatibility code to build on various OS's etc/ Sample /etc/security configuration files - ibauditd Common audit management functions for auditd and launchd + libauditd Common audit management functions for auditd and launchd libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages modules/ Directory for auditfilterd module source @@ -56,4 +56,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#33 $ +$P4: //depot/projects/trustedbsd/openbsm/README#34 $ From owner-p4-projects@FreeBSD.ORG Fri Dec 19 13:20:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D5E51065673; Fri, 19 Dec 2008 13:20: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 00F2E106564A for ; Fri, 19 Dec 2008 13:20:37 +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 E50308FC19 for ; Fri, 19 Dec 2008 13:20:36 +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 mBJDKaHG011502 for ; Fri, 19 Dec 2008 13:20:36 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJDKaGD011500 for perforce@freebsd.org; Fri, 19 Dec 2008 13:20:36 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 19 Dec 2008 13:20:36 GMT Message-Id: <200812191320.mBJDKaGD011500@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 155001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 13:20:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=155001 Change 155001 by rene@rene_self on 2008/12/19 13:19:44 MFen handbook/introduction 1.129 -> 1.130 sina.com <-> sina.cn pending answer from murray@ Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#9 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.35 2005/09/23 17:03:10 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.129 + %SRCID% 1.130 --> @@ -536,6 +536,12 @@ Rambler + Sina + + + Sina + + Pair Networks @@ -570,13 +576,6 @@ TELEHOUSE America - - Sophos Anti-Virus - - - Sophos - Anti-Virus - en nog veel meer sites. From owner-p4-projects@FreeBSD.ORG Fri Dec 19 13:21:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80A11106567C; Fri, 19 Dec 2008 13:21: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 2C0D01065675 for ; Fri, 19 Dec 2008 13:21:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19D3C8FC20 for ; Fri, 19 Dec 2008 13:21:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJDLctX011590 for ; Fri, 19 Dec 2008 13:21:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJDLcmh011588 for perforce@freebsd.org; Fri, 19 Dec 2008 13:21:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 13:21:38 GMT Message-Id: <200812191321.mBJDLcmh011588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 13:21:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=155002 Change 155002 by rwatson@rwatson_fledge on 2008/12/19 13:21:28 Add OpenBSM 1.1 alpha 4. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-alpha4.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#17 edit .. //depot/projects/trustedbsd/www/openbsm.page#34 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#17 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#16 $ + $P4: //depot/projects/trustedbsd/www/news.page#17 $ @@ -52,6 +52,15 @@
    December 7, 2008 OpenBSM 1.1 alpha 3 released
    +

    OpenBSM 1.1 alpha 4 has been released; this is a test release + of OpenBSM, and primarily improves support for Mac OS X by + exposing auditd(8)'s components for use by launchd(8), and by + adding support for Apple's ASL(3) system logging facility. Further + cleanups to event numbers, bug fixes, improvements in crash + recovery, and portable error mesage printing are also present. See + the OpenBSM web page for more + information.

    +

    OpenBSM 1.1 alpha 3 has been released; this is a test release of OpenBSM, adding extended socket token support, mapping between local and BSM error numbers, and bumping the BSM file format ==== //depot/projects/trustedbsd/www/openbsm.page#34 (text+ko) ==== @@ -30,7 +30,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#33 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#34 $ @@ -178,17 +178,24 @@ Description - 1.1 alpha 3 - openbsm-1.1-alpha3.tgz - 512K - 2008-12-07 + 1.1 alpha 4 + openbsm-1.1-alpha4.tgz + 544K + 2008-12-19 -

    In this revision, OpenBSM maps between local and wire values - for the errno error space, bugs are fixed in the encoding of - execve arguments and environmental variables, support for the - portable AUT_SOCKET_EX token type is added, and the BSM header - version is bumped to give OpenBSM 1.1 its own file format - version due to non-trivial changes in tokens.

    +

    In this revision, most functional components of auditd(8) are + moved to a new libauditd(3), so that they can be shared by + auditd(8) on FreeBSD and launchd(8) on Mac OS X. In addition, + audit_submit(3) is taught to accept local errno values (as it + did before the additional of a BSM error number space), further + cleanup of the user audit event ID space is performed in order + to avoid collisions with other systems, au_strerror(3) is added + to allow printing of error numbers without converting to local + numbers (which may lose fidelity), and audit crash recovery is + improved as auditd now maintains a current trail link and + cleans up if it discovers auditd failed during the last + rotation. In Mac OS X, ASL(3) is used instead of syslog(3) for + system logging.

    @@ -213,6 +220,20 @@ Description + 1.1 alpha 3 + openbsm-1.1-alpha3.tgz + 512K + 2008-12-07 + +

    In this revision, OpenBSM maps between local and wire values + for the errno error space, bugs are fixed in the encoding of + execve arguments and environmental variables, support for the + portable AUT_SOCKET_EX token type is added, and the BSM header + version is bumped to give OpenBSM 1.1 its own file format + version due to non-trivial changes in tokens.

    + + + 1.1 alpha 2 openbsm-1.1-alpha2.tgz 512K From owner-p4-projects@FreeBSD.ORG Fri Dec 19 14:23:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9671F1065677; Fri, 19 Dec 2008 14:23: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 59E7F1065673 for ; Fri, 19 Dec 2008 14:23:41 +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 4ABB28FC17 for ; Fri, 19 Dec 2008 14:23:41 +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 mBJENfR2017750 for ; Fri, 19 Dec 2008 14:23:41 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJENfjD017748 for perforce@freebsd.org; Fri, 19 Dec 2008 14:23:41 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 19 Dec 2008 14:23:41 GMT Message-Id: <200812191423.mBJENfjD017748@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 155004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 14:23:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=155004 Change 155004 by pgj@kolbasz on 2008/12/19 14:22:46 Fix a small mistake Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#3 (text+ko) ==== @@ -355,7 +355,7 @@ Például ennek a szakasznak így néz ki a szabályos tördelése: - +---]] Ez a nulladik oszlop + +--- Ez a nulladik oszlop V <chapter> <title>...</title> From owner-p4-projects@FreeBSD.ORG Fri Dec 19 14:29:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E40681065675; Fri, 19 Dec 2008 14:29:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A527C1065674 for ; Fri, 19 Dec 2008 14:29:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 940078FC1A for ; Fri, 19 Dec 2008 14:29:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJETlED018191 for ; Fri, 19 Dec 2008 14:29:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJETlTr018189 for perforce@freebsd.org; Fri, 19 Dec 2008 14:29:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 14:29:47 GMT Message-Id: <200812191429.mBJETlTr018189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 14:29:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=155005 Change 155005 by rwatson@rwatson_fledge on 2008/12/19 14:29:11 Fix version number in web announcement. Affected files ... .. //depot/projects/trustedbsd/www/news.page#18 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#18 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#17 $ + $P4: //depot/projects/trustedbsd/www/news.page#18 $ @@ -50,7 +50,7 @@
    -
    December 7, 2008 OpenBSM 1.1 alpha 3 released
    +
    December 7, 2008 OpenBSM 1.1 alpha 4 released

    OpenBSM 1.1 alpha 4 has been released; this is a test release of OpenBSM, and primarily improves support for Mac OS X by From owner-p4-projects@FreeBSD.ORG Fri Dec 19 14:30:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EC901065689; Fri, 19 Dec 2008 14:30: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 EEADD106564A for ; Fri, 19 Dec 2008 14:30:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD65A8FC1F for ; Fri, 19 Dec 2008 14:30:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJEUmHm018565 for ; Fri, 19 Dec 2008 14:30:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJEUmXQ018563 for perforce@freebsd.org; Fri, 19 Dec 2008 14:30:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 14:30:48 GMT Message-Id: <200812191430.mBJEUmXQ018563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 14:30:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=155007 Change 155007 by rwatson@rwatson_fledge on 2008/12/19 14:30:27 Add missing header, suddenly clear why the version number looked wrong. Affected files ... .. //depot/projects/trustedbsd/www/news.page#19 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#19 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#18 $ + $P4: //depot/projects/trustedbsd/www/news.page#19 $ @@ -50,7 +50,7 @@

    -
    December 7, 2008 OpenBSM 1.1 alpha 4 released
    +
    December 19, 2008 OpenBSM 1.1 alpha 4 released

    OpenBSM 1.1 alpha 4 has been released; this is a test release of OpenBSM, and primarily improves support for Mac OS X by @@ -61,6 +61,8 @@ the OpenBSM web page for more information.

    +
    December 7, 2008 OpenBSM 1.1 alpha 3 released
    +

    OpenBSM 1.1 alpha 3 has been released; this is a test release of OpenBSM, adding extended socket token support, mapping between local and BSM error numbers, and bumping the BSM file format From owner-p4-projects@FreeBSD.ORG Fri Dec 19 14:58:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CABB01065675; Fri, 19 Dec 2008 14:58: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 8EEC01065677 for ; Fri, 19 Dec 2008 14:58:17 +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 7FC768FC17 for ; Fri, 19 Dec 2008 14:58:17 +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 mBJEwHst021011 for ; Fri, 19 Dec 2008 14:58:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJEwHKQ021009 for perforce@freebsd.org; Fri, 19 Dec 2008 14:58:17 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 19 Dec 2008 14:58:17 GMT Message-Id: <200812191458.mBJEwHKQ021009@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 155010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 14:58:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155010 Change 155010 by rene@rene_self on 2008/12/19 14:57:39 Add a new article to the build - "Writing FreeBSD Problem Reports" To be translated. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#6 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#1 add Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#6 (text+ko) ==== @@ -6,8 +6,7 @@ SUBDIR = SUBDIR+= contributing SUBDIR+= explaining-bsd - -# ROOT_SYMLINKS+= new-users +SUBDIR+= problem-reports DOC_PREFIX?= ${.CURDIR}/../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" From owner-p4-projects@FreeBSD.ORG Fri Dec 19 15:02:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C0741065674; Fri, 19 Dec 2008 15:02: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 16C7B1065670 for ; Fri, 19 Dec 2008 15:02:22 +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 078828FC12 for ; Fri, 19 Dec 2008 15:02:22 +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 mBJF2L7F021328 for ; Fri, 19 Dec 2008 15:02:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJF2LmU021326 for perforce@freebsd.org; Fri, 19 Dec 2008 15:02:21 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 19 Dec 2008 15:02:21 GMT Message-Id: <200812191502.mBJF2LmU021326@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 155011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 15:02:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=155011 Change 155011 by rene@rene_self on 2008/12/19 15:01:37 Initialize tags for problem-reports article and Makefile. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#2 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/Makefile,v 1.6 2004/08/05 10:04:28 den Exp $ +# $FreeBSD: $ # # Article: Writing FreeBSD Problem Reports ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#2 (text+ko) ==== @@ -3,12 +3,16 @@ %articles.ent; ]> + +

    Writing &os; Problem Reports - $FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.60 2008/07/13 14:37:24 remko Exp $ - &tm-attrib.freebsd; &tm-attrib.cvsup; From owner-p4-projects@FreeBSD.ORG Fri Dec 19 16:35:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F4FE106567A; Fri, 19 Dec 2008 16:35: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 E75781065678 for ; Fri, 19 Dec 2008 16:35:03 +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 D78338FC22 for ; Fri, 19 Dec 2008 16:35:03 +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 mBJGZ0Ue031683 for ; Fri, 19 Dec 2008 16:35:00 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJGYxTB031668 for perforce@freebsd.org; Fri, 19 Dec 2008 16:34:59 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 19 Dec 2008 16:34:59 GMT Message-Id: <200812191634.mBJGYxTB031668@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 155019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Dec 2008 16:35:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=155019 Change 155019 by pgj@kolbasz on 2008/12/19 16:34:40 Add Hungarian translation of chapter "Using sgml-mode in Emacs" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#2 (text+ko) ==== @@ -31,108 +31,165 @@ --> - Using <literal>sgml-mode</literal> with - <application>Emacs</application> - - Recent versions of Emacs or XEmacs (available from the ports - collection) contain a very useful package called PSGML. Automatically - invoked when a file with the .sgml extension is loaded, - or by typing M-x sgml-mode, it is a major mode for - dealing with SGML files, elements and attributes. + Az <literal>sgml-mode</literal> használata az + <application>Emacs</application> + szövegszerkesztõben + + Az Emacs és + XEmacs újabb változataihoz + tartozik egy psgml nevû, nagyon hasznos + csomag (a Portgyûjteménybõl a editors/psgml portból + telepíthetjük fel). Ez a + kiegészítés vagy az .sgml + állományok megnyitásakor töltõdik be + automatikusan, vagy pedig az M-x sgml-mode + parancs begépelésével. + Általánosságban véve ez az SGML + állományok és a bennük + található elemek és tulajdonságok + szerkesztésére alkalmas mód. - An understanding of some of the commands provided by this mode can - make working with SGML documents such as the Handbook much easier. + Az alábbiakban bemutatunk néhány olyan + alapvetõ parancsot ebben a módban, amelyekkel + könnyebbé válik a különbözõ + SGML dokumentumok, többek közt a kézikönyv + szerkesztése. C-c C-e - + - Runs sgml-insert-element. You will be - prompted for the name of the element to insert at the current point. - You can use the TAB key to complete the element. Elements that are - not valid at the current point will be disallowed. + Meghívja az + sgml-insert-element függvényt. + Ekkor meg kell adnunk az adott pontra beillesztendõ elem + nevét. Itt a Tab + lenyomásával kérhetjük a név + kiegészítését, az adott ponton + érvénytelen elemek neveit ilyenkor nem + érhetjük el. - The start and end tags for the element will be inserted. If the - element contains other, mandatory, elements then these will be - inserted as well. + A szövegbe ekkor bekerülnek az elemhez + tartozó kezdõ- és + zárócímkék. Amennyiben az elemhez + még tartoznak más egyéb + kötelezõ elemek is, akkor egyúttal ezek is + beszúródnak. - + C-c = - + - Runs sgml-change-element-name. Place the - point within an element and run this command. You will be prompted - for the name of the element to change to. Both the start and end - tags of the current element will be changed to the new - element. + Meghívja az + sgml-change-element-name + függvényt. A parancs használatához + álljunk a módosítandó elembe. A + végrehajtáshoz meg kell még adnunk azt + is, hogy mire akarjuk átírni az elem + nevét. Ezután az érintett elem + kezdõ- és zárócímkéi + lecserélõdnek. - + C-c C-r - + - Runs sgml-tag-region. Select some text (move - to start of text, C-space, move to end of text, C-space) and then - run this command. You will be prompted for the element to use. This - element will then be inserted immediately before and after your - marked region. + Meghívja az sgml-tag-region + függvényt. A használatához + elõször jelöljük ki a szöveg egy + részét (vigyük a kurzort a + kijelölés kezdetéhez, adjuk ki a + C-space billentyûparancsot, vigyük a kurzort a + kijelölés végéhez és + ismét adjuk ki a C-space parancsot). + Ezután meg kell adnunk még a bejelölt + rész jelöléséhez használni + kívánt elemet. Ennek + eredményeképpen végül a + kijelölt szakasz elejére és + végére bekerül az adott elem kezdõ- + és zárócímkéje. C-c - - + - Runs sgml-untag-element. Place the point - within the start or end tag of an element you want to remove, and - run this command. The element's start and end tags will be - removed. + Meghívja az sgml-untag-element + függvényt. Álljunk a kurzorral az + eltávolítani kívánt elem + kezdõ- vagy + zárócímkéjére és + adjuk ki a parancsot. Ekkor az elem kezdõ- és + zárócímkéi törlésre + kerülnek. - + C-c C-q - + - Runs sgml-fill-element. Will recursively fill - (i.e., reformat) content from the current element in. The filling - will affect content in which whitespace is - significant, such as within programlisting - elements, so run this command with care. + Meghívja az sgml-fill-element + függvényt. Ennek hatására az elem, + amelyben állunk a kurzorral rekurzívan + feldolgozásra kerül (például + újraformázódik). Ez a + változtatás a tördelést is + érinteni fogja, tehát + például még + programlisting elemek esetében is. + Ezért mindig csak körültekintéssel + alkalmazzuk! - + C-c C-a - + - Runs sgml-edit-attributes. Opens a second - buffer containing a list of all the attributes for the closest - enclosing element, and their current values. Use TAB to navigate - between attributes, C-k to remove an existing - value and replace it with a new one, C-c C-c - to close this buffer and return to the main document. + Meghívja az + sgml-edit-attributes függvényt. + Ekkor a legközelebbi befoglaló elemhez + megnyílik egy másik szerkesztési + pufferben az összes hozzátartozó + tulajdonság, értékekkel együtt. Itt + a Tab lenyomásával tudunk + lépkedni az egyes elemek között, a + C-k paranccsal lecserélni egy + meglevõ értéket egy újra, illetve a + C-c C-c paranccsal bezárni a puffert + és visszatérni az eredeti dokumentum + szerkesztéséhez. - + C-c C-v - + - Runs sgml-validate. Prompts you to save the - current document (if necessary) and then runs an SGML validator. The - output from the validator is captured into a new buffer, and you can - then navigate from one troublespot to the next, fixing markup errors - as you go. + Meghívja az sgml-validate + függvényt. Felajánlja a jelenleg megnyitott + dokumentum mentését (amennyiben + szükséges) és ellenõrzi az SGML + szabvány szerinti + érvényességét. A vizsgálat + eredménye egy új pufferbe kerül, ahol + szépen sorban végig tudjuk nézni az + összes hibát és javítani ezeket + menet közben. @@ -140,18 +197,23 @@ C-c / - Runs sgml-insert-end-tag. Inserts the - end tag for the current open element. + Meghívja az + sgml-insert-end-tag + függvényt. Bezárja a kurzor elõtt + megkezdett elemet. - - Doubtless there are other useful functions of this mode, but those are - the ones I use most often. + + Nyilvánvalóan ebben a módban még + vannak további hasznos funkciók, de az + említetteket használják a leggyakrabban. - You can also use the following entries in - .emacs to set proper spacing, indentation, - and column width for working with the Documentation Project. + A Dokumentációs Projekten belüli + munkához az .emacs + állományban a következõ bejegyzéseket + érdemes megadni a megfelelõ tördeléshez, + elrendezéshez és sorszélességhez: (defun local-sgml-mode-hook @@ -165,10 +227,8 @@ (add-hook 'psgml-mode-hook '(lambda () (local-psgml-mode-hook))) - - + %articles.ent; ]> - -
    +
    - Writing &os; Problem Reports + Probleemrapporten voor &os; schrijven &tm-attrib.freebsd; @@ -24,15 +25,18 @@ - This article describes how to best formulate and submit a - problem report to the &os; Project. + Dit artikel beschrijft hoe een probleemrapport het beste + geformuleerd en naar het &os; Project verzonden kan + worden. + + Vertaald door door René Ladan. Dag-Erling Smørgrav - Contributed by + Bijgedragen door @@ -42,179 +46,186 @@ - problem reports + probleemrapporten
    - Introduction + Introductie - One of the most frustrating experiences one can have as a - software user is to submit a problem report only to have it - summarily closed with a terse and unhelpful explanation like - not a bug or bogus PR. Similarly, - one of the most frustrating experiences as a software developer - is to be flooded with problem reports that are not really - problem reports but requests for support, or that contain little - or no information about what the problem is and how to reproduce - it. + Eén van de meest frusterende ervaringen die een + gebruiker van software kan hebben is om een probleemrapport in te + versturen om het vervolgens afgehandeld te zien met een korte en + onbehulpzame uitleg als geen bug of fout + PR. Evenzo is één van de meest + frusterende ervaringen als ontwikkelaar van software om overspoeld + te worden met probleemrapporten die niet echt een probleemrapport + zijn maar ondersteuningsverzoeken, of die weinig tot geen + informatie bevatten over wat het probleem is en hoe het te + reproduceren. - This document attempts to describe how to write good problem - reports. What, you ask, is a good problem report? Well, to go - straight to the bottom line, a good problem report is one that - can be analyzed and dealt with swiftly, to the mutual - satisfaction of both user and developer. + Dit document poogt te beschrijven hoe goede probleemrapporten + te schrijven. Wat is een goed probleemrapport? Kort door de + bocht is een goed probleemrapport een rapport dat geanalyseerd kan + worden en waar snel mee kan wordne omgegaan, voor het wederzijdse + plezier van zowel de gebruiker als de ontwikkelaar. - Although the primary focus of this article is on &os; - problem reports, most of it should apply quite well to other - software projects. + Hoewel de nadruk van dit artikel ligt op probleemrapporten + voor &os;, zou het meeste ook op andere softwareprojecten van + toepassing moeten zijn. - Note that this article is organized thematically, not - chronologically, so you should read through the entire document - before submitting a problem report, rather than treat it as a - step-by-step tutorial. + Merk op dat dit artikel thematisch in plaats van chronologisch + is ingedeeld, dus u dient het hele document te lezen alvorens een + probleemrapport op te sturen, in plaats van het als een + stapsgewijze tutorial te behandelen.
    - When to submit a problem report + Wanneer een probleemrapport te versturen - There are many types of problems, and not all of them should - engender a problem report. Of course, nobody is perfect, and - there will be times when you are convinced you have found a bug - in a program when in fact you have misunderstood the syntax for - a command or made a typographical error in a configuration file - (though that in - itself may sometimes be indicative of poor documentation or poor - error handling in the application). There are still many cases - where submitting a problem report is clearly - not the right - course of action, and will only serve to frustrate you and the - developers. Conversely, there are cases where it might be - appropriate to submit a problem report about something else than - a bug—an enhancement or a feature request, for - instance. + Er zijn vele soorten problemen, die niet allemaal geschikt + zijn voor een probleemrapport. Natuurlijk is niemand perfect dus + zal het soms voorkomen dat u overtuigd bent dat u een bug in een + programma heeft gevonden terwijl u in feite de syntaxis voor een + commando verkeerd begrepen of een typfout in een + instellingenbestand gemaakt heeft (hoewel dat soms zelf al op + slechte documentatie of slechte foutafhandeling in de applicatie + kan wijzen). Er zijn nog steeds veel gevallen waarin het insturen + van een probleemrapport duidelijk niet de + juiste handeling is, en het alleen tot frustatie bij uzelf en de + ontwikkelaars leidt. Omgekeerd zijn er gevallen waarin het juist + kan zijn om een probleemrapport in te sturen over iets anders dan + een bug—bijvoorbeeld voor een verbetering of een + mogelijkheidsverzoek. - So how do you determine what is a bug and what is not? As a - simple rule of thumb your problem is not a - bug if it can be expressed as a question (usually of the form - How do I do X? or Where can I find - Y?). It is not always quite so black and white, but the - question rule covers a large majority of cases. If you are looking - for an answer, consider posing your question to the - &a.questions;. + Dus hoe wordt bepaald of iets wel of niet een bug is? Een + eenvoudige vuistregel is dat uw probleem geen + bug is als het als een vraag kan worden uitgedrukt (meestal in de + vorm Hoe doe ik X? of Waar kan ik Y + vinden?). Het is niet altijd zo zwart-wit, maar de + vraagregel gaat in de meeste gevallen op. Overweeg, als u een + antwoord zoekt, om uw vraag aan de &a.questions; te + stellen. - Some cases where it may be appropriate to submit a problem - report about something that is not a bug are: + Enkele gevallen waar het juist kan zijn om een probleemrapport + in te sturen over iets dat geen bug is zijn: - Requests for feature enhancements. It is generally a - good idea to air these on the mailing lists before - submitting a problem report. + Verzoeken om verbetering van mogelijkheden. Het is over + het algemeen een goed idee om deze op de mailinglijsten te + uiten alvorens een probleemrapport in te sturen. - Notification of updates to externally maintained - software (mainly ports, but also externally maintained base - system components such as BIND or various GNU - utilities). + Meldingen van updates aan extern onderhouden software + (over het algemeen ports, maar ook extern onderhouden + componenten van het basissysteem zoals BIND of verscheidene + gereedschappen van GNU). + + Voor onbeheerde ports (MAINTAINER bevat + ports@FreeBSD.org kan zo'n updatemelding + opgepakt worden door een geïnteresseerde committer, of u + kunt gevraagd worden om een patch aan te leveren om de port + bij te werken; door dit van te voren aan te bieden verhoogt u + in sterke mate de kans dat de port binnen een redelijk + tijdsbestek wordt bijgewerkt. + + Als de port beheerd wordt, zijn PRs die nieuwe + stroomopwaartse uitgaven aankondigen niet erg nuttig aangezien + ze aanvullend werk voor de committers genereren, en + waarschijnlijk weet de beheerder al dat er een nieuwe versie + uit is, ze hebben er waarschijnlijk met de ontwikkelaars aan + gewerkt, ze zijn waarschijnlijk regressietesten aan het + uitvoeren, enzovoorts. - For unmaintained ports (MAINTAINER contains - ports@FreeBSD.org), such update notifications - might get picked up by an interested - committer, or you might be asked to provide a patch to update - the port; providing it upfront will greatly improve your chances - that the port will get updated in a timely manner. - - If the port is maintained, PRs announcing new upstream releases - are usually not very useful since they generate supplementary work - for the committers, and the maintainer likely knows already there is - a new version, they have probably worked with the developers on it, - they are probably testing to see there is no regression, etc. - - In either case, following the process described in Porter's - Handbook will yield the best results. (You might - also wish to read - Contributing to the FreeBSD Ports Collection.) - + In beide gevallen zal het volgen van het proces zoals + beschreven in het Porters + Handboek tot de beste resultaten leiden. (U bent + misschien ook geïnteresseerd in + Bijdragen aan de &os; Portscollectie.) - A bug that can not be reproduced can rarely be - fixed. If the bug only occurred once and you can not reproduce - it, and it does not seem to happen to anybody else, chances are - none of the developers will be able to reproduce it or figure - out what is wrong. That does not mean it did not happen, but it - does mean that the chances of your problem report ever leading - to a bug fix are very slim. To make matters worse, often - these kinds of bugs are actually caused by failing hard drives - or overheating processors — you should always try to rule - out these causes, whenever possible, before submitting a PR. + Een bug die niet reproduceerbaar is kan zelden gemaakt worden. + Als een bug slechts eenmalig voorkwam en u deze niet kunt + reproduceren, en het bijna niemand anders lijkt voor te komen, dan + bestaat de kans dat geen van de ontwikkelaars het kan reproduceren + of kan uitzoeken wat er mis is. Dit betekent niet dat het niet + gebeurde, maar wel dat de kansen dat uw probleemrapport ooit tot + een reparatie leidt erg klein zijn. Om het allemaal erger te + maken, worden dit soort bugs vaak veroorzaakt door falende harde + schijven of oververhitte processoren — u dient altijd te + proberen om deze problemen, indien mogelijk, uit te sluiten + voordat u een PR instuurt. - Next, to decide to whom you should file your problem - report, you need to understand that the software that makes - up &os; is composed of several different elements: + Vervolgens, voordat u besluit aan wie u uw probleemrapport + dient te sturen, moet u weten dat de software waaruit &os; bestaat + uit verschillende elementen is opgebouwd: - Code in the base system that is written and maintained - by &os; contributors, such as the kernel, the C library, - and the device drivers (categorized as kern); - the binary utilities (bin); the manual - pages and documentation (docs); and - the web pages (www). All bugs in - these areas should be reported to the &os; developers. + Code in het basissysteem die geschreven is en onderhouden + wordt door &os;-vrijwilligers, zoals de kernel, de + C-bibliotheek, en de apparaatstuurprogramma's (gecategoriseerd + als kern); de binaire hulpmiddelen + (bin); de handleidingpagina's en + documentatie (docs); en de webpagina's + (www). Alle bugs in deze gebieden dienen + aan de &os;-ontwikkelaars gerapporteerd te worden. - Code in the base system that is written and maintained - by others, and imported into &os; and adapted. Examples - include bind, &man.gcc.1;, and - &man.sendmail.8;. Most bugs in these areas should be reported - to the &os; developers; but in some cases they may need to be - reported to the original authors instead if the problems are - not &os;-specific. Usually these bugs will fall under either - the bin or gnu - categories. + Code in het basissysteem die geschreven is en onderhouden + wordt door anderen, en geïmporteerd is in &os; en is + aangepast. Voorbeelden zijn bind, + &man.gcc.1;, en &man.sendmail.8;. De meeste bugs in deze + gebieden dienen aan de &os;-ontwikkelaars gerapporteerd te + worden; maar in sommige gevallen kan het zijn dat ze aan de + originele auteurs gerapporteerd moeten worden als de problemen + niet specifiek voor &os; zijn. Gewoonlijk vallen deze bugs + ofwel in de categorie bin ofwel in de + categorie gnu. - Individual applications that are not in the base system - but are instead part of the &os; Ports Collection (category - ports). Most of these applications are - not written by &os; developers; what &os; provides is merely - a framework for installing the application. Therefore, you - should only report a problem to the &os; developers when you - believe the problem is &os;-specific; otherwise, you should - report it to the authors of the software. + Individuele applicaties die niet in het basissysteem + zitten maar in plaats daarvan deel zijn van de Portscollectie + van &os; (categorie ports). De meeste van + deze applicaties zijn niet geschreven door &os;-ontwikkelaars; + wat &os; biedt is slechts een raamwerk om de applicatie te + installeren. Daarom dient u alleen een probleem aan de + &os;-ontwikkelaars te rapporteren als u gelooft dat het + probleem &os;-specifiek is; anders dient u het aan de auteurs + van de software te rapporteren. - - Then you should ascertain whether or not the problem is - timely. There are few things - that will annoy a developer more than receiving a problem report - about a bug she has already fixed. + Daarna dient u vast te stellen of het probleem tijdig is. Er + zijn maar weinig dingen die een ontwikkelaar meer irriteren dan + het ontvangen van een probleemrapport over een bug die reeds + gerepareerd is. - If the problem is in the base system, you should first read - the FAQ section on - - &os; versions, if you are not already familiar with - the topic. It is not possible for &os; to fix problems in - anything other than certain recent branches of the base system, - so filing a bug report about an older version will probably - only result in a developer advising you to upgrade to a - supported version to see if the problem still recurs. The - Security Officer team maintains the - list of supported - versions. + Als het probleem in het basissysteem zit, dient u eerst het + FAQ-gedeelte over + &os;-versies te lezen, als u niet reeds bekend bent met + het onderwerp. Het is niet mogelijk voor &os;om problemen in iets + anders dan bepaalde recente takken van het basissysteem op te + lossen, dus leidt het insturen van een bugrapport over een oudere + versie waarschijnlijk alleen tot het advies van een ontwikkelaar + die u adviseert om naar een ondersteunde versie bij te werken om + te kijken of het probleem nog steeds voorkomt. Het Security + Officer Team onderhoudt de lijst + van ondersteunde versies. - If the problem is in a port, note that you must first - upgrade to the latest version of the Ports Collection and see - if the problem still applies. Due to the rapid pace of changes - in these applications, it is infeasible for &os; to support - anything other than the absolute latest versions, and problems - with older version of applications simply cannot be fixed. + Als het probleem in een port zit, moet u uw Portscollectie + eerst naar de laatste versie bijwerken en kijken of het probleem + nog steeds van toepassing is. Wegens de hoge snelheid waarmee + deze applicaties veranderen, is het onhaalbaar voor &os; om andere + dan de allernieuwste versies te ondersteunen, en problemen met + oudere versies van applicaties kunnen simpelweg niet worden + opgelost.
    From owner-p4-projects@FreeBSD.ORG Sat Dec 20 05:47:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE5571065678; Sat, 20 Dec 2008 05:47: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 85670106564A for ; Sat, 20 Dec 2008 05:47:46 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 732408FC12 for ; Sat, 20 Dec 2008 05:47:46 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK5lk7n056598 for ; Sat, 20 Dec 2008 05:47:46 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK5lkvx056596 for perforce@freebsd.org; Sat, 20 Dec 2008 05:47:46 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 05:47:46 GMT Message-Id: <200812200547.mBK5lkvx056596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 05:47:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=155039 Change 155039 by weongyo@weongyo_ws on 2008/12/20 05:47:44 prevent sleeping without a lock Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#30 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#30 (text+ko) ==== @@ -483,6 +483,8 @@ usb_config_descriptor_t cd, *cdp; usbd_status status; + mtx_lock(&Giant); + urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; if (ctldesc->ucd_desctype == UDESC_CONFIG) { @@ -491,6 +493,7 @@ &cd); if (status != USBD_NORMAL_COMPLETION) { ctldesc->ucd_trans_buflen = 0; + mtx_unlock(&Giant); return usbd_usb2urb(status); } /* Get the full descriptor. Try a few times for slow devices. */ @@ -505,6 +508,7 @@ } if (status != USBD_NORMAL_COMPLETION) { ctldesc->ucd_trans_buflen = 0; + mtx_unlock(&Giant); return usbd_usb2urb(status); } @@ -534,11 +538,15 @@ if (status != USBD_NORMAL_COMPLETION) { ctldesc->ucd_trans_buflen = 0; + mtx_unlock(&Giant); return usbd_usb2urb(status); } ctldesc->ucd_trans_buflen = actlen; ip->irp_iostat.isb_info = actlen; + + mtx_unlock(&Giant); + return (USBD_STATUS_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Sat Dec 20 06:09:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A68FC1065676; Sat, 20 Dec 2008 06:09: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 6ABEE106564A for ; Sat, 20 Dec 2008 06:09:08 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 581258FC13 for ; Sat, 20 Dec 2008 06:09:08 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK6983O059155 for ; Sat, 20 Dec 2008 06:09:08 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK698CP059153 for perforce@freebsd.org; Sat, 20 Dec 2008 06:09:08 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 06:09:08 GMT Message-Id: <200812200609.mBK698CP059153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 06:09:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=155041 Change 155041 by weongyo@weongyo_ws on 2008/12/20 06:08:47 discard a policy which didn't try to halt after attaching the device. From now the ndisulator try to call the halt function after attaching and it'll re-initialize the device wheh it's UPed. Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#12 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#12 (text+ko) ==== @@ -96,11 +96,6 @@ #define DPRINTF(x) #endif -SYSCTL_DECL(_hw_ndisusb); -int ndisusb_reset = 0; -SYSCTL_INT(_hw_ndisusb, OID_AUTO, reset, CTLFLAG_RW, &ndisusb_reset, 0, - "Reset NDIS USB driver when it's UPed"); - MODULE_DEPEND(ndis, ether, 1, 1, 1); MODULE_DEPEND(ndis, wlan, 1, 1, 1); MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); @@ -951,15 +946,8 @@ return (error); } - /* - * In cases of USB devices, it looks that many NDIS drivers doesn't - * work after calling HALT handler. Many drivers drive theirself to - * the kernel panic at ndis_init() if we halt NIC. Thus we prefer - * not to halt NIC in USB cases. - */ - if (sc->ndis_iftype != PNPBus) - /* We're done talking to the NIC for now; halt it. */ - ndis_halt_nic(sc); + /* We're done talking to the NIC for now; halt it. */ + ndis_halt_nic(sc); return(error); } @@ -1975,14 +1963,9 @@ */ ndis_stop(sc); - if (sc->ndis_iftype == PCIBus || sc->ndis_iftype == PCMCIABus) { - error = ndis_init_nic(sc); - if (error != 0) - return; - } else if (ndisusb_reset != 0) { - /* Reset USB NIC using NDIS's reset handler. */ - ndis_reset_nic(sc); - } + error = ndis_init_nic(sc); + if (error != 0) + return; /* Init our MAC address */ @@ -3190,14 +3173,8 @@ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); NDIS_UNLOCK(sc); - /* - * If we're detaching NIC we should call ndis_halt_nic() even if the - * driver is for USB. - */ - if (sc->ndis_iftype != PNPBus || - (sc->ndis_iftype == PNPBus && - sc->ndisusb_status & NDISUSB_STATUS_DETACH)) - ndis_halt_nic(sc); + /* If we're detaching NIC we should call ndis_halt_nic(). */ + ndis_halt_nic(sc); NDIS_LOCK(sc); for (i = 0; i < NDIS_EVENTS; i++) { From owner-p4-projects@FreeBSD.ORG Sat Dec 20 06:18:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B02B1065679; Sat, 20 Dec 2008 06:18: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 D2C631065674 for ; Sat, 20 Dec 2008 06:18:17 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C07188FC08 for ; Sat, 20 Dec 2008 06:18:17 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK6IHKY059911 for ; Sat, 20 Dec 2008 06:18:17 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK6IHel059909 for perforce@freebsd.org; Sat, 20 Dec 2008 06:18:17 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 06:18:17 GMT Message-Id: <200812200618.mBK6IHel059909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 06:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155042 Change 155042 by weongyo@weongyo_ws on 2008/12/20 06:18:15 sometimes usbd_set_interface() could return USBD_IN_USE. It's not a error. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#31 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#31 (text+ko) ==== @@ -610,7 +610,7 @@ } ret = usbd_set_interface(iface, intf->uii_altset); - if (ret != USBD_NORMAL_COMPLETION) { + if (ret != USBD_NORMAL_COMPLETION && ret != USBD_IN_USE) { device_printf(dev, "setting alternate interface failed: %s\n", usbd_errstr(ret)); From owner-p4-projects@FreeBSD.ORG Sat Dec 20 07:26:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D13D51065674; Sat, 20 Dec 2008 07:26: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 8AAC5106564A for ; Sat, 20 Dec 2008 07:26:27 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 775BC8FC1B for ; Sat, 20 Dec 2008 07:26:27 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK7QRQB067826 for ; Sat, 20 Dec 2008 07:26:27 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK7QRuL067824 for perforce@freebsd.org; Sat, 20 Dec 2008 07:26:27 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 07:26:27 GMT Message-Id: <200812200726.mBK7QRuL067824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 07:26:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=155043 Change 155043 by weongyo@weongyo_ws on 2008/12/20 07:26:23 get rid of special handlings of the Interrupt IN pipe that the code is unified with the code which handles Interrupt OUT, Bulk IN/OUT. With this routines to manage are simplified and become less errors. Moreover some hacks due to abnormal behaviors of usbd_open_pipe_intr() are removed so I think the code becomes more easy to understand. Now some problems are fixed that it's occured when it try to halt th device. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#32 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#32 (text+ko) ==== @@ -75,7 +75,6 @@ static driver_object usbd_driver; static int32_t usbd_func_bulkintr(irp *); -static int32_t usbd_func_bulkintr_iin(irp *); static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_getdesc(irp *); @@ -85,8 +84,6 @@ static usbd_status usbd_init_ndispipe(irp *, usb_endpoint_descriptor_t *); static usbd_xfer_handle usbd_init_ndisxfer(irp *, usb_endpoint_descriptor_t *, void *, uint32_t); -static void usbd_intr(usbd_xfer_handle, usbd_private_handle, - usbd_status); static int32_t usbd_iodispatch(device_object *, irp *); static int32_t usbd_ioinvalid(device_object *, irp *); static int32_t usbd_pnp(device_object *, irp *); @@ -95,8 +92,6 @@ uint32_t, io_stack_location *); static void usbd_irpcancel(device_object *, irp *); static void usbd_irpcancel_cb(void *); -static void usbd_irpcancel_iin(device_object *, irp *); -static void usbd_irpcancel_iin_cb(void *); static int32_t usbd_submit_urb(irp *); static int32_t usbd_urb2nt(int32_t); static void usbd_xfereof(usbd_xfer_handle, usbd_private_handle, @@ -119,8 +114,6 @@ static usb_interface_descriptor_t *USBD_ParseConfigurationDescriptor( usb_config_descriptor_t *, uint8_t, uint8_t); -#define USBD_STATUS_IIN_ERROR 0x1 -static int usbd_iin_error; /* * We need to wrap these functions because these need `context switch' from * Windows to UNIX before it's called. @@ -130,7 +123,6 @@ static funcptr usbd_pnp_wrap; static funcptr usbd_power_wrap; static funcptr usbd_irpcancel_wrap; -static funcptr usbd_irpcancel_iin_wrap; static funcptr usbd_xfertask_wrap; int @@ -157,8 +149,6 @@ (funcptr *)&usbd_power_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_irpcancel, (funcptr *)&usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL); - windrv_wrap((funcptr)usbd_irpcancel_iin, - (funcptr *)&usbd_irpcancel_iin_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_xfertask, (funcptr *)&usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL); @@ -199,7 +189,6 @@ windrv_unwrap(usbd_pnp_wrap); windrv_unwrap(usbd_power_wrap); windrv_unwrap(usbd_irpcancel_wrap); - windrv_unwrap(usbd_irpcancel_iin_wrap); windrv_unwrap(usbd_xfertask_wrap); free(usbd_driver.dro_drivername.us_buf, M_DEVBUF); @@ -722,126 +711,6 @@ return usbd_usb2urb(status); } -static void -usbd_irpcancel_iin_cb(priv) - void *priv; -{ - struct ndisusb_cancel *nc = priv; - struct ndis_softc *sc = device_get_softc(nc->dev); - usbd_status status; - - if (sc->ndisusb_status & NDISUSB_STATUS_DETACH) - goto exit; - - status = usbd_abort_pipe(sc->ndisusb_ep[NDISUSB_ENDPT_IIN]); - if (status != USBD_NORMAL_COMPLETION) - device_printf(nc->dev, "IIN can't be canceld"); -exit: - free(nc, M_USBDEV); -} - -static void -usbd_irpcancel_iin(dobj, ip) - device_object *dobj; - irp *ip; -{ - device_t dev = IRP_NDIS_DEV(ip); - struct ndisusb_cancel *nc; - struct usb_attach_arg *uaa = device_get_ivars(dev); - - /* XXX see the description of usbd_irpcancel() */ - nc = malloc(sizeof(struct ndisusb_cancel), M_USBDEV, M_NOWAIT | M_ZERO); - if (nc == NULL) { - ip->irp_cancel = FALSE; - IoReleaseCancelSpinLock(ip->irp_cancelirql); - return; - } - - nc->dev = dev; - nc->xfer = IRP_NDISUSB_XFER(ip); - usb_init_task(&nc->task, usbd_irpcancel_iin_cb, nc); - - IRP_NDISUSB_XFER(ip) = NULL; - usb_add_task(uaa->device, &nc->task, USB_TASKQ_DRIVER); - - ip->irp_cancel = TRUE; - IoReleaseCancelSpinLock(ip->irp_cancelirql); -} - -static int32_t -usbd_func_bulkintr_iin(ip) - irp *ip; -{ - char *iin_buf; - device_t dev = IRP_NDIS_DEV(ip); - struct ndis_softc *sc = device_get_softc(dev); - struct usb_attach_arg *uaa = device_get_ivars(dev); - struct usbd_urb_bulk_or_intr_transfer *ubi; - union usbd_urb *urb; - usb_endpoint_descriptor_t *ep; - usbd_interface_handle iface; - usbd_status status; -#ifdef NDISUSB_DEBUG - static irp *debug_irp = NULL; -#endif - - urb = usbd_geturb(ip); - - if (sc->ndisusb_ep[NDISUSB_ENDPT_IIN] != NULL) { -#ifdef NDISUSB_DEBUG - if (debug_irp != NULL && debug_irp != ip) - device_printf(dev, - "trying to re-initialize IIN with other IRP\n"); -#endif - /* don't need to open the NDISUSB_ENDPT_IIN pipe again. */ - USBD_URB_STATUS(urb) = USBD_STATUS_PENDING; - return (USBD_STATUS_PENDING); - } - - status = usbd_device2interface_handle(uaa->device, NDISUSB_IFACE_INDEX, - &iface); - if (status != USBD_NORMAL_COMPLETION) { - device_printf(dev, "could not get interface handle\n"); - return usbd_usb2urb(status); - } - - ubi = &urb->uu_bulkintr; - ep = ubi->ubi_epdesc; - - if (ubi->ubi_trans_buf != NULL && - MmIsAddressValid(ubi->ubi_trans_buf) == FALSE && - ubi->ubi_trans_buflen > 0) { - iin_buf = malloc(ubi->ubi_trans_buflen, M_USBDEV, - M_NOWAIT | M_ZERO); - if (iin_buf == NULL) - return USBD_STATUS_NO_MEMORY; - - sc->ndisusb_iin_buf = iin_buf; - } else - iin_buf = ubi->ubi_trans_buf; - - status = usbd_open_pipe_intr(iface, ep->bEndpointAddress, - USBD_SHORT_XFER_OK, &sc->ndisusb_ep[NDISUSB_ENDPT_IIN], ip, iin_buf, - ubi->ubi_trans_buflen, usbd_intr, USBD_DEFAULT_INTERVAL); - if (status != USBD_NORMAL_COMPLETION) { - device_printf(dev, "open IIN pipe failed: %s\n", - usbd_errstr(status)); - return usbd_usb2urb(status); - } - -#ifdef NDISUSB_DEBUG - debug_irp = ip; -#endif - - IoAcquireCancelSpinLock(&ip->irp_cancelirql); - ip->irp_iostat.isb_status = STATUS_SUCCESS; - ip->irp_cancelfunc = (cancel_func)usbd_irpcancel_iin_wrap; - USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; - IoReleaseCancelSpinLock(ip->irp_cancelirql); - - return usbd_usb2urb(status); -} - static usbd_status usbd_init_ndispipe(ip, ep) irp *ip; @@ -860,13 +729,6 @@ return (status); } - if (!(UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN || - UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_OUT)) { - device_printf(dev, "unexpected direction 0x%x\n", - UE_GET_DIR(ep->bEndpointAddress)); - return (USBD_INVAL); - } - switch (UE_GET_XFERTYPE(ep->bmAttributes)) { case UE_BULK: if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) { @@ -888,9 +750,16 @@ USBD_EXCLUSIVE_USE, &sc->ndisusb_ep[NDISUSB_ENDPT_BOUT]); break; case UE_INTERRUPT: - if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) - /* incorrect call. */ - return (USBD_INVAL); + if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) { + /* Interrupt IN. */ + if (sc->ndisusb_ep[NDISUSB_ENDPT_IIN] != NULL) + return (USBD_NORMAL_COMPLETION); + + status = usbd_open_pipe(iface, ep->bEndpointAddress, + USBD_EXCLUSIVE_USE, + &sc->ndisusb_ep[NDISUSB_ENDPT_IIN]); + break; + } /* Interrupt OUT. */ if (sc->ndisusb_ep[NDISUSB_ENDPT_IOUT] != NULL) @@ -1043,42 +912,6 @@ } static void -usbd_intr(xfer, priv, status) - usbd_xfer_handle xfer; - usbd_private_handle priv; - usbd_status status; -{ - int set = 0; - - /* - * We should handle the interrupt IN pipe specially. For a example, - * ZD1211B NDIS driver uses the interrupt IN pipe so we opens its pipe - * using usbd_open_pipe_intr(). In a case of we forcibly plug out - * the ZD1211B USB adapter then firstly usbd_open_pipe_intr() calls our - * callback function whose the value of the status is USBD_IOERROR. - * As a next return, sometimes it returns USBD_CANCELLED. The problem - * is that at this case when we get USBD_IOERROR status we try to free - * IRP related with the interrupt IN pipe. As next if we get - * USBD_CANCELLED, in the previous we tried to free again so it causes - * a page fault. I don't know why the USB framework reports errors - * twice. To solve this problem we only handle first error. - * - * XXX I don't want to use a global variable and don't like this like - * a hack but no way to pass `sc' safely because `priv' can be a pointer - * which already be freed. - */ - if (status == USBD_NORMAL_COMPLETION) - usbd_iin_error &= ~USBD_STATUS_IIN_ERROR; - if (status == USBD_IOERROR) { - usbd_iin_error |= USBD_STATUS_IIN_ERROR; - set = 1; - } - - if ((!(usbd_iin_error & USBD_STATUS_IIN_ERROR)) || set == 1) - usbd_xferadd(xfer, priv, status, 0); -} - -static void usbd_xfereof(xfer, priv, status) usbd_xfer_handle xfer; usbd_private_handle priv; @@ -1209,18 +1042,6 @@ if (ep == NULL) return (USBD_STATUS_INVALID_PIPE_HANDLE); - if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_INTERRUPT && - UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) { - /* - * when we handle Interrupt IN we should proceed this unlike - * what Windows does because in FreeBSD we normally try to use - * usbd_open_pipe_intr() and it will never be called again after - * setting. However, in cases of Windows, it looks that it try - * to re-set whenever it's completion routine is called. - */ - return usbd_func_bulkintr_iin(ip); - } - status = usbd_init_ndispipe(ip, ep); if (status != USBD_NORMAL_COMPLETION) return usbd_usb2urb(status); @@ -1232,35 +1053,37 @@ return (USBD_STATUS_NO_MEMORY); } + if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) { + xfer->flags |= USBD_SHORT_XFER_OK; + if (!(ubi->ubi_trans_flags & USBD_SHORT_TRANSFER_OK)) + xfer->flags &= ~USBD_SHORT_XFER_OK; + } + if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_BULK) { - if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) { + if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) /* RX (bulk IN) */ - xfer->flags |= USBD_SHORT_XFER_OK; - if (!(ubi->ubi_trans_flags & USBD_SHORT_TRANSFER_OK)) - xfer->flags &= ~USBD_SHORT_XFER_OK; - usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_BIN], ip, xfer->buffer, xfer->length, xfer->flags, USBD_NO_TIMEOUT, usbd_xfereof); - } else { + else { /* TX (bulk OUT) */ xfer->flags |= USBD_NO_COPY; - + usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_BOUT], ip, xfer->buffer, xfer->length, xfer->flags, NDISUSB_TX_TIMEOUT, usbd_xfereof); } } else { - /* interrupt OUT */ - KASSERT(UE_GET_XFERTYPE(ep->bmAttributes) == UE_INTERRUPT && - UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_OUT, - ("unexpected endpoint xfertype 0x%x dir 0x%x", - UE_GET_XFERTYPE(ep->bmAttributes), - UE_GET_DIR(ep->bEndpointAddress))); - - usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_IOUT], - ip, xfer->buffer, xfer->length, xfer->flags, - NDISUSB_INTR_TIMEOUT, usbd_xfereof); + if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) + /* Interrupt IN */ + usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_IIN], + ip, xfer->buffer, xfer->length, xfer->flags, + USBD_NO_TIMEOUT, usbd_xfereof); + else + /* Interrupt OUT */ + usbd_setup_xfer(xfer, sc->ndisusb_ep[NDISUSB_ENDPT_IOUT], + ip, xfer->buffer, xfer->length, xfer->flags, + NDISUSB_INTR_TIMEOUT, usbd_xfereof); } /* we've done to setup xfer. Let's transfer it. */ From owner-p4-projects@FreeBSD.ORG Sat Dec 20 07:31:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14AFF1065675; Sat, 20 Dec 2008 07:31: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 CD30C106564A for ; Sat, 20 Dec 2008 07:31:32 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAEFC8FC0C for ; Sat, 20 Dec 2008 07:31:32 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK7VW8l068186 for ; Sat, 20 Dec 2008 07:31:32 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK7VWR8068184 for perforce@freebsd.org; Sat, 20 Dec 2008 07:31:32 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 07:31:32 GMT Message-Id: <200812200731.mBK7VWR8068184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 07:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=155044 Change 155044 by weongyo@weongyo_ws on 2008/12/20 07:30:38 no more need to distinguish whether the xfer should be freed or not. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#33 edit .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#8 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#33 (text+ko) ==== @@ -97,7 +97,7 @@ static void usbd_xfereof(usbd_xfer_handle, usbd_private_handle, usbd_status); static void usbd_xferadd(usbd_xfer_handle, usbd_private_handle, - usbd_status, uint8_t); + usbd_status); static void usbd_xfertask(device_object *, void *); static void dummy(void); @@ -881,11 +881,10 @@ } static void -usbd_xferadd(xfer, priv, status, freexfer) +usbd_xferadd(xfer, priv, status) usbd_xfer_handle xfer; usbd_private_handle priv; usbd_status status; - uint8_t freexfer; { irp *ip = priv; device_t dev = IRP_NDIS_DEV(ip); @@ -901,7 +900,6 @@ nx->nx_xfer = xfer; nx->nx_priv = priv; nx->nx_status = status; - nx->nx_freexfer = freexfer; KeAcquireSpinLock(&sc->ndisusb_xferlock, &irql); InsertTailList((&sc->ndisusb_xferlist), (&nx->nx_xferlist)); @@ -918,7 +916,7 @@ usbd_status status; { - usbd_xferadd(xfer, priv, status, 1); + usbd_xferadd(xfer, priv, status); } static void @@ -1013,8 +1011,7 @@ next: l = l->nle_flink; RemoveEntryList(&nx->nx_xferlist); - if (nx->nx_freexfer) - usbd_free_xfer(nx->nx_xfer); + usbd_free_xfer(nx->nx_xfer); free(nx, M_USBDEV); if (error) continue; ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#8 (text+ko) ==== @@ -121,7 +121,6 @@ usbd_xfer_handle nx_xfer; usbd_private_handle nx_priv; usbd_status nx_status; - uint8_t nx_freexfer; list_entry nx_xferlist; }; From owner-p4-projects@FreeBSD.ORG Sat Dec 20 07:38:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87B36106568A; Sat, 20 Dec 2008 07:38: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 3972E106567A for ; Sat, 20 Dec 2008 07:38:40 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26D278FC38 for ; Sat, 20 Dec 2008 07:38:40 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK7ceB8068731 for ; Sat, 20 Dec 2008 07:38:40 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK7ceJH068729 for perforce@freebsd.org; Sat, 20 Dec 2008 07:38:40 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 07:38:40 GMT Message-Id: <200812200738.mBK7ceJH068729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 07:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=155045 Change 155045 by weongyo@weongyo_ws on 2008/12/20 07:37:52 print a failed message if it failed to initiliaized the device. Without this we don't know that the device is initiliaized successfully when we try to up the device. Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#13 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#13 (text+ko) ==== @@ -1964,8 +1964,11 @@ ndis_stop(sc); error = ndis_init_nic(sc); - if (error != 0) + if (error != 0) { + device_printf(sc->ndis_dev, + "failed to initialize the device: %d\n", error); return; + } /* Init our MAC address */ From owner-p4-projects@FreeBSD.ORG Sat Dec 20 08:06:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61C4B1065675; Sat, 20 Dec 2008 08:06: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 25B191065673 for ; Sat, 20 Dec 2008 08:06:08 +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 129DE8FC14 for ; Sat, 20 Dec 2008 08:06:08 +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 mBK868sc072225 for ; Sat, 20 Dec 2008 08:06:08 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK867qb072223 for perforce@freebsd.org; Sat, 20 Dec 2008 08:06:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 08:06:07 GMT Message-Id: <200812200806.mBK867qb072223@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 155046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 08:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=155046 Change 155046 by pgj@kolbasz on 2008/12/20 08:05:24 Add Hungarian translation of chapter "See Also" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#2 (text+ko) ==== @@ -31,29 +31,34 @@ --> - See Also + Lásd még... - This document is deliberately not an exhaustive discussion of SGML, - the DTDs listed, and the FreeBSD Documentation Project. For more - information about these, you are encouraged to see the following web - sites. + Ez a dokumentum szándékosan nem törekszik az + SGML és az említett DTD-k, valamint a &os; + Dokumentációs Projekt részletes + bemutatására. Ezekrõl részletesebb + információkat az ebben a fejezetben + összegyûjtött hivatkozások mentén + kaphatunk. - The FreeBSD Documentation Project + &os; Dokumentációs Projekt - The FreeBSD - Documentation Project web pages + A &os; + Dokumentációs Projekt honlapja - The FreeBSD Handbook + A &os; + kézikönyv @@ -63,13 +68,15 @@ - The SGML/XML web - page, a comprehensive SGML resource + Az SGML/XML + honlapja, minden, ami SGML - + Gentle introduction to SGML + url="http://etext.virginia.edu/bin/tei-tocs?div=DIV1&id=SG">Könnyed + bevezetés az SGML használatába + (angolul) @@ -79,13 +86,13 @@ - The World Wide Web - Consortium + A World Wide Web + Consortium honlapja - The HTML 4.0 - specification + A HTML 4.0 + specifikációja @@ -95,32 +102,34 @@ - The DocBook - Technical Committee, maintainers of the DocBook DTD + DocBook + Mûszaki Bizottság, a DocBook DTD + karbantartói - DocBook: The Definitive - Guide, the online documentation for the DocBook - DTD. - + DocBook: The + Definitive Guide, a DocBook DTD interneten + olvasható dokumentációja - The DocBook Open - Repository contains DSSSL stylesheets and other resources - for people using DocBook. + Nyílt + DocBook Repository, különbözõ + DSSSL stíluslapok és egyéb + források a DocBook felhasználók + számára - The Linux Documentation Project + A Linux Dokumentációs Projekt - The Linux Documentation - Project web pages + A Linux + Dokumentációs Projekt honlapja From owner-p4-projects@FreeBSD.ORG Sat Dec 20 08:11:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A33121065674; Sat, 20 Dec 2008 08:11:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67806106564A for ; Sat, 20 Dec 2008 08:11:13 +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 559248FC12 for ; Sat, 20 Dec 2008 08:11:13 +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 mBK8BDCR072628 for ; Sat, 20 Dec 2008 08:11:13 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK8BDO6072626 for perforce@freebsd.org; Sat, 20 Dec 2008 08:11:13 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 08:11:13 GMT Message-Id: <200812200811.mBK8BDO6072626@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 155047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 08:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=155047 Change 155047 by pgj@kolbasz on 2008/12/20 08:11:06 It seems I had to translate this (relatively easy) document alone... I am sad :( Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#4 (text+ko) ==== @@ -94,10 +94,7 @@ szakaszokat a címükben csillaggal jelöltük meg. - Fordítja és a - fordítást vezeti: &a.hu.pgj;. Várjuk - további fordítók - jelentkezését! + Fordította: &a.hu.pgj; From owner-p4-projects@FreeBSD.ORG Sat Dec 20 08:12:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E61BC1065675; Sat, 20 Dec 2008 08:12: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 AA8711065670 for ; Sat, 20 Dec 2008 08:12:14 +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 7F45C8FC1A for ; Sat, 20 Dec 2008 08:12:14 +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 mBK8CEHf072701 for ; Sat, 20 Dec 2008 08:12:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBK8CEOw072699 for perforce@freebsd.org; Sat, 20 Dec 2008 08:12:14 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 08:12:14 GMT Message-Id: <200812200812.mBK8CEOw072699@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 155048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 08:12:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=155048 Change 155048 by pgj@kolbasz on 2008/12/20 08:11:58 Just one fix Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#3 (text+ko) ==== @@ -124,7 +124,7 @@ - A Linux Dokumentációs Projekt + Linux Dokumentációs Projekt From owner-p4-projects@FreeBSD.ORG Sat Dec 20 10:45:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276201065675; Sat, 20 Dec 2008 10:45: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 DFE371065670 for ; Sat, 20 Dec 2008 10:45:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFBE08FC13 for ; Sat, 20 Dec 2008 10:45:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBKAjoDb002195 for ; Sat, 20 Dec 2008 10:45:50 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKAjo1e002193 for perforce@freebsd.org; Sat, 20 Dec 2008 10:45:50 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 20 Dec 2008 10:45:50 GMT Message-Id: <200812201045.mBKAjo1e002193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 10:45:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155052 Change 155052 by weongyo@weongyo_ws on 2008/12/20 10:45:43 introduce `ndisusb_halt' sysctl to control whether the ndisulator try to halt after attaching. This is needed to solve some NDIS USB driver's problems. For example ZyDAS 1211B NDIS driver doen't response against GET_CONFIG_DESCRIPTOR messages after halting; don't know it's NDIS driver's problem. Some NDIS drivers doesn't work for halting by unknown problems. Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#14 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#14 (text+ko) ==== @@ -96,6 +96,11 @@ #define DPRINTF(x) #endif +SYSCTL_DECL(_hw_ndisusb); +int ndisusb_halt = 1; +SYSCTL_INT(_hw_ndisusb, OID_AUTO, halt, CTLFLAG_RW, &ndisusb_halt, 0, + "Halt NDIS USB driver when it's attached"); + MODULE_DEPEND(ndis, ether, 1, 1, 1); MODULE_DEPEND(ndis, wlan, 1, 1, 1); MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); @@ -946,6 +951,9 @@ return (error); } + if (sc->ndis_iftype == PNPBus && ndisusb_halt == 0) + return (error); + /* We're done talking to the NIC for now; halt it. */ ndis_halt_nic(sc); @@ -1963,11 +1971,13 @@ */ ndis_stop(sc); - error = ndis_init_nic(sc); - if (error != 0) { - device_printf(sc->ndis_dev, - "failed to initialize the device: %d\n", error); - return; + if (!(sc->ndis_iftype == PNPBus && ndisusb_halt == 0)) { + error = ndis_init_nic(sc); + if (error != 0) { + device_printf(sc->ndis_dev, + "failed to initialize the device: %d\n", error); + return; + } } /* Init our MAC address */ @@ -3176,8 +3186,9 @@ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); NDIS_UNLOCK(sc); - /* If we're detaching NIC we should call ndis_halt_nic(). */ - ndis_halt_nic(sc); + if (!(sc->ndis_iftype == PNPBus && ndisusb_halt == 0) || + sc->ndisusb_status & NDISUSB_STATUS_DETACH) + ndis_halt_nic(sc); NDIS_LOCK(sc); for (i = 0; i < NDIS_EVENTS; i++) { From owner-p4-projects@FreeBSD.ORG Sat Dec 20 14:16:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69FC01065675; Sat, 20 Dec 2008 14:16: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 2C6CA106564A for ; Sat, 20 Dec 2008 14:16:24 +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 1CAA28FC08 for ; Sat, 20 Dec 2008 14:16:24 +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 mBKEGOXF038036 for ; Sat, 20 Dec 2008 14:16:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKEGOms038034 for perforce@freebsd.org; Sat, 20 Dec 2008 14:16:24 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 14:16:24 GMT Message-Id: <200812201416.mBKEGOms038034@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 155054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 14:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=155054 Change 155054 by pgj@kolbasz on 2008/12/20 14:15:25 Add Hungarian translation of appendix "Examples" from FDP Primer. Translation finished. Heh! Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#2 (text+ko) ==== @@ -31,34 +31,54 @@ --> - Examples + Példatár - This appendix contains example SGML files and command lines you can - use to convert them from one output format to another. If you have - successfully installed the Documentation Project tools then you should - be able to use these examples directly. + Ebben a függelékben bemutatunk néhány + minta SGML forrást, illetve azokat a parancsokat, amelyekkel + egyik formátumból a másikba lehet ezeket + alakítani. Amennyiben sikeresen telepítettük + rendszerünkre a Dokumentációs Projektben + használt segédprogramokat, akkor az itt megadott minta + forrásokat akár közvetlenül is fel tudjuk + használni. - These examples are not exhaustive—they do not contain all the - elements you might want to use, particularly in your document's front - matter. For more examples of DocBook markup you should examine the SGML - source for this and other documents, available in the - CVSup doc collection, or - available online starting at - . + A mintáképp mellékelt források nem + fednek le mindent — nem tartalmazzák az összes + korábban ismertetett elemet, és + egyáltalán nem térnek ki a rövidebb + részek, például bevezetés, + elõszó, + köszönetnyilvánítás stb. + jelölésére. Ha konkrét + jelölési megoldásokra lenne + szükségünk, akkor kérjük le a + repositoryból a doc + CVSup gyûjteményt, és + nézzük át a benne szereplõ SGML + forrásokat, vagy böngésszük ezeket + közvetlenül a honlapon + keresztül. - To avoid confusion, these examples use the standard DocBook 4.1 DTD - rather than the FreeBSD extension. They also use the stock stylesheets - distributed by Norm Walsh, rather than any customizations made to those - stylesheets by the FreeBSD Documentation Project. This makes them more - useful as generic DocBook examples. + A félreértések elkerülése + végett ezek a példák a szabvány DocBook + 4.1 DTD szerint íródtak, mellõzik a &os; + kiterjesztéseit. Ugyanúgy nem + építkeznek a &os; Dokumentációs Projekt + által módosított stíluslapokra sem, + hanem a Norm Walsh eredetileg kiadott stíluslapjait + használják. Ennek köszönhetõen + általános DocBook mintáknak is + tekinthetõek. - DocBook <sgmltag>book</sgmltag> + DocBook könyv, a <sgmltag>book</sgmltag> elem DocBook <sgmltag>book</sgmltag> @@ -67,42 +87,43 @@ - An Example Book - + ]]>Könyvminta<![ CDATA [ + - Your first name - Your surname + ]]>Vezetéknév + ]]>Keresztnév -
    foo@example.com
    +
    ]]>ize@minta.hu
         - 2000 - Copyright string here + 2008 + ]]>A copyright szövege - If your book has an abstract then it should go here. + ]]>Ha tartozik a könyvhöz rövid tartalmi összefoglaló + (absztrakt), akkor azt ide írjuk.     - Preface + ]]>Elõszó<![ CDATA [ - Your book may have a preface, in which case it should be placed - here. + ]]>A könyvhöz tartozhat elõszó is, amelyet itt kell + szerepeltetnünk. - + - My first chapter + ]]>Elsõ fejezet<![ CDATA [ - This is the first chapter in my book. + ]]>Ez a könyv elsõ fejezetének tartalma. - My first section + ]]>Az elsõ szakasz<![ CDATA [ - This is the first section in my book. + ]]>Ez a könyv elsõ szakasza.     ]]> @@ -110,7 +131,7 @@     - DocBook <sgmltag>article</sgmltag> + DocBook cikk, az <sgmltag>article</sgmltag> elem DocBook <sgmltag>article</sgmltag> @@ -119,230 +140,301 @@
    - An example article + ]]>Cikkminta<![ CDATA [ - Your first name - Your surname + ]]>Vezetéknév + ]]>Keresztnév -
    foo@example.com
    +
    ize@minta.hu
         - 2000 - Copyright string here + 2008 + ]]>A copyright szövege - If your article has an abstract then it should go here. + ]]>Ha tartozik a cikkhez rövid tartalmi összefoglalás + (absztrakt), akkor annak ide kell kerülnie.     - My first section + ]]>Elsõ szakasz<![ CDATA [ - This is the first section in my article. + ]]>Ez a cikk elsõ szakasza. - My first sub-section + ]]>Elsõ alszakasz<![ CDATA [ - This is the first sub-section in my article. - + ]]>Ez a cikk elsõ alszakasza. +
    ]]>     - Producing formatted output + A formázott kimenet + elõállítása - This section assumes that you have installed the software listed in - the textproc/docproj port, either by hand, or by - using the port. Further, it is assumed that your software is installed - in subdirectories under /usr/local/, and the - directory where binaries have been installed is in your - PATH. Adjust the paths as necessary for your - system. + Ebben a szakaszban feltételezzük, hogy már + vagy kézzel vagy pedig a hozzátartozó port + segítségével telepítettük a + textproc/docproj portban szereplõ + segédeszközöket. Emellett továbbá + még feltesszük, hogy az összes eszközt a + /usr/local + könyvtár alá telepítettük és + a binárisok elérési útvonala + része a PATH környezeti + változónak. Amennyiben ezektõl a + feltételezésektõl valamilyen módon + eltértünk, akkor a példákat + értelemszerûen a saját környezetünkre + alkalmazva kell végrehajtani. - Using Jade + A Jade használata - Converting DocBook to HTML (one large file) - + DocBook forrás átalakítása + HTML formátumúra (egyetlen nagy + állomány) + &prompt.user; jade -V nochunks \ -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ -c /usr/local/share/sgml/docbook/catalog \ -c /usr/local/share/sgml/jade/catalog \ -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.sgml > file.html + -t sgml állomány.sgml > állomány.html - Specifies the nochunks parameter to the - stylesheets, forcing all output to be written to - STDOUT (using Norm Walsh's stylesheets). + A nochunks paramétert adja + át a stíluslapoknak és az + eredményt a szabványos kimenetre + irányítattja át (Norm Walsh + stíluslapjait használjuk). - Specifies the catalogs that Jade will need to process. - Three catalogs are required. The first is a catalog that - contains information about the DSSSL stylesheets. The second - contains information about the DocBook DTD. The third contains - information specific to Jade. + Megadjuk a Jade + által feldolgozandó katalógusokat. Itt + három katalógust kell megadni. Az elsõ + katalógus a DSSSL stíluslapok, a + második a DocBook DTD és a harmadik a + Jade számára + tartalmaz információkat. - Specifies the full path to the DSSSL stylesheet that Jade - will use when processing the document. + A Jade a dokumentum + feldolgozásához az itt megadott DSSSL + stíluslapot fogja felhasználni. - Instructs Jade to perform a - transformation from one DTD to another. In - this case, the input is being transformed from the DocBook DTD - to the HTML DTD. + A Jade itt kap + utasítást arra, hogy az egyik DTD-ból a + másikba alakítsa + át a dokumentumot. Ebben a + példában most a DocBook DTD-ból + alakítunk át a HTML DTD-ba. - Specifies the file that Jade should process, and redirects - output to the specified .html file. + Megadjuk a feldolgozandó + állományt a Jade + számára és + átirányítjuk a kimenetet egy + .html kiterjesztésû + állományba. - Converting DocBook to HTML (several small files) - + DocBook forrás átalakítása + HTML formátumúra (több kisebb + állomány) + &prompt.user; jade \ -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ -c /usr/local/share/sgml/docbook/catalog \ -c /usr/local/share/sgml/jade/catalog \ -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \ - -t sgml file.sgml + -t sgml állomány.sgml - Specifies the catalogs that Jade will need to process. - Three catalogs are required. The first is a catalog that - contains information about the DSSSL stylesheets. The second - contains information about the DocBook DTD. The third contains - information specific to Jade. + Megadjuk a Jade + által feldolgozandó katalógusokat. Itt + három katalógust kell megadni. Az elsõ + katalógus a DSSSL stíluslapok, a + második a DocBook DTD és a harmadik a + Jade számára + tartalmaz információkat. - Specifies the full path to the DSSSL stylesheet that Jade - will use when processing the document. + A Jade a dokumentum + feldolgozásához az itt megadott DSSSL + stíluslapot fogja felhasználni. - Instructs Jade to perform a - transformation from one DTD to another. In - this case, the input is being transformed from the DocBook DTD - to the HTML DTD. + A Jade itt kap + utasítást arra, hogy az egyik DTD-ból a + másikba alakítsa + át a dokumentumot. Ebben a + példában most a DocBook DTD-ból + alakítunk át a HTML DTD-ba. - Specifies the file that Jade should process. The - stylesheets determine how the individual HTML files will be - named, and the name of the root file (i.e., the - one that contains the start of the document. + Megadjuk a feldolgozandó + állományt a Jade + számára. A stíluslap fogja majd + eldönteni, hogy mi legyen a neve a menet közben + keletkezõ egyes HTML állományoknak, + illetve a gyökérnek (ez az az + állomány, ahonnan a dokumentum + kezdõdik). - This example may still only generate one HTML file, depending on - the structure of the document you are processing, and the - stylesheet's rules for splitting output. + Elõfordulhat, hogy ez a parancs szintén csak + egyetlen HTML állományt generál. Ez + függ a feldolgozandó dokumentum + szerkezetétõl és a stíluslap + feldarabolást vezérlõ + szabályaitól. - Converting DocBook to Postscript + DocBook forrás átalakítása + Postscript formátumúra - The source SGML file must be converted to a &tex; file. + Az SGML forrást &tex; + állománnyá akarjuk alakítani. - &prompt.user; jade -Vtex-backend \ + &prompt.user; jade -V tex-backend \ -c /usr/local/share/sgml/docbook/dsssl/modular/catalog \ -c /usr/local/share/sgml/docbook/catalog \ -c /usr/local/share/sgml/jade/catalog \ -d /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl \ - -t tex file.sgml + -t tex állomány.sgml - Customizes the stylesheets to use various options - specific to producing output for &tex;. + Felparaméterezzük a stíluslapot a + &tex; formátumú kimenet + elõállításához. - + - Specifies the catalogs that Jade will need to process. Three - catalogs are required. The first is a catalog that contains - information about the DSSSL stylesheets. The second contains - information about the DocBook DTD. The third contains - information specific to Jade. + Megadjuk a Jade + által feldolgozandó katalógusokat. Itt + három katalógust kell megadni. Az elsõ + katalógus a DSSSL stíluslapok, a + második a DocBook DTD és a harmadik a + Jade számára + tartalmaz információkat. - Specifies the full path to the DSSSL stylesheet that - Jade will use when processing the document. + A Jade a dokumentum + feldolgozásához az itt megadott DSSSL + stíluslapot fogja felhasználni. - Instructs Jade to convert the output to &tex;. + Megadjuk a Jade + számára, hogy &tex; formátumú + kimenetet készítsen. - The generated .tex file must now be run - through tex, specifying the - &jadetex macro package. - - &prompt.user; tex "&jadetex" file.tex + Az így keletkezõ .tex + kiterjesztésû állomány aztán a + &jadetex makrócsomaggal + együtt átadható bemenetként a + tex parancsnak. + + &prompt.user; tex "&jadetex" állomány.tex + + A tex parancsot + legalább háromszor le kell + futtatni. Elõször feldolgozza a dokumentumot, + és szétválogatja az egyes részeit, + hogy meg tudja állapítani részeit + hivatkoztuk valahonnan máshonnan, hogyan indexelje + stb. + + Ha ebben a fázbisban különbözõ + figyelmeztetéseket látunk, mint + például LaTeX Warning: Reference + `136' on page 5 undefined on input line 728., + akkor még ilyenkor ne foglalkozzunk + különösebben velük. + + A második futtatás során újra + feldolgozza a dokumentumot a korábbi + feldolgozásból származó bizonyos + elõismeretek (például a dokumentum + oldalszámának) alapján. Ekkor az indexek + és a kereszthivatkozások már gond + nélkül feloldhatóak. - You have to run tex at - least three times. The first run processes the - document, and determines areas of the document which are referenced - from other parts of the document, for use in indexing, and so - on. + A harmadik menetben elvégzi az utolsó + simításokat, amennyiben szükség van + rájuk. - Do not be alarmed if you see warning messages such as - LaTeX Warning: Reference `136' on page 5 undefined on input - line 728. at this point. - - The second run reprocesses the document now that certain pieces - of information are known (such as the document's page length). This - allows index entries and other cross-references to be fixed - up. + Ebben a fázisban egy + állomány.dvi + alakú eredményt kapunk. - The third pass performs any final cleanup necessary. - - The output from this stage will be - file.dvi. - - Finally, run dvips to convert the - .dvi file to Postscript. + Végezetül az imént kapott + .dvi állomány Postscript + formátumúra alakításához + futtassuk le a dvips parancsot: - &prompt.user; dvips -o file.ps file.dvi + &prompt.user; dvips -o állomány.ps állomány.dvi - Converting DocBook to PDF + DocBook forrás átalakítása + PDF formátumúra - The first part of this process is identical to that when - converting DocBook to Postscript, using the same - jade command line (). + A feldolgozási folyamat elsõ része + hasonló ahhoz, amikor DocBook forrásból + akarunk Postscript formátumú + állományt készíteni, tehát + elegendõ a jade parancsot az + elõbb megadott paraméterekkel meghívni + (lásd ). - When the .tex file has been generated you - run pdfTeX. However, use the &pdfjadetex macro package - instead. + Amikor viszont megkaptuk a .tex + állományt, akkor a + pdfTeX programot futtassuk le + rá. Ügyeljünk arra, hogy ekkor már a + &pdfjadetex makrócsomagot kell + használnunk: - &prompt.user; pdftex "&pdfjadetex" file.tex + &prompt.user; pdftex "&pdfjadetex" állomány.tex - Again, run this command three times. + Ebben az esetben is háromszor kell lefuttatnunk a + parancsot. - This will generate - file.pdf, which does - not need to be processed any further. + Ennek eredményeképpen aztán + végül elõáll egy további + feldolgozást már nem igénylõ + állomány.pdf + állomány. From owner-p4-projects@FreeBSD.ORG Sat Dec 20 15:32:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E0EA1065674; Sat, 20 Dec 2008 15:32: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 DA5751065677 for ; Sat, 20 Dec 2008 15:32:51 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C83998FC17 for ; Sat, 20 Dec 2008 15:32:51 +0000 (UTC) (envelope-from bz@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 mBKFWpdR046888 for ; Sat, 20 Dec 2008 15:32:51 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKFWjJD046880 for perforce@freebsd.org; Sat, 20 Dec 2008 15:32:45 GMT (envelope-from bz@freebsd.org) Date: Sat, 20 Dec 2008 15:32:45 GMT Message-Id: <200812201532.mBKFWjJD046880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 155056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 15:32:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=155056 Change 155056 by bz@bz_dumpster on 2008/12/20 15:32:44 IFC @155055 Affected files ... .. //depot/projects/s390/COPYRIGHT#5 integrate .. //depot/projects/s390/Makefile#16 integrate .. //depot/projects/s390/Makefile.inc1#26 integrate .. //depot/projects/s390/ObsoleteFiles.inc#6 integrate .. //depot/projects/s390/UPDATING#19 integrate .. //depot/projects/s390/bin/df/df.1#7 integrate .. //depot/projects/s390/bin/df/df.c#10 integrate .. //depot/projects/s390/bin/ps/print.c#11 integrate .. //depot/projects/s390/bin/sh/eval.c#8 integrate .. //depot/projects/s390/bin/sh/exec.c#8 integrate .. //depot/projects/s390/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/s390/cddl/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/s390/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/s390/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/s390/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/s390/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/s390/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/s390/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/s390/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/s390/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/s390/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/s390/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/s390/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/s390/contrib/binutils/bfd/config.bfd#6 integrate .. //depot/projects/s390/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/s390/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/s390/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/s390/contrib/ipfilter/ipsend/44arp.c#5 integrate .. //depot/projects/s390/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/s390/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/s390/contrib/ncurses/FREEBSD-vendor#2 delete .. //depot/projects/s390/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/s390/contrib/ncurses/MANIFEST#3 integrate .. //depot/projects/s390/contrib/ncurses/NEWS#3 integrate .. //depot/projects/s390/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/s390/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/s390/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/s390/contrib/ncurses/config.guess#3 integrate .. //depot/projects/s390/contrib/ncurses/config.sub#3 integrate .. //depot/projects/s390/contrib/ncurses/configure#3 integrate .. //depot/projects/s390/contrib/ncurses/configure.in#3 integrate .. //depot/projects/s390/contrib/ncurses/dist.mk#3 integrate .. //depot/projects/s390/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/s390/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/s390/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/s390/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/s390/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/s390/contrib/ncurses/include/MKterm.h.awk.in#3 integrate .. //depot/projects/s390/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/s390/contrib/ncurses/include/curses.h.in#3 integrate .. //depot/projects/s390/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/s390/contrib/ncurses/include/nc_alloc.h#3 integrate .. //depot/projects/s390/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/s390/contrib/ncurses/include/ncurses_defs#3 integrate .. //depot/projects/s390/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/s390/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/s390/contrib/ncurses/man/curs_terminfo.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/curs_util.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/form_driver.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/man_db.renames#3 integrate .. //depot/projects/s390/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/menu_driver.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/man/ncurses.3x#3 integrate .. //depot/projects/s390/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/s390/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/s390/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/s390/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/s390/contrib/ncurses/misc/terminfo.src#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/Makefile.in#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/MKkeyname.awk#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/MKlib_gen.sh#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/MKunctrl.awk#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_mouse.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_newterm.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_newwin.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_screen.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_set_term.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/resizeterm.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/tries.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/llib-lncurses#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_hash.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_acs.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#4 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_raw.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_setup.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_termcap.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_tparm.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_tputs.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/name_match.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/parse_entry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tinfo/write_entry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_traceatr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_tracebits.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_tracechr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_tracedmp.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/lib_tracemse.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/varargs.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tty/lib_mvcur.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#3 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/s390/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/s390/contrib/ncurses/panel/p_new.c#3 integrate .. //depot/projects/s390/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/Makefile.in#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/dump_entry.h#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/infocmp.c#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/progs.priv.h#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/tic.c#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/toe.c#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/tput.c#3 integrate .. //depot/projects/s390/contrib/ncurses/progs/tset.c#3 integrate .. //depot/projects/s390/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/s390/contrib/netcat/nc.1#4 integrate .. //depot/projects/s390/contrib/netcat/netcat.c#4 integrate .. //depot/projects/s390/contrib/openbsm/CREDITS#1 branch .. //depot/projects/s390/contrib/openbsm/HISTORY#3 delete .. //depot/projects/s390/contrib/openbsm/INSTALL#1 branch .. //depot/projects/s390/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/s390/contrib/openbsm/Makefile.am#3 integrate .. //depot/projects/s390/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/NEWS#1 branch .. //depot/projects/s390/contrib/openbsm/README#3 integrate .. //depot/projects/s390/contrib/openbsm/TODO#3 integrate .. //depot/projects/s390/contrib/openbsm/VERSION#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/s390/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/s390/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/praudit/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/s390/contrib/openbsm/bsm/Makefile.am#3 integrate .. //depot/projects/s390/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/s390/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/s390/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/s390/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/s390/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/s390/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/s390/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/s390/contrib/openbsm/configure#3 integrate .. //depot/projects/s390/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/s390/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/Makefile.am#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_free_token.3#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_token.3#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/s390/contrib/openbsm/man/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/s390/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/getaudit.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/getauid.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/setaudit.2#3 integrate .. //depot/projects/s390/contrib/openbsm/man/setauid.2#3 integrate .. //depot/projects/s390/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/s390/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/s390/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/s390/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/s390/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/s390/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/s390/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/s390/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/s390/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/s390/etc/Makefile#18 integrate .. //depot/projects/s390/etc/devd.conf#11 integrate .. //depot/projects/s390/etc/devd/Makefile#1 branch .. //depot/projects/s390/etc/devd/asus.conf#1 branch .. //depot/projects/s390/etc/mtree/BSD.include.dist#13 integrate .. //depot/projects/s390/etc/mtree/BSD.root.dist#10 integrate .. //depot/projects/s390/etc/newsyslog.conf#9 integrate .. //depot/projects/s390/etc/rc.d/defaultroute#2 integrate .. //depot/projects/s390/etc/regdomain.xml#2 integrate .. //depot/projects/s390/etc/syslog.conf#5 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/s390/gnu/usr.bin/binutils/libbfd/bfd.h#4 integrate .. //depot/projects/s390/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/s390/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/s390/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/s390/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/s390/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/s390/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/s390/gnu/usr.bin/groff/tmac/mdoc.local#11 integrate .. //depot/projects/s390/gnu/usr.bin/sort/config.h#6 integrate .. //depot/projects/s390/include/Makefile#15 integrate .. //depot/projects/s390/include/arpa/nameser.h#4 integrate .. //depot/projects/s390/include/resolv.h#7 integrate .. //depot/projects/s390/include/string.h#7 integrate .. //depot/projects/s390/include/utmp.h#2 integrate .. //depot/projects/s390/kerberos5/include/config.h#7 integrate .. //depot/projects/s390/lib/Makefile#15 integrate .. //depot/projects/s390/lib/bind/bind/port_after.h#4 integrate .. //depot/projects/s390/lib/libarchive/archive.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/s390/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/s390/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/s390/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/s390/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/s390/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/s390/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/s390/lib/libarchive/test/main.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/s390/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/s390/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/s390/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/s390/lib/libc/amd64/sys/Makefile.inc#6 integrate .. //depot/projects/s390/lib/libc/arm/sys/Makefile.inc#3 integrate .. //depot/projects/s390/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/s390/lib/libc/gen/dlfcn.c#8 integrate .. //depot/projects/s390/lib/libc/gen/getvfsbyname.3#5 integrate .. //depot/projects/s390/lib/libc/gen/times.3#3 integrate .. //depot/projects/s390/lib/libc/i386/sys/Makefile.inc#7 integrate .. //depot/projects/s390/lib/libc/i386/sys/pipe.S#4 integrate .. //depot/projects/s390/lib/libc/i386/sys/reboot.S#4 integrate .. //depot/projects/s390/lib/libc/i386/sys/setlogin.S#4 integrate .. //depot/projects/s390/lib/libc/ia64/sys/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/include/isc/eventlib.h#3 integrate .. //depot/projects/s390/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/s390/lib/libc/inet/inet_net_pton.c#3 integrate .. //depot/projects/s390/lib/libc/mips/sys/Makefile.inc#2 integrate .. //depot/projects/s390/lib/libc/net/rcmd.3#6 integrate .. //depot/projects/s390/lib/libc/powerpc/sys/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/resolv/res_debug.c#3 integrate .. //depot/projects/s390/lib/libc/resolv/res_mkquery.c#3 integrate .. //depot/projects/s390/lib/libc/resolv/res_query.c#3 integrate .. //depot/projects/s390/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/s390/lib/libc/sparc64/sys/Makefile.inc#5 integrate .. //depot/projects/s390/lib/libc/stdio/fread.c#6 integrate .. //depot/projects/s390/lib/libc/stdio/vfprintf.c#10 integrate .. //depot/projects/s390/lib/libc/stdio/vfwprintf.c#8 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/s390/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/s390/lib/libc/string/Symbol.map#4 integrate .. //depot/projects/s390/lib/libc/string/strdup.3#3 integrate .. //depot/projects/s390/lib/libc/string/strndup.c#1 branch .. //depot/projects/s390/lib/libc/string/strsep.3#6 integrate .. //depot/projects/s390/lib/libc/sys/cpuset_getaffinity.2#2 integrate .. //depot/projects/s390/lib/libc/sys/jail.2#7 integrate .. //depot/projects/s390/lib/libc/sys/pipe.2#6 integrate .. //depot/projects/s390/lib/libc/sys/recv.2#8 integrate .. //depot/projects/s390/lib/libc/sys/rename.2#7 integrate .. //depot/projects/s390/lib/libfetch/fetch.3#12 integrate .. //depot/projects/s390/lib/libfetch/fetch.c#5 integrate .. //depot/projects/s390/lib/libfetch/fetch.h#4 integrate .. //depot/projects/s390/lib/libfetch/http.c#10 integrate .. //depot/projects/s390/lib/libkvm/kvm_proc.c#10 integrate .. //depot/projects/s390/lib/libmagic/config.h#3 integrate .. //depot/projects/s390/lib/libmd/Makefile#5 integrate .. //depot/projects/s390/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/s390/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/s390/lib/libpmc/pmc.3#5 integrate .. //depot/projects/s390/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/s390/lib/libpmc/pmclog.c#4 integrate .. //depot/projects/s390/lib/libstand/bootp.c#3 integrate .. //depot/projects/s390/lib/libstand/if_ether.h#3 integrate .. //depot/projects/s390/lib/libstand/nfs.c#6 integrate .. //depot/projects/s390/lib/libstand/printf.c#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_fork.c#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/s390/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/s390/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/s390/lib/libutil/Makefile#8 integrate .. //depot/projects/s390/lib/libutil/gr_util.c#2 integrate .. //depot/projects/s390/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/s390/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/s390/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/s390/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/s390/lib/libutil/libutil.h#5 integrate .. //depot/projects/s390/lib/libutil/realhostname.c#6 integrate .. //depot/projects/s390/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/s390/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/s390/libexec/bootpd/rtmsg.c#4 integrate .. //depot/projects/s390/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld_lock.c#4 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld_lock.h#4 integrate .. //depot/projects/s390/libexec/telnetd/Makefile#6 integrate .. //depot/projects/s390/release/Makefile#23 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/s390/release/picobsd/tinyware/ns/ns.c#3 integrate .. //depot/projects/s390/sbin/atacontrol/atacontrol.8#9 integrate .. //depot/projects/s390/sbin/devd/devd.cc#11 integrate .. //depot/projects/s390/sbin/devd/devd.conf.5#7 integrate .. //depot/projects/s390/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/s390/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/s390/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/s390/sbin/geom/misc/subr.c#5 integrate .. //depot/projects/s390/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/s390/sbin/ifconfig/ifvlan.c#6 integrate .. //depot/projects/s390/sbin/ifconfig/regdomain.c#2 integrate .. //depot/projects/s390/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#16 integrate .. //depot/projects/s390/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/s390/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/config.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/s390/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/s390/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/s390/sbin/iscontrol/login.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/s390/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/s390/sbin/mount/mount.c#11 integrate .. //depot/projects/s390/sbin/mount/mount_fs.c#3 integrate .. //depot/projects/s390/sbin/mount_msdosfs/mount_msdosfs.c#7 integrate .. //depot/projects/s390/sbin/newfs/Makefile#4 integrate .. //depot/projects/s390/sbin/newfs/mkfs.c#11 integrate .. //depot/projects/s390/sbin/newfs/newfs.8#11 integrate .. //depot/projects/s390/sbin/newfs/newfs.c#10 integrate .. //depot/projects/s390/sbin/newfs/newfs.h#7 integrate .. //depot/projects/s390/sbin/newfs_msdos/newfs_msdos.8#5 integrate .. //depot/projects/s390/sbin/newfs_msdos/newfs_msdos.c#6 integrate .. //depot/projects/s390/sbin/route/route.c#8 integrate .. //depot/projects/s390/sbin/routed/table.c#4 integrate .. //depot/projects/s390/secure/usr.sbin/sshd/Makefile#11 integrate .. //depot/projects/s390/share/man/man4/Makefile#20 integrate .. //depot/projects/s390/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/s390/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/s390/share/man/man4/ale.4#1 branch .. //depot/projects/s390/share/man/man4/altq.4#5 integrate .. //depot/projects/s390/share/man/man4/ath_hal.4#4 integrate .. //depot/projects/s390/share/man/man4/bce.4#3 integrate .. //depot/projects/s390/share/man/man4/cxgb.4#2 integrate .. //depot/projects/s390/share/man/man4/ddb.4#7 integrate .. //depot/projects/s390/share/man/man4/fxp.4#10 integrate .. //depot/projects/s390/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/s390/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/s390/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/s390/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/s390/share/man/man4/miibus.4#6 integrate .. //depot/projects/s390/share/man/man4/route.4#4 integrate .. //depot/projects/s390/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/s390/share/man/man4/upgt.4#2 integrate .. //depot/projects/s390/share/man/man4/vlan.4#8 integrate .. //depot/projects/s390/share/man/man5/fstab.5#5 integrate .. //depot/projects/s390/share/man/man7/hier.7#13 integrate .. //depot/projects/s390/share/man/man7/ports.7#10 integrate .. //depot/projects/s390/share/man/man9/Makefile#14 integrate .. //depot/projects/s390/share/man/man9/VFS_SET.9#7 integrate .. //depot/projects/s390/share/man/man9/VOP_STRATEGY.9#5 integrate .. //depot/projects/s390/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/s390/share/man/man9/bus_dma.9#7 integrate .. //depot/projects/s390/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/s390/share/man/man9/ifnet.9#10 integrate .. //depot/projects/s390/share/man/man9/ktr.9#8 integrate .. //depot/projects/s390/share/man/man9/rtalloc.9#4 integrate .. //depot/projects/s390/share/man/man9/rtentry.9#5 integrate .. //depot/projects/s390/share/man/man9/style.9#11 integrate .. //depot/projects/s390/share/man/man9/vfs_mountedon.9#4 delete .. //depot/projects/s390/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/s390/share/misc/bsd-family-tree#14 integrate .. //depot/projects/s390/share/misc/committers-src.dot#2 integrate .. //depot/projects/s390/share/mk/bsd.libnames.mk#12 integrate .. //depot/projects/s390/sys/amd64/Makefile#2 integrate .. //depot/projects/s390/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/s390/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/s390/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/s390/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/s390/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/s390/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/s390/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/s390/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/s390/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/s390/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/s390/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/s390/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/s390/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/s390/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/s390/sys/amd64/include/elf.h#4 integrate .. //depot/projects/s390/sys/amd64/include/md_var.h#8 integrate .. //depot/projects/s390/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/s390/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/s390/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/s390/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/s390/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/s390/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/s390/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/s390/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/s390/sys/arm/at91/at91.c#4 integrate .. //depot/projects/s390/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/s390/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/s390/sys/arm/at91/at91board.h#1 branch .. //depot/projects/s390/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/s390/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/s390/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/s390/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/s390/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/s390/sys/arm/at91/files.at91#3 integrate .. //depot/projects/s390/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/s390/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/s390/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/s390/sys/arm/at91/kb920x_machdep.c#3 delete .. //depot/projects/s390/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/s390/sys/arm/at91/std.at91#3 integrate .. //depot/projects/s390/sys/arm/at91/std.bwct#1 branch .. //depot/projects/s390/sys/arm/at91/std.hl200#1 branch .. //depot/projects/s390/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/s390/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/s390/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/s390/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/s390/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/s390/sys/arm/conf/AVILA#3 integrate .. //depot/projects/s390/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/s390/sys/arm/conf/BWCT#3 integrate .. //depot/projects/s390/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/s390/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/s390/sys/arm/conf/CRB#3 integrate .. //depot/projects/s390/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/s390/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/s390/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/s390/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/s390/sys/arm/conf/EP80219#3 integrate .. //depot/projects/s390/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/s390/sys/arm/conf/HL200#3 integrate .. //depot/projects/s390/sys/arm/conf/KB920X#4 integrate .. //depot/projects/s390/sys/arm/conf/NSLU#3 integrate .. //depot/projects/s390/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/s390/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/s390/sys/arm/include/armreg.h#5 integrate .. //depot/projects/s390/sys/arm/include/atomic.h#5 integrate .. //depot/projects/s390/sys/arm/include/elf.h#5 integrate .. //depot/projects/s390/sys/arm/include/intr.h#4 integrate .. //depot/projects/s390/sys/arm/mv/common.c#2 integrate .. //depot/projects/s390/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/s390/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/s390/sys/arm/mv/files.mv#2 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/s390/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/s390/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/s390/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/s390/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/s390/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/s390/sys/arm/mv/obio.c#2 integrate .. //depot/projects/s390/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/s390/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/s390/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/s390/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/s390/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/s390/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/s390/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/s390/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/ixp435_ehci.c#1 branch .. //depot/projects/s390/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/s390/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/s390/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/s390/sys/boot/Makefile#12 integrate .. //depot/projects/s390/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/s390/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/s390/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/s390/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/s390/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/s390/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/s390/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/s390/sys/boot/common/bootstrap.h#7 integrate .. //depot/projects/s390/sys/boot/common/interp.c#3 integrate .. //depot/projects/s390/sys/boot/common/loader.8#13 integrate .. //depot/projects/s390/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/s390/sys/boot/forth/support.4th#3 integrate .. //depot/projects/s390/sys/boot/i386/Makefile#5 integrate .. //depot/projects/s390/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/s390/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/s390/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/s390/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/s390/sys/boot/i386/libi386/biosdisk.c#10 integrate .. //depot/projects/s390/sys/boot/i386/libi386/bootinfo32.c#4 integrate .. //depot/projects/s390/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/s390/sys/boot/i386/loader/Makefile#10 integrate .. //depot/projects/s390/sys/boot/i386/loader/conf.c#8 integrate .. //depot/projects/s390/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/s390/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/s390/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/s390/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/s390/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/s390/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/s390/sys/boot/zfs/Makefile#1 branch .. //depot/projects/s390/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/s390/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/s390/sys/bsm/audit.h#4 integrate .. //depot/projects/s390/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/s390/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/s390/sys/bsm/audit_record.h#3 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#14 integrate .. //depot/projects/s390/sys/cam/cam_periph.h#5 integrate .. //depot/projects/s390/sys/cam/cam_sim.c#7 integrate .. //depot/projects/s390/sys/cam/cam_sim.h#4 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/s390/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/s390/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/s390/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/s390/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/s390/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/s390/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/s390/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/s390/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32.h#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/s390/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/s390/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/s390/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/s390/sys/compat/linux/linux_ipc.c#10 integrate .. //depot/projects/s390/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#13 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_sockio.c#8 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_sysvec.c#9 integrate .. //depot/projects/s390/sys/conf/Makefile.arm#7 integrate .. //depot/projects/s390/sys/conf/NOTES#24 integrate .. //depot/projects/s390/sys/conf/files#26 integrate .. //depot/projects/s390/sys/conf/files.amd64#9 integrate .. //depot/projects/s390/sys/conf/files.arm#6 integrate .. //depot/projects/s390/sys/conf/files.i386#15 integrate .. //depot/projects/s390/sys/conf/files.mips#3 integrate .. //depot/projects/s390/sys/conf/files.pc98#16 integrate .. //depot/projects/s390/sys/conf/files.powerpc#13 integrate .. //depot/projects/s390/sys/conf/files.sparc64#15 integrate .. //depot/projects/s390/sys/conf/files.sun4v#2 integrate .. //depot/projects/s390/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/s390/sys/conf/options#21 integrate .. //depot/projects/s390/sys/conf/options.arm#6 integrate .. //depot/projects/s390/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/s390/sys/contrib/dev/ath/COPYRIGHT#5 delete .. //depot/projects/s390/sys/contrib/dev/ath/README#5 delete .. //depot/projects/s390/sys/contrib/dev/ath/ah.h#5 delete .. //depot/projects/s390/sys/contrib/dev/ath/ah_desc.h#5 delete .. //depot/projects/s390/sys/contrib/dev/ath/ah_devid.h#5 delete .. //depot/projects/s390/sys/contrib/dev/ath/ah_soc.h#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap30.inc#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap43.inc#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap51.inc#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/s390/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 20 15:55:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 039A21065678; Sat, 20 Dec 2008 15:55: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 BAF5A1065673 for ; Sat, 20 Dec 2008 15:55:14 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91FA68FC17 for ; Sat, 20 Dec 2008 15:55:14 +0000 (UTC) (envelope-from bz@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 mBKFtEgL048980 for ; Sat, 20 Dec 2008 15:55:14 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKFtEcN048978 for perforce@freebsd.org; Sat, 20 Dec 2008 15:55:14 GMT (envelope-from bz@freebsd.org) Date: Sat, 20 Dec 2008 15:55:14 GMT Message-Id: <200812201555.mBKFtEcN048978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 155057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 15:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=155057 Change 155057 by bz@bz_dumpster on 2008/12/20 15:54:16 Add {,w}mb(). Affected files ... .. //depot/projects/s390/sys/s390/include/atomic.h#3 edit Differences ... ==== //depot/projects/s390/sys/s390/include/atomic.h#3 (text+ko) ==== @@ -17,6 +17,9 @@ #define SERIALIZATION __asm volatile (SOP ::: "memory") +#define mb() SERIALIZATION +#define wmb() SERIALIZATION + /* Not sure if serialization before load is really needed here. */ #define ATOMIC_CHANGE_32(V,S,OP) \ uint32_t nv, pv; \ From owner-p4-projects@FreeBSD.ORG Sat Dec 20 19:55:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 754E310656AB; Sat, 20 Dec 2008 19:55: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 3608E106568D for ; Sat, 20 Dec 2008 19:55:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E61A8FC12 for ; Sat, 20 Dec 2008 19:55:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBKJtHQa083184 for ; Sat, 20 Dec 2008 19:55:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKJtHRs083182 for perforce@freebsd.org; Sat, 20 Dec 2008 19:55:17 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 20 Dec 2008 19:55:17 GMT Message-Id: <200812201955.mBKJtHRs083182@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 155061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 19:55:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155061 Change 155061 by rene@rene_self on 2008/12/20 19:54:35 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#8 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -243,6 +243,27 @@ &chap.mirrors.ftp.inc;     + + BitTorrent + + + BitTorrent + + + The ISO images for the basic release CDs are available via + BitTorrent. A collection of torrent files to download the + images is available at http://torrents.freebsd.org:8080 + + The BitTorrent client software is available from the + net-p2p/py-bittorrent port, + or a precompiled package. + + After downloading the ISO image with BitTorrent, you may + burn it to CD or DVD media as described in , burncd. + + Anonymous CVS ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ Announce doc/ tree slush - TBD -- + 2 September 2008 Notification of the impending doc/ tree slush should be sent to doc@. @@ -110,6 +110,12 @@ Begin BETA1 builds. + + BETA2 builds + -- + 19 October 2008 + Begin BETA2 builds. + RELENG_7_1 branch From owner-p4-projects@FreeBSD.ORG Sat Dec 20 20:07:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCC971065676; Sat, 20 Dec 2008 20:07: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 90C581065674 for ; Sat, 20 Dec 2008 20:07:30 +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 7E88F8FC0C for ; Sat, 20 Dec 2008 20:07:30 +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 mBKK7Ur1084958 for ; Sat, 20 Dec 2008 20:07:30 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKK7ULW084956 for perforce@freebsd.org; Sat, 20 Dec 2008 20:07:30 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 20 Dec 2008 20:07:30 GMT Message-Id: <200812202007.mBKK7ULW084956@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 155062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 20:07:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=155062 Change 155062 by rene@rene_self on 2008/12/20 20:07:28 MFen handbook/mirrors 1.454 -> 1.455 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.454 + %SRCID% 1.455 --> @@ -263,6 +263,25 @@ &chap.mirrors.ftp.inc; + + BitTorrent + + BitTorrent + + De ISO-afbeeldingen voor de basis-CD's van de uitgaven zijn + beschikbaar via BitTorrent. Een verzameling torrent-bestanden om + de afbeeldingen binnen te halen is beschikbaar op http://torrents.freebsd.org:8080 + + De software voor de BitTorrent-cliënt is beschikbaar via + de port net-p2p/py-bittorrent, + of als voorgecompileerd pakket. + + Nadat de ISO-afbeelding met BitTorrent is gedownload, kan het + op CD of DVD gebrand worden zoals beschreven in burncd. + + Anonieme CVS From owner-p4-projects@FreeBSD.ORG Sat Dec 20 21:16:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E34B106567B; Sat, 20 Dec 2008 21: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 30B241065677 for ; Sat, 20 Dec 2008 21:16:41 +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 012358FC16 for ; Sat, 20 Dec 2008 21:16:41 +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 mBKLGeVO000923 for ; Sat, 20 Dec 2008 21:16:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKLGe2l000921 for perforce@freebsd.org; Sat, 20 Dec 2008 21:16:40 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 20 Dec 2008 21:16:40 GMT Message-Id: <200812202116.mBKLGe2l000921@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 155065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 21:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=155065 Change 155065 by rene@rene_self on 2008/12/20 21:16:37 Translated problem-reports up to section 3. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#4 (text+ko) ==== @@ -229,83 +229,84 @@
    - Preparations + Voorbereidingen - A good rule to follow is to always do a background search - before submitting a problem report. Maybe your problem has - already been reported; maybe it is being discussed on the - mailing lists, or recently was; it may even already be fixed in - a newer version than what you are running. You should therefore - check all the obvious places before submitting your problem - report. For &os;, this means: + Een goede regel is om altijd een vooronderzoek te doen voordat + er een probleemrapport wordt ingestuurd. Misschien is uw probleem + reeds gerapporteerd; misshien wordt het besproken op de + mailinglijsten, of gebeurde dat recentelijk; misschien is het al + gerepareerd in een nieuwere versie dan die u draait. Om deze + redenen dient u alle voor de hand liggende plaatsen te controleren + voordat u uw probleemrapport instuurt. Voor &os; betekent + dit: - The &os; - Frequently Asked - Questions (FAQ) list. - The FAQ attempts to provide answers for a wide range of questions, - such as those concerning - hardware - compatibility, - user - applications, - and kernel - configuration. + De &os;-lijst van + Veelgestelde + Vragen (FAQ). De FAQ probeert antwoord te geven op + een breed scala aan vragen, zoals die die betrekking hebben op + compatibiliteit van + hardware, + + gebruikersapplicaties, en + kernelconfiguratie. - The + De mailing - lists—if you are not subscribed, use + url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">mailinglijsten + —als u niet geabonneerd bent, gebruik dan the - searchable archives on the &os; web site. If your - problem has not been discussed on the lists, you might try - posting a message about it and waiting a few days to see if - someone can spot something you have overlooked. + url="http://www.FreeBSD.org/search/search.html#mailinglists">de + doorzoekbare archieven op de &os;-website. Als uw + probleem niet op de lijsten bediscussieerd is, kunt u proberen + om er een bericht over te posten en enkele dagen wachten om te + zien of iemand iets kan zien wat u misschien over het hoofd + heeft gezien. - Optionally, the entire web—use your favorite - search engine to locate any references to your problem. You - may even get hits from archived mailing lists or newsgroups - you did not know of or had not thought to search - through. + Optioneel, het gehele web—gebruik uw favoriete + zoekmachine om enige referenties naar uw probleem te vinden. U + kunt zelfs hits krijgen van gearchiveerde mailinglijsten of + nieuwsgroepen die u niet kende of waarvan u er niet aan had + gedacht om die te doorzoeken. - Next, the searchable + Vervolgens, de doorzoekbare - &os; PR database (GNATS). Unless your problem - is recent or obscure, there is a fair chance it has already - been reported. + &os; PR-database (GNATS). Tenzij uw probleem recent + of obscuur is, bestaat er een redelijke kans dat het reeds + gerapporteerd is. - Most importantly, you should attempt to see if existing - documentation in the source base addresses your problem. + Het belangrijkste is dat u probeert te controleren of + bestaande documentatie in de bronnen uw probleem + bespreekt. - For the base &os; code, you should - carefully study the contents of the - /usr/src/UPDATING file on your system - or its latest version at - . - (This is vital information - if you are upgrading from one version to - another—especially if you are upgrading to the - &os.current; branch). + Voor de basis-&os;-code dient u zorgvuldig de inhoud van + het bestand /usr/src/UPDATING op uw + systeem of de laatste versie ervan op + te bestuderen. (Dit is essentiële informatie als u van + de ene naar een andere versie bijwerkt—in het bijzonder + als u naar de &os.current;-tak bijwerkt.) - However, if the problem is in something that was installed - as a part of the &os; Ports Collection, you should refer to - /usr/ports/UPDATING (for individual ports) - or /usr/ports/CHANGES (for changes - that affect the entire Ports Collection). + Als het probleem echter zit in iets wat als deel van de + &os; Portscollectie was geïnstalleerd, dan dient u + /usr/ports/UPDATING (voor individuele + ports) of /usr/ports/CHANGES (voor + veranderingen die de gehele Portscollectie beïnvloeden) + te raadplegen. - and + en - are also available via CVSweb. + zijn ook beschikbaar via CVSweb. +
    From owner-p4-projects@FreeBSD.ORG Sat Dec 20 23:15:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8913C1065686; Sat, 20 Dec 2008 23:15: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 4D4B6106564A for ; Sat, 20 Dec 2008 23:15:43 +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 3C8D28FC08 for ; Sat, 20 Dec 2008 23:15:43 +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 mBKNFgCA012095 for ; Sat, 20 Dec 2008 23:15:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKNFgoG012093 for perforce@freebsd.org; Sat, 20 Dec 2008 23:15:42 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 23:15:42 GMT Message-Id: <200812202315.mBKNFgoG012093@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 155068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 23:15:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=155068 Change 155068 by pgj@kolbasz on 2008/12/20 23:14:46 Add links to the Hungarian FDP Primer on the web page Affected files ... .. //depot/projects/docproj_hu/www/hu/docproj/hungarian.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/docproj/sgml.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#17 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docproj/hungarian.sgml#8 (text+ko) ==== @@ -36,9 +36,9 @@ nyelven készülnek, így az angol nyelv ismerete mellett az SGML nyelv alapjaival is tisztában kell lennünk, valamint követnünk kell az A &os; - Dokumentációs Projekt irányelvei - kezdõknek címû könyv tartalmi és + href="&enbase;/doc/hu/books/fdp-primer/index.html">A &os; + Dokumentációs Projekt irányelvei + kezdõknek címû könyv tartalmi és formai elõírásait.

    Kapcsolat

    ==== //depot/projects/docproj_hu/www/hu/docproj/sgml.sgml#9 (text+ko) ==== @@ -197,7 +197,7 @@ DocBook nyelvekrõl

    Elsõként olvassuk el a A &os; Dokumentációs Projekt irányelvei kezdõknek + href="&enbase;/doc/hu/books/fdp-primer/index.html">A &os; Dokumentációs Projekt irányelvei kezdõknek címû könyvet. Ennek célja, hogy átfogó leírást nyújtson minden, a &os; dokumentációja kapcsán @@ -206,7 +206,7 @@ leírás, amely kisebb részekre szedtek szét, de lehetõségünk van megtekinteni akár egészben + href="&enbase;/doc/hu/books/fdp-primer/book.html">egészben is.

    ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#17 (text+ko) ==== @@ -115,7 +115,7 @@

    A &os; Dokumentációs Projekt irányelvei kezdõknek - (fdp-primer)
    + (fdp-primer) [magyarul]
    Minden, amit ahhoz kell tudnunk, hogy a &os; Dokumentációs Projektben dolgozhassunk.

    From owner-p4-projects@FreeBSD.ORG Sat Dec 20 23:17:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C4E01065676; Sat, 20 Dec 2008 23:17: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 50FBA1065674 for ; Sat, 20 Dec 2008 23:17:45 +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 40D378FC12 for ; Sat, 20 Dec 2008 23:17:45 +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 mBKNHjd7012216 for ; Sat, 20 Dec 2008 23:17:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBKNHjLJ012214 for perforce@freebsd.org; Sat, 20 Dec 2008 23:17:45 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 20 Dec 2008 23:17:45 GMT Message-Id: <200812202317.mBKNHjLJ012214@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 155069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 20 Dec 2008 23:17:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=155069 Change 155069 by pgj@kolbasz on 2008/12/20 23:16:55 Change FDP Primer reference to the Hungarian version in the FAQ Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#30 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#30 (text+ko) ==== @@ -13750,7 +13750,7 @@ Olvassuk el a &os; Dokumentációs Projekt bevezetõjében található Fordítói + url="&url.books.fdp-primer;/translations.html">Fordítói GYIK-ot.