From owner-p4-projects@FreeBSD.ORG Sun Nov 9 07:14:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9E1F1065670; Sun, 9 Nov 2008 07:14:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D89B106567E; Sun, 9 Nov 2008 07:14:22 +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 302828FC0C; Sun, 9 Nov 2008 07:14:22 +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 mA97ECot004343; Sun, 9 Nov 2008 00:14:12 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 09 Nov 2008 00:15:27 -0700 (MST) Message-Id: <20081109.001527.1720213087.imp@bsdimp.com> To: hselasky@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200811041851.mA4Ip2cP040847@repoman.freebsd.org> References: <200811041851.mA4Ip2cP040847@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 152478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Nov 2008 07:14:22 -0000 In message: <200811041851.mA4Ip2cP040847@repoman.freebsd.org> Hans Petter Selasky writes: : http://perforce.freebsd.org/chv.cgi?CH=152478 : : Change 152478 by hselasky@hselasky_laptop001 on 2008/11/04 18:50:56 : : : Patch to support a common "usbdevs" file. : : Affected files ... : : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#25 edit : .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#11 delete : .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 edit : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 edit : : Differences ... : : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#25 (text+ko) ==== : : @@ -795,7 +795,7 @@ : : /* AIPTEK products */ : product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega : -product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 : +product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 This should have its own section. : /* AirPrime products */ : product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card : @@ -1006,7 +1006,7 @@ : : /* Chicony products */ : product CHICONY KB8933 0x0001 KB-8933 keyboard : -product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera : +product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera Ditot. : /* CH Products */ : product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle : Warner From owner-p4-projects@FreeBSD.ORG Sun Nov 9 09:16:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A365106567D; Sun, 9 Nov 2008 09:16: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 2E3281065673 for ; Sun, 9 Nov 2008 09:16:30 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe05.swip.net [212.247.154.129]) by mx1.freebsd.org (Postfix) with ESMTP id 8B7F58FC1D for ; Sun, 9 Nov 2008 09:16:29 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=byfPAnWZzwkA:10 a=d6BVkb5LuPPVEe4iNQMLyA==:17 a=6I5d2MoRAAAA:8 a=F7A8L05IgF4PQvV9iJgA:9 a=_cCp1yQ5YFvldygsPWMA:7 a=qMGSUFkDLLeeLULzIkjJLwWOYKIA:4 a=SV7veod9ZcQA:10 a=LY0hPdMaydYA:10 Received: from [62.113.135.6] (account mc467741@c2i.net [62.113.135.6] verified) by mailfe05.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1043595833; Sun, 09 Nov 2008 10:16:27 +0100 From: Hans Petter Selasky To: "M. Warner Losh" Date: Sun, 9 Nov 2008 10:18:38 +0100 User-Agent: KMail/1.9.7 References: <200811041851.mA4Ip2cP040847@repoman.freebsd.org> <20081109.001527.1720213087.imp@bsdimp.com> In-Reply-To: <20081109.001527.1720213087.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200811091018.38787.hselasky@freebsd.org> Cc: perforce@freebsd.org Subject: Re: PERFORCE change 152478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Nov 2008 09:16:30 -0000 On Sunday 09 November 2008, M. Warner Losh wrote: > In message: <200811041851.mA4Ip2cP040847@repoman.freebsd.org> > > Hans Petter Selasky writes: > : http://perforce.freebsd.org/chv.cgi?CH=152478 > : > : Change 152478 by hselasky@hselasky_laptop001 on 2008/11/04 18:50:56 > : > : > : Patch to support a common "usbdevs" file. > : > : Affected files ... > : > : .. //depot/projects/usb/src/sys/dev/usb/usbdevs#25 edit > : .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#11 delete > : .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 edit > : .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 edit > : > : Differences ... > : > : ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#25 (text+ko) ==== > : > : @@ -795,7 +795,7 @@ > : > : /* AIPTEK products */ > : product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega > : -product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 > : +product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 > > This should have its own section. > > : /* AirPrime products */ > : product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card > : @@ -1006,7 +1006,7 @@ > : > : /* Chicony products */ > : product CHICONY KB8933 0x0001 KB-8933 keyboard > : -product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera > : +product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera > > Ditot. > > : /* CH Products */ > : product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle > > Warner Hi, The problem is that the usbdevs does not succeed generating the verbose debug table because the AIPTEK2 and CHICONY2 vendor ID's do not exist. By looking at the source of these ID's I figured out the correct vendor ID. Is it possible you could fix this in -current Warner ? --HPS From owner-p4-projects@FreeBSD.ORG Sun Nov 9 11:35:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A5110656D9; Sun, 9 Nov 2008 11:35:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4580010656D4 for ; Sun, 9 Nov 2008 11:35:56 +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 3137D8FC8B for ; Sun, 9 Nov 2008 11:35:56 +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 mA9BZtNR056153 for ; Sun, 9 Nov 2008 11:35:55 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA9BZtkD056151 for perforce@freebsd.org; Sun, 9 Nov 2008 11:35:55 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 9 Nov 2008 11:35:55 GMT Message-Id: <200811091135.mA9BZtkD056151@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 152687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Nov 2008 11:35:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=152687 Change 152687 by rene@rene_self on 2008/11/09 11:34:59 MFen handbook/cutting-edge 1.228 -> 1.231 Checked build, spelling (diff only), whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.228 + %SRCID% 1.231 --> @@ -99,6 +99,16 @@ linkend="ports">). + + + Door dit hoofdstuk heen wordt cvsup + gebruikt om de broncode van &os; te verkrijgen en bij te werken. + Om het te gebruiken, dient u een port of pakket als net/cvsup-without-gui te + installeren. Als u &os; 6.2-RELEASE of nieuwer gebruikt, + kunt u dit vervangen door &man.csup.1; welke nu deel uitmaakt + van het basissysteem. + @@ -224,26 +234,30 @@ Neem een abonnement op de mailinglijsten - &a.current.name; en &a.cvsall.name;. Dit is niet alleen - een goed idee, het is essentieel. - Geen berichten ontvangen van de lijst - &a.current.name; betekent geen - commentaar zien dat mensen maken over de huidige staat - van het systeem en dus waarschijnlijk struikelen over - problemen die anderen al gevonden en opgelost hebben. - Nog belangrijker is het missen van belangrijke informatie - die kritisch kan zijn voor een systeem. + &a.current.name; en &a.svn-src-head.name;. Dit is niet + alleen een goed idee, het is + essentieel. Geen berichten ontvangen + van de lijst &a.current.name; + betekent geen commentaar zien dat mensen maken over de + huidige staat van het systeem en dus waarschijnlijk + struikelen over problemen die anderen al gevonden en + opgelost hebben. Nog belangrijker is het missen van + belangrijke informatie die kritisch kan zijn voor een + systeem. - De lijst &a.cvsall.name; biedt de mogelijkheid de - wijzigingsboodschap te zien voor elke wijziging die - gemaakt wordt samen met relevante informatie over + De lijst &a.svn-src-head.name; biedt de mogelijkheid + de wijzigingsboodschap te zien voor elke wijziging die + gemaakt wordt, samen met relevante informatie over mogelijke bijwerkingen. Ga om op deze lijsten of één van de andere beschikbare lijsten te abonneren naar &a.mailman.lists.link; en klik op de gewenste lijst. Instructies over de rest van de procedure zijn daar - beschikbaar. + beschikbaar. Als u geïnteresseerd bent in het volgen + van veranderingen voor de gehele broncodeboom, raden wij u + aan een abonnement te nemen op de &a.svn-src-all.name; + lijst. @@ -276,7 +290,26 @@ broncode automatisch bijgewerkt. De voorbeeld supfile dient aangepast te worden om cvsup in te - stellen voor een omgeving. + stellen voor uw omgeving. + + + Het voorbeeld + standard-supfile is bedoeld om + een specifieke beveiligingstak van &os; te volgen, + niet &os.current;. U moet dit bestand bewerken en + de volgende regel vervangen: + + *default release=cvs tag=RELENG_X_Y + + door deze: + + *default release=cvs tag=. + + Voor een gedetailleerde uitleg over bruikbare + tags wordt naar de sectie CVS Tags van het + Handboek verwezen. + @@ -427,21 +460,28 @@ te reageren als ze goede redenen hebben tegen de voorgestelde wijziging. - De lijst &a.cvsall.name; biedt informatie over de - commitlogregels voor elke wijziging zoals deze gemaakt is - tezamen met relevante informatie over mogelijke - bijwerkingen. + Wordt lid van de relevante + SVN-lijst voor de tak die u + volgt. Als u bijvoorbeeld de tak 7-STABLE volgt, wordt u + lid van de &a.svn-src-stable-7.name; lijst. Dit stelt u + in staat om het commit-log-bericht te bekijken voor elke + verandering die is gemaakt, tezamen met relevante + informatie over mogelijke bijwerkingen. Ga om te abonneren op deze lijsten, of één van de andere beschikbare lijsten naar &a.mailman.lists.link; en klik op de lijst waarop een abonnement gewenst is. Instructies over de rest van - de procedure zijn daar beschikbaar. + de procedure zijn daar beschikbaar. Als u + geïnteresseerd bent in het volgen van veranderingen + voor de gehele broncodeboom, raden wij u aan een + abonnement te nemen op de &a.svn-src-all.name; + lijst. Kijk op de webpagina Snapshots om een + url="&url.base;/snapshots/">Snapshots om een systeem te installeren van een maandelijkse snapshot van &os.stable;. Het is ook mogelijk om de meest recente &os.stable; release te installeren van de - &prompt.root; make buildworld + &prompt.root; cd /usr/src +&prompt.root; make buildworld &prompt.root; make buildkernel &prompt.root; make installkernel -&prompt.root; reboot +&prompt.root; shutdown -r now Er zijn een aantal zeldzame gevallen waarin @@ -700,7 +741,9 @@ (met boot -s vanaf de loaderprompt). Draai dan: - &prompt.root; mergemaster -p + &prompt.root; mount -a -t ufs +&prompt.root; mergemaster -p +&prompt.root; cd /usr/src &prompt.root; make installworld &prompt.root; mergemaster &prompt.root; reboot From owner-p4-projects@FreeBSD.ORG Sun Nov 9 14:33:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B04E3106567F; Sun, 9 Nov 2008 14:33:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 746A71065672 for ; Sun, 9 Nov 2008 14:33:56 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FA7D8FC1B for ; Sun, 9 Nov 2008 14:33:56 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA9EXuEq082683 for ; Sun, 9 Nov 2008 14:33:56 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA9EXuhg082681 for perforce@freebsd.org; Sun, 9 Nov 2008 14:33:56 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 9 Nov 2008 14:33:56 GMT Message-Id: <200811091433.mA9EXuhg082681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 152690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Nov 2008 14:33:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=152690 Change 152690 by gk@gk_h1 on 2008/11/09 14:33:22 mbuf can be consumed by pfil Affected files ... .. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#11 edit .. //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#6 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#11 (text+ko) ==== @@ -2974,7 +2974,8 @@ if (PFIL_HOOKED(ðer_pfil_hook) && dir == PFIL_OUT && bifp != NULL && (bifp->if_flags & IFF_L2FILTER)) { - if (pfil_run_hooks(ðer_pfil_hook, mp, bifp, PFIL_OUT, NULL) != 0) + if (pfil_run_hooks(ðer_pfil_hook, mp, bifp, PFIL_OUT, NULL) != 0 || + *mp == NULL) return EACCES; } ==== //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#6 (text+ko) ==== @@ -612,7 +612,8 @@ */ if (PFIL_HOOKED(ðer_pfil_hook) && (ifp->if_flags & IFF_L2FILTER) && !(m->m_flags & M_PROMISC)) { - if (pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_IN, NULL) != 0) + if (pfil_run_hooks(ðer_pfil_hook, &m, ifp, PFIL_IN, NULL) != 0 || + m == NULL) return; } eh = mtod(m, struct ether_header *); From owner-p4-projects@FreeBSD.ORG Sun Nov 9 17:25:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F31C106568C; Sun, 9 Nov 2008 17:25: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 AE0B21065673 for ; Sun, 9 Nov 2008 17:25:56 +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 9EB7A8FC08 for ; Sun, 9 Nov 2008 17:25:56 +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 mA9HPuJ1014438 for ; Sun, 9 Nov 2008 17:25:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA9HPuLM014436 for perforce@freebsd.org; Sun, 9 Nov 2008 17:25:56 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 9 Nov 2008 17:25:56 GMT Message-Id: <200811091725.mA9HPuLM014436@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 152696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 09 Nov 2008 17:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=152696 Change 152696 by pgj@kolbasz on 2008/11/09 17:25:31 MFen (doc): 1.331 -> 1.332 hu_HU.ISO8859-2/books/handbook/security/chapter.sgml 1.3 -> 1.4 hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml 1.103 -> 1.105 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#15 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#9 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#5 (text+ko) ==== @@ -6,7 +6,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#15 (text+ko) ==== @@ -7,7 +7,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#9 (text+ko) ==== @@ -12,7 +12,7 @@ aaron@FreeBSD.org"> @@ -874,6 +874,8 @@ remko@FreeBSD.org"> +rene@FreeBSD.org"> + rgrimes@FreeBSD.org"> ricardag@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -714,6 +714,11 @@ &pgpkey.remko; + + &a.rene; + &pgpkey.rene; + + &a.scottl; &pgpkey.scottl; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#12 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -229,6 +229,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -438,6 +438,7 @@ + @@ -598,13 +599,13 @@ - + - + ==== //depot/projects/docproj_hu/www/en/news/status/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/status/Makefile,v 1.43 2008/08/19 23:04:12 brd Exp $ +# $FreeBSD: www/en/news/status/Makefile,v 1.44 2008/11/11 03:52:54 brd Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -41,6 +41,7 @@ XMLDOCS+= report-2007-10-2007-12 XMLDOCS+= report-2008-01-2008-03 XMLDOCS+= report-2008-04-2008-06 +XMLDOCS+= report-2008-07-2008-09 XSLT.DEFAULT= report.xsl ==== //depot/projects/docproj_hu/www/en/news/status/status.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Next submissions due: October 6, 2008

+

Next submissions due: January 6, 2009

Use the xml generator or download and edit the @@ -41,6 +41,8 @@

2008

    +
  • July, 2008 - + September, 2008
  • April, 2008 - June, 2008
  • January, 2008 - ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#5 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.89 2008/06/18 06:55:29 ed Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.90 2008/11/02 22:48:28 versus Exp $ @@ -1801,37 +1801,6 @@ - - Multibyte collation support - - -

    Technical Contact: Diomidis Spinellis

    - -

    Currently FreeBSD supports only single byte collation. Multibyte - collation support would be nice. This might involve implementing - the Unicode Collation Algorithm (see http://unicode.org/reports/tr10/), - writing a tool to compile the Default Unicode Collation Element - Table (http://www.unicode.org/Public/UCA/latest) - into an efficient lookup format, and integrating the corresponding - conformance tests (http://www.unicode.org/Public/UCA/latest/CollationTest.html) - into the FreeBSD regression testing framework.

    - -

    Benefits:

    -
      -
    • Proper national sorting in UTF-8 and other multibyte locales.
      • -
    -

    Requirements:

    -
      -
    • Knowledge of C.
      • -
    • Familiarity with locale subsystem and relevant ISO standards.
      • -
    - - - NDMP data server ==== //depot/projects/docproj_hu/www/en/releases/6.4R/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.1 2008/08/22 14:30:38 hrs Exp $ +# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.2 2008/11/06 15:47:57 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,7 +7,32 @@ .include "../Makefile.inc" .endif -DOCS= schedule.sgml +#DOCS= announce.sgml +DOCS= relnotes.sgml +DOCS+= hardware.sgml +DOCS+= installation.sgml +DOCS+= schedule.sgml + +DATA+= errata.html +DATA+= hardware-alpha.html +DATA+= hardware-amd64.html +DATA+= hardware-i386.html +DATA+= hardware-pc98.html +DATA+= hardware-powerpc.html +DATA+= hardware-sparc64.html +DATA+= installation-alpha.html +DATA+= installation-amd64.html +DATA+= installation-i386.html +DATA+= installation-pc98.html +DATA+= installation-powerpc.html +DATA+= installation-sparc64.html +DATA+= readme.html +DATA+= relnotes-alpha.html +DATA+= relnotes-amd64.html +DATA+= relnotes-i386.html +DATA+= relnotes-pc98.html +DATA+= relnotes-powerpc.html +DATA+= relnotes-sparc64.html DATA= docbook.css ==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -158,20 +158,20 @@ RC2 builds 22 September 2008 - -- + 2 November 2008 Begin RC2 builds. RELEASE builds - TBD + 12 November 2008 -- Begin RELEASE builds. Announcement - 6 October 2008 + 6 October 2008 -- Announcement sent out after a majority of the mirrors have received the bits. ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#26 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.204 2008/11/01 12:55:08 versus Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.207 2008/11/11 03:52:54 brd Exp $ @@ -36,6 +36,40 @@ 11 + 10 + + + July - September, 2008 Status Reports + +

    The July - September, 2008 Status Reports are now + available with 14 entries.

    +     +     + + + 3 + +

    New committer: + René Ladan (doc-nl)

    +     + + + &os; 6.4-RC2 Available + +

    The second Release Candidate for &os; 6.4 is now available. + ISO images for Tier-1 architectures are available for + download on most of the &os; mirror sites. + &os; 6.4-RC2 should be the last of the public test builds + for the FreeBSD 6.4 release cycle, therefore we encourage + people to test and report any outstanding bugs as soon as + possible.

    +     +     + + 1 New committer: <a href="mailto:versus@FreeBSD.org"> ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#5 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: www/share/sgml/release.ent,v 1.25 2008/10/23 08:17:10 danger Exp $ --> +<!-- $FreeBSD: www/share/sgml/release.ent,v 1.26 2008/11/04 20:38:09 danger Exp $ --> <!-- XXX rel.current and u.rel.* should be available in doc/ --> <!-- The currently released versions of FreeBSD. This value is used to @@ -39,7 +39,7 @@ <!ENTITY beta2.testing "INCLUDE"> <!ENTITY % beta2.testing "INCLUDE"> <!ENTITY betarel2.current '6.4'> -<!ENTITY betarel2.vers 'RC1'> +<!ENTITY betarel2.vers 'RC2'> <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'> <!ENTITY rel.current.major '7'> From owner-p4-projects@FreeBSD.ORG Tue Nov 11 15:27:40 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D5BF106567A; Tue, 11 Nov 2008 15:27: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 00E171065673 for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4B438FC19 for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27:39 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mABFRdpS083304 for <perforce@freebsd.org>; Tue, 11 Nov 2008 15:27:39 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mABFRdtb083302 for perforce@freebsd.org; Tue, 11 Nov 2008 15:27:39 GMT (envelope-from trasz@freebsd.org) Date: Tue, 11 Nov 2008 15:27:39 GMT Message-Id: <200811111527.mABFRdtb083302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 15:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=152808 Change 152808 by trasz@trasz_victim7 on 2008/11/11 15:27:05 Fix regression tests after recent change on rename(2) semantics when moving directories. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#2 (text+ko) ==== @@ -24,7 +24,7 @@ expect 0 -u 65534 -g 65534 rmdir ${n0} # Moving directory elsewhere allowed on writable directory. -expect 0 mkdir ${n0} 0755 +expect 0 mkdir ${n0} 0777 expect 0 prependacl . user:65534:write_data::deny expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} expect 0 prependacl . user:65534:write_data::allow @@ -40,7 +40,7 @@ # Moving directory from elsewhere overwriting local directory allowed # on writable directory. expect 0 mkdir ${n0} 0755 -expect 0 mkdir ../${n3}/${n0} 0755 +expect 0 mkdir ../${n3}/${n0} 0777 expect 0 prependacl . user:65534:write_data::deny expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 prependacl . user:65534:write_data::allow @@ -54,7 +54,7 @@ expect 0 -u 65534 -g 65534 rmdir ${n0} # Denied DELETE changes nothing wrt moving elsewhere or from elsewhere. -expect 0 mkdir ${n0} 0755 +expect 0 mkdir ${n0} 0777 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 -u 65534 -g 65534 rmdir ${n0} @@ -67,7 +67,7 @@ # 35 # DELETE_CHILD denies moving directory elsewhere. -expect 0 mkdir ${n0} 0755 +expect 0 mkdir ${n0} 0777 expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} expect 0 rename ${n0} ../${n3}/${n0} @@ -86,7 +86,7 @@ expect 0 -u 65534 -g 65534 rmdir ${n0} # Same for moving the directory elsewhere. -expect 0 mkdir ${n0} 0755 +expect 0 mkdir ${n0} 0777 expect 0 prependacl ${n0} user:65534:delete::allow expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} @@ -99,7 +99,7 @@ # DELETE does not allow for overwriting a directory in a unwritable # directory with DELETE_CHILD denied. expect 0 mkdir ${n0} 0755 -expect 0 mkdir ../${n3}/${n0} 0755 +expect 0 mkdir ../${n3}/${n0} 0777 expect 0 prependacl . user:65534:write_data::deny expect 0 prependacl . user:65534:delete_child::deny expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} @@ -118,7 +118,7 @@ expect 0 -u 65534 -g 65534 rmdir ${n0} # Moving things elsewhere is allowed. -expect 0 mkdir ${n0} 0755 +expect 0 mkdir ${n0} 0777 expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} # 60 @@ -128,10 +128,10 @@ # Even if we're overwriting. # XXX: expect 0 mkdir ${n0} 0755 -expect 0 mkdir ../${n3}/${n0} 0755 +expect 0 mkdir ../${n3}/${n0} 0777 # XXX: expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} -expect 0 mkdir ../${n3}/${n0} 0755 +expect 0 mkdir ../${n3}/${n0} 0777 # Even if we have DELETE on the existing directory. expect 0 prependacl ${n0} user:65534:delete::allow From owner-p4-projects@FreeBSD.ORG Tue Nov 11 19:27:44 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D052C106567C; Tue, 11 Nov 2008 19:27: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 943751065676 for <perforce@freebsd.org>; Tue, 11 Nov 2008 19:27:43 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97EA48FC21 for <perforce@freebsd.org>; Tue, 11 Nov 2008 19:27:43 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mABJRhZs052651 for <perforce@freebsd.org>; Tue, 11 Nov 2008 19:27:43 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mABJRhvG052649 for perforce@freebsd.org; Tue, 11 Nov 2008 19:27:43 GMT (envelope-from csjp@freebsd.org) Date: Tue, 11 Nov 2008 19:27:43 GMT Message-Id: <200811111927.mABJRhvG052649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" <csjp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 19:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=152814 Change 152814 by csjp@hvm02 on 2008/11/11 19:27:31 Add support for setting the audit kernel information. This information will be used when setting the host information for extended header tokens. The audit_control file now supports a "host" parameter which can be used by the auditing daemon to set this information. If this parameter is not used, the OpenBSM will default to the use of regular tokens. Reviewed by: rwatson, (sson, wsalamon (older version)) Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#8 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#38 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#35 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#30 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#23 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#71 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#20 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#8 (text+ko) ==== @@ -1,5 +1,11 @@ OpenBSM Version History +- Add support for setting the audit kernel information. This information + will be used when setting the host information for extended header tokens. + The audit_control file now supports a "host" parameter which can be used + by the auditing daemon to set this information. If this parameter is not + used, the OpenBSM will default to the use of regular tokens. + OpenBSM 1.1 alpha 2 - Include files in OpenBSM are now broken out into two parts: library builds @@ -341,4 +347,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#7 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#8 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#38 (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.c#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#38 $ */ #include <sys/types.h> @@ -35,6 +35,8 @@ #include <sys/dirent.h> #include <sys/mman.h> +#include <sys/socket.h> +#include <sys/param.h> #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> #else /* !HAVE_FULL_QUEUE_H */ @@ -47,6 +49,8 @@ #include <bsm/audit_uevents.h> #include <bsm/libbsm.h> +#include <netinet/in.h> + #include <err.h> #include <errno.h> #include <fcntl.h> @@ -58,6 +62,7 @@ #include <signal.h> #include <string.h> #include <syslog.h> +#include <netdb.h> #include "auditd.h" #ifdef USE_MACH_IPC @@ -766,6 +771,69 @@ config_audit_controls(); } +static int +config_audit_host(void) +{ + char hoststr[MAXHOSTNAMELEN]; + struct sockaddr_in6 *sin6; + struct sockaddr_in *sin; + struct addrinfo *res; + struct auditinfo_addr aia; + int error; + + if (getachost(hoststr, MAXHOSTNAMELEN) != 0) { + syslog(LOG_WARNING, + "warning: failed to read 'host' param in control file"); + /* + * To maintain reverse compatability with older audit_control + * files, simply drop a warning if the host parameter has not + * been set. However, we will explicitly disable the + * generation of extended audit header by passing in a zeroed + * termid structure. + */ + bzero(&aia, sizeof(aia)); + aia.ai_termid.at_type = AU_IPv4; + error = auditon(A_SETKAUDIT, &aia, sizeof(aia)); + if (error < 0 && errno == ENOSYS) + return (0); + else if (error < 0) { + syslog(LOG_ERR, + "Failed to set audit host info"); + return (-1); + } + return (0); + } + error = getaddrinfo(hoststr, NULL, NULL, &res); + if (error) { + syslog(LOG_ERR, "Failed to lookup hostname: %s", hoststr); + return (-1); + } + switch (res->ai_family) { + case PF_INET6: + sin6 = (struct sockaddr_in6 *) res->ai_addr; + bcopy(&sin6->sin6_addr.s6_addr, + &aia.ai_termid.at_addr[0], sizeof(struct in6_addr)); + aia.ai_termid.at_type = AU_IPv6; + break; + case PF_INET: + sin = (struct sockaddr_in *) res->ai_addr; + bcopy(&sin->sin_addr.s_addr, + &aia.ai_termid.at_addr[0], sizeof(struct in_addr)); + aia.ai_termid.at_type = AU_IPv4; + break; + default: + syslog(LOG_ERR, + "Un-supported address family in host parameter"); + return (-1); + } + if (auditon(A_SETKAUDIT, &aia, sizeof(aia)) < 0) { + syslog(LOG_ERR, + "auditon: failed to set audit host information"); + return (-1); + } + return (0); +} + /* * Reap our children. */ @@ -995,7 +1063,7 @@ } else syslog(LOG_ERR, "Failed to obtain filesz: %m"); - return (0); + return (config_audit_host()); } #ifdef USE_MACH_IPC ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#35 (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#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#35 $ */ #ifndef _LIBBSM_H_ @@ -82,6 +82,7 @@ #define FLAGS_CONTROL_ENTRY "flags" #define NA_CONTROL_ENTRY "naflags" #define POLICY_CONTROL_ENTRY "policy" +#define AUDIT_HOST_CONTROL_ENTRY "host" #define AU_CLASS_NAME_MAX 8 #define AU_CLASS_DESC_MAX 72 @@ -764,6 +765,7 @@ int getacflg(char *auditstr, int len); int getacna(char *auditstr, int len); int getacpol(char *auditstr, size_t len); +int getachost(char *auditstr, size_t len); int getauditflagsbin(char *auditstr, au_mask_t *masks); int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose); ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#15 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#14 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#15 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -72,6 +72,8 @@ .Nm au_to_header , .Nm au_to_header32 , .Nm au_to_header64 , +.Nm au_to_header_ex , +.Nm au_to_header32_ex , .Nm au_to_trailer , .Nm au_to_zonename .Nd "routines for generating BSM audit tokens" @@ -196,6 +198,10 @@ .Ft "token_t *" .Fn au_to_header64 "int rec_size" "au_event_t e_type" "au_emod_t e_mod" .Ft "token_t *" +.Fn au_to_header_ex "int rec_size" "au_event_t e_type" "au_emod_t e_mod" +.Ft "token_t *" +.Fn au_to_header32_ex "int rec_size" "au_event_t e_type" "au_emod_t e_mod" +.Ft "token_t *" .Fn au_to_trailer "int rec_size" .Ft "token_t *" .Fn au_to_zonename "const char *zonename" ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#30 (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#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#30 $ */ #include <sys/types.h> @@ -45,6 +45,8 @@ #include <bsm/audit_internal.h> #include <bsm/libbsm.h> +#include <netinet/in.h> + #include <errno.h> #include <pthread.h> #include <stdlib.h> @@ -204,12 +206,51 @@ au_assemble(au_record_t *rec, short event) { token_t *header, *tok, *trailer; - size_t tot_rec_size; + size_t tot_rec_size, hdrsize; u_char *dptr; + struct in6_addr *aptr; int error; + struct auditinfo_addr aia; + struct timeval tm; - tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; - header = au_to_header32(tot_rec_size, event, 0); + /* + * Grab the size of the address family stored in the kernel's audit + * state. + */ + aia.ai_termid.at_type = AU_IPv4; + aia.ai_termid.at_addr[0] = INADDR_ANY; + if (auditon(A_GETKAUDIT, &aia, sizeof(aia)) < 0) { + if (errno != ENOSYS) + return (-1); + tot_rec_size = rec->len + AUDIT_HEADER_SIZE + + AUDIT_TRAILER_SIZE; + header = au_to_header(tot_rec_size, event, 0); + } else { + if (gettimeofday(&tm, NULL) < 0) + return (-1); + switch (aia.ai_termid.at_type) { + case AU_IPv4: + hdrsize = (aia.ai_termid.at_addr[0] == INADDR_ANY) ? + AUDIT_HEADER_SIZE : AUDIT_HEADER_EX_SIZE(&aia); + break; + case AU_IPv6: + aptr = (struct in6_addr *)&aia.ai_termid.at_addr[0]; + hdrsize = + (IN6_IS_ADDR_UNSPECIFIED(aptr)) ? + AUDIT_HEADER_SIZE : AUDIT_HEADER_EX_SIZE(&aia); + break; + } + tot_rec_size = rec->len + hdrsize + AUDIT_TRAILER_SIZE; + /* + * A header size greater then AUDIT_HEADER_SIZE means + * that we are using an extended header. + */ + if (hdrsize > AUDIT_HEADER_SIZE) + header = au_to_header32_ex_tm(tot_rec_size, event, + 0, tm, &aia); + else + header = au_to_header(tot_rec_size, event, 0); + } if (header == NULL) return (-1); @@ -285,7 +326,7 @@ goto cleanup; } - tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; + tot_rec_size = rec->len + MAX_AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { /* @@ -335,7 +376,7 @@ } retval = 0; - tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; + tot_rec_size = rec->len + MAX_AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#23 (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#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#23 $ */ #include <config/config.h> @@ -519,3 +519,27 @@ pthread_mutex_unlock(&mutex); return (0); } + +int +getachost(char *auditstr, size_t len) +{ + char *str; + + pthread_mutex_lock(&mutex); + setac_locked(); + if (getstrfromtype_locked(AUDIT_HOST_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + if (str == NULL) { + pthread_mutex_unlock(&mutex); + return (1); + } + if (strlen(str) >= len) { + pthread_mutex_unlock(&mutex); + return (-3); + } + strcpy(auditstr, str); + pthread_mutex_unlock(&mutex); + return (0); +} ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#71 (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_token.c#70 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#71 $ */ #include <sys/types.h> @@ -1321,6 +1321,53 @@ return (t); } +/* + * token ID 1 byte + * record byte count 4 bytes + * version # 1 byte [2] + * event type 2 bytes + * event modifier 2 bytes + * address type/length 4 bytes + * machine address 4 bytes/16 bytes (IPv4/IPv6 address) + * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) + * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) + */ +token_t * +au_to_header32_ex_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm, struct auditinfo_addr *aia) +{ + token_t *t; + u_char *dptr = NULL; + u_int32_t timems, hostid; + au_tid_addr_t *tid = &aia->ai_termid; + + if (tid->at_type != AU_IPv4 && tid->at_type != AU_IPv6) + return (NULL); + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + + sizeof(u_char) + 2 * sizeof(u_int16_t) + 3 * + sizeof(u_int32_t) + tid->at_type); + if (t == NULL) + return (NULL); + + ADD_U_CHAR(dptr, AUT_HEADER32_EX); + ADD_U_INT32(dptr, rec_size); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); + ADD_U_INT16(dptr, e_type); + ADD_U_INT16(dptr, e_mod); + + ADD_U_INT32(dptr, tid->at_type); + if (tid->at_type == AU_IPv6) + ADD_MEM(dptr, &tid->at_addr[0], 4 * sizeof(u_int32_t)); + else + ADD_MEM(dptr, &tid->at_addr[0], sizeof(u_int32_t)); + timems = tm.tv_usec/1000; + /* Add the timestamp */ + ADD_U_INT32(dptr, tm.tv_sec); + ADD_U_INT32(dptr, timems); /* We need time in ms. */ + + return (t); +} + token_t * au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm) @@ -1350,6 +1397,22 @@ #if !defined(KERNEL) && !defined(_KERNEL) token_t * +au_to_header32_ex(int rec_size, au_event_t e_type, au_emod_t e_mod) +{ + struct timeval tm; + struct auditinfo_addr aia; + + if (gettimeofday(&tm, NULL) == -1) + return (NULL); + if (auditon(A_GETKAUDIT, &aia, sizeof(aia)) < 0) { + if (errno != ENOSYS) + return (NULL); + return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); + } + return (au_to_header32_ex_tm(rec_size, e_type, e_mod, tm, &aia)); +} + +token_t * au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) { struct timeval tm; @@ -1376,6 +1439,13 @@ return (au_to_header32(rec_size, e_type, e_mod)); } + +token_t * +au_to_header_ex(int rec_size, au_event_t e_type, au_emod_t e_mod) +{ + + return (au_to_header32_ex(rec_size, e_type, e_mod)); +} #endif /* ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#20 (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/man/audit_control.5#19 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#20 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 @@ -57,6 +57,18 @@ .Xr audit_user 5 describes how to audit events for individual users. See the information below for the format of the audit flags. +.It Va host +Specify the hostname or IP address to be used when setting the local +systems's audit host information. +This hostname will be converted into an IP or IPv6 address and will +be included in the header of each audit record. +Due to the possibility of transient errors coupled with the +security issues in the DNS protocol itself, the use of DNS +should be avoided. +Instead, it is strongly recommended that the hostname be +specified in the /etc/hosts file. +For more information see +.Xr hosts 5 . .It Va naflags Contains the audit flags that define what classes of events are audited when an action cannot be attributed to a specific user. ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 (text+ko) ==== @@ -30,7 +30,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_internal.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 $ */ #ifndef _AUDIT_INTERNAL_H @@ -71,7 +71,9 @@ * token structures may contain pointers of whose contents we do not know the * size (e.g text tokens). */ +#define AUDIT_HEADER_EX_SIZE(a) ((a)->ai_termid.at_type+18+sizeof(u_int32_t)) #define AUDIT_HEADER_SIZE 18 +#define MAX_AUDIT_HEADER_SIZE (5*sizeof(u_int32_t)+18) #define AUDIT_TRAILER_SIZE 7 /* ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,10 +199,13 @@ token_t *au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); +token_t *au_to_header32_ex_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm, struct auditinfo_addr *aia); token_t *au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod, struct timeval tm); #if !defined(KERNEL) && !defined(_KERNEL) token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); +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); #endif From owner-p4-projects@FreeBSD.ORG Tue Nov 11 19:36:54 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC4B11065678; Tue, 11 Nov 2008 19:36: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 7EA3D1065676 for <perforce@FreeBSD.org>; Tue, 11 Nov 2008 19:36:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81A778FC1C for <perforce@FreeBSD.org>; Tue, 11 Nov 2008 19:36:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mABJarBq053397 for <perforce@FreeBSD.org>; Tue, 11 Nov 2008 19:36:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mABJaqTA053395 for perforce@freebsd.org; Tue, 11 Nov 2008 19:36:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 11 Nov 2008 19:36:52 GMT Message-Id: <200811111936.mABJaqTA053395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 152815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 19:36:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=152815 Change 152815 by hselasky@hselasky_laptop001 on 2008/11/11 19:36:05 IFC @ 152813 Affected files ... .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/minidump_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/usb/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/minidump.h#1 branch .. //depot/projects/usb/src/sys/arm/include/pmap.h#8 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/systrace/systrace.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/usb/src/sys/conf/NOTES#21 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#11 integrate .. //depot/projects/usb/src/sys/conf/files.arm#8 integrate .. //depot/projects/usb/src/sys/conf/files.i386#14 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#12 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#6 integrate .. //depot/projects/usb/src/sys/dev/an/if_an.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/usb/src/sys/dev/en/midway.c#6 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.h#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_pentium.h#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.h#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.h#2 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_tsc.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_tsc.h#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/usb/src/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#31 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#21 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/usb/src/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/usb/src/sys/kern/init_sysent.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_firmware.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#9 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#9 integrate .. //depot/projects/usb/src/sys/kern/syscalls.c#10 integrate .. //depot/projects/usb/src/sys/kern/syscalls.master#10 integrate .. //depot/projects/usb/src/sys/kern/systrace_args.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/modules/Makefile#22 integrate .. //depot/projects/usb/src/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/krpc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/snp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/usb/src/sys/net/if.c#12 integrate .. //depot/projects/usb/src/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/usb/src/sys/net/if_gif.c#9 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#8 integrate .. //depot/projects/usb/src/sys/net/radix_mpath.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_tty.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_fha.c#2 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#11 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#11 integrate .. //depot/projects/usb/src/sys/sys/cfictl.h#2 integrate .. //depot/projects/usb/src/sys/sys/pmc.h#4 integrate .. //depot/projects/usb/src/sys/sys/priv.h#9 integrate .. //depot/projects/usb/src/sys/sys/proc.h#13 integrate .. //depot/projects/usb/src/sys/sys/syscall.h#10 integrate .. //depot/projects/usb/src/sys/sys/syscall.mk#10 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#9 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#10 integrate .. //depot/projects/usb/src/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#12 integrate .. //depot/projects/usb/src/sys/xdr/xdr_mbuf.c#3 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/include/pmc_mdep.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/amd64/include/pmc_mdep.h,v 1.6 2008/09/15 06:47:52 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.7 2008/11/09 17:37:54 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -35,9 +35,35 @@ #ifndef _MACHINE_PMC_MDEP_H #define _MACHINE_PMC_MDEP_H 1 +#ifdef _KERNEL +struct pmc_mdep; +#endif + #include <dev/hwpmc/hwpmc_amd.h> #include <dev/hwpmc/hwpmc_piv.h> +#include <dev/hwpmc/hwpmc_tsc.h> +/* + * Intel processors implementing V2 and later of the Intel performance + * measurement architecture have PMCs of the following classes: TSC, + * IAF and IAP. + */ +#define PMC_MDEP_CLASS_INDEX_TSC 0 +#define PMC_MDEP_CLASS_INDEX_K8 1 +#define PMC_MDEP_CLASS_INDEX_P4 1 +#define PMC_MDEP_CLASS_INDEX_IAF 1 +#define PMC_MDEP_CLASS_INDEX_IAP 2 + +/* + * On the amd64 platform we support the following PMCs. + * + * TSC The timestamp counter + * K8 AMD Athlon64 and Opteron PMCs in 64 bit mode. + * PIV Intel P4/HTT and P4/EMT64 + * IAP Intel Core/Core2/Atom CPUs in 64 bits mode. + * IAF Intel fixed-function PMCs in Core2 and later CPUs. + */ + union pmc_md_op_pmcallocate { struct pmc_md_amd_op_pmcallocate pm_amd; struct pmc_md_p4_op_pmcallocate pm_p4; @@ -55,8 +81,6 @@ struct pmc_md_p4_pmc pm_p4; }; -struct pmc; - #define PMC_TRAPFRAME_TO_PC(TF) ((TF)->tf_rip) #define PMC_TRAPFRAME_TO_FP(TF) ((TF)->tf_rbp) #define PMC_TRAPFRAME_TO_USER_SP(TF) ((TF)->tf_rsp) @@ -88,5 +112,10 @@ void start_exceptions(void), end_exceptions(void); void pmc_x86_lapic_enable_pmc_interrupt(void); -#endif +struct pmc_mdep *pmc_amd_initialize(void); +void pmc_amd_finalize(struct pmc_mdep *_md); +struct pmc_mdep *pmc_intel_initialize(void); +void pmc_intel_finalize(struct pmc_mdep *_md); + +#endif /* _KERNEL */ #endif /* _MACHINE_PMC_MDEP_H */ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.49 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.50 2008/11/11 14:55:59 ed Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -977,33 +977,20 @@ int linux_pipe(struct thread *td, struct linux_pipe_args *args) { - int pip[2]; int error; - register_t reg_rdx; + int fildes[2]; #ifdef DEBUG if (ldebug(pipe)) printf(ARGS(pipe, "*")); #endif - reg_rdx = td->td_retval[1]; - error = pipe(td, 0); - if (error) { - td->td_retval[1] = reg_rdx; + error = kern_pipe(td, fildes); + if (error) return (error); - } - pip[0] = td->td_retval[0]; - pip[1] = td->td_retval[1]; - error = copyout(pip, args->pipefds, 2 * sizeof(int)); - if (error) { - td->td_retval[1] = reg_rdx; - return (error); - } - - td->td_retval[1] = reg_rdx; - td->td_retval[0] = 0; - return (0); + /* XXX: Close descriptors on error. */ + return (copyout(fildes, args->pipefds, sizeof fildes)); } int ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.38 2008/11/09 10:48:06 ed Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed */ #ifndef _LINUX_SYSPROTO_H_ @@ -378,6 +378,10 @@ char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; +struct linux_setdomainname_args { + char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; + char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; +}; struct linux_newuname_args { char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; }; @@ -1077,6 +1081,7 @@ int linux_ipc(struct thread *, struct linux_ipc_args *); int linux_sigreturn(struct thread *, struct linux_sigreturn_args *); int linux_clone(struct thread *, struct linux_clone_args *); +int linux_setdomainname(struct thread *, struct linux_setdomainname_args *); int linux_newuname(struct thread *, struct linux_newuname_args *); int linux_adjtimex(struct thread *, struct linux_adjtimex_args *); int linux_mprotect(struct thread *, struct linux_mprotect_args *); @@ -1339,6 +1344,7 @@ #define LINUX_SYS_AUE_linux_ipc AUE_NULL #define LINUX_SYS_AUE_linux_sigreturn AUE_SIGRETURN #define LINUX_SYS_AUE_linux_clone AUE_RFORK +#define LINUX_SYS_AUE_linux_setdomainname AUE_SYSCTL #define LINUX_SYS_AUE_linux_newuname AUE_NULL #define LINUX_SYS_AUE_linux_adjtimex AUE_ADJTIME #define LINUX_SYS_AUE_linux_mprotect AUE_MPROTECT ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.38 2008/11/09 10:48:06 ed Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed */ #define LINUX_SYS_exit 1 @@ -112,7 +112,7 @@ #define LINUX_SYS_fsync 118 #define LINUX_SYS_linux_sigreturn 119 #define LINUX_SYS_linux_clone 120 -#define LINUX_SYS_setdomainname 121 +#define LINUX_SYS_linux_setdomainname 121 #define LINUX_SYS_linux_newuname 122 #define LINUX_SYS_linux_adjtimex 124 #define LINUX_SYS_linux_mprotect 125 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.37 2008/05/13 20:02:25 rdivacky Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.38 2008/11/09 10:48:06 ed Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 184789 2008-11-09 10:45:13Z ed */ #include "opt_compat.h" @@ -140,7 +140,7 @@ { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = setdomainname */ + { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ ==== //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#8 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.34 2008/05/13 20:01:26 rdivacky Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.35 2008/11/09 10:45:13 ed Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -216,7 +216,7 @@ ; linux uses some strange calling convention here so we have to use the dummy arg 120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack, \ void *parent_tidptr, int dummy, void * child_tidptr); } -121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ +121 AUE_SYSCTL STD { int linux_setdomainname(char *name, \ int len); } 122 AUE_NULL STD { int linux_newuname( \ struct l_new_utsname *buf); } ==== //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -25,12 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.5 2008/10/01 22:08:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.6 2008/11/06 16:20:27 raj Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/cons.h> +#include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/proc.h> #include <sys/kerneldump.h> @@ -44,6 +45,11 @@ CTASSERT(sizeof(struct kerneldumpheader) == 512); +int do_minidump = 1; +TUNABLE_INT("debug.minidump", &do_minidump); +SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0, + "Enable mini crash dumps"); + /* * Don't touch the first SIZEOF_METADATA bytes on the dump device. This * is to protect us from metadata and to protect metadata from us. @@ -155,11 +161,10 @@ vm_offset_t va; uint32_t pgs; size_t counter, sz, chunk; - int c, error, twiddle; + int c, error; error = 0; /* catch case in which chunk size is 0 */ - counter = 0; /* Update twiddle every 16MB */ - twiddle = 0; + counter = 0; va = 0; pgs = mdp->md_size / PAGE_SIZE; pa = mdp->md_start; @@ -264,7 +269,12 @@ off_t hdrgap; size_t hdrsz; int error; - + + if (do_minidump) { + minidumpsys(di); + return; + } + bzero(&ehdr, sizeof(ehdr)); ehdr.e_ident[EI_MAG0] = ELFMAG0; ehdr.e_ident[EI_MAG1] = ELFMAG1; ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#12 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.106 2008/11/06 16:28:28 raj Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -270,6 +270,11 @@ struct msgbuf *msgbufp = 0; +/* + * Crashdump maps. + */ +static caddr_t crashdumpmap; + extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); @@ -1209,7 +1214,7 @@ CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d " "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) - cpu_l2cache_wb_range(va, rest); + cpu_l2cache_wb_range(va, rest); len -= rest; va += rest; @@ -1241,7 +1246,7 @@ CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d " "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) - cpu_l2cache_wb_range(va, rest); + cpu_l2cache_wb_range(va, rest); len -= rest; va += rest; @@ -1276,6 +1281,7 @@ pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv, boolean_t rd_only) { + CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x " "len 0x%x ", pm, pm == pmap_kernel(), va, len); CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only); @@ -1290,8 +1296,7 @@ cpu_dcache_wbinv_range(va, len); pmap_l2cache_wbinv_range(pm, va, len); } - } else - if (!rd_only) { + } else if (!rd_only) { cpu_dcache_wb_range(va, len); pmap_l2cache_wb_range(pm, va, len); } @@ -2455,6 +2460,8 @@ pmap_alloc_specials(&virtual_avail, 1, (vm_offset_t*)&_tmppt, NULL); + pmap_alloc_specials(&virtual_avail, + MAXDUMPPGS, (vm_offset_t *)&crashdumpmap, NULL); SLIST_INIT(&l1_list); TAILQ_INIT(&l1_lru_list); mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF); @@ -2793,6 +2800,20 @@ } /* + * Make a temporary mapping for a physical address. This is only intended + * to be used for panic dumps. + */ +void * +pmap_kenter_temp(vm_paddr_t pa, int i) +{ + vm_offset_t va; + + va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE); + pmap_kenter(va, pa); + return ((void *)crashdumpmap); +} + +/* * add a wired page to the kva * note that in order for the mapping to take effect -- you * should do a invltlb after doing the pmap_kenter... @@ -3958,7 +3979,7 @@ * Hook in the page, zero it, invalidate the TLB as needed. * * Note the temporary zero-page mapping must be a non-cached page in - * ordert to work without corruption when write-allocate is enabled. + * order to work without corruption when write-allocate is enabled. */ *cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE); cpu_tlb_flushD_SE(cdstp); ==== //depot/projects/usb/src/sys/arm/include/md_var.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/md_var.h,v 1.40 2001/07/12 - * $FreeBSD: src/sys/arm/include/md_var.h,v 1.4 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/md_var.h,v 1.5 2008/11/06 16:20:27 raj Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -35,6 +35,8 @@ extern char sigcode[]; extern int szsigcode; +extern uint32_t *vm_page_dump; +extern int vm_page_dump_size; extern int (*_arm_memcpy)(void *, void *, int, int); extern int (*_arm_bzero)(void *, int, int); @@ -46,7 +48,11 @@ #define SRC_IS_USER 0x2 #define IS_PHYSICAL 0x4 +struct dumperinfo; extern int busdma_swi_pending; void busdma_swi(void); +void dump_add_page(vm_paddr_t); +void dump_drop_page(vm_paddr_t); +void minidumpsys(struct dumperinfo *); #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/usb/src/sys/arm/include/pmap.h#8 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.29 2008/03/06 21:59:47 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.30 2008/11/06 16:20:27 raj Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -206,6 +206,7 @@ void pmap_bootstrap(vm_offset_t, vm_offset_t, struct pv_addr *); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); void pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa); +void *pmap_kenter_temp(vm_paddr_t pa, int i); void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_offset_t, vm_size_t); ==== //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.1 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.2 2008/11/06 16:25:12 raj Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -93,9 +93,6 @@ #define debugf(fmt, args...) #endif -#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ -#define KERNEL_PT_KERN 1 - /* * This is the number of L2 page tables required for covering max * (hypothetical) memsize of 4GB and all kernel mappings (vectors, msgbuf, @@ -366,7 +363,7 @@ struct bi_mem_region *mr; void *kmdp; u_int l1pagetable; - int i = 0; + int i = 0, j = 0; kmdp = NULL; lastaddr = 0; @@ -465,13 +462,14 @@ if (!(i % (PAGE_SIZE / L2_TABLE_SIZE_REAL))) { valloc_pages(kernel_pt_table[i], L2_TABLE_SIZE / PAGE_SIZE); + j = i; } else { - kernel_pt_table[i].pv_va = freemempos - - (i % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) * - L2_TABLE_SIZE_REAL; + kernel_pt_table[i].pv_va = kernel_pt_table[j].pv_va + + L2_TABLE_SIZE_REAL * (i - j); kernel_pt_table[i].pv_pa = kernel_pt_table[i].pv_va - KERNVIRTADDR + KERNPHYSADDR; + } } /* @@ -506,7 +504,7 @@ l2_start = lastaddr & ~(L1_S_OFFSET); for (i = 0 ; i < l2size - 1; i++) pmap_link_l2pt(l1pagetable, l2_start + i * L1_S_SIZE, - &kernel_pt_table[KERNEL_PT_KERN + i]); + &kernel_pt_table[i]); pmap_curmaxkvaddr = l2_start + (l2size - 1) * L1_S_SIZE; @@ -532,7 +530,7 @@ /* Link and map the vector page */ pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH, - &kernel_pt_table[KERNEL_PT_SYS]); + &kernel_pt_table[l2size - 1]); pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); @@ -603,8 +601,8 @@ arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); - dump_avail[0] = KERNPHYSADDR; - dump_avail[1] = KERNPHYSADDR + memsize; + dump_avail[0] = 0; + dump_avail[1] = memsize; dump_avail[2] = 0; dump_avail[3] = 0; ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.5 2008/05/24 19:30:38 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.7 2008/11/05 20:32:13 rodrigc Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -93,6 +93,10 @@ zfs_kmem_free(void *buf, size_t size __unused) { #ifdef KMEM_DEBUG + if (buf == NULL) { + printf("%s: attempt to free NULL\n",__func__); + return; + } struct kmem_item *i; buf = (u_char *)buf - sizeof(struct kmem_item); @@ -236,7 +240,8 @@ } #ifdef KMEM_DEBUG -static void +void kmem_show(void *); +void kmem_show(void *dummy __unused) { struct kmem_item *i; @@ -248,12 +253,10 @@ printf("KMEM_DEBUG: Leaked elements:\n\n"); LIST_FOREACH(i, &kmem_items, next) { printf("address=%p\n", i); - stack_print(&i->stack); - printf("\n"); } } mtx_unlock(&kmem_items_mtx); } -SYSUNINIT(sol_kmem, SI_SUB_DRIVERS, SI_ORDER_FIRST, kmem_show, NULL); +SYSUNINIT(sol_kmem, SI_SUB_CPU, SI_ORDER_FIRST, kmem_show, NULL); #endif /* KMEM_DEBUG */ ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/types.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/cddl/compat/opensolaris/sys/types.h,v 1.4 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/types.h,v 1.5 2008/11/05 19:39:11 rodrigc Exp $ */ #ifndef _OPENSOLARIS_SYS_TYPES_H_ @@ -64,12 +64,13 @@ typedef int64_t rlim64_t; #else - +#ifdef NEED_SOLARIS_BOOLEAN #if defined(__XOPEN_OR_POSIX) typedef enum { _B_FALSE, _B_TRUE } boolean_t; #else typedef enum { B_FALSE, B_TRUE } boolean_t; #endif /* defined(__XOPEN_OR_POSIX) */ +#endif typedef longlong_t offset_t; typedef u_longlong_t u_offset_t; ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.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/cddl/compat/opensolaris/sys/uio.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/uio.h,v 1.3 2008/11/05 19:39:11 rodrigc Exp $ */ #ifndef _OPENSOLARIS_SYS_UIO_H_ @@ -51,6 +51,7 @@ #define uio_loffset uio_offset +#ifdef BUILDING_ZFS static __inline int zfs_uiomove(void *cp, size_t n, enum uio_rw dir, uio_t *uio) { @@ -59,5 +60,6 @@ return (uiomove(cp, (int)n, uio)); } #define uiomove(cp, n, dir, uio) zfs_uiomove((cp), (n), (dir), (uio)) +#endif #endif /* !_OPENSOLARIS_SYS_UIO_H_ */ ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $ + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $ */ /* @@ -3007,6 +3007,9 @@ case DIF_VAR_EXECARGS: { struct pargs *p_args = curthread->td_proc->p_args; + if (p_args == NULL) + return(0); + return (dtrace_dif_varstrz( (uintptr_t) p_args->ar_args, p_args->ar_length, state, mstate)); } @@ -10598,7 +10601,6 @@ /* * If there is already a buffer allocated for this CPU, it * is only possible that this is a DR event. In this case, - * the buffer size must match our specified size. */ if (buf->dtb_tomax != NULL) { ASSERT(buf->dtb_size == size); @@ -12815,11 +12817,7 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else if (dev != NULL) { - /* - * Disable this until we have the ability to set user - * credentials for DTrace. - * cr = dev->si_cred; - */ + cr = dev->si_cred; m = dev2unit(dev); } @@ -15241,6 +15239,15 @@ } #endif +#if !defined(sun) +#if __FreeBSD_version >= 800039 +static void +dtrace_dtr(void *data __unused) +{ +} +#endif +#endif + /*ARGSUSED*/ static int #if defined(sun) @@ -15266,6 +15273,7 @@ #else cred_t *cred_p = NULL; +#if __FreeBSD_version < 800039 /* * The first minor device is the one that is cloned so there is * nothing more to do here. @@ -15281,6 +15289,7 @@ */ if (dev->si_drv1 != NULL) return (EBUSY); +#endif cred_p = dev->si_cred; #endif @@ -15292,9 +15301,11 @@ dtrace_cred2priv(cred_p, &priv, &uid, &zoneid); if (priv == DTRACE_PRIV_NONE) { #if !defined(sun) +#if __FreeBSD_version < 800039 /* Destroy the cloned device. */ destroy_dev(dev); #endif +#endif return (EACCES); } @@ -15326,7 +15337,11 @@ state = dtrace_state_create(devp, cred_p); #else state = dtrace_state_create(dev); +#if __FreeBSD_version < 800039 dev->si_drv1 = state; +#else + devfs_set_cdevpriv(state, dtrace_dtr); +#endif #endif mutex_exit(&cpu_lock); @@ -15340,9 +15355,11 @@ #endif mutex_exit(&dtrace_lock); #if !defined(sun) +#if __FreeBSD_version < 800039 /* Destroy the cloned device. */ destroy_dev(dev); #endif +#endif return (EAGAIN); } @@ -15368,11 +15385,16 @@ state = ddi_get_soft_state(dtrace_softstate, minor); #else +#if __FreeBSD_version < 800039 dtrace_state_t *state = dev->si_drv1; /* Check if this is not a cloned device. */ if (dev2unit(dev) == 0) return (0); +#else + dtrace_state_t *state; + devfs_get_cdevpriv((void **) &state); +#endif #endif @@ -15392,7 +15414,11 @@ #if !defined(sun) kmem_free(state, 0); +#if __FreeBSD_version < 800039 dev->si_drv1 = NULL; +#else + devfs_clear_cdevpriv(); +#endif #endif } @@ -15407,8 +15433,10 @@ mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 11 20:24:42 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235BF106567D; Tue, 11 Nov 2008 20:24: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 DA8671065677 for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:24:41 +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 DE88C8FC08 for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:24:41 +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 mABKOfOf057910 for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:24:41 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 mABKOffs057908 for perforce@freebsd.org; Tue, 11 Nov 2008 20:24:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 20:24:41 GMT Message-Id: <200811112024.mABKOffs057908@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 20:24:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=152816 Change 152816 by rwatson@rwatson_fledge on 2008/11/11 20:24:24 Move extended header support information into the OpenBSM 1.1 alpha 2 section, as we have haven't released alpha 2 yet. Revise description a bit. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#9 (text+ko) ==== @@ -1,11 +1,5 @@ OpenBSM Version History -- Add support for setting the audit kernel information. This information - will be used when setting the host information for extended header tokens. - The audit_control file now supports a "host" parameter which can be used - by the auditing daemon to set this information. If this parameter is not - used, the OpenBSM will default to the use of regular tokens. - OpenBSM 1.1 alpha 2 - Include files in OpenBSM are now broken out into two parts: library builds @@ -23,6 +17,13 @@ or asprintf(). Added compat/strlcpy.h for Linux. - Remove compatibility defines for old Darwin token constant names; now only BSM token names are provided and used. +- Add support for extended header tokens, which contain space for information + on the host generating the record. +- Add support for setting extended host information in the kernel, which is + used for setting host information in extended header tokens. The + audit_control file now supports a "host" parameter which can be used by + auditd to set the information; if not present, the kernel parameters won't + be set and auditd uses unextended headers for records that it generates. OpenBSM 1.1 alpha 1 @@ -347,4 +348,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#8 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#9 $ From owner-p4-projects@FreeBSD.ORG Tue Nov 11 20:58:16 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 630D7106567A; Tue, 11 Nov 2008 20:58: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 286D51065677 for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:58:16 +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 0C1198FC0A for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:58:16 +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 mABKwF8c070141 for <perforce@freebsd.org>; Tue, 11 Nov 2008 20:58: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 mABKwFFX070139 for perforce@freebsd.org; Tue, 11 Nov 2008 20:58:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 20:58:15 GMT Message-Id: <200811112058.mABKwFFX070139@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 20:58:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=152817 Change 152817 by rwatson@rwatson_lethe on 2008/11/11 20:57:53 Don't use auditon(2) on systems without HAVE_AUDIT_SYSCALLS defined, and exclude certain use of extended headers where that is implicit. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#31 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#72 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#31 (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#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#31 $ */ #include <sys/types.h> @@ -213,6 +213,7 @@ struct auditinfo_addr aia; struct timeval tm; +#ifdef HAVE_AUDIT_SYSCALLS /* * Grab the size of the address family stored in the kernel's audit * state. @@ -222,9 +223,11 @@ if (auditon(A_GETKAUDIT, &aia, sizeof(aia)) < 0) { if (errno != ENOSYS) return (-1); +#endif /* HAVE_AUDIT_SYSCALLS */ tot_rec_size = rec->len + AUDIT_HEADER_SIZE + AUDIT_TRAILER_SIZE; header = au_to_header(tot_rec_size, event, 0); +#ifdef HAVE_AUDIT_SYSCALLS } else { if (gettimeofday(&tm, NULL) < 0) return (-1); @@ -251,6 +254,7 @@ else header = au_to_header(tot_rec_size, event, 0); } +#endif /* HAVE_AUDIT_SYSCALLS */ if (header == NULL) return (-1); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#72 (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_token.c#71 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#72 $ */ #include <sys/types.h> @@ -1396,6 +1396,7 @@ } #if !defined(KERNEL) && !defined(_KERNEL) +#ifdef HAVE_AUDIT_SYSCALLS token_t * au_to_header32_ex(int rec_size, au_event_t e_type, au_emod_t e_mod) { @@ -1411,6 +1412,7 @@ } return (au_to_header32_ex_tm(rec_size, e_type, e_mod, tm, &aia)); } +#endif /* HAVE_AUDIT_SYSCALLS */ token_t * au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod) @@ -1440,13 +1442,15 @@ return (au_to_header32(rec_size, e_type, e_mod)); } +#ifdef HAVE_AUDIT_SYSCALLS token_t * au_to_header_ex(int rec_size, au_event_t e_type, au_emod_t e_mod) { return (au_to_header32_ex(rec_size, e_type, e_mod)); } -#endif +#endif /* HAVE_AUDIT_SYSCALLS */ +#endif /* !defined(KERNEL) && !defined(_KERNEL) */ /* * token ID 1 byte From owner-p4-projects@FreeBSD.ORG Tue Nov 11 21:01:19 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9821810656DC; Tue, 11 Nov 2008 21:01: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 5E00C10656D7 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:01: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 4214D8FC1E for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:01: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 mABL1JdR070428 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:01: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 mABL1Jta070426 for perforce@freebsd.org; Tue, 11 Nov 2008 21:01:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 21:01:19 GMT Message-Id: <200811112101.mABL1Jta070426@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 21:01:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=152818 Change 152818 by rwatson@rwatson_lethe on 2008/11/11 21:00:41 In most places in OpenBSM, we rely on the audit_internal.h definition of __unused for platforms not implementing it; however, for auditfilter_noop, which is sample code to be used by third-party developers, don't rey on an OpenBSM-internal definition, and just do it here as well. Affected files ... .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/auditfilter_noop.c#6 $ */ /* @@ -38,6 +38,10 @@ #include <bsm/libbsm.h> #include <bsm/audit_filter.h> +#ifndef __unused +#define __unused +#endif + int AUDIT_FILTER_ATTACH(void *instance __unused, int argc __unused, char *argv[] __unused) From owner-p4-projects@FreeBSD.ORG Tue Nov 11 21:06:25 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 566301065674; Tue, 11 Nov 2008 21:06: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 1AC2D1065672 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:06:25 +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 F31768FC1D for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:06:24 +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 mABL6O9g071735 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:06:24 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 mABL6O44071733 for perforce@freebsd.org; Tue, 11 Nov 2008 21:06:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 21:06:24 GMT Message-Id: <200811112106.mABL6O44071733@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 21:06:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=152820 Change 152820 by rwatson@rwatson_cinnamon on 2008/11/11 21:05:34 Only include one of types.h or param.h. Perhaps ideally we would use something from limits.h for MAXHOSTNAMELEN instead, but not yet. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#39 (text+ko) ==== @@ -26,17 +26,16 @@ * (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.c#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#39 $ */ -#include <sys/types.h> +#include <sys/param.h> #include <config/config.h> #include <sys/dirent.h> #include <sys/mman.h> #include <sys/socket.h> -#include <sys/param.h> #ifdef HAVE_FULL_QUEUE_H #include <sys/queue.h> #else /* !HAVE_FULL_QUEUE_H */ From owner-p4-projects@FreeBSD.ORG Tue Nov 11 21:14:33 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C73001065680; Tue, 11 Nov 2008 21:14: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 8A034106567A for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:14:33 +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 54E218FC2A for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:14:33 +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 mABLEX2E072296 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:14:33 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 mABLEXqU072294 for perforce@freebsd.org; Tue, 11 Nov 2008 21:14:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 21:14:33 GMT Message-Id: <200811112114.mABLEXqU072294@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 21:14:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=152821 Change 152821 by rwatson@rwatson_fledge on 2008/11/11 21:14:23 OpenBSM 1.1alpha2 binary. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-alpha2.tgz#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Nov 11 21:22:43 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5375F1065694; Tue, 11 Nov 2008 21:22: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 17C32106567F for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:22:43 +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 EFC508FC18 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:22:42 +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 mABLMfrW072980 for <perforce@freebsd.org>; Tue, 11 Nov 2008 21:22:41 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 mABLMfvS072978 for perforce@freebsd.org; Tue, 11 Nov 2008 21:22:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 21:22:41 GMT Message-Id: <200811112122.mABLMfvS072978@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 <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 152822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 11 Nov 2008 21:22:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=152822 Change 152822 by rwatson@rwatson_fledge on 2008/11/11 21:22:18 Hook up OpenBSM 1.1 alpha2 to the TrustedBSD web site. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#32 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#32 (text+ko) ==== @@ -1,5 +1,6 @@ <!-- Copyright (c) 2005-2008 Robert N. M. Watson + Copyright (c) 2008 Apple, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,7 +30,7 @@ <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $P4: //depot/projects/trustedbsd/www/openbsm.page#31 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#32 $ </cvs:keyword> </cvs:keywords> @@ -177,6 +178,44 @@ <td valign="top" bgcolor="#eeeeee"><b>Description</b></td> </tr> <tr> + <td bgcolor="#eeeeee">1.1 alpha 2</td> + <td bgcolor="#eeeeee"><a href="downloads/openbsm-1.1-alpha2.tgz">openbsm-1.1-alpha2.tgz</a></td> + <td bgcolor="#eeeeee">512K</td> + <td bgcolor="#eeeeee">2008-11-11</td> + <td bgcolor="#eeeeee"> + <p>In this revision, BSM include files required by OS vendors for + use in kernels are broken out into a separate include + directory, a configure option is added to force use of native + rather than OpenBSM sys includes if desired, strlcpy() and + strlcat() are used in preference to less robust APIs, + compatibility defines for old Darwin event identifiers are + removed, support for exended header tokens (containing host + information) is added to the BSM library and auditd(8), and can + be set in audit_control(5).</p> + </td> + </tr> + </table> + + </html> + </section> + + <section> + <title>Historical Development Snapshots + + +

    This is an archive of past OpenBSM test snapshots; use of these + versions is not recommended. + These snapshots are from the development of OpenBSM 1.1:

    + + + + + + + + + + @@ -193,15 +232,7 @@
    VersionDownloadSizeDateDescription
    1.1 alpha 1 openbsm-1.1-alpha1.tgz 496K
    - - - -
    - Historical Development Snapshots - - -

    This is an archive of past OpenBSM test snapshots; use of these - versions is not recommended.

    +

    These snapshots are from the development of OpenBSM 1.0:

    From owner-p4-projects@FreeBSD.ORG Tue Nov 11 21:24:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2779D1065688; Tue, 11 Nov 2008 21:24: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 DEC5F106567A for ; Tue, 11 Nov 2008 21:24:43 +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 C31568FC12 for ; Tue, 11 Nov 2008 21:24:43 +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 mABLOhPE073126 for ; Tue, 11 Nov 2008 21:24:43 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mABLOhup073124 for perforce@freebsd.org; Tue, 11 Nov 2008 21:24:43 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 11 Nov 2008 21:24:43 GMT Message-Id: <200811112124.mABLOhup073124@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 152823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Nov 2008 21:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=152823 Change 152823 by rene@rene_self on 2008/11/11 21:24:10 Finish translation of Contributing article. Checked build, spelling, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#6 (text+ko) ==== @@ -1,3 +1,4 @@ + @@ -11,8 +12,6 @@ Bijdragen aan &os; - $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.508 2006/03/06 21:52:11 jcamou Exp $ - Vertaald door René Ladan. @@ -40,14 +39,14 @@ bijdragen Dus u wilt bijdragen aan &os;? Dat is mooi! &os; - vertrouwt op de bijdragen van zijn gebruikers - om te overleven. Uw bijdragen worden niet alleen gewaardeerd, ze - zijn van vitaal belang voor de aanhoudende groei van &os;. + bouwt op de bijdragen van zijn gebruikers om te + overleven. Uw bijdragen worden niet alleen gewaardeerd, ze zijn van + vitaal belang voor de aanhoudende groei van &os;. In tegenstelling tot wat sommige mensen u laten geloven, hoeft u geen doorgewinterde programmeur of een goede vriend van het coreteam van &os; te zijn opdat uw bijdragen geaccepteerd worden. Een groot - en groeiend aantal internationale contributanten, van een grote + en groeiend aantal internationale contribuanten, van een grote variëteit aan leeftijden en technische expertisegebieden, ontwikkelen &os;. Er is altijd meer werk te doen dan dat er mensen zijn om het uit te voeren, en meer hulp wordt altijd @@ -76,7 +75,7 @@ Wat is er nodig - De onderstaande lijst van taken en subprojecten representeert + De onderstaande lijst van taken en deelprojecten representeert een soort amalgaam van verschillende TODO-lijsten en verzoeken van gebruikers. @@ -87,13 +86,13 @@ Veel mensen die betrokken zijn bij &os; zijn geen programmeurs. Het Project omvat documentatieschrijvers, Webontwerpers, en mensen ter ondersteuning. Deze mensen hoeven - alleen een tijdsinverstering en een wil om te leren bij te + alleen een tijdsinvestering en een wil om te leren bij te dragen. Lees regelmatig de FAQ en het Handboek door. Laat het - ons weten als er iets slecht is uitgelegd, is velopen of + ons weten als er iets slecht is uitgelegd, is verlopen of gewoon helemaal verkeerd is. Of stuur een reparatie in (SGML is niet moeilijk te leren, maar er is geen bezwaar tegen inzendingen in ASCII). @@ -171,7 +170,7 @@ Bouw de broncodeboom (of slechts een gedeelte ervan) met - extra waarshuwingen aangezet en ruim de waarschuwingen + extra waarschuwingen aangezet en ruim de waarschuwingen op. @@ -216,7 +215,7 @@ De &os; PR-lijst laat alle huidige actieve probleemrapportages - en verzoeken voor verrijkingen zien dir door gebruikers van &os; + en verzoeken voor verrijkingen zien die door gebruikers van &os; zijn ingestuurd. De PR-database bevat zowel taken voor programmeurs als voor niet-programmeurs. Bekijk de open PR's, en kijk of iets uw interesse wekt. Sommige van deze kunnen heel @@ -239,7 +238,7 @@ pagina De &os;-lijst van - projecten en ideeën voor vrijwilliggers is ook + projecten en ideeën voor vrijwilligers is ook beschikbaar voor mensen die aan het &os;-project willen bijdragen. Deze lijst wordt regelmatig bijgewerkt en bevat punten voor zowel programmeurs als niet-programmeurs met @@ -283,7 +282,7 @@ &man.uuencode.1; te gebruiken als ze 20kB overschrijden. - Na het opsturen van een rapport dinet u een bevestiging met + Na het opsturen van een rapport dient u een bevestiging met daarbij een volgnummer te krijgen. Bewaar dit volgnummer zodat u ons op de hoogte kunt houden met details over het probleem door mail te sturen naar &a.bugfollowup;. Gebruik het nummer @@ -345,15 +344,9 @@ Aannemende dat u in staat bent om redelijk recente broncode veilig kunt stellen om uw veranderingen op te baseren, is de volgende stap het produceren van een verzameling diffs om naar - de maintainers van &os; te sturen. Dit wordt gedaan met het - commando &man.diff.1;. + de onderhoudsmensen van &os; te sturen. Dit wordt gedaan met + het commando &man.diff.1;. - The preferred &man.diff.1; format for submitting patches - is the unified output format generated by diff - -u. However, for patches that substantially change a - region of code, a context output format diff generated by - diff -c may be more readable and thus - preferable. Het geprefereerde &man.diff.1;-formaat voor het opsturen van patches is het verenigde uitvoerformaat gegenereerd door diff -u. Echter, voor patches die @@ -380,7 +373,9 @@ Evenzo, &prompt.user; diff -u oudbestand nieuwbestand - or + + of + &prompt.user; diff -u -r oudbestand nieuwbestand zal hetzelfde doen, maar dan in het verenigde @@ -417,7 +412,7 @@ bijvoorbeeld als u onzeker bent over copyright-dingen die de verdere distributie ervan dicteren of als u eenvoudigweg niet klaar bent om het uit te geven zonder een voorafgaand nauwer - review, dan dinet u het direct naar &a.core; te sturen in plaats + review, dan dient u het direct naar &a.core; te sturen in plaats van het met &man.send-pr.1; op te sturen. De &a.core; bereikt een veel kleinere groep mensen die veel dagelijks werk op &os; doen. Merk op dat deze groep het ook erg @@ -434,17 +429,18 @@ Nieuwe code of grote pakketten met toegevoegde waarde In het geval van een significante bijdrage van een grote - bijdrage aan werk, of van een belangrijke nieuwe mogelijkheid aan - &os;, is het bijna altijd nodig om de veranderingen als uuencoded - tar-bestanden te versturen of ze naar een web- of FTP-site up te - loaden zodat andere mensen ze kunnen benaderen. Als u geen - toegang heeft tot een web- of FTP-site, vraag dan een geschikte - &os;-mailinglijst om iemand de veranderingen voor u te laten - hosten. + bijdrage aan werk, of van een belangrijke nieuwe mogelijkheid + aan &os;, is het bijna altijd nodig om de veranderingen als + uuencoded tar-bestanden te versturen of ze naar een web- of + FTP-site up te loaden zodat andere mensen ze kunnen benaderen. + Als u geen toegang heeft tot een web- of FTP-site, vraag dan een + geschikte &os;-mailinglijst om iemand de veranderingen voor u te + laten hosten. - Bij het werken met grote hoeveelheden code komt het gevoelige - onderwerp van copyright ook altijd naar voren. Acceptabele - copyrights voor code voor opname in &os; zijn: + Bij het werken met grote hoeveelheden code komt het + gevoelige onderwerp van copyright ook altijd naar voren. + Acceptabele copyrights voor code voor opname in &os; + zijn: BSD-copyright @@ -454,10 +450,10 @@ verkozen wegens zijn natuur van geen voorwaarden en de algemene aantrekkelijkheid voor commerciële ondernemingen. Ver van het ontmoedigen van - dit soort commercieel gebruik, moedigt het &os; Project zulke - participatie door commerciële interesses actief aan die - uiteindelijk geneigd kunen zijn om zelf iets in &os; te - investeren. + dit soort commercieel gebruik, moedigt het &os; Project + zulke participatie door commerciële interesses actief + aan die uiteindelijk geneigd kunnen zijn om zelf iets in + &os; te investeren. GPLGNU General Public License @@ -480,24 +476,18 @@ - Contributions coming under any other type of copyright - must be carefully reviewed before their inclusion into FreeBSD - will be considered. Contributions for which particularly - restrictive commercial copyrights apply are generally - rejected, though the authors are always encouraged to make - such changes available through their own channels. Bijdragen die onder een ander soort copyright vallen moeten zorgvuldig worden herzien voordat hun opname in &os; wordt overwogen. Bijdragen waarvoor nogal beperkende commerciële - copyrights gelden worden over het algemeen verworpen, alhoewel de - auteurs altijd worden aangemoedigd om zulke veranderingen via hun - eigen kanalen beschikbaar te maken. + copyrights gelden worden over het algemeen verworpen, alhoewel + de auteurs altijd worden aangemoedigd om zulke veranderingen via + hun eigen kanalen beschikbaar te maken. Om een copyright in BSD-stijl op uw werk te - plaatsen, dient u de volgende tekst aan het uiterste begn van elk - broncodebestand te plaatsen dat u wilt beschermen, en daarbij de - tekst tussen de %% door de juiste informatie - te vervangen: + plaatsen, dient u de volgende tekst aan het uiterste begin van + elk broncodebestand te plaatsen dat u wilt beschermen, en + daarbij de tekst tussen de %% door de juiste + informatie te vervangen: Copyright (c) %%juiste_jaren_hier%% %%uw_naam_hier%%, %%uw_staat%% %%uw_postcode%%. @@ -526,31 +516,35 @@ $Id$ - Voor uw gemak kan een kopie van deze tekst gevonden worden in + Voor uw gemak kan een kopie van deze tekst gevonden worden + in /usr/share/examples/etc/bsd-style-copyright. - Money, Hardware or Internet Access + Geld, hardware, of Internettoegang - We are always very happy to accept donations to further - the cause of the FreeBSD Project and, in a volunteer effort - like ours, a little can go a long way! Donations of hardware - are also very important to expanding our list of supported - peripherals since we generally lack the funds to buy such - items ourselves. + We accepteren altijd graag donaties om het &os; Project + verder te verspreiden en in een vrijwilligersonderneming zoals + het onze kan een klein beetje een groot verschil maken! + Hardwaredonaties zijn ook erg belangrijk om onze lijst van + ondersteunde randapparatuur uit te breiden aangezien ons het + over het algemeen aan de middelen ontbreekt om zelf zulke dingen + te kopen. - <anchor id="donations">Donating Funds + <anchor id="donations">Geld doneren - The FreeBSD Foundation is a non-profit, tax-exempt - foundation established to further the goals of the FreeBSD - Project. As a 501(c)3 entity, the Foundation is generally - exempt from US federal income tax as well as Colorado State - income tax. Donations to a tax-exempt entity are often - deductible from taxable federal income. + De &os; Foundation is een non-profit, belastinguitgesloten + stichting die opgericht is om de doelen van het &os; Project + verder te verspreiden. Als een 501(c)3-entiteit is de + Foundation over het algemeen uitgesloten van van + inkomstenbelasting van de overheid van de VS alsook van + inkomstenbelasting van de staat Colorado. Donaties aan een + entiteit die van belasting is uitgesloten zijn vaak aftrekbaar + van het belastbaar nationaal inkomen. - Donations may be sent in check form to: + Donaties kunnen als check verstuurd worden aan:
    The FreeBSD Foundation 7321 Brockway Dr. @@ -559,39 +553,39 @@
    - The FreeBSD Foundation is now able to accept donations - through the web with PayPal. To place a donation, please - visit the Foundation web - site. + De &os; Foundation is nu in staat om donaties via het web + met PayPal te ontvangen. Om een donatie te maken bezoekt u de + website + van de Foundation. - More information about the FreeBSD Foundation can be - found in Meer informatie over de &os; Foundation kan gevonden + worden in The - FreeBSD Foundation -- an Introduction. To contact - the Foundation by email, write to + FreeBSD Foundation -- an Introduction. Om de + Foundation per email te bereiken, schrijft u naar bod@FreeBSDFoundation.org.     - Donating Hardware - donations + Hardware doneren + + donaties - The FreeBSD Project happily accepts donations of - hardware that it can find good use for. If you are - interested in donating hardware, please contact the Donations Liaison - Office. + Het &os; Project accepteert graag hardwaredonaties die het + goed kan gebruiken. Als u geïnteresseerd bent in het + doneren van hardware, neem dan contact op met het Donations Liaison + Office. - Donating Internet Access + Internettoegang doneren - We can always use new mirror sites for FTP, WWW or - cvsup. If you would like to be such a - mirror, please see the Mirroring FreeBSD - article for more information. + We kunnen altijd nieuwe spiegelsites voor FTP, WWW, of + cvsup gebruiken. Als u zo'n spiegel wilt + hosten, bekijk dan het artikel Mirroring &os; + voor meer informtie.     From owner-p4-projects@FreeBSD.ORG Tue Nov 11 22:22:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFAB106567D; Tue, 11 Nov 2008 22:22: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 12C24106567A for ; Tue, 11 Nov 2008 22:22:43 +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 E0D2E8FC20 for ; Tue, 11 Nov 2008 22:22:42 +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 mABMMgwA078767 for ; Tue, 11 Nov 2008 22:22:42 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 mABMMgeR078765 for perforce@freebsd.org; Tue, 11 Nov 2008 22:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Nov 2008 22:22:42 GMT Message-Id: <200811112222.mABMMgeR078765@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 152827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 11 Nov 2008 22:22:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=152827 Change 152827 by rwatson@rwatson_fledge on 2008/11/11 22:21:46 Add news blub about OpenBSM 1.1 alpha 2. Modify old news about OpenBSM 1.1 alpha 1: we won't be shipping 1.1 in 7.1, it will be in 7.2. Affected files ... .. //depot/projects/trustedbsd/www/news.page#15 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#15 (text+ko) ==== @@ -1,6 +1,7 @@ @@ -486,6 +486,16 @@ + , Ondersteuning van + bestandssystemen + + + Gaat de ondersteuning voor vreemde bestandssystemen in + &os; na, zoals het Z File System van &sun;. + + + + , Vinum @@ -529,9 +539,31 @@ + + , DTrace + + + Beschrijft hoe het gereedschap DTrace van &sun; te + configureren en gebruiken in &os;. Dynamisch tracen kan + helpen bij het lokaliseren van prestatieproblemen, door + real-time systeemanalyse uit te voeren. + + + + , &os; bijwerken + + + Beschrijft de nieuwste gereedschappen die gebruikt kunnen + worden om een &os;-systeem bij te werken. Er is + &man.freebsd-update.8; voor het basissysteem, en + &man.portsnap.8; voor de Ports Collectie. + + + + , Seriële communicatie From owner-p4-projects@FreeBSD.ORG Wed Nov 12 22:36:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFF0C106568A; Wed, 12 Nov 2008 22:36:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83BE4106568E for ; Wed, 12 Nov 2008 22:36: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 6FDB08FC12 for ; Wed, 12 Nov 2008 22:36: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 mACMa3aG084286 for ; Wed, 12 Nov 2008 22:36:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mACMa3xx084284 for perforce@freebsd.org; Wed, 12 Nov 2008 22:36:03 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 12 Nov 2008 22:36:03 GMT Message-Id: <200811122236.mACMa3xx084284@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 152909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Nov 2008 22:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=152909 Change 152909 by rene@rene_self on 2008/11/12 22:35:33 Add a missing . Obtained from: manolis@ (sort of) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Remko Lodder %SOURCE% en_US.ISO8859-1/books/handbook/preface/preface.sgml - %SRCID% 1.40 + %SRCID% 1.41 --> @@ -540,7 +540,7 @@ - , DTrace + , DTrace Beschrijft hoe het gereedschap DTrace van &sun; te From owner-p4-projects@FreeBSD.ORG Wed Nov 12 23:03:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D30F7106567B; Wed, 12 Nov 2008 23:03:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96ADE1065679 for ; Wed, 12 Nov 2008 23:03:31 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81EAF8FC13 for ; Wed, 12 Nov 2008 23:03:31 +0000 (UTC) (envelope-from peter-gmail@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 mACN3VI5088841 for ; Wed, 12 Nov 2008 23:03:31 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mACN3Vd5088839 for perforce@freebsd.org; Wed, 12 Nov 2008 23:03:31 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Nov 2008 23:03:31 GMT Message-Id: <200811122303.mACN3Vd5088839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 12 Nov 2008 23:03:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=152911 Change 152911 by peter@peter_hammer on 2008/11/12 23:02:51 Attempt to cover both cases of running 32 bit binaries on 64 bit hosts. We may be using ld-elf32.so.1, which wants $LD_32_PRELOAD. Or it might be a regular i386 ld-elf.so.1 in a chroot, which will want $LD_PRELOAD. Cover both scenarios. Affected files ... .. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#5 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#5 (text+ko) ==== @@ -217,12 +217,17 @@ static HChar** setup_client_env ( HChar** origenv, const HChar* toolname) { HChar* preload_core = "vgpreload_core"; - HChar* ld_preload; + HChar* ld_preload = "LD_PRELOAD="; HChar* v_launcher = VALGRIND_LAUNCHER "="; - Int ld_preload_len; + Int ld_preload_len = VG_(strlen)( ld_preload ); Int v_launcher_len = VG_(strlen)( v_launcher ); Bool ld_preload_done = False; Int vglib_len = VG_(strlen)(VG_(libdir)); +#if defined(VGP_x86_freebsd) + HChar* ld_32_preload = "LD_32_PRELOAD="; + Int ld_32_preload_len = VG_(strlen)( ld_32_preload ); + Bool ld_32_preload_done = False; +#endif HChar** cpp; HChar** ret; @@ -277,15 +282,6 @@ vg_assert(envc == (cpp - ret)); - ld_preload = "LD_PRELOAD="; - ld_preload_len = VG_(strlen)( ld_preload ); -#if defined(VGP_x86_freebsd) - if (VG_(is32on64)()) - ld_preload = "LD_32_PRELOAD="; - else -#endif - ld_preload = "LD_PRELOAD="; - ld_preload_len = VG_(strlen)( ld_preload ); /* Walk over the new environment, mashing as we go */ for (cpp = ret; cpp && *cpp; cpp++) { if (VG_(memcmp)(*cpp, ld_preload, ld_preload_len) == 0) { @@ -313,6 +309,37 @@ ret[envc++] = cp; } +#if defined(VGP_x86_freebsd) + /* If we're running a 32 bit binary, ld-elf32.so.1 may be looking for + * a different variable name. Or it might be a 32 bit ld-elf.so.1 in a + * chroot. Cover both cases. */ + if (VG_(is32on64)()) { + for (cpp = ret; cpp && *cpp; cpp++) { + if (VG_(memcmp)(*cpp, ld_32_preload, ld_32_preload_len) == 0) { + Int len = VG_(strlen)(*cpp) + preload_string_len; + HChar *cp = VG_(malloc)("initimg-linux.sce.4a", len); + vg_assert(cp); + + VG_(snprintf)(cp, len, "%s%s:%s", + ld_32_preload, preload_string, (*cpp)+ld_32_preload_len); + + *cpp = cp; + + ld_32_preload_done = True; + } + } + if (!ld_32_preload_done) { + Int len = ld_32_preload_len + preload_string_len; + HChar *cp = VG_(malloc) ("initimg-linux.sce.5a", len); + vg_assert(cp); + + VG_(snprintf)(cp, len, "%s%s", ld_32_preload, preload_string); + + ret[envc++] = cp; + } + } +#endif + /* ret[0 .. envc-1] is live now. */ /* Find and remove a binding for VALGRIND_LAUNCHER. */ for (i = 0; i < envc; i++) From owner-p4-projects@FreeBSD.ORG Thu Nov 13 00:11:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B673106567E; Thu, 13 Nov 2008 00:11: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 4F82A106567A for ; Thu, 13 Nov 2008 00:11:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B8738FC14 for ; Thu, 13 Nov 2008 00:11:45 +0000 (UTC) (envelope-from peter-gmail@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 mAD0BjC4094949 for ; Thu, 13 Nov 2008 00:11:45 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAD0BjmG094947 for perforce@freebsd.org; Thu, 13 Nov 2008 00:11:45 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 13 Nov 2008 00:11:45 GMT Message-Id: <200811130011.mAD0BjmG094947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Nov 2008 00:11:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=152913 Change 152913 by peter@peter_cheese on 2008/11/13 00:10:51 Create and initialize an extra slot in the new env[] array for the 32 bit preload string. Affected files ... .. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#6 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#6 (text+ko) ==== @@ -272,13 +272,14 @@ /* Allocate a new space */ ret = VG_(malloc) ("initimg-linux.sce.3", - sizeof(HChar *) * (envc+1+1)); /* 1 new entry + NULL */ + sizeof(HChar *) * (envc+2+1)); /* 2 new entries + NULL */ vg_assert(ret); /* copy it over */ for (cpp = ret; *origenv; ) *cpp++ = *origenv++; *cpp = NULL; + *(cpp + 1) = NULL; vg_assert(envc == (cpp - ret)); From owner-p4-projects@FreeBSD.ORG Thu Nov 13 17:21:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC0911065673; Thu, 13 Nov 2008 17:21: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 9055C1065670 for ; Thu, 13 Nov 2008 17:21:24 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87F228FC08 for ; Thu, 13 Nov 2008 17:21:24 +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 mADHLOCK055135 for ; Thu, 13 Nov 2008 17:21:24 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mADHLOro055133 for perforce@freebsd.org; Thu, 13 Nov 2008 17:21:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Nov 2008 17:21:24 GMT Message-Id: <200811131721.mADHLOro055133@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 152938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Nov 2008 17:21:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=152938 Change 152938 by hselasky@hselasky_laptop001 on 2008/11/13 17:20:52 Don't poll standard input because libusb will not ensure that its data gets read. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#10 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#10 (text+ko) ==== @@ -886,7 +886,7 @@ void libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout) { - struct pollfd pfd[2]; + struct pollfd pfd[1]; if (!pdev->is_opened) { return; @@ -894,11 +894,8 @@ pfd[0].fd = pdev->file; pfd[0].events = (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM); pfd[0].revents = 0; - pfd[1].fd = 0; /* standard input */ - pfd[1].events = (POLLIN | POLLRDNORM); - pfd[1].revents = 0; - if (poll(pfd, 2, timeout)) { + if (poll(pfd, 1, timeout)) { /* ignore any error */ } return; From owner-p4-projects@FreeBSD.ORG Thu Nov 13 20:20:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665E4106567D; Thu, 13 Nov 2008 20:20: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 2AF561065679 for ; Thu, 13 Nov 2008 20:20:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B3768FC1A for ; Thu, 13 Nov 2008 20:20:39 +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 mADKKcD3073102 for ; Thu, 13 Nov 2008 20:20:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mADKKc5Z073100 for perforce@freebsd.org; Thu, 13 Nov 2008 20:20:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Nov 2008 20:20:38 GMT Message-Id: <200811132020.mADKKc5Z073100@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 152943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Nov 2008 20:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=152943 Change 152943 by hselasky@hselasky_laptop001 on 2008/11/13 20:20:25 Style. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#11 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#11 (text+ko) ==== @@ -647,7 +647,7 @@ int libusb20_dev_req_string_sync(struct libusb20_device *pdev, - uint8_t strIndex, uint16_t langid, void *ptr, uint16_t len) + uint8_t str_index, uint16_t langid, void *ptr, uint16_t len) { struct LIBUSB20_CONTROL_SETUP_DECODED req; int error; @@ -667,7 +667,7 @@ LIBUSB20_RECIPIENT_DEVICE | LIBUSB20_ENDPOINT_IN; req.bRequest = LIBUSB20_REQUEST_GET_DESCRIPTOR; - req.wValue = (LIBUSB20_DT_STRING << 8) | strIndex; + req.wValue = (LIBUSB20_DT_STRING << 8) | str_index; req.wIndex = langid; req.wLength = 4; /* bytes */ @@ -695,7 +695,7 @@ int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, - uint8_t strIndex, void *ptr, uint16_t len) + uint8_t str_index, void *ptr, uint16_t len) { char *buf; int error; @@ -720,7 +720,7 @@ } langid = temp[2] | (temp[3] << 8); - error = libusb20_dev_req_string_sync(pdev, strIndex, + error = libusb20_dev_req_string_sync(pdev, str_index, langid, temp, sizeof(temp)); if (error < 0) { *(uint8_t *)ptr = 0; /* zero terminate */ From owner-p4-projects@FreeBSD.ORG Thu Nov 13 21:49:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9D85106567B; Thu, 13 Nov 2008 21:49:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F3B31065673 for ; Thu, 13 Nov 2008 21:49:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 776798FC1D for ; Thu, 13 Nov 2008 21:49:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mADLn94k092234 for ; Thu, 13 Nov 2008 21:49:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mADLn9sC092232 for perforce@freebsd.org; Thu, 13 Nov 2008 21:49:09 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Nov 2008 21:49:09 GMT Message-Id: <200811132149.mADLn9sC092232@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 152950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 13 Nov 2008 21:49:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=152950 Change 152950 by hselasky@hselasky_laptop001 on 2008/11/13 21:48:35 Fix problem with USB-FS mode looping in the poll-handler, due to an invalid selwakeup. Add some more comments. Put a TAB character after some "#define" keywords. Reported by: Stefan Ehmann Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#24 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#40 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#24 (text+ko) ==== @@ -159,12 +159,12 @@ #define usb2_callout_drain(c) callout_drain(&(c)->co) #define usb2_callout_pending(c) callout_pending(&(c)->co) -#define USB_BUS_LOCK(_b) mtx_lock(&(_b)->bus_mtx) -#define USB_BUS_UNLOCK(_b) mtx_unlock(&(_b)->bus_mtx) -#define USB_BUS_LOCK_ASSERT(_b, _t) mtx_assert(&(_b)->bus_mtx, _t) -#define USB_XFER_LOCK(_x) mtx_lock((_x)->xfer_mtx) -#define USB_XFER_UNLOCK(_x) mtx_unlock((_x)->xfer_mtx) -#define USB_XFER_LOCK_ASSERT(_x, _t) mtx_assert((_x)->xfer_mtx, _t) +#define USB_BUS_LOCK(_b) mtx_lock(&(_b)->bus_mtx) +#define USB_BUS_UNLOCK(_b) mtx_unlock(&(_b)->bus_mtx) +#define USB_BUS_LOCK_ASSERT(_b, _t) mtx_assert(&(_b)->bus_mtx, _t) +#define USB_XFER_LOCK(_x) mtx_lock((_x)->xfer_mtx) +#define USB_XFER_UNLOCK(_x) mtx_unlock((_x)->xfer_mtx) +#define USB_XFER_LOCK_ASSERT(_x, _t) mtx_assert((_x)->xfer_mtx, _t) /* structure prototypes */ struct file; @@ -401,13 +401,14 @@ struct usb2_fifo *rxfifo; struct usb2_fifo *txfifo; uint32_t devloc; /* original devloc */ - uint16_t bus_index; - uint8_t dev_index; - uint8_t iface_index; - uint8_t ep_index; - uint8_t is_read; - uint8_t is_write; - uint8_t is_uref; + uint16_t bus_index; /* bus index */ + uint8_t dev_index; /* device index */ + uint8_t iface_index; /* interface index */ + uint8_t ep_index; /* endpoint index */ + uint8_t is_read; /* set if location has read access */ + uint8_t is_write; /* set if location has write access */ + uint8_t is_uref; /* set if USB refcount decr. needed */ + uint8_t is_usbfs; /* set if USB-FS is active */ }; /* external variables */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#40 (text+ko) ==== @@ -537,7 +537,11 @@ ploc->rxfifo = NULL; ploc->is_write = 0; ploc->is_read = 0; + ploc->is_usbfs = 0; } else { + /* initialise "is_usbfs" flag */ + ploc->is_usbfs = 0; + /* check for write */ if (fflags & FWRITE) { ppf = ploc->udev->fifo; @@ -549,6 +553,10 @@ (f->curr_file != fp)) { goto error; } + /* check if USB-FS is active */ + if (f->fs_ep_max != 0) { + ploc->is_usbfs = 1; + } } else { ploc->txfifo = NULL; ploc->is_write = 0; /* no ref */ @@ -565,6 +573,10 @@ (f->curr_file != fp)) { goto error; } + /* check if USB-FS is active */ + if (f->fs_ep_max != 0) { + ploc->is_usbfs = 1; + } } else { ploc->rxfifo = NULL; ploc->is_read = 0; /* no ref */ @@ -1594,7 +1606,6 @@ struct usb2_mbuf *m; int fflags; int revents; - uint8_t usbfs_active = 0; revents = usb2_ref_device(fp, &loc, 1 /* no uref */ );; if (revents) { @@ -1602,20 +1613,6 @@ } fflags = fp->f_flag; - /* figure out if the USB File System is active */ - - if (fflags & FWRITE) { - f = loc.txfifo; - if (f->fs_ep_max != 0) { - usbfs_active = 1; - } - } - if (fflags & FREAD) { - f = loc.rxfifo; - if (f->fs_ep_max != 0) { - usbfs_active = 1; - } - } /* Figure out who needs service */ if ((events & (POLLOUT | POLLWRNORM)) && @@ -1625,7 +1622,7 @@ mtx_lock(f->priv_mtx); - if (!usbfs_active) { + if (!loc.is_usbfs) { if (f->flag_iserror) { /* we got an error */ m = (void *)1; @@ -1664,7 +1661,7 @@ mtx_lock(f->priv_mtx); - if (!usbfs_active) { + if (!loc.is_usbfs) { if (f->flag_iserror) { /* we have and error */ m = (void *)1; @@ -1693,8 +1690,10 @@ f->flag_isselect = 1; selrecord(td, &f->selinfo); - /* start reading data */ - (f->methods->f_start_read) (f); + if (!loc.is_usbfs) { + /* start reading data */ + (f->methods->f_start_read) (f); + } } mtx_unlock(f->priv_mtx); @@ -1739,22 +1738,23 @@ mtx_lock(f->priv_mtx); + /* check for permanent read error */ if (f->flag_iserror) { err = EIO; goto done; } + /* check if USB-FS interface is active */ + if (loc.is_usbfs) { + /* + * The queue is used for events that should be + * retrieved using the "USB_FS_COMPLETE" ioctl. + */ + err = EINVAL; + goto done; + } while (uio->uio_resid > 0) { - if (f->fs_ep_max == 0) { - USB_IF_DEQUEUE(&f->used_q, m); - } else { - /* - * The queue is used for events that should be - * retrieved using the "USB_FS_COMPLETE" - * ioctl. - */ - m = NULL; - } + USB_IF_DEQUEUE(&f->used_q, m); if (m == NULL) { @@ -1883,26 +1883,27 @@ mtx_lock(f->priv_mtx); + /* check for permanent write error */ if (f->flag_iserror) { err = EIO; goto done; } - if ((f->queue_data == NULL) && (f->fs_ep_max == 0)) { + /* check if USB-FS interface is active */ + if (loc.is_usbfs) { + /* + * The queue is used for events that should be + * retrieved using the "USB_FS_COMPLETE" ioctl. + */ + err = EINVAL; + goto done; + } + if (f->queue_data == NULL) { /* start write transfer, if not already started */ (f->methods->f_start_write) (f); } /* we allow writing zero length data */ do { - if (f->fs_ep_max == 0) { - USB_IF_DEQUEUE(&f->free_q, m); - } else { - /* - * The queue is used for events that should be - * retrieved using the "USB_FS_COMPLETE" - * ioctl. - */ - m = NULL; - } + USB_IF_DEQUEUE(&f->free_q, m); if (m == NULL) { ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#30 (text+ko) ==== @@ -209,10 +209,6 @@ /* transfers are already opened */ return (0); } - if (f->fs_xfer) { - /* should not happen */ - return (EINVAL); - } bzero(usb2_config, sizeof(usb2_config)); usb2_config[1].type = UE_CONTROL; @@ -281,10 +277,6 @@ /* transfers are already opened */ return (0); } - if (f->fs_xfer) { - /* should not happen */ - return (EINVAL); - } bzero(usb2_config, sizeof(usb2_config)); usb2_config[1].type = UE_CONTROL; From owner-p4-projects@FreeBSD.ORG Fri Nov 14 02:41:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9473E1065679; Fri, 14 Nov 2008 02: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 57AC11065673 for ; Fri, 14 Nov 2008 02:41:06 +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 3D8BA8FC16 for ; Fri, 14 Nov 2008 02:41: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 mAE2f6PH047928 for ; Fri, 14 Nov 2008 02:41:06 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE2f65H047926 for perforce@freebsd.org; Fri, 14 Nov 2008 02:41:06 GMT (envelope-from weongyo@FreeBSD.org) Date: Fri, 14 Nov 2008 02:41:06 GMT Message-Id: <200811140241.mAE2f65H047926@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 152959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 02:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=152959 Change 152959 by weongyo@weongyo_ws on 2008/11/14 02:40:54 - improve AL2230 RF handling - support AL2230S RF that PV2000 is renamed to AL2230S - use register ZYD_CR244, ZYD_CR243, ZYD_CR242 when the driver writes values on RF. This routine is more faster than the original one - use private TX lock to avoid LOR at zyd_raw_xmit() - increate TX slots from 1 to 5 - needs to set the channel at IEEE80211_S_AUTH not IEEE80211_S_RUN - detailed error handling. In previous the next command was sent to the device even if there was errors - setting ZYD_MAC_RX_THRESHOLD value should be different between 1211 and 1211b - only try to stop the device at zyd_init_locked() if the device is UPed - do not use MTX_RECURSE - do not try to grap Giant lock when the channel is changing - move the device initialization routines from zyd_attach to zyd_init to give a device full-reset chance to the driver. - code cleanup at zyd_raw_xmit() - simplify zyd_attach() routines - resort functions and clean up variables - DPRINTF style change. - style(9) Affected files ... .. //depot/projects/vap/sys/dev/usb/if_zyd.c#31 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#11 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#31 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.23 2008/10/27 16:46:50 sam Exp $ */ +/* $FreeBSD: if_zyd.c 10 2008-11-12 05:15:17Z weongyo $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -66,14 +66,32 @@ #include #include -#define ZYD_DEBUG #ifdef ZYD_DEBUG -#define DPRINTF(x) do { if (zyddebug > 0) printf x; } while (0) -#define DPRINTFN(n, x) do { if (zyddebug > (n)) printf x; } while (0) -int zyddebug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, zyd, CTLFLAG_RW, 0, "ZyDAS zd1211/zd1211b"); +int zyd_debug = 0; +SYSCTL_INT(_hw_usb_zyd, OID_AUTO, debug, CTLFLAG_RW, &zyd_debug, 0, + "control debugging printfs"); +TUNABLE_INT("hw.usb.zyd.debug", &zyd_debug); +enum { + ZYD_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ + ZYD_DEBUG_RECV = 0x00000002, /* basic recv operation */ + ZYD_DEBUG_RESET = 0x00000004, /* reset processing */ + ZYD_DEBUG_INIT = 0x00000008, /* device init */ + ZYD_DEBUG_TX_PROC = 0x00000010, /* tx ISR proc */ + ZYD_DEBUG_RX_PROC = 0x00000020, /* rx ISR proc */ + ZYD_DEBUG_STATE = 0x00000040, /* 802.11 state transitions */ + ZYD_DEBUG_STAT = 0x00000080, /* statistic */ + ZYD_DEBUG_FW = 0x00000100, /* firmware */ + ZYD_DEBUG_ANY = 0xffffffff +}; +#define DPRINTF(sc, m, fmt, ...) do { \ + if (sc->sc_debug & (m)) \ + printf(fmt, __VA_ARGS__); \ +} while (0) #else -#define DPRINTF(x) -#define DPRINTFN(n, x) +#define DPRINTF(sc, m, fmt, ...) do { \ + (void) sc; \ +} while (0) #endif static const struct zyd_phy_pair zyd_def_phy[] = ZYD_DEF_PHY; @@ -144,8 +162,28 @@ ZYD_ZD1211B_DEV(ZYXEL, M202), ZYD_ZD1211B_DEV(ZYXEL, G220V2), }; -#define zyd_lookup(v, p) \ +#define zyd_lookup(v, p) \ ((const struct zyd_type *)usb_lookup(zyd_devs, v, p)) +#define zyd_read16_m(sc, val, data) do { \ + error = zyd_read16(sc, val, data); \ + if (error != 0) \ + goto fail; \ +} while (0) +#define zyd_write16_m(sc, val, data) do { \ + error = zyd_write16(sc, val, data); \ + if (error != 0) \ + goto fail; \ +} while (0) +#define zyd_read32_m(sc, val, data) do { \ + error = zyd_read32(sc, val, data); \ + if (error != 0) \ + goto fail; \ +} while (0) +#define zyd_write32_m(sc, val, data) do { \ + error = zyd_write32(sc, val, data); \ + if (error != 0) \ + goto fail; \ +} while (0) static device_probe_t zyd_match; static device_attach_t zyd_attach; @@ -156,8 +194,6 @@ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]); static void zyd_vap_delete(struct ieee80211vap *); -static int zyd_attachhook(struct zyd_softc *); -static int zyd_complete_attach(struct zyd_softc *); static int zyd_open_pipes(struct zyd_softc *); static void zyd_close_pipes(struct zyd_softc *); static int zyd_alloc_tx_list(struct zyd_softc *); @@ -175,38 +211,18 @@ static int zyd_write16(struct zyd_softc *, uint16_t, uint16_t); static int zyd_write32(struct zyd_softc *, uint16_t, uint32_t); static int zyd_rfwrite(struct zyd_softc *, uint32_t); -static void zyd_lock_phy(struct zyd_softc *); -static void zyd_unlock_phy(struct zyd_softc *); -static int zyd_rfmd_init(struct zyd_rf *); -static int zyd_rfmd_switch_radio(struct zyd_rf *, int); -static int zyd_rfmd_set_channel(struct zyd_rf *, uint8_t); -static int zyd_al2230_init(struct zyd_rf *); -static int zyd_al2230_switch_radio(struct zyd_rf *, int); -static int zyd_al2230_set_channel(struct zyd_rf *, uint8_t); -static int zyd_al2230_init_b(struct zyd_rf *); -static int zyd_al7230B_init(struct zyd_rf *); -static int zyd_al7230B_switch_radio(struct zyd_rf *, int); -static int zyd_al7230B_set_channel(struct zyd_rf *, uint8_t); -static int zyd_al2210_init(struct zyd_rf *); -static int zyd_al2210_switch_radio(struct zyd_rf *, int); -static int zyd_al2210_set_channel(struct zyd_rf *, uint8_t); -static int zyd_gct_init(struct zyd_rf *); -static int zyd_gct_switch_radio(struct zyd_rf *, int); -static int zyd_gct_set_channel(struct zyd_rf *, uint8_t); -static int zyd_maxim_init(struct zyd_rf *); -static int zyd_maxim_switch_radio(struct zyd_rf *, int); -static int zyd_maxim_set_channel(struct zyd_rf *, uint8_t); -static int zyd_maxim2_init(struct zyd_rf *); -static int zyd_maxim2_switch_radio(struct zyd_rf *, int); -static int zyd_maxim2_set_channel(struct zyd_rf *, uint8_t); +static int zyd_lock_phy(struct zyd_softc *); +static int zyd_unlock_phy(struct zyd_softc *); static int zyd_rf_attach(struct zyd_softc *, uint8_t); static const char *zyd_rf_name(uint8_t); static int zyd_hw_init(struct zyd_softc *); +static int zyd_read_pod(struct zyd_softc *); static int zyd_read_eeprom(struct zyd_softc *); +static int zyd_get_macaddr(struct zyd_softc *); static int zyd_set_macaddr(struct zyd_softc *, const uint8_t *); static int zyd_set_bssid(struct zyd_softc *, const uint8_t *); static int zyd_switch_radio(struct zyd_softc *, int); -static void zyd_set_led(struct zyd_softc *, int, int); +static int zyd_set_led(struct zyd_softc *, int, int); static void zyd_set_multi(void *); static void zyd_update_mcast(struct ifnet *); static int zyd_set_rxfilter(struct zyd_softc *); @@ -228,13 +244,35 @@ static void zyd_init_locked(struct zyd_softc *); static void zyd_init(void *); static void zyd_stop(struct zyd_softc *, int); -static int zyd_loadfirmware(struct zyd_softc *, u_char *, size_t); +static int zyd_loadfirmware(struct zyd_softc *); static void zyd_newassoc(struct ieee80211_node *, int); static void zyd_scantask(void *); static void zyd_scan_start(struct ieee80211com *); static void zyd_scan_end(struct ieee80211com *); static void zyd_set_channel(struct ieee80211com *); static void zyd_wakeup(struct zyd_softc *); +static int zyd_rfmd_init(struct zyd_rf *); +static int zyd_rfmd_switch_radio(struct zyd_rf *, int); +static int zyd_rfmd_set_channel(struct zyd_rf *, uint8_t); +static int zyd_al2230_init(struct zyd_rf *); +static int zyd_al2230_switch_radio(struct zyd_rf *, int); +static int zyd_al2230_set_channel(struct zyd_rf *, uint8_t); +static int zyd_al2230_init_b(struct zyd_rf *); +static int zyd_al7230B_init(struct zyd_rf *); +static int zyd_al7230B_switch_radio(struct zyd_rf *, int); +static int zyd_al7230B_set_channel(struct zyd_rf *, uint8_t); +static int zyd_al2210_init(struct zyd_rf *); +static int zyd_al2210_switch_radio(struct zyd_rf *, int); +static int zyd_al2210_set_channel(struct zyd_rf *, uint8_t); +static int zyd_gct_init(struct zyd_rf *); +static int zyd_gct_switch_radio(struct zyd_rf *, int); +static int zyd_gct_set_channel(struct zyd_rf *, uint8_t); +static int zyd_maxim_init(struct zyd_rf *); +static int zyd_maxim_switch_radio(struct zyd_rf *, int); +static int zyd_maxim_set_channel(struct zyd_rf *, uint8_t); +static int zyd_maxim2_init(struct zyd_rf *); +static int zyd_maxim2_switch_radio(struct zyd_rf *, int); +static int zyd_maxim2_set_channel(struct zyd_rf *, uint8_t); static int zyd_match(device_t dev) @@ -242,68 +280,57 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); if (!uaa->iface) - return UMATCH_NONE; + return (UMATCH_NONE); return (zyd_lookup(uaa->vendor, uaa->product) != NULL) ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE; -} - -static int -zyd_attachhook(struct zyd_softc *sc) -{ - u_char *firmware; - int len, error; - - if (sc->mac_rev == ZYD_ZD1211) { - firmware = (u_char *)zd1211_firmware; - len = sizeof(zd1211_firmware); - } else { - firmware = (u_char *)zd1211b_firmware; - len = sizeof(zd1211b_firmware); - } - - error = zyd_loadfirmware(sc, firmware, len); - if (error != 0) { - device_printf(sc->sc_dev, - "could not load firmware (error=%d)\n", error); - return error; - } - - sc->sc_flags |= ZYD_FLAG_FWLOADED; - - /* complete the attach process */ - return zyd_complete_attach(sc); + (UMATCH_VENDOR_PRODUCT) : (UMATCH_NONE); } static int zyd_attach(device_t dev) { int error = ENXIO; + struct ieee80211com *ic; + struct ifnet *ifp; + struct usb_attach_arg *uaa = device_get_ivars(dev); struct zyd_softc *sc = device_get_softc(dev); - struct usb_attach_arg *uaa = device_get_ivars(dev); usb_device_descriptor_t* ddesc; - struct ifnet *ifp; + uint8_t bands; sc->sc_dev = dev; - - ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); - if (ifp == NULL) { - device_printf(dev, "can not if_alloc()\n"); - return ENXIO; - } - sc->sc_udev = uaa->device; - sc->sc_flags = 0; - sc->mac_rev = zyd_lookup(uaa->vendor, uaa->product)->rev; + sc->sc_macrev = zyd_lookup(uaa->vendor, uaa->product)->rev; +#ifdef ZYD_DEBUG + sc->sc_debug = zyd_debug; +#endif ddesc = usbd_get_device_descriptor(sc->sc_udev); if (UGETW(ddesc->bcdDevice) < 0x4330) { device_printf(dev, "device version mismatch: 0x%x " "(only >= 43.30 supported)\n", UGETW(ddesc->bcdDevice)); - goto bad; + return (ENXIO); + } + + if ((error = zyd_get_macaddr(sc)) != 0) { + device_printf(sc->sc_dev, "could not read EEPROM\n"); + return (ENXIO); } + mtx_init(&sc->sc_txmtx, device_get_nameunit(sc->sc_dev), + MTX_NETWORK_LOCK, MTX_DEF); + usb_init_task(&sc->sc_mcasttask, zyd_set_multi, sc); + usb_init_task(&sc->sc_scantask, zyd_scantask, sc); + usb_init_task(&sc->sc_task, zyd_task, sc); + callout_init(&sc->sc_watchdog_ch, 0); + STAILQ_INIT(&sc->sc_rqh); + + ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); + if (ifp == NULL) { + device_printf(dev, "can not if_alloc()\n"); + error = ENXIO; + goto fail0; + } ifp->if_softc = sc; if_initname(ifp, "zyd", device_get_unit(sc->sc_dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | @@ -314,89 +341,18 @@ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); IFQ_SET_READY(&ifp->if_snd); - STAILQ_INIT(&sc->sc_rqh); - - error = zyd_attachhook(sc); - if (error != 0) { -bad: - if_free(ifp); - return error; - } - - return 0; -} - -static int -zyd_complete_attach(struct zyd_softc *sc) -{ - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; - usbd_status error; - uint8_t bands; - - mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, - MTX_DEF | MTX_RECURSE); - - usb_init_task(&sc->sc_scantask, zyd_scantask, sc); - usb_init_task(&sc->sc_task, zyd_task, sc); - usb_init_task(&sc->sc_mcasttask, zyd_set_multi, sc); - - callout_init(&sc->sc_watchdog_ch, 0); - - error = usbd_set_config_no(sc->sc_udev, ZYD_CONFIG_NO, 1); - if (error != 0) { - device_printf(sc->sc_dev, "setting config no failed\n"); - error = ENXIO; - goto fail; - } - - error = usbd_device2interface_handle(sc->sc_udev, ZYD_IFACE_INDEX, - &sc->sc_iface); - if (error != 0) { - device_printf(sc->sc_dev, "getting interface handle failed\n"); - error = ENXIO; - goto fail; - } - - if ((error = zyd_open_pipes(sc)) != 0) { - device_printf(sc->sc_dev, "could not open pipes\n"); - goto fail; - } - - if ((error = zyd_read_eeprom(sc)) != 0) { - device_printf(sc->sc_dev, "could not read EEPROM\n"); - goto fail; - } - - if ((error = zyd_rf_attach(sc, sc->rf_rev)) != 0) { - device_printf(sc->sc_dev, "could not attach RF, rev 0x%x\n", - sc->rf_rev); - goto fail; - } - - if ((error = zyd_hw_init(sc)) != 0) { - device_printf(sc->sc_dev, "hardware initialization failed\n"); - goto fail; - } - - device_printf(sc->sc_dev, - "HMAC ZD1211%s, FW %02x.%02x, RF %s, PA %x, address %s\n", - (sc->mac_rev == ZYD_ZD1211) ? "": "B", - sc->fw_rev >> 8, sc->fw_rev & 0xff, zyd_rf_name(sc->rf_rev), - sc->pa_rev, ether_sprintf(ic->ic_myaddr)); - - IEEE80211_ADDR_COPY(sc->sc_bssid, ic->ic_myaddr); - + ic = ifp->if_l2com; ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; + IEEE80211_ADDR_COPY(ic->ic_myaddr, sc->sc_bssid); /* set device capabilities */ ic->ic_caps = IEEE80211_C_STA /* station mode */ | IEEE80211_C_MONITOR /* monitor mode */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ - | IEEE80211_C_SHSLOT /* short slot time supported */ + | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_WPA /* 802.11i */ ; @@ -420,11 +376,9 @@ bpfattach(ifp, DLT_IEEE802_11_RADIO, sizeof(struct ieee80211_frame) + sizeof(sc->sc_txtap)); - sc->sc_rxtap_len = sizeof(sc->sc_rxtap); sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(ZYD_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof(sc->sc_txtap); sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(ZYD_TX_RADIOTAP_PRESENT); @@ -434,12 +388,10 @@ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); - return error; + return (0); -fail: - mtx_destroy(&sc->sc_mtx); - - return error; +fail0: mtx_destroy(&sc->sc_txmtx); + return (error); } static int @@ -450,31 +402,24 @@ struct ieee80211com *ic = ifp->if_l2com; if (!device_is_attached(dev)) - return 0; + return (0); - /* protect a race when we have listeners related with the driver. */ - ifp->if_flags &= ~IFF_UP; + /* set a flag to indicate we're detaching. */ + sc->sc_flags |= ZYD_FLAG_DETACHING; zyd_stop(sc, 1); bpfdetach(ifp); ieee80211_ifdetach(ic); - /* set a flag to indicate we're detaching. */ - sc->sc_flags |= ZYD_FLAG_DETACHING; - - usb_rem_task(sc->sc_udev, &sc->sc_scantask); - usb_rem_task(sc->sc_udev, &sc->sc_task); - callout_stop(&sc->sc_watchdog_ch); - zyd_wakeup(sc); zyd_close_pipes(sc); if_free(ifp); - mtx_destroy(&sc->sc_mtx); + mtx_destroy(&sc->sc_txmtx); usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); - return 0; + return (0); } static struct ieee80211vap * @@ -487,11 +432,11 @@ struct ieee80211vap *vap; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ - return NULL; + return (NULL); zvp = (struct zyd_vap *) malloc(sizeof(struct zyd_vap), M_80211_VAP, M_NOWAIT | M_ZERO); if (zvp == NULL) - return NULL; + return (NULL); vap = &zvp->vap; /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, @@ -507,9 +452,10 @@ 1000 /* 1 sec */); /* complete setup */ - ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); + ieee80211_vap_attach(vap, ieee80211_media_change, + ieee80211_media_status); ic->ic_opmode = opmode; - return vap; + return (vap); } static void @@ -532,18 +478,18 @@ /* interrupt in */ edesc = usbd_get_endpoint_descriptor(sc->sc_iface, 0x83); if (edesc == NULL) - return EINVAL; + return (EINVAL); isize = UGETW(edesc->wMaxPacketSize); if (isize == 0) /* should not happen */ - return EINVAL; + return (EINVAL); - sc->ibuf = malloc(isize, M_USBDEV, M_NOWAIT); - if (sc->ibuf == NULL) - return ENOMEM; + sc->sc_ibuf = malloc(isize, M_USBDEV, M_NOWAIT); + if (sc->sc_ibuf == NULL) + return (ENOMEM); error = usbd_open_pipe_intr(sc->sc_iface, 0x83, USBD_SHORT_XFER_OK, - &sc->zyd_ep[ZYD_ENDPT_IIN], sc, sc->ibuf, isize, zyd_intr, + &sc->sc_ep[ZYD_ENDPT_IIN], sc, sc->sc_ibuf, isize, zyd_intr, USBD_DEFAULT_INTERVAL); if (error != 0) { device_printf(sc->sc_dev, "open rx intr pipe failed: %s\n", @@ -553,7 +499,7 @@ /* interrupt out (not necessarily an interrupt pipe) */ error = usbd_open_pipe(sc->sc_iface, 0x04, USBD_EXCLUSIVE_USE, - &sc->zyd_ep[ZYD_ENDPT_IOUT]); + &sc->sc_ep[ZYD_ENDPT_IOUT]); if (error != 0) { device_printf(sc->sc_dev, "open tx intr pipe failed: %s\n", usbd_errstr(error)); @@ -562,7 +508,7 @@ /* bulk in */ error = usbd_open_pipe(sc->sc_iface, 0x82, USBD_EXCLUSIVE_USE, - &sc->zyd_ep[ZYD_ENDPT_BIN]); + &sc->sc_ep[ZYD_ENDPT_BIN]); if (error != 0) { device_printf(sc->sc_dev, "open rx pipe failed: %s\n", usbd_errstr(error)); @@ -571,17 +517,17 @@ /* bulk out */ error = usbd_open_pipe(sc->sc_iface, 0x01, USBD_EXCLUSIVE_USE, - &sc->zyd_ep[ZYD_ENDPT_BOUT]); + &sc->sc_ep[ZYD_ENDPT_BOUT]); if (error != 0) { device_printf(sc->sc_dev, "open tx pipe failed: %s\n", usbd_errstr(error)); goto fail; } - return 0; + return (0); fail: zyd_close_pipes(sc); - return ENXIO; + return (ENXIO); } static void @@ -590,15 +536,15 @@ int i; for (i = 0; i < ZYD_ENDPT_CNT; i++) { - if (sc->zyd_ep[i] != NULL) { - usbd_abort_pipe(sc->zyd_ep[i]); - usbd_close_pipe(sc->zyd_ep[i]); - sc->zyd_ep[i] = NULL; + if (sc->sc_ep[i] != NULL) { + usbd_abort_pipe(sc->sc_ep[i]); + usbd_close_pipe(sc->sc_ep[i]); + sc->sc_ep[i] = NULL; } } - if (sc->ibuf != NULL) { - free(sc->ibuf, M_USBDEV); - sc->ibuf = NULL; + if (sc->sc_ibuf != NULL) { + free(sc->sc_ibuf, M_USBDEV); + sc->sc_ibuf = NULL; } } @@ -607,10 +553,10 @@ { int i, error; - sc->tx_queued = 0; + sc->sc_txqueued = 0; for (i = 0; i < ZYD_TX_LIST_CNT; i++) { - struct zyd_tx_data *data = &sc->tx_data[i]; + struct zyd_tx_data *data = &sc->sc_txdata[i]; data->sc = sc; /* backpointer for callbacks */ @@ -632,10 +578,10 @@ /* clear Tx descriptor */ bzero(data->buf, sizeof(struct zyd_tx_desc)); } - return 0; + return (0); fail: zyd_free_tx_list(sc); - return error; + return (error); } static void @@ -644,7 +590,7 @@ int i; for (i = 0; i < ZYD_TX_LIST_CNT; i++) { - struct zyd_tx_data *data = &sc->tx_data[i]; + struct zyd_tx_data *data = &sc->sc_txdata[i]; if (data->xfer != NULL) { usbd_free_xfer(data->xfer); @@ -663,7 +609,7 @@ int i, error; for (i = 0; i < ZYD_RX_LIST_CNT; i++) { - struct zyd_rx_data *data = &sc->rx_data[i]; + struct zyd_rx_data *data = &sc->sc_rxdata[i]; data->sc = sc; /* backpointer for callbacks */ @@ -682,10 +628,10 @@ goto fail; } } - return 0; + return (0); fail: zyd_free_rx_list(sc); - return error; + return (error); } static void @@ -694,7 +640,7 @@ int i; for (i = 0; i < ZYD_RX_LIST_CNT; i++) { - struct zyd_rx_data *data = &sc->rx_data[i]; + struct zyd_rx_data *data = &sc->sc_rxdata[i]; if (data->xfer != NULL) { usbd_free_xfer(data->xfer); @@ -711,41 +657,44 @@ struct zyd_node *zn; zn = malloc(sizeof(struct zyd_node), M_80211_NODE, M_NOWAIT | M_ZERO); - return zn != NULL ? &zn->ni : NULL; + return (zn != NULL) ? (&zn->ni) : (NULL); } static void zyd_task(void *arg) { + int error; struct zyd_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct ieee80211_node *ni = vap->iv_bss; struct zyd_vap *zvp = ZYD_VAP(vap); switch (sc->sc_state) { + case IEEE80211_S_AUTH: + zyd_set_chan(sc, ic->ic_curchan); + break; case IEEE80211_S_RUN: - { - struct ieee80211_node *ni = vap->iv_bss; + if (vap->iv_opmode == IEEE80211_M_MONITOR) + break; - zyd_set_chan(sc, ic->ic_curchan); - - if (vap->iv_opmode != IEEE80211_M_MONITOR) { - /* turn link LED on */ - zyd_set_led(sc, ZYD_LED1, 1); - - /* make data LED blink upon Tx */ - zyd_write32(sc, sc->fwbase + ZYD_FW_LINK_STATUS, 1); - - IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid); - zyd_set_bssid(sc, sc->sc_bssid); - } + /* turn link LED on */ + error = zyd_set_led(sc, ZYD_LED1, 1); + if (error != 0) + goto fail; + + /* make data LED blink upon Tx */ + zyd_write32_m(sc, sc->sc_fwbase + ZYD_FW_LINK_STATUS, 1); + + IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid); + zyd_set_bssid(sc, sc->sc_bssid); break; - } default: break; } +fail: IEEE80211_LOCK(ic); zvp->newstate(vap, sc->sc_state, sc->sc_arg); if (vap->iv_newstate_cb != NULL) @@ -760,6 +709,10 @@ struct ieee80211com *ic = vap->iv_ic; struct zyd_softc *sc = ic->ic_ifp->if_softc; + DPRINTF(sc, ZYD_DEBUG_STATE, "%s: %s -> %s\n", __func__, + ieee80211_state_name[vap->iv_state], + ieee80211_state_name[nstate]); + usb_rem_task(sc->sc_udev, &sc->sc_scantask); usb_rem_task(sc->sc_udev, &sc->sc_task); callout_stop(&sc->sc_watchdog_ch); @@ -770,10 +723,10 @@ if (nstate == IEEE80211_S_INIT) { zvp->newstate(vap, nstate, arg); - return 0; + return (0); } else { usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER); - return EINPROGRESS; + return (EINPROGRESS); } } @@ -783,15 +736,15 @@ { usbd_xfer_handle xfer; struct zyd_cmd cmd; - struct rq rq; + struct zyd_rq rq; uint16_t xferflags; usbd_status error; if (sc->sc_flags & ZYD_FLAG_DETACHING) - return ENXIO; + return (ENXIO); if ((xfer = usbd_alloc_xfer(sc->sc_udev)) == NULL) - return ENOMEM; + return (ENOMEM); cmd.code = htole16(code); bcopy(idata, cmd.data, ilen); @@ -806,27 +759,27 @@ STAILQ_INSERT_TAIL(&sc->sc_rqh, &rq, rq); } - usbd_setup_xfer(xfer, sc->zyd_ep[ZYD_ENDPT_IOUT], 0, &cmd, + usbd_setup_xfer(xfer, sc->sc_ep[ZYD_ENDPT_IOUT], 0, &cmd, sizeof(uint16_t) + ilen, xferflags, ZYD_INTR_TIMEOUT, NULL); error = usbd_transfer(xfer); if (error != USBD_IN_PROGRESS && error != 0) { device_printf(sc->sc_dev, "could not send command (error=%s)\n", usbd_errstr(error)); (void)usbd_free_xfer(xfer); - return EIO; + return (EIO); } if (!(flags & ZYD_CMD_FLAG_READ)) { (void)usbd_free_xfer(xfer); - return 0; /* write: don't wait for reply */ + return (0); /* write: don't wait for reply */ } /* wait at most one second for command reply */ error = tsleep(odata, PCATCH, "zydcmd", hz); if (error == EWOULDBLOCK) device_printf(sc->sc_dev, "zyd_read sleep timeout\n"); - STAILQ_REMOVE(&sc->sc_rqh, &rq, rq, rq); + STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); (void)usbd_free_xfer(xfer); - return error; + return (error); } static int @@ -840,7 +793,7 @@ ZYD_CMD_FLAG_READ); if (error == 0) *val = le16toh(tmp.val); - return error; + return (error); } static int @@ -856,7 +809,7 @@ ZYD_CMD_FLAG_READ); if (error == 0) *val = le16toh(tmp[0].val) << 16 | le16toh(tmp[1].val); - return error; + return (error); } static int @@ -887,11 +840,11 @@ zyd_rfwrite(struct zyd_softc *sc, uint32_t val) { struct zyd_rf *rf = &sc->sc_rf; - struct zyd_rfwrite req; + struct zyd_rfwrite_cmd req; uint16_t cr203; - int i; + int error, i; - (void)zyd_read16(sc, ZYD_CR203, &cr203); + zyd_read16_m(sc, ZYD_CR203, &cr203); cr203 &= ~(ZYD_RF_IF_LE | ZYD_RF_CLK | ZYD_RF_DATA); req.code = htole16(2); @@ -901,27 +854,47 @@ if (val & (1 << (rf->width - 1 - i))) req.bit[i] |= htole16(ZYD_RF_DATA); } - return zyd_cmd(sc, ZYD_CMD_RFCFG, &req, 4 + 2 * rf->width, NULL, 0, 0); + error = zyd_cmd(sc, ZYD_CMD_RFCFG, &req, 4 + 2 * rf->width, NULL, 0, 0); +fail: + return (error); +} + +static int +zyd_rfwrite_cr(struct zyd_softc *sc, uint32_t val) +{ + int error; + + zyd_write16_m(sc, ZYD_CR244, (val >> 16) & 0xff); + zyd_write16_m(sc, ZYD_CR243, (val >> 8) & 0xff); + zyd_write16_m(sc, ZYD_CR242, (val >> 0) & 0xff); +fail: + return (error); } -static void +static int zyd_lock_phy(struct zyd_softc *sc) { + int error; uint32_t tmp; - (void)zyd_read32(sc, ZYD_MAC_MISC, &tmp); + zyd_read32_m(sc, ZYD_MAC_MISC, &tmp); tmp &= ~ZYD_UNLOCK_PHY_REGS; - (void)zyd_write32(sc, ZYD_MAC_MISC, tmp); + zyd_write32_m(sc, ZYD_MAC_MISC, tmp); +fail: + return (error); } -static void +static int zyd_unlock_phy(struct zyd_softc *sc) { + int error; uint32_t tmp; - (void)zyd_read32(sc, ZYD_MAC_MISC, &tmp); + zyd_read32_m(sc, ZYD_MAC_MISC, &tmp); tmp |= ZYD_UNLOCK_PHY_REGS; - (void)zyd_write32(sc, ZYD_MAC_MISC, tmp); + zyd_write32_m(sc, ZYD_MAC_MISC, tmp); +fail: + return (error); } /* @@ -938,43 +911,49 @@ /* init RF-dependent PHY registers */ for (i = 0; i < N(phyini); i++) { - error = zyd_write16(sc, phyini[i].reg, phyini[i].val); - if (error != 0) - return error; + zyd_write16_m(sc, phyini[i].reg, phyini[i].val); } /* init RFMD radio */ for (i = 0; i < N(rfini); i++) { if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return error; + return (error); } - return 0; +fail: + return (error); #undef N } static int zyd_rfmd_switch_radio(struct zyd_rf *rf, int on) { + int error; struct zyd_softc *sc = rf->rf_sc; - (void)zyd_write16(sc, ZYD_CR10, on ? 0x89 : 0x15); - (void)zyd_write16(sc, ZYD_CR11, on ? 0x00 : 0x81); - - return 0; + zyd_write16_m(sc, ZYD_CR10, on ? 0x89 : 0x15); + zyd_write16_m(sc, ZYD_CR11, on ? 0x00 : 0x81); +fail: + return (error); } static int zyd_rfmd_set_channel(struct zyd_rf *rf, uint8_t chan) { + int error; struct zyd_softc *sc = rf->rf_sc; static const struct { uint32_t r1, r2; } rfprog[] = ZYD_RFMD_CHANTABLE; - (void)zyd_rfwrite(sc, rfprog[chan - 1].r1); - (void)zyd_rfwrite(sc, rfprog[chan - 1].r2); + error = zyd_rfwrite(sc, rfprog[chan - 1].r1); + if (error != 0) + goto fail; + error = zyd_rfwrite(sc, rfprog[chan - 1].r2); + if (error != 0) + goto fail; - return 0; +fail: + return (error); } /* @@ -990,18 +969,36 @@ int i, error; /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) { - error = zyd_write16(sc, phyini[i].reg, phyini[i].val); - if (error != 0) - return error; - } + for (i = 0; i < N(phyini); i++) + zyd_write16_m(sc, phyini[i].reg, phyini[i].val); /* init AL2230 radio */ for (i = 0; i < N(rfini); i++) { if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return error; + return (error); } - return 0; +fail: + return (error); +#undef N +} + +static int +zyd_al2230_fini(struct zyd_rf *rf) +{ +#define N(a) (sizeof(a) / sizeof((a)[0])) + int error, i; + struct zyd_softc *sc = rf->rf_sc; + static const struct zyd_phy_pair phy[] = ZYD_AL2230_PHY_FINI_PART1; + + for (i = 0; i < N(phy); i++) + zyd_write16_m(sc, phy[i].reg, phy[i].val); + + if (sc->sc_newphy != 0) + zyd_write16_m(sc, ZYD_CR9, 0xe1); + + zyd_write16_m(sc, ZYD_CR203, 0x6); +fail: + return (error); #undef N } @@ -1010,23 +1007,67 @@ { #define N(a) (sizeof(a) / sizeof((a)[0])) struct zyd_softc *sc = rf->rf_sc; + static const struct zyd_phy_pair phy1[] = ZYD_AL2230_PHY_PART1; + static const struct zyd_phy_pair phy2[] = ZYD_AL2230_PHY_PART2; + static const struct zyd_phy_pair phy3[] = ZYD_AL2230_PHY_PART3; + static const struct zyd_phy_pair phy2230s[] = ZYD_AL2230S_PHY_INIT; static const struct zyd_phy_pair phyini[] = ZYD_AL2230_PHY_B; - static const uint32_t rfini[] = ZYD_AL2230_RF_B; + static const uint32_t rfini_part1[] = ZYD_AL2230_RF_B_PART1; + static const uint32_t rfini_part2[] = ZYD_AL2230_RF_B_PART2; + static const uint32_t rfini_part3[] = ZYD_AL2230_RF_B_PART3; + static const uint32_t zyd_al2230_chtable[][3] = ZYD_AL2230_CHANTABLE; int i, error; + for (i = 0; i < N(phy1); i++) + zyd_write16_m(sc, phy1[i].reg, phy1[i].val); + /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) { - error = zyd_write16(sc, phyini[i].reg, phyini[i].val); + for (i = 0; i < N(phyini); i++) + zyd_write16_m(sc, phyini[i].reg, phyini[i].val); + + if (sc->sc_rfrev == ZYD_RF_AL2230S || sc->sc_al2230s != 0) + zyd_write16_m(sc, phy2230s[i].reg, phy2230s[i].val); + + for (i = 0; i < 3; i++) { + error = zyd_rfwrite_cr(sc, zyd_al2230_chtable[0][i]); + if (error != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 14 04:48:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928EF1065686; Fri, 14 Nov 2008 04:48: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 33A9D1065678 for ; Fri, 14 Nov 2008 04:48:15 +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 169F38FC1A for ; Fri, 14 Nov 2008 04:48:15 +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 mAE4mE2H072068 for ; Fri, 14 Nov 2008 04:48:14 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE4mETa072066 for perforce@freebsd.org; Fri, 14 Nov 2008 04:48:14 GMT (envelope-from nwhitehorn@freebsd.org) Date: Fri, 14 Nov 2008 04:48:14 GMT Message-Id: <200811140448.mAE4mETa072066@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 152961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 04:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=152961 Change 152961 by nwhitehorn@nwhitehorn_trantor on 2008/11/14 04:47:43 Make the unified OFW PCI stuff really work well. IRQs show up in dmesg, and interrupt assignment works on Uninorth systems with many PCI devices, which it did not before. Once sparc64 can use this code too (which requires only mechanical changes, since it came from sparc64), it will be in good shape to merge. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#9 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#6 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#3 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#7 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#6 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#3 (text+ko) ==== @@ -56,8 +56,8 @@ typedef uint32_t ofw_pci_intr_t; /* Helper functions */ -static void ofw_pcibus_setup_device(device_t bridge, uint32_t clock, - u_int busno, u_int slot, u_int func); +static void ofw_pcibus_setup_device(device_t bridge, phandle_t dev, + uint32_t clock, u_int busno, u_int slot, u_int func); /* Methods */ static device_probe_t ofw_pcibus_probe; @@ -114,16 +114,20 @@ * Perform miscellaneous setups the firmware usually does not do for us. */ static void -ofw_pcibus_setup_device(device_t bridge, uint32_t clock, u_int busno, - u_int slot, u_int func) +ofw_pcibus_setup_device(device_t bridge, phandle_t dev, uint32_t clock, + u_int busno, u_int slot, u_int func) { + int intline = PCI_INVALID_IRQ; + /* * The preset in the intline register is usually wrong. Reset * it to 255, so that the PCI code will reroute the interrupt if * needed. */ + if (OF_getproplen(dev, "interrupts") > 0) + intline = 0; PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_INTLINE, - PCI_INVALID_IRQ, 1); + intline, 1); } static int @@ -155,7 +159,7 @@ /* Some OFW device trees contain dupes. */ if (pci_find_dbsf(domain, busno, slot, func) != NULL) continue; - ofw_pcibus_setup_device(pcib, clock, busno, slot, func); + ofw_pcibus_setup_device(pcib, child, clock, busno, slot, func); dinfo = (struct ofw_pcibus_devinfo *)pci_read_device(pcib, domain, busno, slot, func, sizeof(*dinfo)); if (dinfo == NULL) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#9 (text+ko) ==== @@ -318,7 +318,7 @@ cpcpci_attach(device_t dev) { struct cpcpci_softc *sc; - phandle_t node; + phandle_t node, iparent; u_int32_t reg[2], busrange[2], config_base; struct cpcpci_range *rp, *io, *mem[2]; struct cpcpci_range fakeio; @@ -415,6 +415,12 @@ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + /* We need the number of interrupt cells to read the imap */ + sc->sc_icells = 2; + if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0) + OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, + sizeof(sc->sc_icells)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); @@ -606,14 +612,15 @@ { struct cpcpci_softc *sc; struct ofw_pci_register reg; - uint32_t pintr, mintr; + uint32_t pintr, mintr[2]; uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; sc = device_get_softc(bus); pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, - sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) - return (mintr); + sizeof(reg), &pintr, sizeof(pintr), &mintr, + sizeof(mintr[0])*sc->sc_icells, maskbuf)) + return (mintr[0]); /* Maybe it's a real interrupt, not an intpin */ if (pin > 4) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#3 (text+ko) ==== @@ -53,6 +53,7 @@ bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; struct ofw_bus_iinfo sc_pci_iinfo; + int sc_icells; }; #endif /* _POWERPC_POWERMAC_CPCHTVAR_H_ */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#6 (text+ko) ==== @@ -165,7 +165,7 @@ grackle_attach(device_t dev) { struct grackle_softc *sc; - phandle_t node; + phandle_t node, iparent; u_int32_t busrange[2]; struct grackle_range *rp, *io, *mem[2]; int nmem, i, error; @@ -254,6 +254,12 @@ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + /* We need the number of interrupt cells to read the imap */ + sc->sc_icells = 2; + if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0) + OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, + sizeof(sc->sc_icells)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -340,14 +346,15 @@ { struct grackle_softc *sc; struct ofw_pci_register reg; - uint32_t pintr, mintr; + uint32_t pintr, mintr[2]; uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; sc = device_get_softc(bus); pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, - sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) - return (mintr); + sizeof(reg), &pintr, sizeof(pintr), &mintr, + sizeof(mintr[0])*sc->sc_icells, maskbuf)) + return (mintr[0]); /* Maybe it's a real interrupt, not an intpin */ if (pin > 4) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#3 (text+ko) ==== @@ -52,6 +52,7 @@ struct rman sc_mem_rman; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + int sc_icells; struct ofw_bus_iinfo sc_pci_iinfo; }; ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#7 (text+ko) ==== @@ -164,8 +164,7 @@ { struct uninorth_softc *sc; const char *compatible; - phandle_t node; - phandle_t child; + phandle_t node, child, iparent; u_int32_t reg[2], busrange[2]; struct uninorth_range *rp, *io, *mem[2]; int nmem, i, error; @@ -297,6 +296,12 @@ ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + /* We need the number of interrupt cells to read the imap */ + sc->sc_icells = 2; + if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0) + OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, + sizeof(sc->sc_icells)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -365,14 +370,15 @@ { struct uninorth_softc *sc; struct ofw_pci_register reg; - uint32_t pintr, mintr; + uint32_t pintr, mintr[2]; uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; sc = device_get_softc(bus); pintr = pin; if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, - sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) - return (mintr); + sizeof(reg), &pintr, sizeof(pintr), mintr, + sizeof(mintr[0])*sc->sc_icells, maskbuf)) + return (mintr[0]); /* Maybe it's a real interrupt, not an intpin */ if (pin > 4) ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#6 (text+ko) ==== @@ -64,6 +64,7 @@ struct ofw_bus_iinfo sc_pci_iinfo; int sc_u3; + int sc_icells; }; struct unin_chip_softc { From owner-p4-projects@FreeBSD.ORG Fri Nov 14 04:57:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18E101065674; Fri, 14 Nov 2008 04:57:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF82F106564A for ; Fri, 14 Nov 2008 04:57:24 +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 B1D5D8FC0A for ; Fri, 14 Nov 2008 04:57:24 +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 mAE4vOvw072825 for ; Fri, 14 Nov 2008 04:57:24 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE4vOr9072823 for perforce@freebsd.org; Fri, 14 Nov 2008 04:57:24 GMT (envelope-from nwhitehorn@freebsd.org) Date: Fri, 14 Nov 2008 04:57:24 GMT Message-Id: <200811140457.mAE4vOr9072823@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 152962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 04:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=152962 Change 152962 by nwhitehorn@nwhitehorn_trantor on 2008/11/14 04:57:24 Provide a pluggable OFW client interface mechanism using KOBJ, like the PowerPC PMAP layer. This (temporarily) destroys the previously added ability to use real mode Open Firmware on PowerPC, but accomplishes the following: 1. Allow implementing a better, less hackish real mode firmware interface. 2. Provide support for more complicated hacks we will need later. As an example, PPC64 systems still have 32-bit firmware, so all data will have have to be copied to bounce pages before we make firmware calls. 3. This should also make implementing support for Flattened Device Trees trivial, and support has been added to PPC locore and ofw_machdep to facilitate this. This breaks sparc64 for the time being, as a few changes are needed to the OF initialization mechanisms. Affected files ... .. //depot/projects/ppc-g5/sys/conf/files.powerpc#9 edit .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_if.m#1 add .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#1 add .. //depot/projects/ppc-g5/sys/dev/ofw/ofwvar.h#1 add .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#3 edit .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#3 edit .. //depot/projects/ppc-g5/sys/dev/ofw/openfirmio.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/locore.S#3 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#6 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#6 edit .. //depot/projects/ppc-g5/sys/powerpc/include/ofw_machdep.h#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/conf/files.powerpc#9 (text+ko) ==== @@ -40,10 +40,12 @@ dev/ofw/openfirm.c optional aim dev/ofw/openfirmio.c optional aim dev/ofw/ofw_bus_if.m optional aim +dev/ofw/ofw_if.m optional aim dev/ofw/ofw_bus_subr.c optional aim dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim dev/ofw/ofw_imap.c optional aim +dev/ofw/ofw_standard.c optional aim dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx dev/scc/scc_bfe_macio.c optional scc powermac ==== //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#3 (text+ko) ==== @@ -66,23 +66,70 @@ #include #include +#include + +#include "ofw_if.h" MALLOC_DEFINE(M_OFWPROP, "openfirm", "Open Firmware properties"); static ihandle_t stdout; +static ofw_def_t *ofw_def_impl; +static ofw_t ofw_obj; +static struct ofw_kobj ofw_kernel_obj; +static struct kobj_ops ofw_kernel_kops; + +/* + * OFW install routines. Highest priority wins, equal priority also + * overrides allowing last-set to win. + */ +SET_DECLARE(ofw_set, ofw_def_t); + +boolean_t +OF_install(char *name, int prio) +{ + ofw_def_t **ofwpp, *ofwp; + static int curr_prio = 0; + + /* + * Try and locate the OFW kobj corresponding to the name + */ + SET_FOREACH(ofwpp, ofw_set) { + ofwp = *ofwpp; + + if (ofwp->name && + !strcmp(ofwp->name, name) && + prio >= curr_prio) { + curr_prio = prio; + ofw_def_impl = ofwp; + return (TRUE); + } + } + + return (FALSE); +} + /* Initialiser */ void -OF_init(int (*openfirm)(void *)) +OF_init(void *cookie) { phandle_t chosen; - set_openfirm_callback(openfirm); + ofw_obj = &ofw_kernel_obj; + /* + * Take care of compiling the selected class, and + * then statically initialise the OFW object + */ + kobj_class_compile_static(ofw_def_impl, &ofw_kernel_kops); + kobj_init((kobj_t)ofw_obj, ofw_def_impl); + + OFW_INIT(ofw_obj, cookie); + if ((chosen = OF_finddevice("/chosen")) == -1) OF_exit(); if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1) - OF_exit(); + stdout = -1; } void @@ -103,77 +150,29 @@ /* Test to see if a service exists. */ int -OF_test(char *name) +OF_test(const char *name) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t service; - cell_t missing; - } args = { - (cell_t)"test", - 1, - 1, - }; - - args.service = openfirm_mapptr(name); - if (openfirmware(&args) == -1) - return (-1); - return (args.missing); + return (OFW_TEST(ofw_obj,name)); } int -OF_interpret(char *cmd, int nreturns, ...) +OF_interpret(const char *cmd, int nreturns, ...) { va_list ap; - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t slot[16]; - } args = { - (cell_t)"interpret", - 1, - }; - cell_t status; + unsigned long slots[16]; int i = 0; + int status; + status = OFW_INTERPRET(ofw_obj,cmd,nreturns,slots); + va_start(ap, nreturns); - args.nreturns = ++nreturns; - args.slot[i++] = openfirm_mapptr(cmd); - while (i < 1) - args.slot[i++] = va_arg(ap, cell_t); - if (openfirmware(&args) == -1) { - va_end(ap); - return (-1); - } - status = args.slot[i++]; while (i < 1 + nreturns) - *va_arg(ap, cell_t *) = args.slot[i++]; + *va_arg(ap, cell_t *) = slots[i++]; va_end(ap); + return (status); } -/* Return firmware millisecond count. */ -int -OF_milliseconds() -{ - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t ms; - } args = { - (cell_t)"milliseconds", - 0, - 1, - }; - - openfirmware(&args); - return (args.ms); -} - /* * Device tree functions */ @@ -182,140 +181,42 @@ phandle_t OF_peer(phandle_t node) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t next; - } args = { - (cell_t)"peer", - 1, - 1, - }; - - args.node = node; - if (openfirmware(&args) == -1) - return (-1); - return (args.next); + return (OFW_PEER(ofw_obj,node)); } /* Return the first child of this node or 0. */ phandle_t OF_child(phandle_t node) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t child; - } args = { - (cell_t)"child", - 1, - 1, - }; - - args.node = node; - if (openfirmware(&args) == -1) - return (-1); - return (args.child); + return (OFW_CHILD(ofw_obj,node)); } /* Return the parent of this node or 0. */ phandle_t OF_parent(phandle_t node) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t parent; - } args = { - (cell_t)"parent", - 1, - 1, - }; - - args.node = node; - if (openfirmware(&args) == -1) - return (-1); - return (args.parent); + return (OFW_PARENT(ofw_obj,node)); } /* Return the package handle that corresponds to an instance handle. */ phandle_t OF_instance_to_package(ihandle_t instance) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t package; - } args = { - (cell_t)"instance-to-package", - 1, - 1, - }; - - args.instance = instance; - if (openfirmware(&args) == -1) - return (-1); - return (args.package); + return (OFW_INSTANCE_TO_PACKAGE(ofw_obj,instance)); } /* Get the length of a property of a package. */ -int -OF_getproplen(phandle_t package, char *propname) +ssize_t +OF_getproplen(phandle_t package, const char *propname) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t proplen; - } args = { - (cell_t)"getproplen", - 2, - 1, - }; - - args.package = package; - args.propname = openfirm_mapptr(propname); - if (openfirmware(&args) == -1) - return (-1); - return (args.proplen); + return (OFW_GETPROPLEN(ofw_obj,package,propname)); } /* Get the value of a property of a package. */ -int -OF_getprop(phandle_t package, char *propname, void *buf, int buflen) +ssize_t +OF_getprop(phandle_t package, const char *propname, void *buf, size_t buflen) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t buflen; - cell_t size; - } args = { - (cell_t)"getprop", - 4, - 1, - }; - - args.package = package; - args.propname = openfirm_mapptr(propname); - args.buf = openfirm_mapptr(buf); - args.buflen = buflen; - if (openfirmware(&args) == -1) - return (-1); - return (args.size); + return (OFW_GETPROP(ofw_obj,package,propname,buf,buflen)); } /* @@ -323,8 +224,8 @@ * (using the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a * single element, the number of elements is return in number. */ -int -OF_getprop_alloc(phandle_t package, char *propname, int elsz, void **buf) +ssize_t +OF_getprop_alloc(phandle_t package, const char *propname, int elsz, void **buf) { int len; @@ -344,194 +245,69 @@ /* Get the next property of a package. */ int -OF_nextprop(phandle_t package, char *previous, char *buf) +OF_nextprop(phandle_t package, const char *previous, char *buf, size_t size) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t previous; - cell_t buf; - cell_t flag; - } args = { - (cell_t)"nextprop", - 3, - 1, - }; - - args.package = package; - args.previous = openfirm_mapptr(previous); - args.buf = openfirm_mapptr(buf); - if (openfirmware(&args) == -1) - return (-1); - return (args.flag); + return (OFW_NEXTPROP(ofw_obj,package,previous,buf,size)); } /* Set the value of a property of a package. */ -/* XXX Has a bug on FirePower */ int -OF_setprop(phandle_t package, char *propname, void *buf, int len) +OF_setprop(phandle_t package, const char *propname, const void *buf, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t len; - cell_t size; - } args = { - (cell_t)"setprop", - 4, - 1, - }; - - args.package = package; - args.propname = openfirm_mapptr(propname); - args.buf = openfirm_mapptr(buf); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - return (args.size); + return (OFW_SETPROP(ofw_obj,package,propname,buf,len)); } /* Convert a device specifier to a fully qualified pathname. */ -int -OF_canon(const char *device, char *buf, int len) +ssize_t +OF_canon(const char *device, char *buf, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t device; - cell_t buf; - cell_t len; - cell_t size; - } args = { - (cell_t)"canon", - 3, - 1, - }; - - args.device = openfirm_mapptr(device); - args.buf = openfirm_mapptr(buf); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - return (args.size); + return (OFW_CANON(ofw_obj,device,buf,len)); } /* Return a package handle for the specified device. */ phandle_t OF_finddevice(const char *device) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t device; - cell_t package; - } args = { - (cell_t)"finddevice", - 1, - 1, - }; - - args.device = openfirm_mapptr(device); - if (openfirmware(&args) == -1) - return (-1); - return (args.package); + return (OFW_FINDDEVICE(ofw_obj,device)); } /* Return the fully qualified pathname corresponding to an instance. */ -int -OF_instance_to_path(ihandle_t instance, char *buf, int len) +ssize_t +OF_instance_to_path(ihandle_t instance, char *buf, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t buf; - cell_t len; - cell_t size; - } args = { - (cell_t)"instance-to-path", - 3, - 1, - }; - - args.instance = instance; - args.buf = openfirm_mapptr(buf); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - return (args.size); + return (OFW_INSTANCE_TO_PATH(ofw_obj,instance,buf,len)); } /* Return the fully qualified pathname corresponding to a package. */ -int -OF_package_to_path(phandle_t package, char *buf, int len) +ssize_t +OF_package_to_path(phandle_t package, char *buf, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t buf; - cell_t len; - cell_t size; - } args = { - (cell_t)"package-to-path", - 3, - 1, - }; - - args.package = package; - args.buf = openfirm_mapptr(buf); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - return (args.size); + return (OFW_PACKAGE_TO_PATH(ofw_obj,package,buf,len)); } /* Call the method in the scope of a given instance. */ int -OF_call_method(char *method, ihandle_t instance, int nargs, int nreturns, ...) +OF_call_method(const char *method, ihandle_t instance, int nargs, int nreturns, + ...) { va_list ap; - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t method; - cell_t instance; - cell_t args_n_results[12]; - } args = { - (cell_t)"call-method", - 2, - 1, - }; - cell_t *cp; - int n; + unsigned long args_n_results[12]; + int n, status; if (nargs > 6) return (-1); - args.nargs = nargs + 2; - args.nreturns = nreturns + 1; - args.method = openfirm_mapptr(method); - args.instance = instance; va_start(ap, nreturns); - for (cp = args.args_n_results + (n = nargs); --n >= 0;) - *--cp = va_arg(ap, cell_t); - if (openfirmware(&args) == -1) - return (-1); - if (args.args_n_results[nargs]) - return (args.args_n_results[nargs]); - for (cp = args.args_n_results + nargs + (n = args.nreturns); --n > 0;) - *va_arg(ap, cell_t *) = *--cp; + for (n = 0; n < nargs; n++) + args_n_results[n] = va_arg(ap, unsigned long); + + status = OFW_CALL_METHOD(ofw_obj, instance, method, nargs, nreturns, + args_n_results); + + if (status != 0) + return (status); + + for (; n < nargs + nreturns; n++) + *va_arg(ap, unsigned long *) = args_n_results[n]; va_end(ap); return (0); } @@ -542,122 +318,37 @@ /* Open an instance for a device. */ ihandle_t -OF_open(char *device) +OF_open(const char *device) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t device; - cell_t instance; - } args = { - (cell_t)"open", - 1, - 1, - }; - - args.device = openfirm_mapptr(device); - if (openfirmware(&args) == -1 || args.instance == 0) { - return (-1); - } - return (args.instance); + return (OFW_OPEN(ofw_obj, device)); } /* Close an instance. */ void OF_close(ihandle_t instance) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - } args = { - (cell_t)"close", - 1, - }; - - args.instance = instance; - openfirmware(&args); + OFW_CLOSE(ofw_obj, instance); } /* Read from an instance. */ -int -OF_read(ihandle_t instance, void *addr, int len) +ssize_t +OF_read(ihandle_t instance, void *addr, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t addr; - cell_t len; - cell_t actual; - } args = { - (cell_t)"read", - 3, - 1, - }; - - args.instance = instance; - args.addr = openfirm_mapptr(addr); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - - return (args.actual); + return (OFW_READ(ofw_obj, instance, addr, len)); } /* Write to an instance. */ -int -OF_write(ihandle_t instance, void *addr, int len) +ssize_t +OF_write(ihandle_t instance, void *addr, size_t len) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t addr; - cell_t len; - cell_t actual; - } args = { - (cell_t)"write", - 3, - 1, - }; - - args.instance = instance; - args.addr = openfirm_mapptr(addr); - args.len = len; - if (openfirmware(&args) == -1) - return (-1); - return (args.actual); + return (OFW_WRITE(ofw_obj, instance, addr, len)); } /* Seek to a position. */ int OF_seek(ihandle_t instance, u_int64_t pos) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t poshi; - cell_t poslo; - cell_t status; - } args = { - (cell_t)"seek", - 3, - 1, - }; - - args.instance = instance; - args.poshi = pos >> 32; - args.poslo = pos; - if (openfirmware(&args) == -1) - return (-1); - return (args.status); + return (OFW_SEEK(ofw_obj, instance, pos)); } /* @@ -668,143 +359,35 @@ void * OF_claim(void *virt, u_int size, u_int align) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t virt; - cell_t size; - cell_t align; - cell_t baseaddr; - } args = { - (cell_t)"claim", - 3, - 1, - }; - - args.virt = (cell_t)virt; - args.size = size; - args.align = align; - if (openfirmware(&args) == -1) - return ((void *)-1); - return ((void *)args.baseaddr); + return (OFW_CLAIM(ofw_obj, virt, size, align)); } /* Release an area of memory. */ void OF_release(void *virt, u_int size) { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t virt; - cell_t size; - } args = { - (cell_t)"release", - 2, - }; - - args.virt = (cell_t)virt; - args.size = size; - openfirmware(&args); + OFW_RELEASE(ofw_obj, virt, size); } /* * Control transfer functions */ -/* Reset the system and call "boot ". */ -void -OF_boot(char *bootspec) -{ - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t bootspec; - } args = { - (cell_t)"boot", - 1, - }; - - args.bootspec = openfirm_mapptr(bootspec); - openfirmware(&args); - for (;;) /* just in case */ - ; -} - /* Suspend and drop back to the Open Firmware interface. */ void OF_enter() { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - } args = { - (cell_t)"enter", - }; - - openfirmware(&args); - /* We may come back. */ + OFW_ENTER(ofw_obj); } /* Shut down and drop back to the Open Firmware interface. */ void OF_exit() { - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - } args = { - (cell_t)"exit", - }; + /* Should not return */ + OFW_EXIT(ofw_obj); - openfirmware(&args); for (;;) /* just in case */ ; } -/* Free bytes starting at , then call with . */ -#if 0 -void -OF_chain(void *virt, u_int size, void (*entry)(), void *arg, u_int len) -{ - static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t virt; - cell_t size; - cell_t entry; - cell_t arg; - cell_t len; - } args = { - (cell_t)"chain", - 5, - }; - - args.virt = (cell_t)virt; - args.size = size; - args.entry = (cell_t)entry; - args.arg = (cell_t)arg; - args.len = len; - openfirmware(&args); -} -#else -void -OF_chain(void *virt, u_int size, - void (*entry)(void *, u_int, void *, void *, u_int), void *arg, u_int len) -{ - /* - * This is a REALLY dirty hack till the firmware gets this going - */ -#if 0 - if (size > 0) - OF_release(virt, size); -#endif - entry(0, 0, openfirmware, arg, len); -} -#endif ==== //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#3 (text+ko) ==== @@ -64,8 +64,6 @@ * Prototypes for Open Firmware Interface Routines */ -typedef unsigned long cell_t; - typedef unsigned int ihandle_t; typedef unsigned int phandle_t; @@ -74,23 +72,27 @@ #include #include +#include + MALLOC_DECLARE(M_OFWPROP); /* - * Stuff that is used by the Open Firmware code. + * Open Firmware interface initialization. OF_install installs the named + * interface as the Open Firmware access mechanism, OF_init initializes it. */ -void set_openfirm_callback(int (*)(void *)); -int openfirmware(void *); -cell_t openfirm_mapptr(const void *); +boolean_t OF_install(char *name, int prio); +void OF_init(void *cookie); /* - * This isn't actually an Open Firmware function, but it seemed like the right - * place for it to go. + * Known Open Firmware interface names */ -void OF_init(int (*openfirm)(void *)); + +#define OFW_STD_DIRECT "ofw_std" /* Standard OF interface */ +#define OFW_STD_REAL "ofw_real" /* Real-mode OF interface */ +#define OFW_FDT "ofw_fdt" /* Flattened Device Tree */ /* Generic functions */ -int OF_test(char *); +int OF_test(const char *); void OF_printf(const char *, ...); /* Device tree functions */ @@ -98,23 +100,24 @@ phandle_t OF_child(phandle_t); phandle_t OF_parent(phandle_t); phandle_t OF_instance_to_package(ihandle_t); -int OF_getproplen(phandle_t, char *); -int OF_getprop(phandle_t, char *, void *, int); -int OF_getprop_alloc(phandle_t package, char *propname, int elsz, - void **buf); -int OF_nextprop(phandle_t, char *, char *); -int OF_setprop(phandle_t, char *, void *, int); -int OF_canon(const char *, char *, int); +ssize_t OF_getproplen(phandle_t, const char *); +ssize_t OF_getprop(phandle_t, const char *, void *, size_t); +ssize_t OF_getprop_alloc(phandle_t package, const char *propname, + int elsz, void **buf); +int OF_nextprop(phandle_t, const char *name, char *, size_t); +int OF_setprop(phandle_t, const char *name, const void *, size_t); +ssize_t OF_canon(const char *, char *, size_t); phandle_t OF_finddevice(const char *); -int OF_instance_to_path(ihandle_t, char *, int); -int OF_package_to_path(phandle_t, char *, int); -int OF_call_method(char *, ihandle_t, int, int, ...); +ssize_t OF_instance_to_path(ihandle_t, char *, size_t); +ssize_t OF_package_to_path(phandle_t, char *, size_t); +int OF_call_method(const char *, ihandle_t, int nargs, + int nreturns, ...); /* Device I/O functions */ -ihandle_t OF_open(char *); +ihandle_t OF_open(const char *); void OF_close(ihandle_t); -int OF_read(ihandle_t, void *, int); -int OF_write(ihandle_t, void *, int); +ssize_t OF_read(ihandle_t, void *, size_t); +ssize_t OF_write(ihandle_t, void *, size_t); int OF_seek(ihandle_t, u_quad_t); /* Memory functions */ @@ -122,17 +125,11 @@ void OF_release(void *, u_int); /* Control transfer functions */ -void OF_boot(char *); void OF_enter(void); void OF_exit(void) __attribute__((noreturn)); -void OF_chain(void *, u_int, - void (*)(void *, u_int, void *, void *, u_int), void *, u_int); /* User interface functions */ -int OF_interpret(char *, int, ...); - -/* Time function */ -int OF_milliseconds(void); +int OF_interpret(const char *cmd, int nreturns, ...); #endif /* _KERNEL */ #endif /* _OPENFIRM_H_ */ ==== //depot/projects/ppc-g5/sys/dev/ofw/openfirmio.c#2 (text+ko) ==== @@ -221,7 +221,7 @@ if (error) break; } - ok = OF_nextprop(node, name, newname); + ok = OF_nextprop(node, name, newname, sizeof(newname)); if (ok == 0) { error = ENOENT; break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 14 05:03:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 422151065670; Fri, 14 Nov 2008 05:03:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06961106567D for ; Fri, 14 Nov 2008 05:03:31 +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 C51FE8FC0A for ; Fri, 14 Nov 2008 05:03:30 +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 mAE53UXf074208 for ; Fri, 14 Nov 2008 05:03:30 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE53UeL074206 for perforce@freebsd.org; Fri, 14 Nov 2008 05:03:30 GMT (envelope-from nwhitehorn@freebsd.org) Date: Fri, 14 Nov 2008 05:03:30 GMT Message-Id: <200811140503.mAE53UeL074206@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 152963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 05:03:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=152963 Change 152963 by nwhitehorn@nwhitehorn_trantor on 2008/11/14 05:02:34 Fix a stupid mistake in the FDT setup code in ofw_machdep. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#7 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#7 (text+ko) ==== @@ -271,7 +271,7 @@ OF_init(openfirmware); } else { - OF_install(OFW_FDT, 0); + status = OF_install(OFW_FDT, 0); if (status != TRUE) return status; From owner-p4-projects@FreeBSD.ORG Fri Nov 14 06:42:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A42E7106567B; Fri, 14 Nov 2008 06:42: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 64508106568E for ; Fri, 14 Nov 2008 06:42:12 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4381F8FC16 for ; Fri, 14 Nov 2008 06:42:12 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAE6gCJw082788 for ; Fri, 14 Nov 2008 06:42:12 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE6fAtR082722 for perforce@freebsd.org; Fri, 14 Nov 2008 06:41:10 GMT (envelope-from qingli@freebsd.org) Date: Fri, 14 Nov 2008 06:41:10 GMT Message-Id: <200811140641.mAE6fAtR082722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 152964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 06:42:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=152964 Change 152964 by qingli@FreeBSD-newarp on 2008/11/14 06:40:39 IFC - changelist# 152951 Affected files ... .. //depot/projects/arp-v2/src/Makefile.inc1#6 integrate .. //depot/projects/arp-v2/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/arp-v2/src/UPDATING#5 integrate .. //depot/projects/arp-v2/src/bin/Makefile#3 integrate .. //depot/projects/arp-v2/src/bin/cat/cat.c#2 integrate .. //depot/projects/arp-v2/src/bin/chio/chio.c#2 integrate .. //depot/projects/arp-v2/src/bin/cp/utils.c#4 integrate .. //depot/projects/arp-v2/src/bin/pkill/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/pkill/pkill.1#1 branch .. //depot/projects/arp-v2/src/bin/pkill/pkill.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/print.c#2 integrate .. //depot/projects/arp-v2/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/arp-v2/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/options.c#3 integrate .. //depot/projects/arp-v2/src/bin/sh/sh.1#2 integrate .. //depot/projects/arp-v2/src/bin/stty/modes.c#2 integrate .. //depot/projects/arp-v2/src/bin/stty/print.c#3 integrate .. //depot/projects/arp-v2/src/bin/stty/stty.1#2 integrate .. //depot/projects/arp-v2/src/cddl/Makefile.inc#3 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/arp-v2/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/bind9/version#3 integrate .. //depot/projects/arp-v2/src/contrib/gcc/common.opt#2 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/arp-v2/src/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/README#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/test/README#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/arp-v2/src/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/arp-v2/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/arp-v2/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/CommitLog#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/INSTALL#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/NEWS#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/README#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/README.bk#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/README.patches#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/README.versions#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/TODO#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/bootstrap#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/build#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/compile#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/config.guess#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/config.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/config.sub#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/configure.ac#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/configure.in#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/depcomp#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/flock-build#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/build.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/config.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/groups.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/hints.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/index.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/patches.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/porting.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/quick.html#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/release.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/include/version.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/README#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/README#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/missing#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/scripts/genver#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/README#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/compile#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/util/tg.c#1 branch .. //depot/projects/arp-v2/src/contrib/ntp/version#2 integrate .. //depot/projects/arp-v2/src/contrib/ntp/version.m4#1 branch .. //depot/projects/arp-v2/src/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/README#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/cf/README#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/README#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/arp-v2/src/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/arp-v2/src/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/arp-v2/src/contrib/tcsh/sh.c#2 integrate .. //depot/projects/arp-v2/src/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/arp-v2/src/contrib/telnet/arpa/telnet.h#2 integrate .. //depot/projects/arp-v2/src/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/arp-v2/src/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/arp-v2/src/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/arp-v2/src/crypto/openssh/config.h#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/moduli.5#2 integrate .. //depot/projects/arp-v2/src/crypto/openssh/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/arp-v2/src/crypto/openssh/openbsd-compat/tree.h#2 delete .. //depot/projects/arp-v2/src/crypto/openssh/readconf.c#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/scp.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sftp.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh-add.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/arp-v2/src/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/arp-v2/src/crypto/openssl/FREEBSD-Xlist#2 delete .. //depot/projects/arp-v2/src/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/arp-v2/src/etc/Makefile#5 integrate .. //depot/projects/arp-v2/src/etc/defaults/devfs.rules#2 integrate .. //depot/projects/arp-v2/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/arp-v2/src/etc/devd.conf#4 integrate .. //depot/projects/arp-v2/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/arp-v2/src/etc/etc.arm/ttys#2 integrate .. //depot/projects/arp-v2/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/arp-v2/src/etc/etc.ia64/ttys#2 integrate .. //depot/projects/arp-v2/src/etc/etc.mips/ttys#2 integrate .. //depot/projects/arp-v2/src/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/arp-v2/src/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/arp-v2/src/etc/freebsd-update.conf#4 integrate .. //depot/projects/arp-v2/src/etc/gss/mech#3 integrate .. //depot/projects/arp-v2/src/etc/login.conf#2 integrate .. //depot/projects/arp-v2/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/arp-v2/src/etc/network.subr#5 integrate .. //depot/projects/arp-v2/src/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/security/550.ipfwlimit#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/security/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/arp-v2/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/arp-v2/src/etc/rc.d/gssd#1 branch .. //depot/projects/arp-v2/src/etc/rc.d/jail#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/kernel#2 delete .. //depot/projects/arp-v2/src/etc/rc.d/netif#5 integrate .. //depot/projects/arp-v2/src/etc/rc.d/nfsd#3 integrate .. //depot/projects/arp-v2/src/etc/rc.d/savecore#3 integrate .. //depot/projects/arp-v2/src/etc/rc.firewall#4 integrate .. //depot/projects/arp-v2/src/etc/rc.initdiskless#3 integrate .. //depot/projects/arp-v2/src/etc/rc.subr#5 integrate .. //depot/projects/arp-v2/src/etc/remote#3 integrate .. //depot/projects/arp-v2/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/arp-v2/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/arp-v2/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/arp-v2/src/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/arp-v2/src/games/random/random.c#2 integrate .. //depot/projects/arp-v2/src/games/random/randomize_fd.c#2 integrate .. //depot/projects/arp-v2/src/games/random/randomize_fd.h#2 integrate .. //depot/projects/arp-v2/src/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/arp-v2/src/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/arp-v2/src/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/lib/libgomp/config.h#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/binutils/libbfd/Makefile.amd64#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cc/cc_tools/elfos-undef.h#1 branch .. //depot/projects/arp-v2/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#4 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/man/man/man.c#4 integrate .. //depot/projects/arp-v2/src/include/Makefile#4 integrate .. //depot/projects/arp-v2/src/include/arpa/telnet.h#2 integrate .. //depot/projects/arp-v2/src/include/rpc/svc_auth.h#2 integrate .. //depot/projects/arp-v2/src/include/rpc/xdr.h#2 integrate .. //depot/projects/arp-v2/src/include/strings.h#2 integrate .. //depot/projects/arp-v2/src/include/unistd.h#5 integrate .. //depot/projects/arp-v2/src/include/uuid.h#2 integrate .. //depot/projects/arp-v2/src/lib/Makefile#5 integrate .. //depot/projects/arp-v2/src/lib/bind/config.h#2 integrate .. //depot/projects/arp-v2/src/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_private.h#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry_stat.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.3#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_ar.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_mtree.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/filter_fork.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/main.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_bad_fd.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_zip.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_empty_write.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_entry.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_compress_program.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin_Z.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_odc.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_empty.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_gz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_iso_gz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_pax_bz2.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tbz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tgz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_tz.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_compress_program.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_secure.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_times.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_newc.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_pax.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/arp-v2/src/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/arp-v2/src/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/_setjmp.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/fabs.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/rfork_thread.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/stdlib/div.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/stdlib/ldiv.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/stdlib/lldiv.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/bcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/bcopy.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/bzero.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/memcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/memset.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/strcat.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/strcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/getcontext.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/dirname.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/_setjmp.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/setjmp.S#3 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/stdlib/ldiv.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/bzero.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/ffs.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/index.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/memchr.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/memcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/memset.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/rindex.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strcat.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strchr.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strcmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strcpy.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strlen.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strncmp.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/strrchr.S#2 integrate .. //depot/projects/arp-v2/src/lib/libc/i386/string/swab.S#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 14 07:08:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D93106567D; Fri, 14 Nov 2008 07:08: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 2E6971065675 for ; Fri, 14 Nov 2008 07:08:39 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED1D8FC21 for ; Fri, 14 Nov 2008 07:08:39 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAE78de5085613 for ; Fri, 14 Nov 2008 07:08:39 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAE78d1I085611 for perforce@freebsd.org; Fri, 14 Nov 2008 07:08:39 GMT (envelope-from qingli@freebsd.org) Date: Fri, 14 Nov 2008 07:08:39 GMT Message-Id: <200811140708.mAE78d1I085611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 152965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 07:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=152965 Change 152965 by qingli@FreeBSD-newarp on 2008/11/14 07:08:22 IFC - changelist# 152951 Affected files ... .. //depot/projects/arp-v2/src/sys/net/if.c#6 integrate Differences ... ==== //depot/projects/arp-v2/src/sys/net/if.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.281 2008/06/26 23:05:28 rwatson Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.290 2008/11/06 15:26:09 bz Exp $ */ #include "opt_compat.h" @@ -56,10 +56,12 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -172,10 +174,11 @@ struct ifnet * ifnet_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; IFNET_RLOCK(); - ifp = ifindex_table[idx].ife_ifnet; + ifp = V_ifindex_table[idx].ife_ifnet; IFNET_RUNLOCK(); return (ifp); } @@ -183,15 +186,17 @@ static void ifnet_setbyindex(u_short idx, struct ifnet *ifp) { + INIT_VNET_NET(curvnet); IFNET_WLOCK_ASSERT(); - ifindex_table[idx].ife_ifnet = ifp; + V_ifindex_table[idx].ife_ifnet = ifp; } struct ifaddr * ifaddr_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); @@ -203,10 +208,11 @@ struct cdev * ifdev_byindex(u_short idx) { + INIT_VNET_NET(curvnet); struct cdev *cdev; IFNET_RLOCK(); - cdev = ifindex_table[idx].ife_dev; + cdev = V_ifindex_table[idx].ife_dev; IFNET_RUNLOCK(); return (cdev); } @@ -214,9 +220,10 @@ static void ifdev_setbyindex(u_short idx, struct cdev *cdev) { + INIT_VNET_NET(curvnet); IFNET_WLOCK(); - ifindex_table[idx].ife_dev = cdev; + V_ifindex_table[idx].ife_dev = cdev; IFNET_WUNLOCK(); } @@ -256,7 +263,7 @@ /* only support interface specific ioctls */ if (IOCGROUP(cmd) != 'i') return (EOPNOTSUPP); - idx = minor(dev); + idx = dev2unit(dev); if (idx == 0) { /* * special network device, not interface. @@ -283,6 +290,7 @@ static int netkqfilter(struct cdev *dev, struct knote *kn) { + INIT_VNET_NET(curvnet); struct knlist *klist; struct ifnet *ifp; int idx; @@ -295,9 +303,9 @@ return (EINVAL); } - idx = minor(dev); + idx = dev2unit(dev); if (idx == 0) { - klist = &ifklist; + klist = &V_ifklist; } else { ifp = ifnet_byindex(idx); if (ifp == NULL) @@ -352,10 +360,12 @@ static void if_init(void *dummy __unused) { + INIT_VNET_NET(curvnet); + IFNET_LOCK_INIT(); - TAILQ_INIT(&ifnet); - TAILQ_INIT(&ifg_head); - knlist_init(&ifklist, NULL, NULL, NULL, NULL); + TAILQ_INIT(&V_ifnet); + TAILQ_INIT(&V_ifg_head); + knlist_init(&V_ifklist, NULL, NULL, NULL, NULL); if_grow(); /* create initial table */ ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "network")); @@ -372,17 +382,18 @@ static void if_grow(void) { + INIT_VNET_NET(curvnet); u_int n; struct ifindex_entry *e; - if_indexlim <<= 1; - n = if_indexlim * sizeof(*e); + V_if_indexlim <<= 1; + n = V_if_indexlim * sizeof(*e); e = malloc(n, M_IFNET, M_WAITOK | M_ZERO); - if (ifindex_table != NULL) { - memcpy((caddr_t)e, (caddr_t)ifindex_table, n/2); - free((caddr_t)ifindex_table, M_IFNET); + if (V_ifindex_table != NULL) { + memcpy((caddr_t)e, (caddr_t)V_ifindex_table, n/2); + free((caddr_t)V_ifindex_table, M_IFNET); } - ifindex_table = e; + V_ifindex_table = e; } /* @@ -393,6 +404,7 @@ struct ifnet* if_alloc(u_char type) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; ifp = malloc(sizeof(struct ifnet), M_IFNET, M_WAITOK|M_ZERO); @@ -403,7 +415,7 @@ * * XXX: should be locked! */ - for (ifp->if_index = 1; ifp->if_index <= if_index; ifp->if_index++) { + for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { if (ifnet_byindex(ifp->if_index) == NULL) break; } @@ -412,9 +424,9 @@ free(ifp, M_IFNET); return (NULL); } - if (ifp->if_index > if_index) - if_index = ifp->if_index; - if (if_index >= if_indexlim) + if (ifp->if_index > V_if_index) + V_if_index = ifp->if_index; + if (V_if_index >= V_if_indexlim) if_grow(); ifp->if_type = type; @@ -455,6 +467,7 @@ void if_free_type(struct ifnet *ifp, u_char type) { + INIT_VNET_NET(curvnet); /* ifp->if_vnet can be NULL here ! */ if (ifp != ifnet_byindex(ifp->if_index)) { if_printf(ifp, "%s: value was not if_alloced, skipping\n", @@ -466,8 +479,8 @@ ifnet_setbyindex(ifp->if_index, NULL); /* XXX: should be locked with if_findindex() */ - while (if_index > 0 && ifnet_byindex(if_index) == NULL) - if_index--; + while (V_if_index > 0 && ifnet_byindex(V_if_index) == NULL) + V_if_index--; IFNET_WUNLOCK(); if (if_com_free[type] != NULL) @@ -492,6 +505,7 @@ void if_attach(struct ifnet *ifp) { + INIT_VNET_NET(curvnet); unsigned socksize, ifasize; int namelen, masklen; struct sockaddr_dl *sdl; @@ -526,7 +540,7 @@ #endif ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, - unit2minor(ifp->if_index), UID_ROOT, GID_WHEEL, 0600, "%s/%s", + ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", net_cdevsw.d_name, ifp->if_xname)); make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", net_cdevsw.d_name, ifp->if_index); @@ -584,7 +598,7 @@ ifp->if_snd.altq_ifp = ifp; IFNET_WLOCK(); - TAILQ_INSERT_TAIL(&ifnet, ifp, if_link); + TAILQ_INSERT_TAIL(&V_ifnet, ifp, if_link); IFNET_WUNLOCK(); if (domain_init_status >= 2) @@ -607,11 +621,12 @@ static void if_attachdomain(void *dummy) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; int s; s = splnet(); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) if_attachdomain1(ifp); splx(s); } @@ -717,6 +732,7 @@ void if_detach(struct ifnet *ifp) { + INIT_VNET_NET(ifp->if_vnet); struct ifaddr *ifa; struct radix_node_head *rnh; int s; @@ -726,9 +742,9 @@ int found = 0; IFNET_WLOCK(); - TAILQ_FOREACH(iter, &ifnet, if_link) + TAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { - TAILQ_REMOVE(&ifnet, ifp, if_link); + TAILQ_REMOVE(&V_ifnet, ifp, if_link); found = 1; break; } @@ -794,7 +810,7 @@ for (i = 1; i <= AF_MAX; i++) { int j; for (j = 0; j < rt_numfibs; j++) { - if ((rnh = rt_tables[j][i]) == NULL) + if ((rnh = V_rt_tables[j][i]) == NULL) continue; RADIX_NODE_HEAD_LOCK(rnh); (void) rnh->rnh_walktree(rnh, if_rtdel, ifp); @@ -832,6 +848,7 @@ int if_addgroup(struct ifnet *ifp, const char *groupname) { + INIT_VNET_NET(ifp->if_vnet); struct ifg_list *ifgl; struct ifg_group *ifg = NULL; struct ifg_member *ifgm; @@ -860,7 +877,7 @@ return (ENOMEM); } - TAILQ_FOREACH(ifg, &ifg_head, ifg_next) + TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next) if (!strcmp(ifg->ifg_group, groupname)) break; @@ -876,7 +893,7 @@ ifg->ifg_refcnt = 0; TAILQ_INIT(&ifg->ifg_members); EVENTHANDLER_INVOKE(group_attach_event, ifg); - TAILQ_INSERT_TAIL(&ifg_head, ifg, ifg_next); + TAILQ_INSERT_TAIL(&V_ifg_head, ifg, ifg_next); } ifg->ifg_refcnt++; @@ -901,6 +918,7 @@ int if_delgroup(struct ifnet *ifp, const char *groupname) { + INIT_VNET_NET(ifp->if_vnet); struct ifg_list *ifgl; struct ifg_member *ifgm; @@ -927,7 +945,7 @@ } if (--ifgl->ifgl_group->ifg_refcnt == 0) { - TAILQ_REMOVE(&ifg_head, ifgl->ifgl_group, ifg_next); + TAILQ_REMOVE(&V_ifg_head, ifgl->ifgl_group, ifg_next); EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group); free(ifgl->ifgl_group, M_TEMP); } @@ -990,6 +1008,7 @@ static int if_getgroupmembers(struct ifgroupreq *data) { + INIT_VNET_NET(curvnet); struct ifgroupreq *ifgr = data; struct ifg_group *ifg; struct ifg_member *ifgm; @@ -997,7 +1016,7 @@ int len, error; IFNET_RLOCK(); - TAILQ_FOREACH(ifg, &ifg_head, ifg_next) + TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next) if (!strcmp(ifg->ifg_group, ifgr->ifgr_name)) break; if (ifg == NULL) { @@ -1099,11 +1118,12 @@ struct ifaddr * ifa_ifwithaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != addr->sa_family) continue; @@ -1129,11 +1149,12 @@ struct ifaddr * ifa_ifwithbroadaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != addr->sa_family) continue; @@ -1156,17 +1177,18 @@ struct ifaddr * ifa_ifwithdstaddr(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if ((ifp->if_flags & IFF_POINTOPOINT) == 0) continue; TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != addr->sa_family) continue; - if (ifa->ifa_dstaddr && + if (ifa->ifa_dstaddr != NULL && sa_equal(addr, ifa->ifa_dstaddr)) goto done; } @@ -1184,6 +1206,7 @@ struct ifaddr * ifa_ifwithnet(struct sockaddr *addr) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; struct ifaddr *ifa_maybe = (struct ifaddr *) 0; @@ -1196,7 +1219,7 @@ */ if (af == AF_LINK) { struct sockaddr_dl *sdl = (struct sockaddr_dl *)addr; - if (sdl->sdl_index && sdl->sdl_index <= if_index) + if (sdl->sdl_index && sdl->sdl_index <= V_if_index) return (ifaddr_byindex(sdl->sdl_index)); } @@ -1205,7 +1228,7 @@ * addresses in this address family. */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { char *cp, *cp2, *cp3; @@ -1220,7 +1243,7 @@ * The trouble is that we don't know the * netmask for the remote end. */ - if (ifa->ifa_dstaddr != 0 && + if (ifa->ifa_dstaddr != NULL && sa_equal(addr, ifa->ifa_dstaddr)) goto done; } else { @@ -1427,6 +1450,7 @@ struct ifnet *ifp = (struct ifnet *)arg; int link_state = ifp->if_link_state; int link; + CURVNET_SET(ifp->if_vnet); /* Notify that the link state has changed. */ rt_ifmsg(ifp); @@ -1463,6 +1487,7 @@ if (log_link_state_change) log(LOG_NOTICE, "%s: link state changed to %s\n", ifp->if_xname, (link_state == LINK_STATE_UP) ? "UP" : "DOWN" ); + CURVNET_RESTORE(); } /* @@ -1525,16 +1550,24 @@ static void if_slowtimo(void *arg) { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; int s = splimp(); IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { - if (ifp->if_timer == 0 || --ifp->if_timer) - continue; - if (ifp->if_watchdog) - (*ifp->if_watchdog)(ifp); + VNET_LIST_RLOCK(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_timer == 0 || --ifp->if_timer) + continue; + if (ifp->if_watchdog) + (*ifp->if_watchdog)(ifp); + } + CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK(); IFNET_RUNLOCK(); splx(s); timeout(if_slowtimo, (void *)0, hz / IFNET_SLOWHZ); @@ -1547,10 +1580,11 @@ struct ifnet * ifunit(const char *name) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (strncmp(name, ifp->if_xname, IFNAMSIZ) == 0) break; } @@ -2119,6 +2153,7 @@ static int ifconf(u_long cmd, caddr_t data) { + INIT_VNET_NET(curvnet); struct ifconf *ifc = (struct ifconf *)data; #ifdef __amd64__ struct ifconf32 *ifc32 = (struct ifconf32 *)data; @@ -2154,7 +2189,7 @@ valid_len = 0; IFNET_RLOCK(); /* could sleep XXX */ - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { int addrs; /* @@ -2279,14 +2314,14 @@ struct ifmultiaddr *ifma; struct sockaddr *dupsa; - MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, mflags | + ifma = malloc(sizeof *ifma, M_IFMADDR, mflags | M_ZERO); if (ifma == NULL) return (NULL); - MALLOC(dupsa, struct sockaddr *, sa->sa_len, M_IFMADDR, mflags); + dupsa = malloc(sa->sa_len, M_IFMADDR, mflags); if (dupsa == NULL) { - FREE(ifma, M_IFMADDR); + free(ifma, M_IFMADDR); return (NULL); } bcopy(sa, dupsa, sa->sa_len); @@ -2301,10 +2336,10 @@ return (ifma); } - MALLOC(dupsa, struct sockaddr *, llsa->sa_len, M_IFMADDR, mflags); + dupsa = malloc(llsa->sa_len, M_IFMADDR, mflags); if (dupsa == NULL) { - FREE(ifma->ifma_addr, M_IFMADDR); - FREE(ifma, M_IFMADDR); + free(ifma->ifma_addr, M_IFMADDR); + free(ifma, M_IFMADDR); return (NULL); } bcopy(llsa, dupsa, llsa->sa_len); @@ -2329,9 +2364,9 @@ ("if_freemulti: protospec not NULL")); if (ifma->ifma_lladdr != NULL) - FREE(ifma->ifma_lladdr, M_IFMADDR); - FREE(ifma->ifma_addr, M_IFMADDR); - FREE(ifma, M_IFMADDR); + free(ifma->ifma_lladdr, M_IFMADDR); + free(ifma->ifma_addr, M_IFMADDR); + free(ifma, M_IFMADDR); } /* @@ -2449,13 +2484,13 @@ } if (llsa != NULL) - FREE(llsa, M_IFMADDR); + free(llsa, M_IFMADDR); return (0); free_llsa_out: if (llsa != NULL) - FREE(llsa, M_IFMADDR); + free(llsa, M_IFMADDR); unlock_out: IF_ADDR_UNLOCK(ifp); @@ -2478,9 +2513,10 @@ int lastref; #ifdef INVARIANTS struct ifnet *oifp; + INIT_VNET_NET(ifp->if_vnet); IFNET_RLOCK(); - TAILQ_FOREACH(oifp, &ifnet, if_link) + TAILQ_FOREACH(oifp, &V_ifnet, if_link) if (ifp == oifp) break; if (ifp != oifp) @@ -2522,6 +2558,9 @@ void if_delmulti_ifma(struct ifmultiaddr *ifma) { +#ifdef DIAGNOSTIC + INIT_VNET_NET(curvnet); +#endif struct ifnet *ifp; int lastref; @@ -2533,7 +2572,7 @@ struct ifnet *oifp; IFNET_RLOCK(); - TAILQ_FOREACH(oifp, &ifnet, if_link) + TAILQ_FOREACH(oifp, &V_ifnet, if_link) if (ifp == oifp) break; if (ifp != oifp) { From owner-p4-projects@FreeBSD.ORG Fri Nov 14 09:13:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C5051065678; Fri, 14 Nov 2008 09:13: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 5FEA41065689 for ; Fri, 14 Nov 2008 09:13:16 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe14.swip.net [212.247.155.161]) by mx1.freebsd.org (Postfix) with ESMTP id EA4968FC19 for ; Fri, 14 Nov 2008 09:13:15 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=Oumcy1zCVZoA:10 a=89sYFII7q9YA:10 a=aniA1o7mVp4QawOfT9qHqA==:17 a=6I5d2MoRAAAA:8 a=5hjLLUScPdrLCMmVSmIA:9 a=-1yZFZQbOdi_TBbrGB0A:7 a=oXe1z_HgLo3ZD3xMNlY0Q834POEA:4 a=50e4U0PicR4A:10 Received: from [62.113.133.1] (account mc467741@c2i.net [62.113.133.1] verified) by mailfe14.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 407629786; Fri, 14 Nov 2008 09:13:12 +0100 From: Hans Petter Selasky To: Perforce Change Reviews Date: Fri, 14 Nov 2008 09:15:17 +0100 User-Agent: KMail/1.9.7 References: <200811080910.mA89AgTZ048172@repoman.freebsd.org> In-Reply-To: <200811080910.mA89AgTZ048172@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200811140915.18846.hselasky@c2i.net> Cc: Alexander Motin Subject: Re: PERFORCE change 152649 for review - busdma problem X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 09:13:16 -0000 Hi Alexander, I am going to revert this patch and suggest a new one. I am not sure how to best implement it, but will it be Ok if I make the offset adjustment only for alignment <= 1 byte ? Is there any documentation or specification that needs to be updated? --HPS On Saturday 08 November 2008, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=152649 > > Change 152649 by hselasky@hselasky_laptop001 on 2008/11/08 09:09:50 > > > Fix a serious BUSDMA bug: The initial virtual page offset is > not retained on the bounce pages, which is what the EHCI and > the OHCI expects. > > Affected files ... > > .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#10 edit > > Differences ... > > ==== //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#10 (text+ko) > ==== > > @@ -938,7 +938,8 @@ > if (op & BUS_DMASYNC_PREWRITE) { > while (bpage != NULL) { > bcopy((void *)bpage->datavaddr, > - (void *)bpage->vaddr, > + (void *)(bpage->vaddr + > + ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)), > bpage->datacount); > bpage = STAILQ_NEXT(bpage, links); > } > @@ -947,7 +948,8 @@ > > if (op & BUS_DMASYNC_POSTREAD) { > while (bpage != NULL) { > - bcopy((void *)bpage->vaddr, > + bcopy((void *)(bpage->vaddr + > + ((vm_offset_t)(bpage->datavaddr) & PAGE_MASK)), > (void *)bpage->datavaddr, > bpage->datacount); > bpage = STAILQ_NEXT(bpage, links); > @@ -1149,7 +1151,7 @@ > bpage->datavaddr = vaddr; > bpage->datacount = size; > STAILQ_INSERT_TAIL(&(map->bpages), bpage, links); > - return (bpage->busaddr); > + return (bpage->busaddr + ((vm_offset_t)vaddr & PAGE_MASK)); > } > > static void From owner-p4-projects@FreeBSD.ORG Fri Nov 14 13:28:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 871971065689; Fri, 14 Nov 2008 13:28: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 2F16A106567C for ; Fri, 14 Nov 2008 13:28:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 232668FC0C for ; Fri, 14 Nov 2008 13:28:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAEDS5cG043709 for ; Fri, 14 Nov 2008 13:28:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAEDS5U5043707 for perforce@freebsd.org; Fri, 14 Nov 2008 13:28:05 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 14 Nov 2008 13:28:05 GMT Message-Id: <200811141328.mAEDS5U5043707@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 152973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 14 Nov 2008 13:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=152973 Change 152973 by rene@rene_self on 2008/11/14 13:27:14 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#7 integrate .. //depot/projects/docproj_nl/www/en/news/status/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2008-07-2008-09.xml#1 branch .. //depot/projects/docproj_nl/www/en/news/status/status.sgml#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#17 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -116,26 +116,36 @@ Thus smaller and heavier-accessed file systems should be closer to the outside of the drive, while larger partitions like /usr should be placed - toward the inner. It is a good idea to create - partitions in a similar order to: root, swap, + toward the inner parts of the disk. It is a good idea to create + partitions in an order similar to: root, swap, /var, /usr. - The size of /var + The size of the /var partition reflects the intended machine usage. - /var is used to hold + The /var file system is used to hold mailboxes, log files, and printer spools. Mailboxes and log files can grow to unexpected sizes depending on how many users exist and how long log - files are kept. Most users would never require a gigabyte, - but remember that /var/tmp - must be large enough to contain packages. - + files are kept. Most users will rarely need more than about a + gigabyte of free disk space in /var. + + + There are a few times that a lot of disk space is required + in /var/tmp. When new software is installed + with &man.pkg.add.1; the packaging tools extract a temporary copy + of the packages under /var/tmp. Large + software packages, like Firefox, + or OpenOffice may be tricky to install + if there is not enough disk space + under /var/tmp. + - The /usr partition holds much - of the files required to support the system, the &man.ports.7; - collection (recommended) and the source code (optional). Both - of which are optional at install time. - At least 2 gigabytes would be recommended for this partition. + The /usr partition holds many + of the files required to support the system, including the &man.ports.7; + collection (recommended) and the source code (optional). Both the + ports and the sources of the base system are optional at install + time, but we recommend at least 2 gigabytes for this + partition. When selecting partition sizes, keep the space requirements in mind. Running out of space in @@ -147,7 +157,6 @@ sometimes select smaller than adequate /var and / partitions. Partition wisely and generously. - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -389,6 +389,13 @@ + , File Systems Support + + Examines support of non-native file systems in &os;, like the Z + File System from &sun;. + + + , Vinum Describes how to use Vinum, a logical volume manager @@ -420,10 +427,27 @@ that process. + + , Dtrace + + Describes how to configure and use the DTrace tool from &sun; + in &os;. Dynamic tracing can help locate performance issues, by + performing real time system analysis. + + + , Updating &os; + + Describes the latest system utilities that may be used to + update a &os; system. These are &man.freebsd-update.8; for + the base system, and &man.portsnap.8; for the + Ports Collection. + + + , Serial Communications Explains how to connect terminals and modems to your ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@