From owner-p4-projects@FreeBSD.ORG Sun Apr 19 07:16:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DD531065673; Sun, 19 Apr 2009 07:16:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D271A106564A for ; Sun, 19 Apr 2009 07:16:19 +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 C0FA98FC17 for ; Sun, 19 Apr 2009 07:16:19 +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 n3J7GJrt085296 for ; Sun, 19 Apr 2009 07:16:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3J7GJgY085294 for perforce@freebsd.org; Sun, 19 Apr 2009 07:16:19 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 19 Apr 2009 07:16:19 GMT Message-Id: <200904190716.n3J7GJgY085294@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 160802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 07:16:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=160802 Change 160802 by pgj@petymeg on 2009/04/19 07:15:59 IFC Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#14 integrate Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#15 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.2 2009/04/14 17:52:55 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.3 2009/04/18 06:48:30 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#14 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.77 2009/04/14 11:00:40 jkoshy Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.78 2009/04/18 12:48:41 jkoshy Exp $ @@ -19,6 +19,15 @@ 4 + First look at PC-BSD 7.1 + http://distrowatch.com/weekly.php?issue=20090413#feature + Distro Watch + http://www.distrowatch.com/ + 13 April 2009 +

A reviewer takes PC-BSD 7.1 release for a spin.

+ + + Combining Debian and FreeBSD; Pushing the Envelope of FOSS http://www.linux-mag.com/id/7295 Linux Magazine From owner-p4-projects@FreeBSD.ORG Sun Apr 19 07:17:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17C2F1065673; Sun, 19 Apr 2009 07:17:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC556106564A for ; Sun, 19 Apr 2009 07:17:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BAECA8FC13 for ; Sun, 19 Apr 2009 07:17:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3J7HKpp085359 for ; Sun, 19 Apr 2009 07:17:20 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3J7HK7b085357 for perforce@freebsd.org; Sun, 19 Apr 2009 07:17:20 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 19 Apr 2009 07:17:20 GMT Message-Id: <200904190717.n3J7HK7b085357@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 160803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 07:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=160803 Change 160803 by pgj@petymeg on 2009/04/19 07:17:14 MFen (doc): 1.458 -> 1.460 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.112 -> 1.115 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#24 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#19 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#24 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.458 + %SRCID% 1.460 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#19 (text+ko) ==== @@ -12,7 +12,7 @@ - + From owner-p4-projects@FreeBSD.ORG Sun Apr 19 07:20:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F5BF1065670; Sun, 19 Apr 2009 07:20: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 0FF61106566B for ; Sun, 19 Apr 2009 07:20:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2A3D8FC13 for ; Sun, 19 Apr 2009 07:20:23 +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 n3J7KN0K085610 for ; Sun, 19 Apr 2009 07:20:23 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3J7KNAX085608 for perforce@freebsd.org; Sun, 19 Apr 2009 07:20:23 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 19 Apr 2009 07:20:23 GMT Message-Id: <200904190720.n3J7KNAX085608@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 160804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 07:20:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=160804 Change 160804 by pgj@petymeg on 2009/04/19 07:19:58 MFen (www): 1.77 -> 1.78 hu/share/sgml/press.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#7 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#7 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,16 @@ 4 + A PC-BSD 7.1 elsõ pillantásra + http://distrowatch.com/weekly.php?issue=20090413#feature + Distro Watch + http://www.distrowatch.com/ + 2009. április 13. +

A cikk írója a PC-BSD 7.1 + kiadásával tesz egy próbát.

+ + + A &os; és a Debian ötvözése — egy még szabadabb szoftver http://www.linux-mag.com/id/7295 From owner-p4-projects@FreeBSD.ORG Sun Apr 19 10:47:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8278B1065670; Sun, 19 Apr 2009 10:47:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CD06106566B for ; Sun, 19 Apr 2009 10:47:13 +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 26A978FC12 for ; Sun, 19 Apr 2009 10:47:13 +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 n3JAlDSA013999 for ; Sun, 19 Apr 2009 10:47:13 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 n3JAksbH013975 for perforce@freebsd.org; Sun, 19 Apr 2009 10:46:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Apr 2009 10:46:54 GMT Message-Id: <200904191046.n3JAksbH013975@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 160812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 10:47:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=160812 Change 160812 by rwatson@rwatson_freebsd_capabilities on 2009/04/19 10:46:25 Integrate trustedbsd_capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#7 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#7 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cat/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/dd/dd.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/ls.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pax/file_subs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/extern.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/keyword.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/print.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/alias.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/CHANGES#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/version#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/proto.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsfile.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/rcsparse.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/csup/updater.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/Qtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/README#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dItest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/ddtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dt.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/dtst.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/ftest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/obad/strtodt.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/obad/xL.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtodt.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/x.ou0#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/x.ou1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xL.ou1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xLtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/test/xtest.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/gdtoa/xsum0.out#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/COPYING#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ChangeLog#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/Makefile#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/README#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/accounting.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/accounting.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/aes.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/aes.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/aes_wrap.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/aes_wrap.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ap.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/beacon.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/beacon.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/build_config.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/common.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/common.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/config.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/config.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/config_types.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/crypto.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/crypto.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ctrl_iface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ctrl_iface.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/defconfig#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/defs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/des.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/developer.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/driver.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/driver_test.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_aka.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_defs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_gpsk.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_gpsk_common.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_gpsk_common.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_gtc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_i.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_identity.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_md5.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_mschapv2.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_pax.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_pax_common.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_pax_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_peap.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_psk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_psk_common.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_psk_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sim.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sim_common.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sim_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sim_db.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_sim_db.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_tls.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_tls_common.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_tls_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_tlv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_ttls.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_ttls.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eapol_sm.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eapol_sm.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eloop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eloop.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostap_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.8#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.conf#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.eap_user#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd_cli.1#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hostapd_cli.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/iapp.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/iapp.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11_auth.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11_auth.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_1x.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ieee802_1x.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/includes.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/l2_packet.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/madwifi.conf#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/md4.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/md5.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/md5.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/milenage.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/milenage.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/mlme.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/mlme.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ms_funcs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/ms_funcs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/os.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/os_none.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/os_unix.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/preauth.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/preauth.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius_client.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius_client.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius_server.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/radius_server.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/rc4.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/rc4.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sha1.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sha1.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sha256.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sha256.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sta_info.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/sta_info.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/tls.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/tls_none.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/tls_openssl.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/version.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wired.conf#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wme.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wme.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wpa.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wpa.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wpa_ctrl.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/hostapd/wpa_ctrl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/less/line.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/FILES#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.Win32#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.aix#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.dag#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.hpux#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.linux#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.macosx#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.septel#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/README.tru64#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/acsite.m4#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/atmuni31.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/chmod_bpf#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/configure#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/dlpisubs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/dlpisubs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/doc/pcap.html#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/doc/pcap.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/doc/pcap.xml#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/fad-sita.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/filtertest.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/findalldevstest.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/ieee80211.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/missing/snprintf.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/mkdep#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/net/bpf_filter.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/packaging/pcap.spec.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-bt-linux.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-bt-linux.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-config.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-config.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-filter.manmisc#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-filter.manmisc.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-libdlpi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-linktype.manmisc#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-linktype.manmisc.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-nit.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-pf.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-savefile.manfile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-savefile.manfile.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-septel.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-septel.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-sita.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-sita.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-sita.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-usb-linux.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-usb-linux.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.3#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/bluetooth.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/bpf.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/namedb.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/pcap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/sll.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/usb.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap/vlan.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap1.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_activate.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_breakloop.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_close.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_compile.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_compile.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_create.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_datalink.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_datalink.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_close.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_file.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_flush.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_open.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_file.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_fileno.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_findalldevs.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_freealldevs.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_freecode.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_geterr.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_inject.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_is_swapped.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_lib_version.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_lookupdev.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_lookupnet.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_loop.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_major_version.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_next_ex.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_offline_filter.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_open_dead.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_open_live.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_open_offline.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_datalink.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_promisc.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_set_timeout.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_setdirection.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_setfilter.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_setnonblock.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_snapshot.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_stats.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_statustostr.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/pcap_strerror.3pcap#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/runlex.sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/sll.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/NEWS#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/VERSION#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/audit.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/auditd_lib.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libauditd/auditd_lib.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/opie/opiekey.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/FILES#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/INSTALL#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/INSTALL.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/Makefile-devel-adds#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/PLATFORMS#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/Readme.Win32#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/TODO#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/addrtoname.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/af.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/af.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/aodv.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/atmuni31.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/bgp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/chdlc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/checksum.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/configure#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/enc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/extract.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/gmt2local.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/igrp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ipfc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ipsec_doi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ipx.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/isakmp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/l2tp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/l2vpn.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/l2vpn.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/lane.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/lbl/os-osf4.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/lbl/os-solaris2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/lbl/os-sunos4.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/lbl/os-ultrix4.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/machdep.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/makemib#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/addrinfo.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/snprintf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/strdup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/missing/strsep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/mpls.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/netbios.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/nfs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/nfsfh.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/nlpid.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/nlpid.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/oakley.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ospf6.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/pcap_dump_ftell.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ah.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-arp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-atalk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-bt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-cdp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-cfm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-cnfp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-decnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-dtp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-dvmrp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-eap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-egp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-esp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-frag6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-gre.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-igmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-igrp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ip6opts.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-isakmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lldp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lwapp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-mobile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-mpcp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ntp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ospf6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-pgm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-pppoe.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-raw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-rip.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-ripng.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-rrcp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-rt6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sflow.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sip.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-slow.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-snmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-syslog.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-telnet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-timed.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-udld.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-vqp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-vrrp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-vtp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-wb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/route6d.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/rx.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/sctpConstants.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/sctpHeader.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/setsignal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/slcompress.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/slip.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/sll.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/smb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/telnet.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/.cvsignore#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/alltests.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/eapon1.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/eapon1.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/eapon1.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/eapon1.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/eapon2.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp-secrets.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp0.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp0.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp1.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp1.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp1.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp2.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp2.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp2.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp3.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp3.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp4.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp4.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp5.gdbinit#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp5.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/esp5.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/espudp1.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/espudp1.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/espudp1.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp1.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp1.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp2.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp2.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp3.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp3.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp4.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp4.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/isakmp4500.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/lmp.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/lmp.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/lmp.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/mpls-ldp-hello.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/ospf-gmpls.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/ospf-gmpls.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/ospf-gmpls.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-A.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-AA.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-X.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-XX.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-capX.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-capXX.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-flags.puu#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-flags.sh#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-x.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tests/print-xx.out#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/tftp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/timed.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/token.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/top/install#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/top/install-sh#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/COPYING#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_sake.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_sim.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_tls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_tnc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/eap_wsc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/ikev2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/ikev2.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/tncs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eap_server/tncs.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eapol_supp/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eapol_supp/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/l2_packet/l2_packet.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius_client.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius_client.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius_server.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/radius/radius_server.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/.gitignore#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/peerkey.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/peerkey.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 19 16:33:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9784B106566C; Sun, 19 Apr 2009 16:33:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 582DD106564A for ; Sun, 19 Apr 2009 16:33:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4534E8FC08 for ; Sun, 19 Apr 2009 16:33:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3JGX4Dm062606 for ; Sun, 19 Apr 2009 16:33:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3JGX4uJ062604 for perforce@freebsd.org; Sun, 19 Apr 2009 16:33:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 19 Apr 2009 16:33:04 GMT Message-Id: <200904191633.n3JGX4uJ062604@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 160819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 16:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=160819 Change 160819 by hselasky@hselasky_laptop001 on 2009/04/19 16:32:31 Initial libusb v1.0 support patch from Sylvestre Gallon. Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#2 edit .. //depot/projects/usb/src/lib/libusb/libusb.3#4 edit .. //depot/projects/usb/src/lib/libusb/libusb.h#1 add .. //depot/projects/usb/src/lib/libusb/libusb10.c#1 add .. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#1 add .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#2 edit .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#2 (text+ko) ==== @@ -10,8 +10,6 @@ SRCS= libusb20.c SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c -SRCS+= libusb20_compat01.c -SRCS+= libusb20_compat10.c INCS+= libusb20.h INCS+= libusb20_desc.h MAN= libusb.3 @@ -23,6 +21,13 @@ # libusb 0.1 compat INCS+= usb.h +SRCS+= libusb20_compat01.c + +# libusb 1.0 compat +SRCS+= libusb10.c +SRCS+= libusb10_desc.c +INCS+= libusb.h +MAN+= libusb10.3 .include ==== //depot/projects/usb/src/lib/libusb/libusb.3#4 (text+ko) ==== @@ -945,6 +945,7 @@ . /dev/usb .Sh SEE ALSO +.Xr libusb10 3 , .Xr usb2_core 4 , .Xr usbconfig 8 . ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#2 (text+ko) ==== @@ -1,29 +1,0 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat10.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * This file contains the emulation layer for LibUSB v1.0 from sourceforge. - */ ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#2 (text+ko) ==== @@ -1,25 +1,0 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat10.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ From owner-p4-projects@FreeBSD.ORG Sun Apr 19 17:24:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB091065674; Sun, 19 Apr 2009 17:24:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8301106564A for ; Sun, 19 Apr 2009 17:24:57 +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 B60088FC16 for ; Sun, 19 Apr 2009 17:24:57 +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 n3JHOvTe077421 for ; Sun, 19 Apr 2009 17:24:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3JHOvtq077419 for perforce@freebsd.org; Sun, 19 Apr 2009 17:24:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 19 Apr 2009 17:24:57 GMT Message-Id: <200904191724.n3JHOvtq077419@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 160823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 17:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=160823 Change 160823 by hselasky@hselasky_laptop001 on 2009/04/19 17:24:09 Patches from HPS for libusb v1.0 compat layer. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.h#2 edit .. //depot/projects/usb/src/lib/libusb/libusb10.c#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.h#2 (text+ko) ==== @@ -222,7 +222,7 @@ struct list_head list; unsigned long session_data; - unsigned char os_priv[0]; + void *os_priv; } libusb_device; typedef struct libusb_device_handle { @@ -231,7 +231,7 @@ struct list_head list; struct libusb_device *dev; - unsigned char os_priv[0]; + void *os_priv; } libusb_device_handle; typedef struct libusb_device_descriptor { ==== //depot/projects/usb/src/lib/libusb/libusb10.c#2 (text+ko) ==== @@ -54,9 +54,6 @@ (entry)->next->prev = (entry)->prev; \ (entry)->prev->next = (entry)->next; - -static struct libusb20_backend *usb_backend = NULL; - /* Library initialisation / deinitialisation */ void @@ -64,7 +61,6 @@ { if (ctx) ctx->debug = level; - return; } int @@ -75,6 +71,7 @@ ctx = malloc(sizeof(*ctx)); if (!ctx) return (LIBUSB_ERROR_INVALID_PARAM); + memset(ctx, 0, sizeof(*ctx)); pthread_mutex_init(&ctx->usb_devs_lock, NULL); @@ -103,43 +100,56 @@ struct libusb20_device *pdev; struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; struct libusb_device *dev; - int i = 0; + struct libusb20_backend *usb_backend; + int i; usb_backend = libusb20_be_alloc_default(); - if (usb_backend == NULL) { + if (usb_backend == NULL) return (-1); - } + pdev = NULL; + i = 0; while ((pdev = libusb20_be_device_foreach(usb_backend, pdev))) i++; - if (!list) + if (!list) { + libusb20_be_free(usb_backend); return (LIBUSB_ERROR_INVALID_PARAM); + } *list = malloc((i + 1) * sizeof(void *)); - if (*list == NULL) - return LIBUSB_ERROR_NO_MEM; + if (*list == NULL) { + libusb20_be_free(usb_backend); + return (LIBUSB_ERROR_NO_MEM); + } + i = 0; + while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) { + /* get device into libUSB v1.0 list */ + libusb20_be_dequeue_device(usb_backend, pdev); - pdev = NULL; - i = 0; - while ((pdev = libusb20_be_device_foreach(usb_backend, pdev))) { ddesc = libusb20_dev_get_device_desc(pdev); - - dev = malloc(sizeof(*dev) + sizeof(*pdev)); + dev = malloc(sizeof(*dev)); + if (dev == NULL) { + free(*list); + libusb20_be_free(usb_backend); + return (LIBUSB_ERROR_NO_MEM); + } + memset(dev, 0, sizeof(*dev)); pthread_mutex_init(&dev->lock, NULL); - dev->refcnt = 0; - dev->ctx = ctx; dev->bus_number = pdev->bus_number; dev->device_address = pdev->device_address; dev->num_configurations = ddesc->bNumConfigurations; - memcpy(dev->os_priv, pdev, sizeof(pdev)); + + /* link together the two structures */ + dev->os_priv = pdev; (*list)[i] = libusb_ref_device(dev); i++; } (*list)[i] = NULL; + libusb20_be_free(usb_backend); return (i); } @@ -200,27 +210,43 @@ pthread_mutex_lock(&dev->lock); dev->refcnt--; pthread_mutex_unlock(&dev->lock); + if (dev->refcnt == 0) { + libusb20_dev_free(dev->os_priv); + free(dev); + } } int libusb_open(libusb_device * dev, libusb_device_handle ** handle) { libusb_context *ctx = dev->ctx; + struct libusb20_device *pdev = dev->os_priv; libusb_device_handle *hdl; + int err; + if (handle == NULL) + return (LIBUSB_ERROR_INVALID_PARAM); + hdl = malloc(sizeof(*hdl)); - if (!handle || hdl) - return LIBUSB_ERROR_NO_MEM; + if (hdl == NULL) + return (LIBUSB_ERROR_NO_MEM); + err = libusb20_dev_open(pdev, 16 * 2 /* number of endpoints */ ); + if (err) { + free(hdl); + return (LIBUSB_ERROR_NO_MEM); + } memset(hdl, 0, sizeof(*hdl)); pthread_mutex_init(&hdl->lock, NULL); + hdl->dev = libusb_ref_device(dev); hdl->claimed_interfaces = 0; - + hdl->os_priv = dev->os_priv; pthread_mutex_lock(&ctx->open_devs_lock); LIST_ADD(&hdl->list, &ctx->open_devs); pthread_mutex_unlock(&ctx->open_devs_lock); + *handle = hdl; /* @@ -257,13 +283,19 @@ void libusb_close(libusb_device_handle * devh) { - pthread_mutex_lock(&(devh->dev->ctx->open_devs_lock)); + libusb_context *ctx; + struct libusb20_device *pdev; + int err; + + ctx = devh->dev->ctx; + pdev = devh->os_priv; + + pthread_mutex_lock(&(ctx->open_devs_lock)); + err = libusb20_dev_close(pdev); LIST_DEL(&(devh->list)); - pthread_mutex_unlock(&(devh->dev->ctx->open_devs_lock)); + pthread_mutex_unlock(&(ctx->open_devs_lock)); libusb_unref_device(devh->dev); free(devh); - - return; } libusb_device * From owner-p4-projects@FreeBSD.ORG Sun Apr 19 17:45:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB2F31065689; Sun, 19 Apr 2009 17:45:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95D5510656BD for ; Sun, 19 Apr 2009 17:45:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69B8B8FC19 for ; Sun, 19 Apr 2009 17:45:18 +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 n3JHjIAI079358 for ; Sun, 19 Apr 2009 17:45:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3JHjIOu079356 for perforce@freebsd.org; Sun, 19 Apr 2009 17:45:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 19 Apr 2009 17:45:18 GMT Message-Id: <200904191745.n3JHjIOu079356@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 160824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 17:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=160824 Change 160824 by hselasky@hselasky_laptop001 on 2009/04/19 17:44:46 Add manual page for libusb v1.0 compat layer. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.3#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 19 22:54:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B122C1065673; Sun, 19 Apr 2009 22:54:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73120106566B for ; Sun, 19 Apr 2009 22:54:35 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 602998FC14 for ; Sun, 19 Apr 2009 22:54:35 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3JMsZ9h019603 for ; Sun, 19 Apr 2009 22:54:35 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3JMsZ9v019601 for perforce@freebsd.org; Sun, 19 Apr 2009 22:54:35 GMT (envelope-from antab@FreeBSD.org) Date: Sun, 19 Apr 2009 22:54:35 GMT Message-Id: <200904192254.n3JMsZ9v019601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 160838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 22:54:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=160838 Change 160838 by antab@antab_farm on 2009/04/19 22:54:06 * Fix bug in avr32 binutils bfd related to linker relaxing * Add avr32 gcc patches for shared libgcc * Add LIB1ASM* to libgcc makefile * Add syscall stubs to libc Affected files ... .. //depot/projects/avr32/src/contrib/binutils/bfd/elf32-avr32.c#2 edit .. //depot/projects/avr32/src/contrib/gcc/config.gcc#3 edit .. //depot/projects/avr32/src/contrib/gcc/config/avr32/avr32.h#2 edit .. //depot/projects/avr32/src/contrib/gcc/config/avr32/freebsd.h#5 edit .. //depot/projects/avr32/src/contrib/gcc/config/avr32/libgcc-avr32.ver#1 add .. //depot/projects/avr32/src/contrib/gcc/config/avr32/t-avr32#2 edit .. //depot/projects/avr32/src/gnu/lib/libgcc/Makefile#3 edit .. //depot/projects/avr32/src/lib/libc/Makefile#3 edit .. //depot/projects/avr32/src/lib/libc/avr32/SYS.h#2 edit .. //depot/projects/avr32/src/lib/libc/avr32/Symbol.map#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/Makefile.inc#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/_ctx_start.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/_set_tp.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/_setjmp.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/alloca.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/fabs.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/infinity.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/makecontext.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/modf.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/setjmp.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/signalcontext.c#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gen/sigsetjmp.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/softfloat/avr32-gcc.h#1 add .. //depot/projects/avr32/src/lib/libc/avr32/softfloat/milieu.h#1 add .. //depot/projects/avr32/src/lib/libc/avr32/softfloat/softfloat.h#1 add .. //depot/projects/avr32/src/lib/libc/avr32/stdlib/Makefile.inc#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/Makefile.inc#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/Ovfork.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/brk.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/cerror.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/pipe.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/ptrace.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/sys/sbrk.S#1 add .. //depot/projects/avr32/src/sys/avr32/include/asm.h#3 edit .. //depot/projects/avr32/src/sys/avr32/include/ieee.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/sigframe.h#1 add Differences ... ==== //depot/projects/avr32/src/contrib/binutils/bfd/elf32-avr32.c#2 (text+ko) ==== @@ -1332,7 +1332,6 @@ retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory) { bfd_byte *contents; - bfd_byte *buffer; bfd_size_type sec_size; bfd_size_type sz; @@ -1342,16 +1341,18 @@ if (contents == NULL && sec_size != 0) { - sz = sec->_raw_size ? sec->_raw_size : sec->_cooked_size; - if (sz == 0) - return NULL; + sz = (sec->_raw_size > sec->_cooked_size) ? sec->_raw_size : sec->_cooked_size; + if (sz == 0) + return NULL; - buffer = bfd_malloc (sz); + contents = bfd_malloc (sz); + if (contents == NULL) + return NULL; - if (! bfd_get_section_contents (abfd, sec, buffer, (file_ptr) 0, sz)) + if (! bfd_get_section_contents (abfd, sec, contents, (file_ptr) 0, sz)) { - if (buffer) - free (buffer); + if (contents) + free (contents); return NULL; } if (keep_memory) ==== //depot/projects/avr32/src/contrib/gcc/config.gcc#3 (text+ko) ==== @@ -783,21 +783,26 @@ use_fixproto=yes ;; avr32*-*-linux*) - tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/avr32.h " - tmake_file="t-linux avr32/t-avr32 avr32/t-elf" + tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/avr32.h " + tmake_file="${tmake_file} t-linux avr32/t-avr32 avr32/t-elf" extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" extra_modes=avr32/avr32-modes.def gnu_ld=yes ;; avr32*-*-uclinux*) tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/uclinux-elf.h avr32/avr32.h" - tmake_file="t-linux avr32/t-avr32 avr32/t-elf" + tmake_file="${tmake_file} t-linux avr32/t-avr32 avr32/t-elf" extra_modes=avr32/avr32-modes.def gnu_ld=yes ;; +avr32*-*-freebsd*) + tm_file="dbxelf.h elfos.h ${fbsd_tm_file} avr32/freebsd.h avr32/avr32.h" + tmake_file="${tmake_file} avr32/t-avr32 avr32/t-elf" + extra_modes=avr32/avr32-modes.def + ;; avr32-*-*) - tm_file="dbxelf.h elfos.h avr32/avr32.h avr32/avr32-elf.h" - tmake_file="avr32/t-avr32 avr32/t-elf" + tm_file="dbxelf.h elfos.h avr32/avr32.h avr32/avr32-elf.h" + tmake_file="${tmake_file} avr32/t-avr32 avr32/t-elf" extra_modes=avr32/avr32-modes.def ;; bfin*-elf*) ==== //depot/projects/avr32/src/contrib/gcc/config/avr32/avr32.h#2 (text+ko) ==== @@ -3294,11 +3294,18 @@ #define RENAME_LIBRARY_SET ".set" +#ifdef HIDE_EXPORTS +/* Make ABI_NAME an alias for __GCC_NAME. */ +#define RENAME_LIBRARY(GCC_NAME, ABI_NAME) \ + __asm__ (".hidden\t__avr32_" #ABI_NAME "\n" \ + ".globl\t__avr32_" #ABI_NAME "\n" \ + ".set\t__avr32_" #ABI_NAME ", __" #GCC_NAME "\n"); +#else /* Make ABI_NAME an alias for __GCC_NAME. */ #define RENAME_LIBRARY(GCC_NAME, ABI_NAME) \ - __asm__ (".globl\t__avr32_" #ABI_NAME "\n" \ - ".set\t__avr32_" #ABI_NAME \ - ", __" #GCC_NAME "\n"); + __asm__ (".globl\t__avr32_" #ABI_NAME "\n" \ + ".set\t__avr32_" #ABI_NAME ", __" #GCC_NAME "\n"); +#endif /* Give libgcc functions avr32 ABI name. */ #ifdef L_muldi3 ==== //depot/projects/avr32/src/contrib/gcc/config/avr32/freebsd.h#5 (text+ko) ==== ==== //depot/projects/avr32/src/contrib/gcc/config/avr32/t-avr32#2 (text+ko) ==== @@ -73,5 +73,4 @@ dp-bit.c: $(srcdir)/config/fp-bit.c cat $(srcdir)/config/fp-bit.c > dp-bit.c - - +SHLIB_MAPFILES += $(srcdir)/config/avr32/libgcc-avr32.ver ==== //depot/projects/avr32/src/gnu/lib/libgcc/Makefile#3 (text+ko) ==== @@ -109,6 +109,19 @@ # _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif +.if ${TARGET_ARCH} == "avr32" +CFLAGS+= -mrelax +LIB1ASMSRC = lib1funcs.S +LIB1ASMFUNCS = _avr32_f64_mul _avr32_f64_mul_fast \ + _avr32_f64_addsub _avr32_f64_addsub_fast _avr32_f64_to_u32 \ + _avr32_f64_to_s32 _avr32_f64_to_u64 _avr32_f64_to_s64 _avr32_u32_to_f64 \ + _avr32_s32_to_f64 _avr32_f64_cmp_eq _avr32_f64_cmp_ge _avr32_f64_cmp_lt \ + _avr32_f32_cmp_eq _avr32_f32_cmp_ge _avr32_f32_cmp_lt _avr32_f64_div _avr32_f64_div_fast \ + _avr32_f32_div _avr32_f32_div_fast _avr32_f32_addsub _avr32_f32_addsub_fast \ + _avr32_f32_mul _avr32_s32_to_f32 _avr32_u32_to_f32 _avr32_f32_to_s32 \ + _avr32_f32_to_u32 _avr32_f32_to_f64 _avr32_f64_to_f32 _mulsi3 +.endif + .if ${TARGET_ARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm @@ -174,7 +187,8 @@ # Floating point emulation functions # .if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \ - ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" + ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" || \ + ${TARGET_ARCH} == 'avr32' FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT DPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES ==== //depot/projects/avr32/src/lib/libc/Makefile#3 (text+ko) ==== @@ -64,7 +64,8 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_ARCH} == "arm" || \ + ${MACHINE_ARCH} == "avr32" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" ==== //depot/projects/avr32/src/lib/libc/avr32/SYS.h#2 (text+ko) ==== @@ -1,11 +1,16 @@ #include #include -/* TODO: Implement this */ +#define RSYSCALL(x) \ + PSEUDO(x) -#define RSYSCALL(x) \ - PSEUDO(x) +#define PSEUDO(x) \ + ENTRY(__CONCAT(__sys_, x)); \ + .weak _C_LABEL(x); \ + .set _C_LABEL(x), _C_LABEL(__CONCAT(__sys_,x)); \ + .weak _C_LABEL(__CONCAT(_,x)); \ + .set _C_LABEL(__CONCAT(_,x)),_C_LABEL(__CONCAT(__sys_,x)); \ + SCALL(x); \ + retal sp; \ + END(__CONCAT(__sys_, x)) -#define PSEUDO(x) \ - ENTRY(__sys_ ## x); \ - END(__sys_ ## x) ==== //depot/projects/avr32/src/sys/avr32/include/asm.h#3 (text+ko) ==== @@ -59,4 +59,16 @@ #define __FBSDID(s) /* nothing */ #endif /* not lint and not STRIP_FBSDID */ +#define _C_LABEL(x) x + +/** + * Do syscall and pass the syscall number in thru r8 + */ +#define SCALL(name) \ + breakpoint; \ + stm --sp, r8; \ + mov r8, SYS_ ## name; \ + scall; \ + sub sp, -4 + #endif /* !_MACHINE_ASM_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 19 22:54:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 157311065670; Sun, 19 Apr 2009 22:54:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2F38106572F for ; Sun, 19 Apr 2009 22:54:36 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADE4B8FC18 for ; Sun, 19 Apr 2009 22:54:36 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3JMsaMv019612 for ; Sun, 19 Apr 2009 22:54:36 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3JMsZMR019606 for perforce@freebsd.org; Sun, 19 Apr 2009 22:54:35 GMT (envelope-from antab@FreeBSD.org) Date: Sun, 19 Apr 2009 22:54:35 GMT Message-Id: <200904192254.n3JMsZMR019606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 160839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 19 Apr 2009 22:54:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=160839 Change 160839 by antab@antab_farm on 2009/04/19 22:54:21 IFC @ 160832 Affected files ... .. //depot/projects/avr32/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/avr32/src/UPDATING#6 integrate .. //depot/projects/avr32/src/bin/sh/parser.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/CREDITS#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/NEWS#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/README#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/configure#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libauditd/auditd_lib.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/au_fcntl_cmd.3#1 branch .. //depot/projects/avr32/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_domain.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_fcntl.c#1 branch .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/Makefile.am#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/avr32/src/contrib/openbsm/sys/bsm/audit_record.h#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/avr32/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/avr32/src/include/signal.h#4 integrate .. //depot/projects/avr32/src/lib/libarchive/Makefile#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive.h#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_disk_entry_from_file.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_disk_set_standard_lookup.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_compression_xz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_empty.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_compression_xz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/archive_write_set_format_mtree.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/avr32/src/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/main.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_bzip2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_gzip.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_xz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_compat_xz_1.txz.uu#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_entry_strmode.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_extattr_freebsd.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_open_fd.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_open_file.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_open_filename.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_pax_filename_encoding.tar.uu#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_compress_program.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_disk.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_disk_entry_from_file.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_bin_gz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_bin_xz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_gtar_gz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_gtar_lzma.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_iso_gz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_pax_bz2.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_tbz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_tgz.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_read_format_txz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_write_compress_bzip2.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_write_compress_gzip.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_write_compress_lzma.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_write_compress_program.c#3 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_compress_xz.c#1 branch .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_failures.c#4 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_disk_sparse.c#2 integrate .. //depot/projects/avr32/src/lib/libarchive/test/test_write_format_mtree.c#1 branch .. //depot/projects/avr32/src/lib/libbsm/Makefile#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strmode.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strmode.c#3 integrate .. //depot/projects/avr32/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/avr32/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/avr32/src/rescue/rescue/Makefile#4 integrate .. //depot/projects/avr32/src/sbin/ifconfig/af_inet.c#2 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/avr32/src/sbin/route/keywords#2 integrate .. //depot/projects/avr32/src/sbin/route/route.c#3 integrate .. //depot/projects/avr32/src/share/man/man4/ed.4#4 integrate .. //depot/projects/avr32/src/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/avr32/src/share/man/man4/man4.i386/ar.4#2 delete .. //depot/projects/avr32/src/share/man/man4/man4.i386/ray.4#2 delete .. //depot/projects/avr32/src/share/man/man4/man4.i386/sr.4#2 delete .. //depot/projects/avr32/src/share/man/man9/altq.9#2 integrate .. //depot/projects/avr32/src/share/misc/iso3166#3 integrate .. //depot/projects/avr32/src/share/zoneinfo/asia#5 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/avr32/src/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/avr32/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/avr32/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/avr32/src/sys/arm/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/avr32/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/avr32/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/avr32/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/avr32/src/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/avr32/src/sys/bsm/audit.h#3 integrate .. //depot/projects/avr32/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/avr32/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/avr32/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/avr32/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/avr32/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/avr32/src/sys/conf/NOTES#5 integrate .. //depot/projects/avr32/src/sys/conf/files#8 edit .. //depot/projects/avr32/src/sys/conf/options#4 integrate .. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/avr32/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ar/if_ar.c#2 delete .. //depot/projects/avr32/src/sys/dev/ar/if_ar.h#2 delete .. //depot/projects/avr32/src/sys/dev/ar/if_ar_isa.c#2 delete .. //depot/projects/avr32/src/sys/dev/ar/if_ar_pci.c#2 delete .. //depot/projects/avr32/src/sys/dev/ar/if_arregs.h#2 delete .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/avr32/src/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/avr32/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/avr32/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/avr32/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/avr32/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/avr32/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/avr32/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/avr32/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/avr32/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/avr32/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/avr32/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/avr32/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/avr32/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/avr32/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/avr32/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ray/if_ray.c#2 delete .. //depot/projects/avr32/src/sys/dev/ray/if_raydbg.h#2 delete .. //depot/projects/avr32/src/sys/dev/ray/if_raymib.h#2 delete .. //depot/projects/avr32/src/sys/dev/ray/if_rayreg.h#2 delete .. //depot/projects/avr32/src/sys/dev/ray/if_rayvar.h#2 delete .. //depot/projects/avr32/src/sys/dev/sr/if_sr.c#2 delete .. //depot/projects/avr32/src/sys/dev/sr/if_sr.h#2 delete .. //depot/projects/avr32/src/sys/dev/sr/if_sr_isa.c#2 delete .. //depot/projects/avr32/src/sys/dev/sr/if_sr_pci.c#2 delete .. //depot/projects/avr32/src/sys/dev/sr/if_srregs.h#2 delete .. //depot/projects/avr32/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/avr32/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/avr32/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/avr32/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/i386/include/metadata.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/avr32/src/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/avr32/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/avr32/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/avr32/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/avr32/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/avr32/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/avr32/src/sys/mips/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/modules/Makefile#5 integrate .. //depot/projects/avr32/src/sys/modules/ar/Makefile#2 delete .. //depot/projects/avr32/src/sys/modules/netgraph/sync_ar/Makefile#2 delete .. //depot/projects/avr32/src/sys/modules/netgraph/sync_sr/Makefile#2 delete .. //depot/projects/avr32/src/sys/modules/ray/Makefile#2 delete .. //depot/projects/avr32/src/sys/modules/sr/Makefile#2 delete .. //depot/projects/avr32/src/sys/net/ethernet.h#2 integrate .. //depot/projects/avr32/src/sys/net/flowtable.c#1 branch .. //depot/projects/avr32/src/sys/net/flowtable.h#1 branch .. //depot/projects/avr32/src/sys/net/if.c#6 integrate .. //depot/projects/avr32/src/sys/net/if.h#3 integrate .. //depot/projects/avr32/src/sys/net/if_arc.h#2 integrate .. //depot/projects/avr32/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_atm.h#2 integrate .. //depot/projects/avr32/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_disc.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_enc.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_faith.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_gif.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_gif.h#3 integrate .. //depot/projects/avr32/src/sys/net/if_gre.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/avr32/src/sys/net/if_loop.c#5 integrate .. //depot/projects/avr32/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/avr32/src/sys/net/if_stf.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_tun.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_var.h#3 integrate .. //depot/projects/avr32/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/avr32/src/sys/net/iso88025.h#2 integrate .. //depot/projects/avr32/src/sys/net/radix_mpath.c#2 integrate .. //depot/projects/avr32/src/sys/net/route.c#3 integrate .. //depot/projects/avr32/src/sys/net/route.h#2 integrate .. //depot/projects/avr32/src/sys/net/rtsock.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_tdma.c#4 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/avr32/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/avr32/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/avr32/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/avr32/src/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/avr32/src/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/avr32/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/avr32/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/avr32/src/sys/rpc/svc.h#2 integrate .. //depot/projects/avr32/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/avr32/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/avr32/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/avr32/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/avr32/src/sys/sys/acl.h#2 integrate .. //depot/projects/avr32/src/sys/sys/malloc.h#3 integrate .. //depot/projects/avr32/src/sys/sys/param.h#6 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/avr32/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/avr32/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/avr32/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/avr32/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/avr32/src/tools/regression/bin/sh/parser/and-pipe-not.0#1 branch .. //depot/projects/avr32/src/tools/tools/nanobsd/fill_pkg.sh#1 branch .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2348#3 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2358#3 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/common#2 integrate .. //depot/projects/avr32/src/tools/tools/net80211/scripts/setup.wdsmain#2 integrate .. //depot/projects/avr32/src/tools/tools/net80211/wlanwds/wlanwds.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/bsdcpio.1#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/cmdline.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/cpio.h#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/pathmatch.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/pathmatch.h#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/main.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test.h#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_0.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_basic.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_format_newc.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_gcpio_compat.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_a.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_c.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_d.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_f.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_m.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_t.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_u.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_version.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_y.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_option_z.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_owner_parse.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_passthrough_dotdot.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_passthrough_reverse.c#2 integrate .. //depot/projects/avr32/src/usr.bin/cpio/test/test_pathmatch.c#2 integrate .. //depot/projects/avr32/src/usr.bin/tar/Makefile#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/avr32/src/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/cmdline.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/read.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/main.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test.h#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_0.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_basic.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_copy.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_patterns.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_strip_components.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/test/test_symlink_dir.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/tree.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/util.c#3 integrate .. //depot/projects/avr32/src/usr.bin/tar/write.c#4 integrate .. //depot/projects/avr32/src/usr.sbin/Makefile#4 integrate .. //depot/projects/avr32/src/usr.sbin/bluetooth/btpand/event.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/pciconf/cap.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/raycontrol/Makefile#2 delete .. //depot/projects/avr32/src/usr.sbin/raycontrol/raycontrol.8#2 delete .. //depot/projects/avr32/src/usr.sbin/raycontrol/raycontrol.c#2 delete .. //depot/projects/avr32/src/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/sysinstall/menus.c#4 integrate Differences ... ==== //depot/projects/avr32/src/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.185 2009/04/10 22:15:01 danger Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.188 2009/04/18 22:16:46 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,31 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090417: removal of legacy versions of USB network interface drivers +OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h +OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h +OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h +OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h +OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h +# 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8) +OLD_FILES+=usr/sbin/raycontrol +OLD_FILES+=usr/share/man/man4/i386/ar.4.gz +OLD_FILES+=usr/share/man/man4/i386/ray.4.gz +OLD_FILES+=usr/share/man/man4/i386/sr.4.gz +OLD_FILES+=usr/share/man/man8/raycontrol.8.gz # 20090410: VOP_LEASE.9 removed OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz +# 20090406: usb_sw_transfer.h removed +OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h # 20090405: removal of if_ppp(4) and if_sl(4) OLD_FILES+=sbin/slattach rescue/slattach OLD_FILES+=sbin/startslip rescue/startslip @@ -54,6 +77,7 @@ OLD_FILES+=usr/lib/libusb20.so OLD_FILES+=usr/lib/libusb20_p.a OLD_FILES+=usr/include/libusb20_compat01.h +OLD_FILES+=usr/include/libusb20_compat10.h .if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libusb20.so.1 OLD_FILES+=usr/lib32/libusb20.a @@ -97,6 +121,8 @@ OLD_FILES+=usr/include/dev/usb/if_upgtvar.h OLD_FILES+=usr/include/dev/usb/if_uralreg.h OLD_FILES+=usr/include/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/dev/usb/if_urtwreg.h +OLD_FILES+=usr/include/dev/usb/if_urtwvar.h OLD_FILES+=usr/include/dev/usb/if_zydfw.h OLD_FILES+=usr/include/dev/usb/if_zydreg.h OLD_FILES+=usr/include/dev/usb/kue_fw.h ==== //depot/projects/avr32/src/UPDATING#6 (text+ko) ==== @@ -22,6 +22,23 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090415: + Anticipate overflowing inp_flags - add inp_flags2. + This changes most offsets in inpcb, so checking v4 connection + state will require a world rebuild. + Bump __FreeBSD_version to 800080. +20090415: + Add an llentry to struct route and struct route_in6. Modules + embedding a struct route will need to be recompiled. + Bump __FreeBSD_version to 800079. + +20090414: + The size of rt_metrics_lite and by extension rtentry has changed. + Networking administration apps will need to be recompiled. + The route command now supports show as an alias for get, weighting + of routes, sticky and nostick flags to alter the behavior of stateful + load balancing. + Bump __FreeBSD_version to 800078. 20090408: Do not use Giant for kbdmux(4) locking. This is wrong and apparently causing more problems than it solves. This will @@ -1390,4 +1407,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.589 2009/04/12 19:42:25 emax Exp $ +$FreeBSD: src/UPDATING,v 1.592 2009/04/15 22:09:42 kmacy Exp $ ==== //depot/projects/avr32/src/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.60 2008/05/28 21:44:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.61 2009/04/13 19:10:56 stefanf Exp $"); #include #include @@ -250,6 +250,7 @@ int negate; negate = 0; + checkkwd = 2; TRACE(("pipeline: entered\n")); while (readtoken() == TNOT) negate = !negate; ==== //depot/projects/avr32/src/contrib/openbsm/CREDITS#3 (text) ==== @@ -28,6 +28,7 @@ Xin LI Stacey Son Todd Heberlein + Gary Hoo In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the ==== //depot/projects/avr32/src/contrib/openbsm/INSTALL#2 (text) ==== @@ -2,9 +2,8 @@ OpenBSM is currently built using autoconf and automake, which should allow for building on a range of operating systems, including FreeBSD, Mac OS X, -and Linux. Depending on the availability of audit facilities in the -underlying operating system, some components that depend on kernel audit -support are built conditionally. Typically, build will be performed using: +and Linux. Some components are built only if appropriate kernel audit +suppport is found. Typical builds will be performed using: ./configure make @@ -15,10 +14,14 @@ CFLAGS="-Wall -Werror" ./configure -To install, use: +To install the library, binaries, and man pages, use: make install +The OpenBSM install will not install files in /etc; these have to be +manually installed or merged. Currently, the locations of these files are +not configurable. + You may wish to specify that the OpenBSM components not be installed in the base system, rather in a specific directory. This may be done using the --prefix argument to configure. If installing to a specific directory, @@ -29,7 +32,3 @@ make make install LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - -You will need to manually propagate openbsm/etc/* into /etc/security on your -system; this is not done automatically so as to avoid disrupting the current -configuration. Currently, the locations of these files is not configurable. ==== //depot/projects/avr32/src/contrib/openbsm/Makefile.in#2 (text) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#10 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -97,6 +97,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -121,6 +122,7 @@ MAKEINFO = @MAKEINFO@ MIG = @MIG@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -184,6 +186,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys @@ -332,8 +335,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -358,8 +361,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -369,13 +372,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -446,6 +448,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -472,6 +478,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -623,8 +631,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ ==== //depot/projects/avr32/src/contrib/openbsm/NEWS#3 (text) ==== @@ -1,5 +1,23 @@ OpenBSM Version History +OpenBSM 1.1 + +- Change auditon(2) parameters and data structures to be 32/64-bit architecture + independent. Add more information to man page about auditon(2) parameters. +- Add wrapper functions for auditon(2) to use legacy commands when the new + commands are not supported. +- Add default for 'expire-after' in audit_control to expire trail files when + the audit directory is more than 10 megabytes ('10M'). +- Interface to convert between local and BSM fcntl(2) command values has been + added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with + definitions of constants in audit_fcntl.h. +- A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens + generated by audit_submit(3) were improperly encoded has been fixed. +- Fix example in audit_submit(3) man page. Also, make it clear that we want + the audit ID as the argument. +- A new audit event class 'aa', for post-login authentication and + authorization events, has been added. + OpenBSM 1.1 beta 1 - The filesz parameter in audit_control(5) now accepts suffixes: 'B' for @@ -431,4 +449,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $ ==== //depot/projects/avr32/src/contrib/openbsm/README#3 (text) ==== @@ -1,15 +1,22 @@ -OpenBSM 1.1 beta 1 +OpenBSM 1.1 Introduction -OpenBSM provides an open source implementation of Sun's BSM Audit API. -Originally created under contract to Apple Computer by McAfee Research, this -implementation is now maintained by volunteers and the generous contribution -of several organizations. Coupled with a kernel audit implementation, -OpenBSM can be used to maintain system audit streams, and is a foundation for -an Audit-enabled system. Portions of OpenBSM, including include files and -token-building routines, are reusable in a kernel audit implementation, and -may be found in the FreeBSD and Mac OS X kernels. +OpenBSM is an open source implementation of Sun's BSM event auditing file +format and API. Originally created for Apple Computer by McAfee Research, +OpenBSM is now maintained by volunteers and through the generous contribution +of several organizations. + +OpenBSM includes several command line tools, including auditreduce(8) and +praudit(8) for reducing and printing audit trails, as well as the libbsm(3) +library to manage configuration files, generate audit records, and parse and +print audit trils. + +Coupled with a kernel audit implementation, OpenBSM can be used to maintain +system audit streams, and is a foundation for a full audit-enabled system. +Portions of OpenBSM, including include files and token-building routines, are +reusable in a kernel audit implementation, and may be found in the FreeBSD +and Mac OS X kernels. Contents @@ -17,7 +24,7 @@ bin/ Audit-related command line tools bsm/ Library include files for BSM - compat/ Compatibility code to build on various OS's + compat/ Compatibility code to build on various operating systems etc/ Sample /etc/security configuration files libauditd Common audit management functions for auditd and launchd libbsm/ Implementation of BSM library interfaces and man pages @@ -44,7 +51,8 @@ The TrustedBSD Project would appreciate the contribution of bug fixes, enhancements, etc, under identically or substantially similar licenses to -those present on the remainder of the OpenBSM source code. +those present on the remainder of the OpenBSM source code. Please see the +file CREDITS to learn more about who has contributed to the project. Location @@ -56,4 +64,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#35 $ +$P4: //depot/projects/trustedbsd/openbsm/README#36 $ ==== //depot/projects/avr32/src/contrib/openbsm/TODO#2 (text) ==== @@ -16,11 +16,10 @@ just at the beginning of a record. This will make it easier to use praudit in test suites processing single-token files without header and trailer context. -- Put hostname in trail file name. - Document audit_warn event arguments. - Allow the path /etc/security to be configured at configure-time so that alternative locations can be used. - NLS support for au_strerror(3), which provides error strings for BSM errors not available on the local OS platform. -$P4: //depot/projects/trustedbsd/openbsm/TODO#12 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#13 $ ==== //depot/projects/avr32/src/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_BETA_1 +OPENBSM_1_1 ==== //depot/projects/avr32/src/contrib/openbsm/aclocal.m4#2 (text) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,14 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.62],, +[m4_warning([this file was generated for autoconf 2.62. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -106,7 +109,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -208,6 +210,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -287,10 +291,81 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -614,7 +689,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -707,7 +786,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -978,7 +1057,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 21 18:40:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CBDA1065676; Tue, 21 Apr 2009 18:40:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A0C21065670 for ; Tue, 21 Apr 2009 18:40:55 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36C918FC13 for ; Tue, 21 Apr 2009 18:40:55 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LIeqIO058560 for ; Tue, 21 Apr 2009 18:40:52 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3LIeoJE058558 for perforce@freebsd.org; Tue, 21 Apr 2009 18:40:50 GMT (envelope-from antab@FreeBSD.org) Date: Tue, 21 Apr 2009 18:40:50 GMT Message-Id: <200904211840.n3LIeoJE058558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 160913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Apr 2009 18:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=160913 Change 160913 by antab@antab_farm on 2009/04/21 18:40:02 Missed some usb related files in last integrate, not sure why:/ Affected files ... .. //depot/projects/avr32/src/gnu/usr.bin/binutils/Makefile.inc0#2 edit .. //depot/projects/avr32/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/avr32/src/sys/dev/cfi/cfi_disk.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_if.m#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usbhid.h#2 integrate Differences ... ==== //depot/projects/avr32/src/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -22,7 +22,8 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "avr32" || \ + ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "powerpc" CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 ==== //depot/projects/avr32/src/sys/dev/ata/ata-usb.c#2 (text) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2006 - 2008 Søren Schmidt * All rights reserved. * + * Copyright (c) 2006 Hans Petter Selasky + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,950 +28,1071 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.8 2008/04/10 13:05:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.14 2009/03/02 05:37:05 thompsa Exp $"); + +#include "usbdevs.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include -#include "opt_ata.h" -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include + #include #include +#define ATAUSB_BULK_SIZE (1<<17) + /* Command Block Wrapper */ struct bbb_cbw { - u_int8_t signature[4]; -#define CBWSIGNATURE 0x43425355 + uint8_t signature[4]; +#define CBWSIGNATURE 0x43425355 - u_int8_t tag[4]; - u_int8_t transfer_length[4]; - u_int8_t flags; -#define CBWFLAGS_OUT 0x00 -#define CBWFLAGS_IN 0x80 + uint8_t tag[4]; + uint8_t transfer_length[4]; + uint8_t flags; +#define CBWFLAGS_OUT 0x00 +#define CBWFLAGS_IN 0x80 - u_int8_t lun; - u_int8_t length; -#define CBWCDBLENGTH 16 + uint8_t lun; + uint8_t length; +#define CBWCDBLENGTH 16 - u_int8_t cdb[CBWCDBLENGTH]; -}; + uint8_t cdb[CBWCDBLENGTH]; +} __packed; /* Command Status Wrapper */ struct bbb_csw { - u_int8_t signature[4]; -#define CSWSIGNATURE 0x53425355 + uint8_t signature[4]; +#define CSWSIGNATURE 0x53425355 - u_int8_t tag[4]; - u_int8_t residue[4]; - u_int8_t status; -#define CSWSTATUS_GOOD 0x0 -#define CSWSTATUS_FAILED 0x1 -#define CSWSTATUS_PHASE 0x2 -}; + uint8_t tag[4]; + uint8_t residue[4]; + uint8_t status; +#define CSWSTATUS_GOOD 0x0 +#define CSWSTATUS_FAILED 0x1 +#define CSWSTATUS_PHASE 0x2 +} __packed; /* USB-ATA 'controller' softc */ -struct atausb_softc { - device_t dev; /* base device */ - usbd_interface_handle iface; /* interface */ - int ifaceno; /* interface number */ - u_int8_t bulkin; /* endpoint address's */ - u_int8_t bulkout; - u_int8_t bulkirq; - usbd_pipe_handle bulkin_pipe; /* pipe handle's */ - usbd_pipe_handle bulkout_pipe; - usbd_pipe_handle bulkirq_pipe; - int maxlun; - int timeout; - struct ata_request *ata_request; - usb_device_request_t usb_request; - struct bbb_cbw cbw; - struct bbb_csw csw; +struct atausb2_softc { + struct bbb_cbw cbw; + struct bbb_csw csw; + struct mtx locked_mtx; + + struct ata_channel *locked_ch; + struct ata_channel *restart_ch; + struct ata_request *ata_request; + +#define ATAUSB_T_BBB_RESET1 0 +#define ATAUSB_T_BBB_RESET2 1 +#define ATAUSB_T_BBB_RESET3 2 +#define ATAUSB_T_BBB_COMMAND 3 +#define ATAUSB_T_BBB_DATA_READ 4 +#define ATAUSB_T_BBB_DATA_RD_CS 5 +#define ATAUSB_T_BBB_DATA_WRITE 6 +#define ATAUSB_T_BBB_DATA_WR_CS 7 +#define ATAUSB_T_BBB_STATUS 8 +#define ATAUSB_T_BBB_MAX 9 + +#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX -#define ATAUSB_T_BBB_CBW 0 -#define ATAUSB_T_BBB_DATA 1 -#define ATAUSB_T_BBB_DCLEAR 2 -#define ATAUSB_T_BBB_CSW1 3 -#define ATAUSB_T_BBB_CSW2 4 -#define ATAUSB_T_BBB_SCLEAR 5 -#define ATAUSB_T_BBB_RESET1 6 -#define ATAUSB_T_BBB_RESET2 7 -#define ATAUSB_T_BBB_RESET3 8 -#define ATAUSB_T_MAX 9 - usbd_xfer_handle transfer[ATAUSB_T_MAX]; + struct usb2_xfer *xfer[ATAUSB_T_MAX]; + caddr_t ata_data; + device_t dev; - int state; -#define ATAUSB_S_ATTACH 0 -#define ATAUSB_S_IDLE 1 -#define ATAUSB_S_BBB_COMMAND 2 -#define ATAUSB_S_BBB_DATA 3 -#define ATAUSB_S_BBB_DCLEAR 4 -#define ATAUSB_S_BBB_STATUS1 5 -#define ATAUSB_S_BBB_SCLEAR 6 -#define ATAUSB_S_BBB_STATUS2 7 -#define ATAUSB_S_BBB_RESET1 8 -#define ATAUSB_S_BBB_RESET2 9 -#define ATAUSB_S_BBB_RESET3 10 -#define ATAUSB_S_DETACH 11 + uint32_t timeout; + uint32_t ata_donecount; + uint32_t ata_bytecount; - struct mtx locked_mtx; - struct ata_channel *locked_ch; - struct ata_channel *restart_ch; + uint8_t last_xfer_no; + uint8_t usb2_speed; + uint8_t intr_stalled; + uint8_t maxlun; + uint8_t iface_no; + uint8_t status_try; }; -static int atausbdebug = 0; +static const int atausbdebug = 0; + +/* prototypes */ + +static device_probe_t atausb2_probe; +static device_attach_t atausb2_attach; +static device_detach_t atausb2_detach; + +static usb2_callback_t atausb2_t_bbb_reset1_callback; +static usb2_callback_t atausb2_t_bbb_reset2_callback; +static usb2_callback_t atausb2_t_bbb_reset3_callback; +static usb2_callback_t atausb2_t_bbb_command_callback; +static usb2_callback_t atausb2_t_bbb_data_read_callback; +static usb2_callback_t atausb2_t_bbb_data_rd_cs_callback; +static usb2_callback_t atausb2_t_bbb_data_write_callback; +static usb2_callback_t atausb2_t_bbb_data_wr_cs_callback; +static usb2_callback_t atausb2_t_bbb_status_callback; +static usb2_callback_t atausb2_tr_error; + +static void atausb2_cancel_request(struct atausb2_softc *sc); +static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no); +static void atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static int ata_usbchannel_begin_transaction(struct ata_request *request); +static int ata_usbchannel_end_transaction(struct ata_request *request); -/* prototypes*/ -static usbd_status atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static usbd_status atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, usb_device_request_t *req, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static void atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer); -static void atausb_bbb_reset(struct atausb_softc *sc); -static int atausb_bbb_start(struct ata_request *request); -static void atausb_bbb_finish(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err); -int ata_usbchannel_begin_transaction(struct ata_request *request); -int ata_usbchannel_end_transaction(struct ata_request *request); +static device_probe_t ata_usbchannel_probe; +static device_attach_t ata_usbchannel_attach; +static device_detach_t ata_usbchannel_detach; +static ata_setmode_t ata_usbchannel_setmode; +static ata_locking_t ata_usbchannel_locking; /* * USB frontend part */ -USB_DECLARE_DRIVER(atausb); -DRIVER_MODULE(atausb, uhub, atausb_driver, atausb_devclass, 0, 0); + +struct usb2_config atausb2_config[ATAUSB_T_BBB_MAX] = { + + [ATAUSB_T_BBB_RESET1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset1_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 500, /* 500 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset2_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset3_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_COMMAND] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = sizeof(struct bbb_cbw), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_command_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_READ] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_read_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_RD_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_rd_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_WRITE] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_write_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_WR_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_wr_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_STATUS] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = sizeof(struct bbb_csw), + .mh.flags = {.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_status_callback, + .mh.timeout = 5000, /* ms */ + }, +}; + +static devclass_t atausb2_devclass; + +static device_method_t atausb2_methods[] = { + DEVMETHOD(device_probe, atausb2_probe), + DEVMETHOD(device_attach, atausb2_attach), + DEVMETHOD(device_detach, atausb2_detach), + {0, 0} +}; + +static driver_t atausb2_driver = { + .name = "atausb", + .methods = atausb2_methods, + .size = sizeof(struct atausb2_softc), +}; + +DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0); +MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); static int -atausb_match(device_t dev) +atausb2_probe(device_t dev) +{ + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; + + if (uaa->usb2_mode != USB_MODE_HOST) { + return (ENXIO); + } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } + id = usb2_get_interface_descriptor(uaa->iface); + if ((!id) || (id->bInterfaceClass != UICLASS_MASS)) { + return (ENXIO); + } + switch (id->bInterfaceSubClass) { + case UISUBCLASS_QIC157: + case UISUBCLASS_RBC: + case UISUBCLASS_SCSI: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + case UISUBCLASS_UFI: + switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_CBI: + case UIPROTO_MASS_CBI_I: + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + return (0); + default: + return (0); + } + break; + default: + return (0); + } +} + +static int +atausb2_attach(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; + struct atausb2_softc *sc = device_get_softc(dev); + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; + const char *proto, *subclass; + struct usb2_device_request request; + device_t child; + uint16_t i; + uint8_t maxlun; + uint8_t has_intr; + int err; - if (uaa->iface == NULL) - return UMATCH_NONE; + device_set_usb2_desc(dev); - id = usbd_get_interface_descriptor(uaa->iface); - if (!id || id->bInterfaceClass != UICLASS_MASS) - return UMATCH_NONE; + sc->dev = dev; + sc->maxlun = 0; + sc->locked_ch = NULL; + sc->restart_ch = NULL; + sc->usb2_speed = usb2_get_speed(uaa->device); + mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, (MTX_DEF | MTX_RECURSE)); - switch (id->bInterfaceSubClass) { - case UISUBCLASS_QIC157: - case UISUBCLASS_RBC: - case UISUBCLASS_SCSI: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - case UISUBCLASS_UFI: + id = usb2_get_interface_descriptor(uaa->iface); switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + proto = "Bulk-Only"; + break; case UIPROTO_MASS_CBI: + proto = "CBI"; + break; case UIPROTO_MASS_CBI_I: - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO; + proto = "CBI with CCI"; + break; + default: + proto = "Unknown"; + } + + switch (id->bInterfaceSubClass) { + case UISUBCLASS_RBC: + subclass = "RBC"; + break; + case UISUBCLASS_QIC157: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + subclass = "ATAPI"; + break; + case UISUBCLASS_SCSI: + subclass = "SCSI"; + break; + case UISUBCLASS_UFI: + subclass = "UFI"; + break; default: - return UMATCH_IFACECLASS_IFACESUBCLASS; + subclass = "Unknown"; + } + + has_intr = (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I); + sc->iface_no = id->bInterfaceNumber; + + device_printf(dev, "using %s over %s\n", subclass, proto); + if (strcmp(proto, "Bulk-Only") || + (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) { + goto detach; + } + err = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, + sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc, + &sc->locked_mtx); + + /* skip reset first time */ + sc->last_xfer_no = ATAUSB_T_BBB_COMMAND; + + if (err) { + device_printf(sc->dev, "could not setup required " + "transfers, %s\n", usb2_errstr(err)); + goto detach; + } + /* get number of devices so we can add matching channels */ + request.bmRequestType = UT_READ_CLASS_INTERFACE; + request.bRequest = 0xfe; /* GET_MAX_LUN; */ + USETW(request.wValue, 0); + USETW(request.wIndex, sc->iface_no); + USETW(request.wLength, sizeof(maxlun)); + err = usb2_do_request(uaa->device, &Giant, &request, &maxlun); + + if (err) { + if (bootverbose) { + device_printf(sc->dev, "get maxlun not supported %s\n", + usb2_errstr(err)); + } + } else { + sc->maxlun = maxlun; + if (bootverbose) { + device_printf(sc->dev, "maxlun=%d\n", sc->maxlun); + } + } + + /* ata channels are children to this USB control device */ + for (i = 0; i <= sc->maxlun; i++) { + if ((child = device_add_child(sc->dev, "ata", + devclass_find_free_unit(ata_devclass, 2))) == NULL) { + device_printf(sc->dev, "failed to add ata child device\n"); + } else + device_set_ivars(child, (void *)(intptr_t)i); } - break; - default: - return UMATCH_IFACECLASS; - } + bus_generic_attach(sc->dev); + + return (0); + +detach: + atausb2_detach(dev); + return (ENXIO); } static int -atausb_attach(device_t dev) +atausb2_detach(device_t dev) { - struct atausb_softc *sc = device_get_softc(dev); - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - usbd_device_handle udev; - usb_device_request_t request; - char devinfo[1024], *proto, *subclass; - u_int8_t maxlun; - int err, i; + struct atausb2_softc *sc = device_get_softc(dev); + device_t *children; + int nchildren, i; + + /* teardown our statemachine */ - sc->dev = dev; - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(dev, devinfo); - sc->bulkin = sc->bulkout = sc->bulkirq = -1; - sc->bulkin_pipe = sc->bulkout_pipe= sc->bulkirq_pipe = NULL; - sc->iface = uaa->iface; - sc->ifaceno = uaa->ifaceno; - sc->maxlun = 0; - sc->timeout = 5000; - sc->locked_ch = NULL; - sc->restart_ch = NULL; - mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, MTX_DEF); + usb2_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); - id = usbd_get_interface_descriptor(sc->iface); - switch (id->bInterfaceProtocol) { - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - proto = "Bulk-Only"; - break; - case UIPROTO_MASS_CBI: - proto = "CBI"; - break; - case UIPROTO_MASS_CBI_I: - proto = "CBI with CCI"; - break; - default: - proto = "Unknown"; - } - switch (id->bInterfaceSubClass) { - case UISUBCLASS_RBC: - subclass = "RBC"; - break; - case UISUBCLASS_QIC157: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - subclass = "ATAPI"; - break; - case UISUBCLASS_SCSI: - subclass = "SCSI"; - break; - case UISUBCLASS_UFI: - subclass = "UFI"; - break; - default: - subclass = "Unknown"; - } - device_printf(dev, "using %s over %s\n", subclass, proto); - if (strcmp(proto, "Bulk-Only") || - (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) - return ENXIO; + /* detach & delete all children, if any */ - for (i = 0 ; i < id->bNumEndpoints ; i++) { - if (!(ed = usbd_interface2endpoint_descriptor(sc->iface, i))) { - device_printf(sc->dev, "could not read endpoint descriptor\n"); - return ENXIO; + if (!device_get_children(dev, &children, &nchildren)) { + for (i = 0; i < nchildren; i++) { + device_delete_child(dev, children[i]); + } + free(children, M_TEMP); } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkin = ed->bEndpointAddress; + mtx_destroy(&sc->locked_mtx); + return (0); +} + +static void +atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no) +{ + if (atausbdebug) { + device_printf(sc->dev, "BBB transfer %d\n", xfer_no); } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkout = ed->bEndpointAddress; + if (sc->xfer[xfer_no]) { + sc->last_xfer_no = xfer_no; + usb2_transfer_start(sc->xfer[xfer_no]); + } else { + atausb2_cancel_request(sc); } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I && - UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) { - sc->bulkirq = ed->bEndpointAddress; +} + +static void +atausb2_t_bbb_reset1_callback(struct usb2_xfer *xfer) +{ + struct atausb2_softc *sc = xfer->priv_sc; + struct usb2_device_request req; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start(sc, ATAUSB_T_BBB_RESET2); + return; + + case USB_ST_SETUP: + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = 0xff; /* bulk-only reset */ + USETW(req.wValue, 0); + req.wIndex[0] = sc->iface_no; + req.wIndex[1] = 0; + USETW(req.wLength, 0); + + usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + + xfer->frlengths[0] = sizeof(req); + xfer->nframes = 1; + usb2_start_hardware(xfer); + return; + + default: /* Error */ + atausb2_tr_error(xfer); + return; + } - } +} + +static void +atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, + ATAUSB_T_BBB_DATA_READ); +} - /* check whether we found at least the endpoints we need */ - if (!sc->bulkin || !sc->bulkout) { - device_printf(sc->dev, "needed endpoints not found (%d,%d)\n", - sc->bulkin, sc->bulkout); - atausb_detach(dev); - return ENXIO; - } +static void +atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, + ATAUSB_T_BBB_DATA_WRITE); +} - /* open the pipes */ - if (usbd_open_pipe(sc->iface, sc->bulkout, - USBD_EXCLUSIVE_USE, &sc->bulkout_pipe)) { - device_printf(sc->dev, "cannot open bulkout pipe (%d)\n", sc->bulkout); - atausb_detach(dev); - return ENXIO; - } - if (usbd_open_pipe(sc->iface, sc->bulkin, - USBD_EXCLUSIVE_USE, &sc->bulkin_pipe)) { - device_printf(sc->dev, "cannot open bulkin pipe (%d)\n", sc->bulkin); - atausb_detach(dev); - return ENXIO; - } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I) { - if (usbd_open_pipe(sc->iface, sc->bulkirq, - USBD_EXCLUSIVE_USE, &sc->bulkirq_pipe)) { - device_printf(sc->dev, "cannot open bulkirq pipe (%d)\n", - sc->bulkirq); - atausb_detach(dev); - return ENXIO; - } - } - sc->state = ATAUSB_S_ATTACH; +static void +atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, + uint8_t next_xfer, + uint8_t stall_xfer) +{ + struct atausb2_softc *sc = xfer->priv_sc; - /* alloc needed number of transfer handles */ - for (i = 0; i < ATAUSB_T_MAX; i++) { - sc->transfer[i] = usbd_alloc_xfer(uaa->device); - if (!sc->transfer[i]) { - device_printf(sc->dev, "out of memory\n"); - atausb_detach(dev); - return ENXIO; - } - } + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: +tr_transferred: + atausb2_transfer_start(sc, next_xfer); + return; - /* driver is ready to process requests here */ - sc->state = ATAUSB_S_IDLE; + case USB_ST_SETUP: + if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { + goto tr_transferred; + } + return; - /* get number of devices so we can add matching channels */ - usbd_interface2device_handle(sc->iface, &udev); - request.bmRequestType = UT_READ_CLASS_INTERFACE; - request.bRequest = 0xfe; //GET_MAX_LUN; - USETW(request.wValue, 0); - USETW(request.wIndex, sc->ifaceno); - USETW(request.wLength, sizeof(maxlun)); - switch ((err = usbd_do_request(udev, &request, &maxlun))) { - case USBD_NORMAL_COMPLETION: - if (bootverbose) - device_printf(sc->dev, "maxlun=%d\n", maxlun); - sc->maxlun = maxlun; - break; - default: - if (bootverbose) - device_printf(sc->dev, "get maxlun not supported %s\n", - usbd_errstr(err)); - } + default: /* Error */ + atausb2_tr_error(xfer); + return; - /* ata channels are children to this USB control device */ - for (i = 0; i <= sc->maxlun; i++) { - if (!device_add_child(sc->dev, "ata", - devclass_find_free_unit(ata_devclass, 2))) { - device_printf(sc->dev, "failed to attach ata child device\n"); - atausb_detach(dev); - return ENXIO; } - } - bus_generic_attach(sc->dev); - return 0; } -static int -atausb_detach(device_t dev) +static void +atausb2_t_bbb_command_callback(struct usb2_xfer *xfer) { - struct atausb_softc *sc = device_get_softc(dev); - usbd_device_handle udev; - device_t *children; - int nchildren, i; + struct atausb2_softc *sc = xfer->priv_sc; + struct ata_request *request = sc->ata_request; + struct ata_channel *ch; + uint32_t tag; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start + (sc, ((request->flags & ATA_R_READ) ? ATAUSB_T_BBB_DATA_READ : + (request->flags & ATA_R_WRITE) ? ATAUSB_T_BBB_DATA_WRITE : + ATAUSB_T_BBB_STATUS)); + return; - /* signal that device is going away */ - sc->state = ATAUSB_S_DETACH; + case USB_ST_SETUP: - /* abort all the pipes in case there are active transfers */ - usbd_interface2device_handle(sc->iface, &udev); - usbd_abort_default_pipe(udev); - if (sc->bulkout_pipe) - usbd_abort_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_abort_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_abort_pipe(sc->bulkirq_pipe); + sc->status_try = 0; - /* detach & delete all children */ - if (!device_get_children(dev, &children, &nchildren)) { - for (i = 0; i < nchildren; i++) - device_delete_child(dev, children[i]); - free(children, M_TEMP); - } + if (request) { + ch = device_get_softc(request->parent); - /* free the transfers */ - for (i = 0; i < ATAUSB_T_MAX; i++) - if (sc->transfer[i]) - usbd_free_xfer(sc->transfer[i]); + sc->timeout = (request->timeout * 1000) + 5000; - /* remove all the pipes */ - if (sc->bulkout_pipe) - usbd_close_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_close_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_close_pipe(sc->bulkirq_pipe); + tag = UGETDW(sc->cbw.tag) + 1; - mtx_destroy(&sc->locked_mtx); - return 0; -} + USETDW(sc->cbw.signature, CBWSIGNATURE); + USETDW(sc->cbw.tag, tag); + USETDW(sc->cbw.transfer_length, request->bytecount); + sc->cbw.flags = (request->flags & ATA_R_READ) ? CBWFLAGS_IN : CBWFLAGS_OUT; + sc->cbw.lun = ch->unit; + sc->cbw.length = 16; + bzero(sc->cbw.cdb, 16); + bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ + usb2_copy_in(xfer->frbuffers, 0, &sc->cbw, sizeof(sc->cbw)); -/* - * Generic USB transfer routines - */ -static usbd_status -atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, - void *buffer, int buflen, int flags, usbd_xfer_handle xfer) -{ - usbd_status err; + xfer->frlengths[0] = sizeof(sc->cbw); + usb2_start_hardware(xfer); + } + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + atausb2_tr_error(xfer); + return; - usbd_setup_xfer(xfer, pipe, (void *)sc, buffer, buflen, flags, - sc->timeout, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } -static usbd_status -atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, - usb_device_request_t *req, void *buffer, int buflen, int flags, - usbd_xfer_handle xfer) +static void +atausb2_t_bbb_data_read_callback(struct usb2_xfer *xfer) { - usbd_status err; + struct atausb2_softc *sc = xfer->priv_sc; + uint32_t max_bulk = xfer->max_data_length; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + + usb2_copy_out(xfer->frbuffers, 0, + sc->ata_data, xfer->actlen); + + sc->ata_bytecount -= xfer->actlen; + sc->ata_data += xfer->actlen; + sc->ata_donecount += xfer->actlen; + + if (xfer->actlen < xfer->sumlen) { + /* short transfer */ + sc->ata_bytecount = 0; + } + case USB_ST_SETUP: + + if (atausbdebug > 1) { + device_printf(sc->dev, "%s: max_bulk=%d, ata_bytecount=%d\n", + __FUNCTION__, max_bulk, sc->ata_bytecount); + } + if (sc->ata_bytecount == 0) { + atausb2_transfer_start(sc, ATAUSB_T_BBB_STATUS); + return; + } + if (max_bulk > sc->ata_bytecount) { + max_bulk = sc->ata_bytecount; + } + xfer->timeout = sc->timeout; + xfer->frlengths[0] = max_bulk; + + usb2_start_hardware(xfer); + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + if (xfer->error == USB_ERR_CANCELLED) { + atausb2_tr_error(xfer); + } else { + atausb2_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); + } + return; - usbd_setup_default_xfer(xfer, udev, (void *)sc, sc->timeout, req, - buffer, buflen, flags, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup ctl transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } static void -atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, - usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer) +atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) { - usbd_device_handle udev; - - if (atausbdebug) - device_printf(sc->dev, "clear endpoint 0x%02x stall\n", endpt); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 21 18:41:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C5FF1065677; Tue, 21 Apr 2009 18:41:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C3581065674 for ; Tue, 21 Apr 2009 18:41:00 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48D928FC0A for ; Tue, 21 Apr 2009 18:41:00 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LIevtE058572 for ; Tue, 21 Apr 2009 18:40:57 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3LIet3i058569 for perforce@freebsd.org; Tue, 21 Apr 2009 18:40:55 GMT (envelope-from antab@FreeBSD.org) Date: Tue, 21 Apr 2009 18:40:55 GMT Message-Id: <200904211840.n3LIet3i058569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 160914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Apr 2009 18:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=160914 Change 160914 by antab@antab_farm on 2009/04/21 18:40:07 * Rewrite tlb miss handler in assembly and call long path in C for vm_faults * Forgot to rearrange one instruction in switch.S that resulted in strange crashes in if_ate Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#9 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#15 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#10 edit .. //depot/projects/avr32/src/sys/avr32/include/tlb.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/trap.h#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#9 (text+ko) ==== @@ -26,11 +26,14 @@ */ #include +#include #include #include #include #include #include +#include +#include #include "assym.s" __FBSDID("$FreeBSD: $"); @@ -130,8 +133,74 @@ POP_TRAPFRAME(SUP) rets -/* later this should be done in assembly, but using C for now */ +/* + * Page fault short path. If no page is found it calls the long path + * r0 PTBR (Page directory)/Page table/Entry pointer + * r1 TLBEHI (Failed page address and ASID) + * r2 TLBELO (Page entry) + * r3 tmp + */ tlb_miss: + pushm r0-r3 + + mfsr r0, AT32_SYS_PTBR /* Pointer to page directory */ + mfsr r1, AT32_SYS_TLBEHI /* Failed page address */ + + bfextu r3, r1, PD_SHIFT, 10 /* Directory index */ + ld.w r0, r0[r3 << 2] /* Get page table */ + cp.w r0, 0 /* No entry */ + breq tlb_miss_long + + bfextu r3, r1, PT_SHIFT, 10 /* Table index */ + add r0, r0, r3 << 2 /* Add table index for later use */ + ld.w r2, r0 /* Get page entry */ + cp.w r2, 0 /* No entry */ + breq tlb_miss_long + + /* Mark dirty if write miss */ + mfsr r3, AT32_SYS_ECR /* Get exception number */ + cp.w r3, T_TLB_MISS_WRITE /* Check if Write miss */ + brne tlb_miss_1 + orl r2, PTE_DIRTY /* Mark page if so */ + st.w r0, r2 /* Save entry */ + +tlb_miss_1: + andl r2, lo(~PTE_SOFTWARE_MASK) /* Mask out software */ + orl r2, PTE_SIZE_4K /* All pages are 4k */ + + sbr r1, AT32_SYS_TLBEHI_V /* Mark entry valid */ + +/* Entry found, insert it into the TLB */ +tlb_miss_insert: + lddpc r0, tlb_at_ptr /* Pointer to next tlb */ + ld.w r0, r0 /* Next tlb */ + + /* Update MMU registers */ + mfsr r3, AT32_SYS_MMUCR + bfins r3, r0, AT32_SYS_MMUCR_DRP, AT32_SYS_MMUCR_DRP_SIZE + mtsr AT32_SYS_MMUCR, r3 + mtsr AT32_SYS_TLBEHI, r1 + mtsr AT32_SYS_TLBELO, r2 + + nop /* Wait for mtsr to exit pipeline */ + tlbw /* Write entry */ + sub pc, -2 /* Flush pipeline */ + + sub r0, -1 /* Increase tlb_at */ + cp.w r0, TLB_SIZE /* At max */ + moveq r0, KSTACK_PAGES /* Reset */ + +tlb_miss_done: + lddpc r1, tlb_at_ptr /* Pointer to next tlb */ + st.w r1, r0 /* Store next tlb */ + popm r0-r3 + rete + +/* No entry found, need to call vm_fault + * XXX: This can be done better. + */ +tlb_miss_long: + popm r0-r3 PUSH_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mfsr r11, AT32_SYS_TLBEAR @@ -141,6 +210,13 @@ POP_TRAPFRAME(EX) rete +tlb_at_ptr: + .long tlb_at + +/* + * Steal proc0 stack, maybe we are here because of stack fault + * and we are fucked anyway. + */ handle_critical: breakpoint mov r12, 0 ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#15 (text+ko) ==== @@ -1069,87 +1069,77 @@ } } -/** - * Called when we need to update the TLB - * XXX: Split this up, with short path written in assembly and long path - * here to call vm_fault. +/* + * Called on page fault */ -static int tlb_at = KSTACK_PAGES; +uint32_t tlb_at = KSTACK_PAGES; void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi, struct trapframe *tf) { pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); struct thread *td = curthread; pt_entry_t *ent; register_t mmucr; + struct proc *p = curproc; + vm_prot_t ftype; + vm_map_t map; + vm_offset_t va; + int rv = 0; + ksiginfo_t ksi; - ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; - if (ent) { - ent += pt_index_from_va(tlbear); - } + /* + * Enable exceptions before continuing, we are going to + * hit memory that need tlb lookups from here one. + */ + __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); + + ftype = (ecr == T_TLB_MISS_WRITE) ? VM_PROT_WRITE : VM_PROT_READ; + va = trunc_page((vm_offset_t)tlbear); + + if ((vm_offset_t)tlbear < VM_MIN_KERNEL_ADDRESS) { + map = &p->p_vmspace->vm_map; - if (!ent || !*ent) { /* - * Enable exceptions before continuing, we are going to - * hit memory needs tlb lookups from here one. + * Keep swapout from messing with us during this + * critical time. */ - __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); + PROC_LOCK(p); + ++p->p_lock; + PROC_UNLOCK(p); - struct proc *p = curproc; - vm_prot_t ftype; - vm_map_t map; - vm_offset_t va; - int rv = 0; - ksiginfo_t ksi; + rv = vm_fault(map, va, ftype, + (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY + : VM_FAULT_NORMAL); - ftype = (ecr == T_TLB_MISS_WRITE) ? VM_PROT_WRITE : VM_PROT_READ; - va = trunc_page((vm_offset_t)tlbear); + PROC_LOCK(p); + --p->p_lock; + PROC_UNLOCK(p); + } else { + map = kernel_map; + rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); + } - if ((vm_offset_t)tlbear < VM_MIN_KERNEL_ADDRESS) { - map = &p->p_vmspace->vm_map; - - /* - * Keep swapout from messing with us during this - * critical time. - */ - PROC_LOCK(p); - ++p->p_lock; - PROC_UNLOCK(p); - - rv = vm_fault(map, va, ftype, - (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY - : VM_FAULT_NORMAL); - - PROC_LOCK(p); - --p->p_lock; - PROC_UNLOCK(p); - } else { - map = kernel_map; - rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); + if (rv != KERN_SUCCESS) { + if (!TRAPF_USERMODE(tf)) { + panic("Fault in kernel at 0x%x", tlbear); } - if (rv != KERN_SUCCESS) { - if (!TRAPF_USERMODE(tf)) { - panic("Fault in kernel at 0x%x", tlbear); - } + /* + * Generate signal + */ + td->td_frame->regs.pc = tf->regs.pc; + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; + ksi.ksi_code = ftype; + ksi.ksi_addr = (void *)tf->regs.pc; + ksi.ksi_trapno = ecr; + trapsignal(td, &ksi); + avr32_debug("trap out\n"); + goto out; + } - /* - * Generate signal - */ - td->td_frame->regs.pc = tf->regs.pc; - ksiginfo_init_trap(&ksi); - ksi.ksi_signo = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; - ksi.ksi_code = ftype; - ksi.ksi_addr = (void *)tf->regs.pc; - ksi.ksi_trapno = ecr; - trapsignal(td, &ksi); + ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; + KASSERT(ent != NULL, ("Empty pte after success from vm_fault")); + ent += pt_index_from_va(tlbear); - goto out; - } - - ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; - KASSERT(ent != NULL, ("Empty pte after success from vm_fault")); - ent += pt_index_from_va(tlbear); - } - /* Write miss, mark page as dirty */ if (ecr == T_TLB_MISS_WRITE) { *ent |= PTE_DIRTY; @@ -1160,7 +1150,7 @@ mmucr |= tlb_at << bit_shift(SYS, MMUCR, DRP); /* Insert into TLB */ - sysreg_write(TLBEHI, (tlbear & bit_mask(SYS, TLBEHI, VPN)) | + sysreg_write(TLBEHI, (tlbehi & bit_mask(SYS, TLBEHI, VPN)) | bit_offset(SYS, TLBEHI, V) | (bit_mask(SYS, TLBEHI, ASID) & tlbehi)); sysreg_write(TLBELO, (*ent & ~PTE_SOFTWARE_MASK) | PTE_SIZE_4K); @@ -1195,5 +1185,6 @@ ent += pt_index_from_va(va); KASSERT(ent || *ent, ("Page table entry missing in protection fault")); + tlb_dump(); panic("Finish implementing protection fault"); } ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#10 (text+ko) ==== @@ -82,13 +82,13 @@ ld.w r2, r12[TD_PCB] /* Add ASID and V flag to kstack value */ + ld.w r10, r12[TD_KSTACK] ld.w r4, r11[PMAP_ASID] add r10, r4 sbr r10, AT32_SYS_TLBEHI_V ld.w r11, r11[PMAP_PD] /* Point r11 to page directory */ /* Check if stack is in P3 */ - ld.w r10, r12[TD_KSTACK] mov r9, r10 lsr r9, 29 cp r9, 0x6 ==== //depot/projects/avr32/src/sys/avr32/include/tlb.h#5 (text+ko) ==== @@ -29,13 +29,15 @@ #define _MACHINE_TLB_H_ /* Number of TLB entries, this should be read from config1 */ -#define TLB_SIZE 32 +#define TLB_SIZE 32 +#ifndef LOCORE void tlb_dump(void); /* Dump content of TLB to console */ void tlb_flush(void); /* Invalid all TLB entries */ void tlb_update_entry(pmap_t, vm_offset_t, pt_entry_t); void tlb_remove_entry(pmap_t, vm_offset_t); void tlb_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); +#endif #endif /* !_MACHINE_TLB_H_ */ ==== //depot/projects/avr32/src/sys/avr32/include/trap.h#6 (text+ko) ==== @@ -29,12 +29,14 @@ #ifndef _MACHINE_TRAP_H_ #define _MACHINE_TRAP_H_ +#ifndef LOCORE #include void trap_handle_illegal_opcode(uint32_t ecr, struct trapframe *reg); void trap_handle_breakpoint(uint32_t ecr, struct trapframe *reg); void trap_handle_address_fault(uint32_t ecr, struct trapframe *reg); void trapframe_dump(struct trapframe *frame); +#endif #define T_BREAKPOINT 0x07 #define T_TLB_PROT_READ 0x0F @@ -42,5 +44,4 @@ #define T_TLB_MISS_READ 0x18 #define T_TLB_MISS_WRITE 0x1C - #endif /* _MACHINE_TRAP_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Apr 22 06:46:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C0C106566C; Wed, 22 Apr 2009 06:46:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6186106566B for ; Wed, 22 Apr 2009 06:46:20 +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 D32A68FC1B for ; Wed, 22 Apr 2009 06:46:20 +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 n3M6kKGL062316 for ; Wed, 22 Apr 2009 06:46:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M6kKi9062312 for perforce@freebsd.org; Wed, 22 Apr 2009 06:46:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 22 Apr 2009 06:46:20 GMT Message-Id: <200904220646.n3M6kKi9062312@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 160923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 06:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=160923 Change 160923 by hselasky@hselasky_laptop001 on 2009/04/22 06:45:52 USB libraries: IFC Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb.3#5 integrate .. //depot/projects/usb/src/lib/libusb/libusb.h#3 delete .. //depot/projects/usb/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_desc.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/usb/src/lib/libusb/usb.h#2 integrate .. //depot/projects/usb/src/lib/libusbhid/Makefile#4 integrate .. //depot/projects/usb/src/lib/libusbhid/data.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/descr.c#7 integrate .. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/parse.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/usage.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#6 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#5 integrate .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#4 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#3 (text+ko) ==== @@ -10,6 +10,8 @@ SRCS= libusb20.c SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c +SRCS+= libusb20_compat01.c +SRCS+= libusb20_compat10.c INCS+= libusb20.h INCS+= libusb20_desc.h MAN= libusb.3 @@ -21,13 +23,6 @@ # libusb 0.1 compat INCS+= usb.h -SRCS+= libusb20_compat01.c - -# libusb 1.0 compat -SRCS+= libusb10.c -SRCS+= libusb10_desc.c -INCS+= libusb.h -MAN+= libusb10.3 .include ==== //depot/projects/usb/src/lib/libusb/libusb.3#5 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.1 2009/03/10 15:49:43 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ .\" -.Dd Mar 27, 2009 +.Dd April 5, 2009 .Dt LIBUSB 3 .Os .Sh NAME @@ -945,7 +945,6 @@ . /dev/usb .Sh SEE ALSO -.Xr libusb10 3 , .Xr usb2_core 4 , .Xr usbconfig 8 . ==== //depot/projects/usb/src/lib/libusb/libusb20.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#3 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#3 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_desc.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_desc.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/usb.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusbhid/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $ -# $FreeBSD: head/lib/libusbhid/Makefile 187994 2009-02-02 00:49:39Z alfred $ +# $FreeBSD: src/lib/libusbhid/Makefile,v 1.12 2009/02/02 00:49:39 alfred Exp $ LIB= usbhid MAN= usbhid.3 ==== //depot/projects/usb/src/lib/libusbhid/data.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/data.c 113273 2003-04-09 01:52:49Z mdodd $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/descr.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/descr.c 189108 2009-02-27 15:30:42Z thompsa $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $"); #include ==== //depot/projects/usb/src/lib/libusbhid/descr_compat.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #ifdef HID_COMPAT7 #include -__FBSDID("$FreeBSD: head/lib/libusbhid/descr_compat.c 188945 2009-02-23 18:36:54Z thompsa $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr_compat.c,v 1.2 2009/02/23 18:36:54 thompsa Exp $"); #include ==== //depot/projects/usb/src/lib/libusbhid/parse.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/parse.c 125716 2004-02-11 21:09:13Z emax $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10 2004/02/11 21:09:13 emax Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/usage.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/usage.c 113273 2003-04-09 01:52:49Z mdodd $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/usbhid.3#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/lib/libusbhid/usbhid.3 187994 2009-02-02 00:49:39Z alfred $ +.\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.19 2009/02/02 00:49:39 alfred Exp $ .\" .Dd January 27, 2009 .Dt USBHID 3 ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/lib/libusbhid/usbhid.h 187994 2009-02-02 00:49:39Z alfred $ + * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.12 2009/02/02 00:49:39 alfred Exp $ * */ ==== //depot/projects/usb/src/lib/libusbhid/usbvar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/lib/libusbhid/usbvar.h 188945 2009-02-23 18:36:54Z thompsa $ + * $FreeBSD: src/lib/libusbhid/usbvar.h,v 1.4 2009/02/23 18:36:54 thompsa Exp $ * */ From owner-p4-projects@FreeBSD.ORG Wed Apr 22 06:48:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83FA41065674; Wed, 22 Apr 2009 06:48:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 444A6106566B for ; Wed, 22 Apr 2009 06:48:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D3728FC27 for ; Wed, 22 Apr 2009 06:48:23 +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 n3M6mMeQ062442 for ; Wed, 22 Apr 2009 06:48:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M6mMVZ062440 for perforce@freebsd.org; Wed, 22 Apr 2009 06:48:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 22 Apr 2009 06:48:22 GMT Message-Id: <200904220648.n3M6mMVZ062440@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 160924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 06:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=160924 Change 160924 by hselasky@hselasky_laptop001 on 2009/04/22 06:48:00 Delete some files which were imported too early. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.3#2 delete .. //depot/projects/usb/src/lib/libusb/libusb10.c#3 delete .. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 22 07:09:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 935C11065674; Wed, 22 Apr 2009 07:09:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 528EE106564A for ; Wed, 22 Apr 2009 07:09:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E64C8FC12 for ; Wed, 22 Apr 2009 07:09:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3M79krv082508 for ; Wed, 22 Apr 2009 07:09:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M79iVZ082506 for perforce@freebsd.org; Wed, 22 Apr 2009 07:09:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 22 Apr 2009 07:09:44 GMT Message-Id: <200904220709.n3M79iVZ082506@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 160925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 07:09:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=160925 Change 160925 by hselasky@hselasky_laptop001 on 2009/04/22 07:09:19 IFC @ 160922 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#17 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_sheeva.S#2 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/files.at91#9 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA.hints#5 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#8 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA.hints#3 integrate .. //depot/projects/usb/src/sys/arm/include/param.h#3 integrate .. //depot/projects/usb/src/sys/arm/mv/common.c#4 integrate .. //depot/projects/usb/src/sys/arm/mv/gpio.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/ic.c#2 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mvreg.h#4 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#9 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/smbios.c#4 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#11 integrate .. //depot/projects/usb/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#12 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#11 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#17 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#8 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_emul.h#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#9 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#11 integrate .. //depot/projects/usb/src/sys/conf/NOTES#32 integrate .. //depot/projects/usb/src/sys/conf/files#59 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#20 integrate .. //depot/projects/usb/src/sys/conf/options#25 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/if_pfsync.c#7 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#8 integrate .. //depot/projects/usb/src/sys/dev/ar/if_ar.c#4 delete .. //depot/projects/usb/src/sys/dev/ar/if_ar.h#2 delete .. //depot/projects/usb/src/sys/dev/ar/if_ar_isa.c#2 delete .. //depot/projects/usb/src/sys/dev/ar/if_ar_pci.c#2 delete .. //depot/projects/usb/src/sys/dev/ar/if_arregs.h#2 delete .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#13 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#22 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#11 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/usb/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r300_reg.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#9 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/fb/creator.c#7 integrate .. //depot/projects/usb/src/sys/dev/fb/machfb.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/usb/src/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/amd64-elf.raid.o.uu#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/usb/src/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/hptintf.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/ioctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/usb/src/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#23 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds1672.c#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#6 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#10 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/LICENSE#3 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/README#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#1 branch .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#6 integrate .. //depot/projects/usb/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbdreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#10 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#10 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#6 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mge.c#3 integrate .. //depot/projects/usb/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/usb/src/sys/dev/mly/mly.c#6 integrate .. //depot/projects/usb/src/sys/dev/mse/mse.c#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#14 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#11 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#13 integrate .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate .. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#9 integrate .. //depot/projects/usb/src/sys/dev/ray/if_ray.c#6 delete .. //depot/projects/usb/src/sys/dev/ray/if_raydbg.h#2 delete .. //depot/projects/usb/src/sys/dev/ray/if_raymib.h#2 delete .. //depot/projects/usb/src/sys/dev/ray/if_rayreg.h#2 delete .. //depot/projects/usb/src/sys/dev/ray/if_rayvar.h#3 delete .. //depot/projects/usb/src/sys/dev/re/if_re.c#18 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#8 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#39 integrate .. //depot/projects/usb/src/sys/dev/sr/if_sr.c#4 delete .. //depot/projects/usb/src/sys/dev/sr/if_sr.h#2 delete .. //depot/projects/usb/src/sys/dev/sr/if_sr_isa.c#2 delete .. //depot/projects/usb/src/sys/dev/sr/if_sr_pci.c#2 delete .. //depot/projects/usb/src/sys/dev/sr/if_srregs.h#2 delete .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/usb/src/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate .. //depot/projects/usb/src/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_cpu_powerpc.c#6 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_dev_ns8250.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#39 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#141 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#9 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/usb/src/sys/geom/geom.h#8 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#9 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.h#5 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#11 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#10 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#18 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_if.m#5 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_share.h#3 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#16 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/metadata.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/param.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/pc/bios.h#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_acct.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_alq.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_time.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/usb/src/sys/kern/tty.c#19 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#21 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#13 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/if_aue.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_auereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_axe.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_axereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdce.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cue.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cuereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_kue.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_kuereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rue.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_ruereg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rum.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumvar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_udav.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_udavreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_ural.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralvar.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zyd.c#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydfw.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydreg.h#2 delete .. //depot/projects/usb/src/sys/legacy/dev/usb/kue_fw.h#2 delete .. //depot/projects/usb/src/sys/mips/include/param.h#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/usb/src/sys/modules/Makefile#30 integrate .. //depot/projects/usb/src/sys/modules/ar/Makefile#3 delete .. //depot/projects/usb/src/sys/modules/ixgbe/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/netgraph/sync_ar/Makefile#3 delete .. //depot/projects/usb/src/sys/modules/netgraph/sync_sr/Makefile#3 delete .. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/nfssvc/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ray/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/sr/Makefile#3 delete .. //depot/projects/usb/src/sys/modules/usb/Makefile#16 integrate .. //depot/projects/usb/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/usb/src/sys/net/bsd_comp.c#5 delete .. //depot/projects/usb/src/sys/net/ethernet.h#9 integrate .. //depot/projects/usb/src/sys/net/flowtable.c#1 branch .. //depot/projects/usb/src/sys/net/flowtable.h#1 branch .. //depot/projects/usb/src/sys/net/if.c#22 integrate .. //depot/projects/usb/src/sys/net/if.h#9 integrate .. //depot/projects/usb/src/sys/net/if_arc.h#2 integrate .. //depot/projects/usb/src/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/usb/src/sys/net/if_atm.h#2 integrate .. //depot/projects/usb/src/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#14 integrate .. //depot/projects/usb/src/sys/net/if_disc.c#5 integrate .. //depot/projects/usb/src/sys/net/if_enc.c#6 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/usb/src/sys/net/if_faith.c#6 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#12 integrate .. //depot/projects/usb/src/sys/net/if_gif.c#12 integrate .. //depot/projects/usb/src/sys/net/if_gif.h#6 integrate .. //depot/projects/usb/src/sys/net/if_gre.c#11 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#10 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#12 integrate .. //depot/projects/usb/src/sys/net/if_lagg.h#5 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#17 integrate .. //depot/projects/usb/src/sys/net/if_mib.c#6 integrate .. //depot/projects/usb/src/sys/net/if_ppp.c#9 delete .. //depot/projects/usb/src/sys/net/if_ppp.h#2 delete .. //depot/projects/usb/src/sys/net/if_pppvar.h#3 delete .. //depot/projects/usb/src/sys/net/if_sl.c#6 delete .. //depot/projects/usb/src/sys/net/if_slvar.h#2 delete .. //depot/projects/usb/src/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#10 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#12 integrate .. //depot/projects/usb/src/sys/net/if_var.h#14 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#13 integrate .. //depot/projects/usb/src/sys/net/iso88025.h#2 integrate .. //depot/projects/usb/src/sys/net/ppp_comp.h#2 delete .. //depot/projects/usb/src/sys/net/ppp_deflate.c#3 delete .. //depot/projects/usb/src/sys/net/ppp_tty.c#3 delete .. //depot/projects/usb/src/sys/net/radix_mpath.c#5 integrate .. //depot/projects/usb/src/sys/net/route.c#15 integrate .. //depot/projects/usb/src/sys/net/route.h#9 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#19 integrate .. //depot/projects/usb/src/sys/net/slip.h#2 delete .. //depot/projects/usb/src/sys/net/vnet.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#19 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#20 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#19 integrate .. //depot/projects/usb/src/sys/netatalk/at_control.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#25 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/usb/src/sys/netinet/icmp6.h#4 integrate .. //depot/projects/usb/src/sys/netinet/icmp_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#18 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#13 integrate .. //depot/projects/usb/src/sys/netinet/igmp_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet/in.c#20 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#12 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#14 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#14 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#21 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_nat.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#18 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.h#6 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#16 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias.c#7 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_dummy.c#2 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_ftp.c#7 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_irc.c#6 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_mod.h#2 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_nbt.c#4 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_pptp.c#3 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_skinny.c#4 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/usb/src/sys/netinet/pim_var.h#2 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#17 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/usb/src/sys/netinet/udp_var.h#6 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#8 integrate .. //depot/projects/usb/src/sys/netinet6/frag6.c#13 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#19 integrate .. //depot/projects/usb/src/sys/netinet6/in6.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/scope6.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#17 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#16 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#14 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/usb/src/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/usb/src/sys/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/usb/src/sys/nfs/nfs_nfssvc.c#1 branch .. //depot/projects/usb/src/sys/nfs/nfssvc.h#1 branch .. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#4 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#21 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#9 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsubs.c#14 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/pc98/cbus/olpt.c#4 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#15 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/param.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/spr.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_real.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate .. //depot/projects/usb/src/sys/rpc/svc.h#3 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#13 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#14 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_fcntl.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#13 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#14 integrate .. //depot/projects/usb/src/sys/security/audit/audit_private.h#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/usb/src/sys/sparc64/include/param.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#8 integrate .. //depot/projects/usb/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/usb/src/sys/sys/acl.h#3 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#13 integrate .. //depot/projects/usb/src/sys/sys/imgact_elf.h#5 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#12 integrate .. //depot/projects/usb/src/sys/sys/malloc.h#6 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#12 integrate .. //depot/projects/usb/src/sys/sys/param.h#27 integrate .. //depot/projects/usb/src/sys/sys/systm.h#15 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#7 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#19 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#12 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#14 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#9 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/usb/src/sys/vm/vm_unix.c#4 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); #include #include @@ -606,7 +606,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - paddr = pmap_kextract(vaddr); + if (pmap) + paddr = pmap_extract(pmap, vaddr); + else + paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); @@ -1134,9 +1137,7 @@ mtx_unlock(&bounce_lock); if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { - /* page offset needs to be preserved */ - bpage->vaddr &= ~PAGE_MASK; - bpage->busaddr &= ~PAGE_MASK; + /* Page offset needs to be preserved. */ bpage->vaddr |= vaddr & PAGE_MASK; bpage->busaddr |= vaddr & PAGE_MASK; } @@ -1155,6 +1156,15 @@ bz = dmat->bounce_zone; bpage->datavaddr = 0; bpage->datacount = 0; + if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) { + /* + * Reset the bounce page to start at offset 0. Other uses + * of this bounce page may need to store a full page of + * data and/or assume it starts on a page boundary. + */ + bpage->vaddr &= ~PAGE_MASK; + bpage->busaddr &= ~PAGE_MASK; + } mtx_lock(&bounce_lock); STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links); ==== //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.29 2009/03/13 16:40:51 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.30 2009/04/05 09:27:19 dchagin Exp $"); #include #include @@ -85,7 +85,7 @@ .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf64_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -101,7 +101,7 @@ .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf64_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#17 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.698 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -2178,45 +2178,24 @@ #ifdef KDB /* - * Provide inb() and outb() as functions. They are normally only - * available as macros calling inlined functions, thus cannot be - * called from the debugger. - * - * The actual code is stolen from , and de-inlined. + * Provide inb() and outb() as functions. They are normally only available as + * inline functions, thus cannot be called from the debugger. */ -#undef inb -#undef outb - /* silence compiler warnings */ -u_char inb(u_int); -void outb(u_int, u_char); +u_char inb_(u_short); +void outb_(u_short, u_char); u_char -inb(u_int port) +inb_(u_short port) { - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); + return inb(port); } void -outb(u_int port, u_char data) +outb_(u_short port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + outb(port, data); } #endif /* KDB */ ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ machine amd64 @@ -18,4 +18,7 @@ # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_EBR +options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR + +options FLOWTABLE ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#23 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.522 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.523 2009/04/10 00:40:48 jfv Exp $ cpu HAMMER ident GENERIC @@ -200,7 +200,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family -device ixgb # Intel PRO/10GbE Ethernet Card +device ixgbe # Intel PRO/10GbE PCIE Ethernet Family device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') ==== //depot/projects/usb/src/sys/amd64/include/cpufunc.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/cpufunc.h,v 1.151 2009/01/31 11:37:21 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.153 2009/04/11 14:01:01 ed Exp $ */ /* @@ -164,79 +164,21 @@ __asm __volatile("hlt"); } -#if !defined(__GNUCLIKE_BUILTIN_CONSTANT_P) || __GNUCLIKE_ASM < 3 - -#define inb(port) inbv(port) -#define outb(port, data) outbv(port, data) - -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ - -/* - * The following complications are to get around gcc not having a - * constraint letter for the range 0..255. We still put "d" in the - * constraint because "i" isn't a valid constraint when the port - * isn't constant. This only matters for -O0 because otherwise - * the non-working version gets optimized away. - * - * Use an expression-statement instead of a conditional expression - * because gcc-2.6.0 would promote the operands of the conditional - * and produce poor code for "if ((inb(var) & const1) == const2)". - * - * The unnecessary test `(port) < 0x10000' is to generate a warning if - * the `port' has type u_short or smaller. Such types are pessimal. - * This actually only works for signed types. The range check is - * careful to avoid generating warnings. - */ -#define inb(port) __extension__ ({ \ - u_char _data; \ - if (__builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000) \ - _data = inbc(port); \ - else \ - _data = inbv(port); \ - _data; }) - -#define outb(port, data) ( \ - __builtin_constant_p(port) && ((port) & 0xffff) < 0x100 \ - && (port) < 0x10000 \ - ? outbc(port, data) : outbv(port, data)) - static __inline u_char -inbc(u_int port) +inb(u_int port) { u_char data; - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); + __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } -static __inline void -outbc(u_int port, u_char data) -{ - __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); -} - -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ - -static __inline u_char -inbv(u_int port) -{ - u_char data; - /* - * We use %%dx and not %1 here because i/o is done at %dx and not at - * %edx, while gcc generates inferior code (movw instead of movl) - * if we tell it to load (u_short) port. - */ - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - return (data); -} - static __inline u_int inl(u_int port) { u_int data; - __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -278,33 +220,20 @@ { u_short data; - __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port)); + __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void -outbv(u_int port, u_char data) +outb(u_int port, u_char data) { - u_char al; - /* - * Use an unnecessary assignment to help gcc's register allocator. - * This make a large difference for gcc-1.40 and a tiny difference - * for gcc-2.6.0. For gcc-1.40, al had to be ``asm("ax")'' for - * best results. gcc-2.6.0 can't handle this. - */ - al = data; - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); + __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - /* - * outl() and outw() aren't used much so we haven't looked at - * possible micro-optimizations such as the unnecessary - * assignment for them. - */ - __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -334,7 +263,7 @@ static __inline void outw(u_int port, u_short data) { - __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port)); + __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -535,12 +464,9 @@ static __inline void load_fs(u_int sel) { - register u_int32_t fsbase __asm("ecx"); - /* Preserve the fsbase value across the selector load */ - fsbase = MSR_FSBASE; - __asm __volatile("rdmsr; mov %0,%%fs; wrmsr" - : : "rm" (sel), "c" (fsbase) : "eax", "edx"); + __asm __volatile("rdmsr; mov %0,%%fs; wrmsr" + : : "rm" (sel), "c" (MSR_FSBASE) : "eax", "edx"); } #ifndef MSR_GSBASE @@ -549,16 +475,13 @@ static __inline void load_gs(u_int sel) { - register u_int32_t gsbase __asm("ecx"); - /* * Preserve the gsbase value across the selector load. * Note that we have to disable interrupts because the gsbase * being trashed happens to be the kernel gsbase at the time. */ - gsbase = MSR_GSBASE; - __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq" - : : "rm" (sel), "c" (gsbase) : "eax", "edx"); + __asm __volatile("pushfq; cli; rdmsr; mov %0,%%gs; wrmsr; popfq" + : : "rm" (sel), "c" (MSR_GSBASE) : "eax", "edx"); } #else /* Usable by userland */ ==== //depot/projects/usb/src/sys/amd64/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $ + * $FreeBSD: src/sys/amd64/include/endian.h,v 1.10 2009/04/08 19:10:20 ed Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -69,25 +69,6 @@ #if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P) -#define __word_swap_int_var(x) \ -__extension__ ({ register __uint32_t __X = (x); \ - __asm ("rorl $16, %0" : "+r" (__X)); \ - __X; }) - -#ifdef __OPTIMIZE__ - -#define __word_swap_int_const(x) \ - ((((x) & 0xffff0000) >> 16) | \ - (((x) & 0x0000ffff) << 16)) -#define __word_swap_int(x) (__builtin_constant_p(x) ? \ - __word_swap_int_const(x) : __word_swap_int_var(x)) - -#else /* __OPTIMIZE__ */ - -#define __word_swap_int(x) __word_swap_int_var(x) - -#endif /* __OPTIMIZE__ */ - #define __byte_swap_int_var(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \ @@ -135,26 +116,6 @@ #endif /* __OPTIMIZE__ */ -#define __byte_swap_word_var(x) \ -__extension__ ({ register __uint16_t __X = (x); \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 22 07:27:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86D151065677; Wed, 22 Apr 2009 07:27:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4781D106566B for ; Wed, 22 Apr 2009 07:27:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 362AF8FC12 for ; Wed, 22 Apr 2009 07:27:04 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3M7R4bH093248 for ; Wed, 22 Apr 2009 07:27:04 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M7R3YQ093176 for perforce@freebsd.org; Wed, 22 Apr 2009 07:27:03 GMT (envelope-from zec@fer.hr) Date: Wed, 22 Apr 2009 07:27:03 GMT Message-Id: <200904220727.n3M7R3YQ093176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 07:27:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=160926 Change 160926 by zec@zec_amdx2 on 2009/04/22 07:26:35 Attempt to fix a panic in nd6_slowtimo() due to INIT_VNET_INET() being called with NULL as an argument - should be curvnet passed as an void *arg to callout handler. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#28 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#41 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#28 (text+ko) ==== @@ -191,7 +191,7 @@ /* start timer */ callout_init(&V_nd6_slowtimo_ch, 0); callout_reset(&V_nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz, - nd6_slowtimo, NULL); + nd6_slowtimo, curvnet); nd6_init_done = 1; @@ -1665,7 +1665,7 @@ struct ifnet *ifp; callout_reset(&V_nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz, - nd6_slowtimo, NULL); + nd6_slowtimo, curvnet); IFNET_RLOCK(); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#41 (text+ko) ==== @@ -155,8 +155,12 @@ LIST_ENTRY(vnet) vnet_le; /* all vnets list */ u_int vnet_magic_n; }; +#endif -extern struct vnet *curvnet; +#ifdef VIMAGE +extern struct vnet *curvnet; /* XXX will become thread-local soon */ +#else +#define curvnet NULL #endif #ifdef VIMAGE @@ -185,11 +189,7 @@ #define VNET_FOREACH(arg) #endif -#ifdef VIMAGE #define TD_TO_VNET(td) curvnet -#else -#define TD_TO_VNET(td) -#endif /* Non-VIMAGE null-macros */ #define IS_DEFAULT_VNET(arg) 1 From owner-p4-projects@FreeBSD.ORG Wed Apr 22 08:25:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10C1B1065674; Wed, 22 Apr 2009 08:25:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4E871065670 for ; Wed, 22 Apr 2009 08:25:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 993F58FC1B for ; Wed, 22 Apr 2009 08:25:03 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3M8P39k045477 for ; Wed, 22 Apr 2009 08:25:03 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M8P3iR045475 for perforce@freebsd.org; Wed, 22 Apr 2009 08:25:03 GMT (envelope-from gabor@freebsd.org) Date: Wed, 22 Apr 2009 08:25:03 GMT Message-Id: <200904220825.n3M8P3iR045475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 160927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 08:25:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=160927 Change 160927 by gabor@gabor_server on 2009/04/22 08:24:36 - Add my Milestones file Affected files ... .. //depot/projects/soc2009/gabor_iconv/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 22 09:38:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AAA21065674; Wed, 22 Apr 2009 09:38:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 021BB1065672 for ; Wed, 22 Apr 2009 09:38:18 +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 E28D28FC1F for ; Wed, 22 Apr 2009 09:38:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3M9cHZH018963 for ; Wed, 22 Apr 2009 09:38:17 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M9cHLG018961 for perforce@freebsd.org; Wed, 22 Apr 2009 09:38:17 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 22 Apr 2009 09:38:17 GMT Message-Id: <200904220938.n3M9cHLG018961@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 160929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 09:38:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=160929 Change 160929 by pgj@beehive on 2009/04/22 09:38:12 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#25 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#20 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#21 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#22 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#50 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.events.xsl#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ + +

  • Social links: http://www.flickr.com/search/?w=all&q=&m=text Flickr, - http://blogsearch.google.com/blogsearch?q=Blog Search, + http://blogsearch.google.com/blogsearch?q=Blog Search, http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    • From owner-p4-projects@FreeBSD.ORG Wed Apr 22 10:19:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA0181065674; Wed, 22 Apr 2009 10:18:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61582106566B for ; Wed, 22 Apr 2009 10:18:59 +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 4E7658FC15 for ; Wed, 22 Apr 2009 10:18:59 +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 n3MAIxBX052585 for ; Wed, 22 Apr 2009 10:18:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MAIxWo052583 for perforce@freebsd.org; Wed, 22 Apr 2009 10:18:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 22 Apr 2009 10:18:59 GMT Message-Id: <200904221018.n3MAIxWo052583@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 160930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 10:19:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=160930 Change 160930 by hselasky@hselasky_laptop001 on 2009/04/22 10:18:01 USB CORE + USB controller: - Minor RootHUB API cleanup. - Factor into generic Handle Request code. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#14 (text+ko) ==== @@ -1744,28 +1744,32 @@ USB_MAKE_STRING_DESC(STRING_VENDOR, at91dci_vendor); USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product); -static void -at91dci_roothub_exec(struct usb2_bus *bus) +static usb2_error_t +at91dci_roothub_exec(struct usb2_device *udev, + struct usb2_device_request *req, const void **pptr, uint16_t *plength) { - struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus); - struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; + struct at91dci_softc *sc = AT9100_DCI_BUS2SC(udev->bus); + const void *ptr; + uint16_t len; uint16_t value; uint16_t index; + usb2_error_t err; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); /* buffer reset */ - std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0); - std->len = 0; + ptr = (const void *)&sc->sc_hub_temp; + len = 0; + err = 0; - value = UGETW(std->req.wValue); - index = UGETW(std->req.wIndex); + value = UGETW(req->wValue); + index = UGETW(req->wIndex); /* demultiplex the control request */ - switch (std->req.bmRequestType) { + switch (req->bmRequestType) { case UT_READ_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_descriptor; case UR_GET_CONFIG: @@ -1778,7 +1782,7 @@ break; case UT_WRITE_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_ADDRESS: goto tr_handle_set_address; case UR_SET_CONFIG: @@ -1794,9 +1798,9 @@ break; case UT_WRITE_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_clear_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -1806,7 +1810,7 @@ } break; case UR_SET_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_set_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -1823,7 +1827,7 @@ break; case UT_READ_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_STATUS: goto tr_handle_get_ep_status; default: @@ -1832,7 +1836,7 @@ break; case UT_WRITE_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_INTERFACE: goto tr_handle_set_interface; case UR_CLEAR_FEATURE: @@ -1844,7 +1848,7 @@ break; case UT_READ_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_INTERFACE: goto tr_handle_get_interface; case UR_GET_STATUS: @@ -1865,7 +1869,7 @@ break; case UT_WRITE_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_valid; case UR_SET_DESCRIPTOR: @@ -1877,7 +1881,7 @@ break; case UT_WRITE_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_handle_clear_port_feature; case UR_SET_FEATURE: @@ -1893,7 +1897,7 @@ break; case UT_READ_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_TT_STATE: goto tr_handle_get_tt_state; case UR_GET_STATUS: @@ -1904,7 +1908,7 @@ break; case UT_READ_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_class_descriptor; case UR_GET_STATUS: @@ -1925,31 +1929,31 @@ if (value & 0xff) { goto tr_stalled; } - std->len = sizeof(at91dci_devd); - std->ptr = USB_ADD_BYTES(&at91dci_devd, 0); + len = sizeof(at91dci_devd); + ptr = (const void *)&at91dci_devd; goto tr_valid; case UDESC_CONFIG: if (value & 0xff) { goto tr_stalled; } - std->len = sizeof(at91dci_confd); - std->ptr = USB_ADD_BYTES(&at91dci_confd, 0); + len = sizeof(at91dci_confd); + ptr = (const void *)&at91dci_confd; goto tr_valid; case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ - std->len = sizeof(at91dci_langtab); - std->ptr = USB_ADD_BYTES(&at91dci_langtab, 0); + len = sizeof(at91dci_langtab); + ptr = (const void *)&at91dci_langtab; goto tr_valid; case 1: /* Vendor */ - std->len = sizeof(at91dci_vendor); - std->ptr = USB_ADD_BYTES(&at91dci_vendor, 0); + len = sizeof(at91dci_vendor); + ptr = (const void *)&at91dci_vendor; goto tr_valid; case 2: /* Product */ - std->len = sizeof(at91dci_product); - std->ptr = USB_ADD_BYTES(&at91dci_product, 0); + len = sizeof(at91dci_product); + ptr = (const void *)&at91dci_product; goto tr_valid; default: break; @@ -1961,12 +1965,12 @@ goto tr_stalled; tr_handle_get_config: - std->len = 1; + len = 1; sc->sc_hub_temp.wValue[0] = sc->sc_conf; goto tr_valid; tr_handle_get_status: - std->len = 2; + len = 2; USETW(sc->sc_hub_temp.wValue, UDS_SELF_POWERED); goto tr_valid; @@ -1985,7 +1989,7 @@ goto tr_valid; tr_handle_get_interface: - std->len = 1; + len = 1; sc->sc_hub_temp.wValue[0] = 0; goto tr_valid; @@ -1993,7 +1997,7 @@ tr_handle_get_class_status: tr_handle_get_iface_status: tr_handle_get_ep_status: - std->len = 2; + len = 2; USETW(sc->sc_hub_temp.wValue, 0); goto tr_valid; @@ -2038,7 +2042,7 @@ sc->sc_flags.change_suspend = 0; break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } goto tr_valid; @@ -2063,7 +2067,7 @@ sc->sc_flags.port_powered = 1; break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } goto tr_valid; @@ -2117,22 +2121,24 @@ value |= UPS_C_SUSPEND; } USETW(sc->sc_hub_temp.ps.wPortChange, value); - std->len = sizeof(sc->sc_hub_temp.ps); + len = sizeof(sc->sc_hub_temp.ps); goto tr_valid; tr_handle_get_class_descriptor: if (value & 0xFF) { goto tr_stalled; } - std->ptr = USB_ADD_BYTES(&at91dci_hubd, 0); - std->len = sizeof(at91dci_hubd); + ptr = (const void *)&at91dci_hubd; + len = sizeof(at91dci_hubd); goto tr_valid; tr_stalled: - std->err = USB_ERR_STALLED; + err = USB_ERR_STALLED; tr_valid: done: - return; + *plength = len; + *pptr = ptr; + return (err); } static void ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#21 (text+ko) ==== @@ -1551,29 +1551,33 @@ USB_MAKE_STRING_DESC(STRING_VENDOR, atmegadci_vendor); USB_MAKE_STRING_DESC(STRING_PRODUCT, atmegadci_product); -static void -atmegadci_roothub_exec(struct usb2_bus *bus) +static usb2_error_t +atmegadci_roothub_exec(struct usb2_device *udev, + struct usb2_device_request *req, const void **pptr, uint16_t *plength) { - struct atmegadci_softc *sc = ATMEGA_BUS2SC(bus); - struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; + struct atmegadci_softc *sc = ATMEGA_BUS2SC(udev->bus); + const void *ptr; + uint16_t len; uint16_t value; uint16_t index; uint8_t temp; + usb2_error_t err; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); /* buffer reset */ - std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0); - std->len = 0; + ptr = (const void *)&sc->sc_hub_temp; + len = 0; + err = 0; - value = UGETW(std->req.wValue); - index = UGETW(std->req.wIndex); + value = UGETW(req->wValue); + index = UGETW(req->wIndex); /* demultiplex the control request */ - switch (std->req.bmRequestType) { + switch (req->bmRequestType) { case UT_READ_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_descriptor; case UR_GET_CONFIG: @@ -1586,7 +1590,7 @@ break; case UT_WRITE_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_ADDRESS: goto tr_handle_set_address; case UR_SET_CONFIG: @@ -1602,9 +1606,9 @@ break; case UT_WRITE_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_clear_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -1614,7 +1618,7 @@ } break; case UR_SET_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_set_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -1631,7 +1635,7 @@ break; case UT_READ_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_STATUS: goto tr_handle_get_ep_status; default: @@ -1640,7 +1644,7 @@ break; case UT_WRITE_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_INTERFACE: goto tr_handle_set_interface; case UR_CLEAR_FEATURE: @@ -1652,7 +1656,7 @@ break; case UT_READ_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_INTERFACE: goto tr_handle_get_interface; case UR_GET_STATUS: @@ -1673,7 +1677,7 @@ break; case UT_WRITE_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_valid; case UR_SET_DESCRIPTOR: @@ -1685,7 +1689,7 @@ break; case UT_WRITE_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_handle_clear_port_feature; case UR_SET_FEATURE: @@ -1701,7 +1705,7 @@ break; case UT_READ_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_TT_STATE: goto tr_handle_get_tt_state; case UR_GET_STATUS: @@ -1712,7 +1716,7 @@ break; case UT_READ_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_class_descriptor; case UR_GET_STATUS: @@ -1733,31 +1737,31 @@ if (value & 0xff) { goto tr_stalled; } - std->len = sizeof(atmegadci_devd); - std->ptr = USB_ADD_BYTES(&atmegadci_devd, 0); + len = sizeof(atmegadci_devd); + ptr = (const void *)&atmegadci_devd; goto tr_valid; case UDESC_CONFIG: if (value & 0xff) { goto tr_stalled; } - std->len = sizeof(atmegadci_confd); - std->ptr = USB_ADD_BYTES(&atmegadci_confd, 0); + len = sizeof(atmegadci_confd); + ptr = (const void *)&atmegadci_confd; goto tr_valid; case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ - std->len = sizeof(atmegadci_langtab); - std->ptr = USB_ADD_BYTES(&atmegadci_langtab, 0); + len = sizeof(atmegadci_langtab); + ptr = (const void *)&atmegadci_langtab; goto tr_valid; case 1: /* Vendor */ - std->len = sizeof(atmegadci_vendor); - std->ptr = USB_ADD_BYTES(&atmegadci_vendor, 0); + len = sizeof(atmegadci_vendor); + ptr = (const void *)&atmegadci_vendor; goto tr_valid; case 2: /* Product */ - std->len = sizeof(atmegadci_product); - std->ptr = USB_ADD_BYTES(&atmegadci_product, 0); + len = sizeof(atmegadci_product); + ptr = (const void *)&atmegadci_product; goto tr_valid; default: break; @@ -1769,12 +1773,12 @@ goto tr_stalled; tr_handle_get_config: - std->len = 1; + len = 1; sc->sc_hub_temp.wValue[0] = sc->sc_conf; goto tr_valid; tr_handle_get_status: - std->len = 2; + len = 2; USETW(sc->sc_hub_temp.wValue, UDS_SELF_POWERED); goto tr_valid; @@ -1793,7 +1797,7 @@ goto tr_valid; tr_handle_get_interface: - std->len = 1; + len = 1; sc->sc_hub_temp.wValue[0] = 0; goto tr_valid; @@ -1801,7 +1805,7 @@ tr_handle_get_class_status: tr_handle_get_iface_status: tr_handle_get_ep_status: - std->len = 2; + len = 2; USETW(sc->sc_hub_temp.wValue, 0); goto tr_valid; @@ -1877,7 +1881,7 @@ sc->sc_flags.change_suspend = 0; break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } goto tr_valid; @@ -1902,7 +1906,7 @@ sc->sc_flags.port_powered = 1; break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } goto tr_valid; @@ -1950,22 +1954,24 @@ value |= UPS_C_SUSPEND; } USETW(sc->sc_hub_temp.ps.wPortChange, value); - std->len = sizeof(sc->sc_hub_temp.ps); + len = sizeof(sc->sc_hub_temp.ps); goto tr_valid; tr_handle_get_class_descriptor: if (value & 0xFF) { goto tr_stalled; } - std->ptr = USB_ADD_BYTES(&atmegadci_hubd, 0); - std->len = sizeof(atmegadci_hubd); + ptr = (const void *)&atmegadci_hubd; + len = sizeof(atmegadci_hubd); goto tr_valid; tr_stalled: - std->err = USB_ERR_STALLED; + err = USB_ERR_STALLED; tr_valid: done: - return; + *plength = len; + *pptr = ptr; + return (err); } static void ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#16 (text+ko) ==== @@ -2987,35 +2987,39 @@ EOWRITE4(sc, port, v | EHCI_PS_PO); } -static void -ehci_roothub_exec(struct usb2_bus *bus) +static usb2_error_t +ehci_roothub_exec(struct usb2_device *udev, + struct usb2_device_request *req, const void **pptr, uint16_t *plength) { - ehci_softc_t *sc = EHCI_BUS2SC(bus); - struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; - char *ptr; + ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); + const char *str_ptr; + const void *ptr; uint32_t port; uint32_t v; + uint16_t len; uint16_t i; uint16_t value; uint16_t index; uint8_t l; + usb2_error_t err; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); /* buffer reset */ - std->ptr = sc->sc_hub_desc.temp; - std->len = 0; + ptr = (const void *)&sc->sc_hub_desc; + len = 0; + err = 0; - value = UGETW(std->req.wValue); - index = UGETW(std->req.wIndex); + value = UGETW(req->wValue); + index = UGETW(req->wIndex); DPRINTFN(3, "type=0x%02x request=0x%02x wLen=0x%04x " "wValue=0x%04x wIndex=0x%04x\n", - std->req.bmRequestType, std->req.bRequest, - UGETW(std->req.wLength), value, index); + req->bmRequestType, req->bRequest, + UGETW(req->wLength), value, index); #define C(x,y) ((x) | ((y) << 8)) - switch (C(std->req.bRequest, std->req.bmRequestType)) { + switch (C(req->bRequest, req->bmRequestType)) { case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE): case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE): case C(UR_CLEAR_FEATURE, UT_WRITE_ENDPOINT): @@ -3025,18 +3029,18 @@ */ break; case C(UR_GET_CONFIG, UT_READ_DEVICE): - std->len = 1; + len = 1; sc->sc_hub_desc.temp[0] = sc->sc_conf; break; case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE): switch (value >> 8) { case UDESC_DEVICE: if ((value & 0xff) != 0) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } - std->len = sizeof(ehci_devd); - sc->sc_hub_desc.devd = ehci_devd; + len = sizeof(ehci_devd); + ptr = (const void *)&ehci_devd; break; /* * We can't really operate at another speed, @@ -3045,74 +3049,74 @@ */ case UDESC_DEVICE_QUALIFIER: if ((value & 0xff) != 0) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } - std->len = sizeof(ehci_odevd); - sc->sc_hub_desc.odevd = ehci_odevd; + len = sizeof(ehci_odevd); + ptr = (const void *)&ehci_odevd; break; case UDESC_CONFIG: if ((value & 0xff) != 0) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } - std->len = sizeof(ehci_confd); - std->ptr = USB_ADD_BYTES(&ehci_confd, 0); + len = sizeof(ehci_confd); + ptr = (const void *)&ehci_confd; break; case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ - ptr = "\001"; + str_ptr = "\001"; break; case 1: /* Vendor */ - ptr = sc->sc_vendor; + str_ptr = sc->sc_vendor; break; case 2: /* Product */ - ptr = "EHCI root HUB"; + str_ptr = "EHCI root HUB"; break; default: - ptr = ""; + str_ptr = ""; break; } - std->len = usb2_make_str_desc - (sc->sc_hub_desc.temp, + len = usb2_make_str_desc( + sc->sc_hub_desc.temp, sizeof(sc->sc_hub_desc.temp), - ptr); + str_ptr); break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } break; case C(UR_GET_INTERFACE, UT_READ_INTERFACE): - std->len = 1; + len = 1; sc->sc_hub_desc.temp[0] = 0; break; case C(UR_GET_STATUS, UT_READ_DEVICE): - std->len = 2; + len = 2; USETW(sc->sc_hub_desc.stat.wStatus, UDS_SELF_POWERED); break; case C(UR_GET_STATUS, UT_READ_INTERFACE): case C(UR_GET_STATUS, UT_READ_ENDPOINT): - std->len = 2; + len = 2; USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): if (value >= EHCI_MAX_DEVICES) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } sc->sc_addr = value; break; case C(UR_SET_CONFIG, UT_WRITE_DEVICE): if ((value != 0) && (value != 1)) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } sc->sc_conf = value; @@ -3122,7 +3126,7 @@ case C(UR_SET_FEATURE, UT_WRITE_DEVICE): case C(UR_SET_FEATURE, UT_WRITE_INTERFACE): case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT): - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE): break; @@ -3136,7 +3140,7 @@ if ((index < 1) || (index > sc->sc_noport)) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } port = EHCI_PORTSC(index); @@ -3191,13 +3195,13 @@ sc->sc_isreset = 0; break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } break; case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE): if ((value & 0xff) != 0) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } v = EOREAD4(sc, EHCI_HCSPARAMS); @@ -3216,10 +3220,10 @@ } sc->sc_hub_desc.hubd.bDescLength = 8 + ((sc->sc_noport + 7) / 8); - std->len = sc->sc_hub_desc.hubd.bDescLength; + len = sc->sc_hub_desc.hubd.bDescLength; break; case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE): - std->len = 16; + len = 16; bzero(sc->sc_hub_desc.temp, 16); break; case C(UR_GET_STATUS, UT_READ_CLASS_OTHER): @@ -3227,7 +3231,7 @@ index); if ((index < 1) || (index > sc->sc_noport)) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } v = EOREAD4(sc, EHCI_PORTSC(index)); @@ -3267,17 +3271,17 @@ if (sc->sc_isreset) i |= UPS_C_PORT_RESET; USETW(sc->sc_hub_desc.ps.wPortChange, i); - std->len = sizeof(sc->sc_hub_desc.ps); + len = sizeof(sc->sc_hub_desc.ps); break; case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE): - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; case C(UR_SET_FEATURE, UT_WRITE_CLASS_DEVICE): break; case C(UR_SET_FEATURE, UT_WRITE_CLASS_OTHER): if ((index < 1) || (index > sc->sc_noport)) { - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } port = EHCI_PORTSC(index); @@ -3328,7 +3332,7 @@ if (v & EHCI_PS_PR) { device_printf(sc->sc_bus.bdev, "port reset timeout\n"); - std->err = USB_ERR_TIMEOUT; + err = USB_ERR_TIMEOUT; goto done; } if (!(v & EHCI_PS_PE) && @@ -3357,7 +3361,7 @@ break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } break; @@ -3367,11 +3371,13 @@ case C(UR_STOP_TT, UT_WRITE_CLASS_OTHER): break; default: - std->err = USB_ERR_IOERROR; + err = USB_ERR_IOERROR; goto done; } done: - return; + *plength = len; + *pptr = ptr; + return (err); } static void ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#7 (text+ko) ==== @@ -446,8 +446,6 @@ union ehci_hub_desc { struct usb2_status stat; struct usb2_port_status ps; - struct usb2_device_descriptor devd; - struct usb2_device_qualifier odevd; struct usb2_hub_descriptor hubd; uint8_t temp[128]; }; ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#12 (text+ko) ==== @@ -2152,28 +2152,32 @@ USB_MAKE_STRING_DESC(STRING_VENDOR, musbotg_vendor); USB_MAKE_STRING_DESC(STRING_PRODUCT, musbotg_product); -static void -musbotg_roothub_exec(struct usb2_bus *bus) +static usb2_error_t +musbotg_roothub_exec(struct usb2_device *udev, + struct usb2_device_request *req, const void **pptr, uint16_t *plength) { - struct musbotg_softc *sc = MUSBOTG_BUS2SC(bus); - struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req; + struct musbotg_softc *sc = MUSBOTG_BUS2SC(udev->bus); + const void *ptr; + uint16_t len; uint16_t value; uint16_t index; + usb2_error_t err; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); /* buffer reset */ - std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0); - std->len = 0; + ptr = (const void *)&sc->sc_hub_temp; + len = 0; + err = 0; - value = UGETW(std->req.wValue); - index = UGETW(std->req.wIndex); + value = UGETW(req->wValue); + index = UGETW(req->wIndex); /* demultiplex the control request */ - switch (std->req.bmRequestType) { + switch (req->bmRequestType) { case UT_READ_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_descriptor; case UR_GET_CONFIG: @@ -2186,7 +2190,7 @@ break; case UT_WRITE_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_ADDRESS: goto tr_handle_set_address; case UR_SET_CONFIG: @@ -2202,9 +2206,9 @@ break; case UT_WRITE_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_clear_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -2214,7 +2218,7 @@ } break; case UR_SET_FEATURE: - switch (UGETW(std->req.wValue)) { + switch (UGETW(req->wValue)) { case UF_ENDPOINT_HALT: goto tr_handle_set_halt; case UF_DEVICE_REMOTE_WAKEUP: @@ -2231,7 +2235,7 @@ break; case UT_READ_ENDPOINT: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_STATUS: goto tr_handle_get_ep_status; default: @@ -2240,7 +2244,7 @@ break; case UT_WRITE_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_SET_INTERFACE: goto tr_handle_set_interface; case UR_CLEAR_FEATURE: @@ -2252,7 +2256,7 @@ break; case UT_READ_INTERFACE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_INTERFACE: goto tr_handle_get_interface; case UR_GET_STATUS: @@ -2273,7 +2277,7 @@ break; case UT_WRITE_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_valid; case UR_SET_DESCRIPTOR: @@ -2285,7 +2289,7 @@ break; case UT_WRITE_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_CLEAR_FEATURE: goto tr_handle_clear_port_feature; case UR_SET_FEATURE: @@ -2301,7 +2305,7 @@ break; case UT_READ_CLASS_OTHER: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_TT_STATE: goto tr_handle_get_tt_state; case UR_GET_STATUS: @@ -2312,7 +2316,7 @@ break; case UT_READ_CLASS_DEVICE: - switch (std->req.bRequest) { + switch (req->bRequest) { case UR_GET_DESCRIPTOR: goto tr_handle_get_class_descriptor; case UR_GET_STATUS: @@ -2333,31 +2337,31 @@ if (value & 0xff) { goto tr_stalled; } - std->len = sizeof(musbotg_devd); - std->ptr = USB_ADD_BYTES(&musbotg_devd, 0); + len = sizeof(musbotg_devd); + ptr = (const void *)&musbotg_devd; goto tr_valid; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 22 10:26:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BADBA1065673; Wed, 22 Apr 2009 10:26: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 7B2B3106566B for ; Wed, 22 Apr 2009 10:26:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68D798FC16 for ; Wed, 22 Apr 2009 10:26:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MAQ6Sh059039 for ; Wed, 22 Apr 2009 10:26:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MAQ6h1059037 for perforce@freebsd.org; Wed, 22 Apr 2009 10:26:06 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 22 Apr 2009 10:26:06 GMT Message-Id: <200904221026.n3MAQ6h1059037@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 160931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 10:26:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=160931 Change 160931 by pgj@beehive on 2009/04/22 10:25:59 MFen: 1.242 -> 1.244 hu/share/sgml/news.xml 1.78 -> 1.79 hu/share/sgml/press.xml 1.12 -> 1.13 hu/share/sgml/templates.events.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#16 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#9 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#16 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,29 @@ 4 + 21 + + + Elérhetõek a DCBSDCon + elõadásai! + +

    A nemrég megrendezésre került DCBSDCon 2009 + összes videora vett szakmai elõadása + mostantól elérhetõ a YouTube portál + BSDConferences + csatornáján. Ezzel együtt a + csatornán most már több mint 50 + különbözõ szakmai elõadás + videoanyaga található meg a korábbi + MeetBSD, NYCBSDCon, AsiaBSDCon és BSDCan anyagai + mellett.

    +     +     + + 17 ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#9 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,23 @@ 4 + A Great Bay Software most már BSD rendszert + használ Linux helyett + http://www.marketwire.com/press-release/Great-Bay-Software-975478.html + Great Bay Software + http://www.greatbaysoftware.com/ + 2009. április 16. + Bob Durkee +

    A nagyvállalati végpontok + teljesítményhangolásával + foglalkozó Great Bay Sofware a korábban erre a + célra kifejlesztett eszközeit Linux + alapokról a &os; rendszerére helyezte át, + többek közt a Beacon Endpoint Profiler 3.0 + nevû termékét.

    +     + + A PC-BSD 7.1 elsõ pillantásra http://distrowatch.com/weekly.php?issue=20090413#feature Distro Watch ==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#4 (text+ko) ==== @@ -40,7 +40,7 @@ Közösségi linkek: http://www.flickr.com/search/?w=all&q=&m=text Flickr, - http://blogsearch.google.com/blogsearch?q=Blog Search, + http://blogsearch.google.com/blogsearch?q=Blog Search, http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    From owner-p4-projects@FreeBSD.ORG Wed Apr 22 13:09:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6365F1065672; Wed, 22 Apr 2009 13:09:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2213A106566C for ; Wed, 22 Apr 2009 13:09:54 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10BC88FC08 for ; Wed, 22 Apr 2009 13:09:54 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MD9rpa037568 for ; Wed, 22 Apr 2009 13:09:53 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MD9rpY037566 for perforce@freebsd.org; Wed, 22 Apr 2009 13:09:53 GMT (envelope-from zec@fer.hr) Date: Wed, 22 Apr 2009 13:09:53 GMT Message-Id: <200904221309.n3MD9rpY037566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 13:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=160933 Change 160933 by zec@zec_amdx2 on 2009/04/22 13:09:16 Unbreak netgraph vnet module registration. Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#54 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#54 (text+ko) ==== @@ -3102,6 +3102,11 @@ switch (event) { case MOD_LOAD: /* Initialize everything. */ +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_netgraph_modinfo); +#else + vnet_netgraph_iattach(NULL); +#endif /* !VIMAGE */ NG_WORKLIST_LOCK_INIT(); mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, MTX_DEF); @@ -3135,11 +3140,6 @@ break; } } -#ifndef VIMAGE_GLOBALS - vnet_mod_register(&vnet_netgraph_modinfo); -#else - vnet_netgraph_iattach(NULL); -#endif /* !VIMAGE */ break; case MOD_UNLOAD: /* You can't unload it because an interface may be using it. */ From owner-p4-projects@FreeBSD.ORG Wed Apr 22 14:43:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C22C106599E; Wed, 22 Apr 2009 14:43: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 39F1D1065985 for ; Wed, 22 Apr 2009 14:43:30 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E27DC8FC18 for ; Wed, 22 Apr 2009 14:43:29 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MEhT4k046500 for ; Wed, 22 Apr 2009 14:43:29 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MEhTMm046498 for perforce@freebsd.org; Wed, 22 Apr 2009 14:43:29 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 22 Apr 2009 14:43:29 GMT Message-Id: <200904221443.n3MEhTMm046498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 160942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 14:43:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=160942 Change 160942 by thompsa@thompsa_burger on 2009/04/22 14:43:04 Remove usb_sw_transfer.[ch] Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#6 delete .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 22 21:13:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C7D11065672; Wed, 22 Apr 2009 21:13:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23D65106566B for ; Wed, 22 Apr 2009 21:13:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FBA08FC18 for ; Wed, 22 Apr 2009 21:13:07 +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 n3MLD6ZV005385 for ; Wed, 22 Apr 2009 21:13:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MLD62E005383 for perforce@freebsd.org; Wed, 22 Apr 2009 21:13:06 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Apr 2009 21:13:06 GMT Message-Id: <200904222113.n3MLD62E005383@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 160956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 21:13:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=160956 Change 160956 by rene@rene_self on 2009/04/22 21:12:14 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#26 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#32 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#10 integrate .. //depot/projects/docproj_nl/www/en/gnome/news.xml#4 integrate .. //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#7 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#35 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#13 integrate .. //depot/projects/docproj_nl/www/share/sgml/templates.events.xsl#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -292,6 +292,11 @@ + &a.gecko.name; + Gecko Rendering Engine issues + + + &a.geom.name; GEOM-specific discussions and implementations @@ -1179,6 +1184,21 @@ + &a.gecko.name; + + + Gecko Rendering Engine + + This is a forum about Gecko + applications using &os;. + + Discussion centers, around Gecko Ports applications, + their installation, their development and their support + within &os;. + + + + &a.geom.name; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ + 702000 + April 15, 2009 + 7.2-RELEASE + + + + 702100 + April 15, 2009 + 7.2-STABLE after 7.2-RELEASE. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte @@ -12990,6 +13002,46 @@ 8.0-CURRENT after adding delay profiles in dummynet. + + 800077 + April 14, 2009 + 8.0-CURRENT after removing VOP_LEASE() and + vop_vector.vop_lease. + + + 800078 + April 15, 2009 + 8.0-CURRENT after struct rt_weight fields have + been added to struct rt_metrics and struct + rt_metrics_lite, changing the layout of struct + rt_metrics_lite. A bump to RTM_VERSION was made, but + backed out. + + + 800079 + April 15, 2009 + 8.0-CURRENT after struct llentry pointers are + added to struct route and struct route_in6. + + + 800080 + April 15, 2009 + 8.0-CURRENT after layout of struct inpcb has been + changed. + + + 800081 + April 19, 2009 + 8.0-CURRENT after the layout of struct malloc_type + has been changed. + + + 800082 + April 21, 2009 + 8.0-CURRENT after the layout of struct ifnet has + changed, and with if_ref() and if_rele() ifnet + refcounting. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -179,6 +179,10 @@ FreeBSD file system project mailing list"> freebsd-fs"> + +FreeBSD gecko mailing list"> +freebsd-gecko"> + FreeBSD GEOM mailing list"> freebsd-geom"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#32 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_nl/www/en/gnome/news.xml#4 (text+ko) ==== @@ -19,7 +19,7 @@ - $FreeBSD: www/en/gnome/news.xml,v 1.147 2009/04/11 03:09:00 marcus Exp $ + $FreeBSD: www/en/gnome/news.xml,v 1.149 2009/04/13 21:34:50 jkois Exp $ @@ -34,13 +34,12 @@ Announcing GNOME 2.26.0 for FreeBSD! -

    The FreeBSD GNOME tam is proud to announce the release of +

    The FreeBSD GNOME team is proud to announce the release of GNOME 2.26.0 for FreeBSD. The official release notes can be found at - href="http://library.gnome.org/misc/release-notes/2.26/ - - . On the FreeBSD front, we introduced a port of libxul 1.9 as + http://library.gnome.org/misc/release-notes/2.26/. + On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers can make use of this provider by setting: ==== //depot/projects/docproj_nl/www/en/releases/7.2R/schedule.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -97,7 +97,7 @@ doc/ tree tagged. 17 April 2009 - -- + 17 April 2009 Version number bumps for doc/ subtree. RELEASE_&local.rel.tag;_0 tag for doc/. doc/ slush ends at this time. @@ -112,8 +112,8 @@ RELENG_7_2 branch - 10 April 2009 - -- + 10 April 2009 + 15 April 2009 The new release branch is created. Update newvers.sh and release.ent on various branches involved. @@ -121,7 +121,7 @@ RC1 builds 13 April 2009 - -- + 15 April 2009 Begin RC1 builds. @@ -131,14 +131,14 @@ Ports tree tagged 20 April 2009 - -- + 21 April 2009 RELEASE_&local.rel.tag;_0 tag for ports/. Ports tree unfrozen 20 April 2009 - -- + 21 April 2009 After the ports/ tree is tagged, the ports/ tree will be re-opened for commits, but commits made after tagging will not go in &local.rel;-RELEASE. @@ -147,7 +147,7 @@ Final package build starts 20 April 2009 - -- + 21 April 2009 The ports cluster and pointyhat build final packages. ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#18 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ May 2009 FreeBSD 7.2 - BETA1 is available + RC1 is available @@ -289,14 +289,14 @@ ports/ - Open + Slush (no sweeping commits until after 7.2 release) &contact.portmgr; FreeBSD Ports Collection. doc/ - Slush + Open &contact.doc; SGML/XML based documentation set. ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#10 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.228 2009/03/23 00:10:01 cperciva Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.229 2009/04/22 14:20:33 cperciva Exp $ @@ -10,6 +10,22 @@ 2009 + 4 + + + 22 + + + FreeBSD-SA-09:08.openssl + + + + FreeBSD-SA-09:07.libc + + + + + 3 ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#16 (text+ko) ==== @@ -4,66 +4,16 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.69 2009/03/06 11:58:35 blackend Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.71 2009/04/14 12:29:35 jkoshy Exp $ - - Network-related Bugathon #6 - http://wiki.freebsd.org/Bugathons/January2009 - - 2009 - 1 - 30 - - - 2009 - 2 - 1 - - - A bugathon is an event coordinated by the &os; - bugbusting team. Bugathons are held on IRC (in the - #freebsd-bugbusters channel of EFnet), and are attended by any - interested &os; developers and contributors during a week-end. - They focus on closing as many problem reports and fixing as many - bugs as possible. The plan for the sixth bugathon is to work - through the all network-related problem reports in &os;'s GNATS - database. - - - - FOSDEM '09 - http://fosdem.org/2009/ - - 2009 - 2 - 7 - - - 2009 - 2 - 8 - - - Belgium - Brussels - ULB Campus Solbosh - - - FOSDEM '09 is a free and non-commercial event organized - by the community, for the community. Its goal is to provide Free - and Open Source developers a place to meet. Several &os; - developers will be present, including Kris Kennaway who will be - giving a talk about system performance. - - EuroBSDCon 2009 http://2009.eurobsdcon.org/ @@ -88,6 +38,33 @@ track, tutorials, and FreeBSD developer summit. + + BSDday Argentina 2009 + http://www.bsdday.com.ar/ + + 2009 + 5 + 29 + + + 2009 + 5 + 30 + + + Argentina + Buenos Aires + + + BSDday Argentina is a conference for users and developers + on BSD based systems. The conference is for anyone developing, + deploying and using systems based on FreeBSD, NetBSD, OpenBSD, + DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference + and aims to collect the best technical papers and presentations available + to ensure that the latest developments in our open source community are + shared with the widest possible audience. + + BSDCan 2009 http://www.bsdcan.org/2009/ @@ -113,31 +90,26 @@ from commercial vendors. - - BSDday Argentina 2009 - http://www.bsdday.com.ar/ + + ACM Talk on FreeBSD/PmcTools + http://acmbangalore.org/index.php?option=com_attend_events&task=view&id=3&Itemid=0 2009 - 5 - 29 + 4 + 18 2009 - 5 - 30 + 4 + 18 - Argentina - Buenos Aires + India + Bangalore +

    Honeywell, Bannerghatta Road
    - - BSDday Argentina is a conference for users and developers - on BSD based systems. The conference is for anyone developing, - deploying and using systems based on FreeBSD, NetBSD, OpenBSD, - DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference - and aims to collect the best technical papers and presentations available - to ensure that the latest developments in our open source community are - shared with the widest possible audience. + A talk on FreeBSD/PmcTools, hosted by the Bangalore chapter + of the ACM.     @@ -228,6 +200,32 @@ the widest possible audience. + + FOSDEM '09 + http://fosdem.org/2009/ + + 2009 + 2 + 7 + + + 2009 + 2 + 8 + + + Belgium + Brussels + ULB Campus Solbosh + + + FOSDEM '09 is a free and non-commercial event organized + by the community, for the community. Its goal is to provide Free + and Open Source developers a place to meet. Several &os; + developers will be present, including Kris Kennaway who will be + giving a talk about system performance. + + DCBSDCon 2009 http://www.dcbsdcon.org/ @@ -252,6 +250,30 @@ security themes. + + Network-related Bugathon #6 + http://wiki.freebsd.org/Bugathons/January2009 + + 2009 + 1 + 30 + + + 2009 + 2 + 1 + + + A bugathon is an event coordinated by the &os; + bugbusting team. Bugathons are held on IRC (in the + #freebsd-bugbusters channel of EFnet), and are attended by any + interested &os; developers and contributors during a week-end. + They focus on closing as many problem reports and fixing as many + bugs as possible. The plan for the sixth bugathon is to work + through the all network-related problem reports in &os;'s GNATS + database. + + NLLGG-bijeenkomst december 2008 http://www.nllgg.nl/bijeenkomst_20081213 ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#35 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.240 2009/04/12 17:51:44 pgj Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.244 2009/04/21 11:39:15 murray Exp $ @@ -36,6 +36,40 @@ 4 + 21 + + + DCBSDCon Videos Posted + +

    All of the technical sessions from the recent DCBSDCon 2009 + conference were recorded and are now available in the BSDConferences + channel on YouTube. + There are now 50 separate videos of technical talks from + MeetBSD, NYCBSDCon, AsiaBSDCon, and BSDCan available in + the channel.

    +     +     + + + 17 + + + FreeBSD 7.2-RC1 Available + +

    The first of two planned Release Candidates for the &os; + 7.2-RELEASE cycle is now available. ISO images for Tier-1 + architectures are now available + on most of the &os; + mirror sites.

    +     +     + + 12 @@ -46,6 +80,25 @@ + 10 + + + PC-BSD 7.1 Released + +

    PC-BSD 7.1 has been released. PC-BSD is a + successful desktop operating system based on FreeBSD that + focuses on providing an easy to use desktop system for + casual computer users. A list of new features/updates + since the last version can be found here.

    + +

    The new release may be downloaded or purchased on DVD.

    +     +     + + 6 ==== //depot/projects/docproj_nl/www/share/sgml/press.xml#10 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.76 2009/03/16 08:08:22 pgj Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.79 2009/04/21 20:23:21 jkois Exp $ @@ -17,6 +17,42 @@ 2009 + 4 + + + Great Bay Software Switches to BSD from Linux + http://www.marketwire.com/press-release/Great-Bay-Software-975478.html + Great Bay Software + http://www.greatbaysoftware.com/ + 16 April 2009 + Bob Durkee +

    Great Bay Software, the innovator of Endpoint Profiling for enterprise networks, + has switched to &os; from Linux for all of its appliances including the + Beacon Endpoint Profiler 3.0.

    +     + + + First look at PC-BSD 7.1 + http://distrowatch.com/weekly.php?issue=20090413#feature + Distro Watch + http://www.distrowatch.com/ + 13 April 2009 +

    A reviewer takes PC-BSD 7.1 release for a spin.

    +     + + + Combining Debian and FreeBSD; Pushing the Envelope of FOSS + http://www.linux-mag.com/id/7295 + Linux Magazine + http://www.linux-mag.com/ + 9 April 2009 + Nathan Willis +

    Coverage of Debian GNU/kFreeBSD, a GNU operating system that + uses the FreeBSD kernel.

    +     +     + + 3 Tomahawk Desktop Switches to BSD from Linux ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#13 (text+ko) ==== @@ -1,4 +1,4 @@ - + + +

  • Social links: http://www.flickr.com/search/?w=all&q=&m=text Flickr, - http://blogsearch.google.com/blogsearch?q=Blog Search, + http://blogsearch.google.com/blogsearch?q=Blog Search, http://www.youtube.com/results?search_query=bsdconferences+YouTube.

    • From owner-p4-projects@FreeBSD.ORG Wed Apr 22 21:30:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FF8E1065673; Wed, 22 Apr 2009 21:30: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 D350E106566B for ; Wed, 22 Apr 2009 21:30:24 +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 A6B718FC16 for ; Wed, 22 Apr 2009 21:30:24 +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 n3MLUOw2006709 for ; Wed, 22 Apr 2009 21:30:24 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3MLUOwl006707 for perforce@freebsd.org; Wed, 22 Apr 2009 21:30:24 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Apr 2009 21:30:24 GMT Message-Id: <200904222130.n3MLUOwl006707@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 160957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Apr 2009 21:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=160957 Change 160957 by rene@rene_self on 2009/04/22 21:30:06 MFen the freebsd-gecko mailing list Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#20 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#20 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.197 + %SRCID% 1.198 --> @@ -348,6 +348,13 @@ + &a.gecko.name; + + Discussies over de Gecko Rendering + Engine + + + &a.geom.name; GEOM-specifieke discussies en implementaties @@ -1381,6 +1388,21 @@     + &a.gecko.name; + + + Gecko Rendering Engine + + Dit is een forum over Gecko + applicaties die &os; gebruiken. + + De discussie concentreert zich op toepassingen van + Gecko Ports, hun installatie, hun ontwikkeling en hun + ondersteuning binnen &os;. + + + + &a.geom.name; ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#14 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.67 + %SRCID% 1.68 --> @@ -184,6 +184,10 @@ FreeBSD bestandssysteem project mailinglijst"> freebsd-fs"> + +FreeBSD gecko mailinglijst"> +freebsd-gecko"> + FreeBSD GEOM mailinglijst"> freebsd-geom"> From owner-p4-projects@FreeBSD.ORG Thu Apr 23 22:18:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 879BD1065677; Thu, 23 Apr 2009 22:18: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 47C3B1065670 for ; Thu, 23 Apr 2009 22:18:15 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B8608FC12 for ; Thu, 23 Apr 2009 22:18:15 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NMIFo5017728 for ; Thu, 23 Apr 2009 22:18:15 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3NMIEj0017726 for perforce@freebsd.org; Thu, 23 Apr 2009 22:18:14 GMT (envelope-from zec@fer.hr) Date: Thu, 23 Apr 2009 22:18:14 GMT Message-Id: <200904232218.n3NMIEj0017726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Apr 2009 22:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=161004 Change 161004 by zec@zec_amdx2 on 2009/04/23 22:17:51 Merge vnet module deregistration handlers, intended to be used on kldunloading a particular networking subsystem, so that the vnet framework can clean up all active instances of that particular subsystem. Obtained from: vimage Affected files ... .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#6 edit .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#13 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#6 (text+ko) ==== @@ -47,6 +47,7 @@ static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +static int vnet_mod_destructor(struct vnet_modlink *); void vnet_mod_register(const struct vnet_modinfo *vmi) @@ -144,6 +145,36 @@ } while (vml_iter != NULL); } +void +vnet_mod_deregister(const struct vnet_modinfo *vmi) +{ + vnet_mod_deregister_multi(vmi, NULL, NULL); +} + +void +vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) +{ + VNET_ITERATOR_DECL(vnet_iter); + struct vnet_modlink *vml; + + TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) + if (vml->vml_modinfo == vmi && vml->vml_iarg == iarg) + break; + if (vml == NULL) + panic("cannot deregister unregistered vnet module %s", + vmi->vmi_name); + + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); + vnet_mod_destructor(vml); + CURVNET_RESTORE(); + } + + TAILQ_REMOVE(&vnet_modlink_head, vml, vml_mod_le); + free(vml, M_VIMAGE); +} + static int vnet_mod_constructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; @@ -176,6 +207,39 @@ return (0); } + +static int +vnet_mod_destructor(struct vnet_modlink *vml) +{ + const struct vnet_modinfo *vmi = vml->vml_modinfo; + +#ifdef DEBUG_ORDERING + printf("destroying vnet_%s", vmi->vmi_name); + if (vml->vml_iarg) + printf("/%s", vml->vml_iname); + printf(": "); + if (vmi->vmi_idetach != NULL) + printf("idetach(); "); + if (vmi->vmi_size) + printf("free()"); + printf("\n"); +#endif + + if (vmi->vmi_idetach) + vmi->vmi_idetach(vml->vml_iarg); + +#ifdef VIMAGE + if (vmi->vmi_size) { + if (curvnet->mod_data[vmi->vmi_id] == NULL) + panic("vi_destroy: %s\n", vmi->vmi_name); + free(curvnet->mod_data[vmi->vmi_id], M_VNET); + curvnet->mod_data[vmi->vmi_id] = NULL; + } +#endif + + return (0); +} + /* * vi_symlookup() attempts to resolve name to address queries for * variables which have been moved from global namespace to virtualization ==== //depot/projects/vimage-commit/src/sys/sys/vimage.h#13 (text+ko) ==== @@ -121,6 +121,8 @@ int vi_symlookup(struct kld_sym_lookup *, char *); void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); +void vnet_mod_deregister(const struct vnet_modinfo *); +void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); #endif /* !VIMAGE_GLOBALS */ From owner-p4-projects@FreeBSD.ORG Thu Apr 23 22:20:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5AB81065675; Thu, 23 Apr 2009 22:20:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CF87106566C for ; Thu, 23 Apr 2009 22:20:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B1798FC1A for ; Thu, 23 Apr 2009 22:20:17 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NMKHpr019799 for ; Thu, 23 Apr 2009 22:20:17 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3NMKHbm019797 for perforce@freebsd.org; Thu, 23 Apr 2009 22:20:17 GMT (envelope-from zec@fer.hr) Date: Thu, 23 Apr 2009 22:20:17 GMT Message-Id: <200904232220.n3NMKHbm019797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Apr 2009 22:20:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=161005 Change 161005 by zec@zec_amdx2 on 2009/04/23 22:20:13 Convert ng_base and several ng modules to use the vnet registration / deregistration framework, so that kldloading and unloading of such modules will be possible with multiple active vnets. Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#8 edit .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#12 edit .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#11 edit .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#10 edit .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#11 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/netgraph.h#8 (text+ko) ==== @@ -1123,6 +1123,7 @@ struct ng_type *ng_findtype(const char *type); int ng_make_node_common(struct ng_type *typep, node_p *nodep); int ng_name_node(node_p node, const char *name); +node_p ng_name2noderef(node_p node, const char *name); int ng_newtype(struct ng_type *tp); ng_ID_t ng_node2ID(node_p node); item_p ng_package_data(struct mbuf *m, int flags); ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#12 (text+ko) ==== @@ -84,6 +84,8 @@ /* Mutex to protect topology events. */ static struct mtx ng_topo_mtx; +static vnet_attach_fn vnet_netgraph_iattach; + #ifdef NETGRAPH_DEBUG static struct mtx ng_nodelist_mtx; /* protects global node/hook lists */ static struct mtx ngq_mtx; /* protects the queue item list */ @@ -227,7 +229,6 @@ /* Imported, these used to be externally visible, some may go back. */ void ng_destroy_hook(hook_p hook); -node_p ng_name2noderef(node_p node, const char *name); int ng_path2noderef(node_p here, const char *path, node_p *dest, hook_p *lasthook); int ng_make_node(const char *type, node_p *nodepp); @@ -3068,6 +3069,26 @@ return (error); } +#ifndef VIMAGE_GLOBALS +static const vnet_modinfo_t vnet_netgraph_modinfo = { + .vmi_id = VNET_MOD_NETGRAPH, + .vmi_name = "netgraph", +#ifdef VIMAGE + .vmi_size = sizeof(struct vnet_netgraph), +#endif + .vmi_iattach = vnet_netgraph_iattach +}; +#endif + +static int +vnet_netgraph_iattach(const void *arg __unused) +{ + + V_nextID = 1; + + return (0); +} + /* * Handle loading and unloading for this code. * The only thing we need to link into is the NETISR strucure. @@ -3082,7 +3103,11 @@ switch (event) { case MOD_LOAD: /* Initialize everything. */ - V_nextID = 1; +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_netgraph_modinfo); +#else + vnet_netgraph_iattach(NULL); +#endif NG_WORKLIST_LOCK_INIT(); mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, MTX_DEF); @@ -3133,6 +3158,7 @@ ngb_mod_event, (NULL) }; + DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE); SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family"); SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,""); ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#11 (text+ko) ==== @@ -113,10 +113,23 @@ }; NETGRAPH_INIT(eiface, &typestruct); +static vnet_attach_fn ng_eiface_iattach; +static vnet_detach_fn ng_eiface_idetach; + #ifdef VIMAGE_GLOBALS static struct unrhdr *ng_eiface_unit; #endif +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_eiface_modinfo = { + .vmi_id = VNET_MOD_NG_EIFACE, + .vmi_name = "ng_eiface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_eiface_iattach, + .vmi_idetach = ng_eiface_idetach +}; +#endif + /************************************************************************ INTERFACE STUFF ************************************************************************/ @@ -588,8 +601,18 @@ switch (event) { case MOD_LOAD: V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_eiface_modinfo); +#else + ng_eiface_iattach(NULL); +#endif break; case MOD_UNLOAD: +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_eiface_modinfo); +#else + ng_eiface_idetach(NULL); +#endif delete_unrhdr(V_ng_eiface_unit); break; default: @@ -598,3 +621,21 @@ } return (error); } + +static int ng_eiface_iattach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); + + return (0); +} + +static int ng_eiface_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + delete_unrhdr(V_ng_eiface_unit); + + return (0); +} ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#10 (text+ko) ==== @@ -75,6 +75,17 @@ #define IFP2NG(ifp) (IFP2AC((ifp))->ac_netgraph) +static vnet_attach_fn ng_ether_iattach; + +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_ether_modinfo = { + .vmi_id = VNET_MOD_NG_ETHER, + .vmi_name = "ng_ether", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_ether_iattach, +}; +#endif + /* Per-node private data */ struct private { struct ifnet *ifp; /* associated interface */ @@ -287,6 +298,17 @@ priv_p priv; node_p node; + /* + * Do not create / attach an ether node to this ifnet if + * a netgraph node with the same name already exists. + * This should prevent ether nodes to become attached to + * eiface nodes, which is pointless. + */ + if ((node = ng_name2noderef(NULL, ifp->if_xname)) != NULL) { + NG_NODE_UNREF(node); + return; + } + /* Create node */ KASSERT(!IFP2NG(ifp), ("%s: node already exists?", __func__)); if (ng_make_node_common(&ng_ether_typestruct, &node) != 0) { @@ -741,7 +763,6 @@ static int ng_ether_mod_event(module_t mod, int event, void *data) { - struct ifnet *ifp; int error = 0; int s; @@ -761,14 +782,11 @@ ng_ether_input_orphan_p = ng_ether_input_orphan; ng_ether_link_state_p = ng_ether_link_state; - /* Create nodes for any already-existing Ethernet interfaces */ - IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_ETHER - || ifp->if_type == IFT_L2VLAN) - ng_ether_attach(ifp); - } - IFNET_RUNLOCK(); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_ether_modinfo); +#else + error = ng_ether_iattach(NULL); +#endif break; case MOD_UNLOAD: @@ -781,6 +799,10 @@ * is MOD_UNLOAD, so there's no need to detach any nodes. */ +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_ether_modinfo); +#endif + /* Unregister function hooks */ ng_ether_attach_p = NULL; ng_ether_detach_p = NULL; @@ -798,3 +820,19 @@ return (error); } +static int ng_ether_iattach(const void *unused) +{ + INIT_VNET_NET(curvnet); + struct ifnet *ifp; + + /* Create nodes for any already-existing Ethernet interfaces */ + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type == IFT_ETHER + || ifp->if_type == IFT_L2VLAN) + ng_ether_attach(ifp); + } + IFNET_RUNLOCK(); + + return (0); +} ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#11 (text+ko) ==== @@ -209,10 +209,23 @@ }; NETGRAPH_INIT(iface, &typestruct); +static vnet_attach_fn ng_iface_iattach; +static vnet_detach_fn ng_iface_idetach; + #ifdef VIMAGE_GLOBALS static struct unrhdr *ng_iface_unit; #endif +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_iface_modinfo = { + .vmi_id = VNET_MOD_NG_IFACE, + .vmi_name = "ng_iface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_iface_iattach, + .vmi_idetach = ng_iface_idetach +}; +#endif + /************************************************************************ HELPER STUFF ************************************************************************/ @@ -834,10 +847,18 @@ switch (event) { case MOD_LOAD: - V_ng_iface_unit = new_unrhdr(0, 0xffff, NULL); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_iface_modinfo); +#else + ng_iface_iattach(NULL); +#endif break; case MOD_UNLOAD: - delete_unrhdr(V_ng_iface_unit); +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_iface_modinfo); +#else + ng_iface_idetach(NULL); +#endif break; default: error = EOPNOTSUPP; @@ -845,3 +866,21 @@ } return (error); } + +static int ng_iface_iattach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_ng_iface_unit = new_unrhdr(0, 0xffff, NULL); + + return (0); +} + +static int ng_iface_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + delete_unrhdr(V_ng_iface_unit); + + return (0); +} From owner-p4-projects@FreeBSD.ORG Thu Apr 23 22:28:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B086E1065672; Thu, 23 Apr 2009 22:28:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55D86106566C for ; Thu, 23 Apr 2009 22:28:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 42A2F8FC1A for ; Thu, 23 Apr 2009 22:28:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NMSQSX033355 for ; Thu, 23 Apr 2009 22:28:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3NMSPOe033353 for perforce@freebsd.org; Thu, 23 Apr 2009 22:28:25 GMT (envelope-from zec@fer.hr) Date: Thu, 23 Apr 2009 22:28:25 GMT Message-Id: <200904232228.n3NMSPOe033353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Apr 2009 22:28:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=161007 Change 161007 by zec@zec_amdx2 on 2009/04/23 22:27:47 IFC @ 161003 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/param.h#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA.hints#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT.hints#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/param.h#3 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#6 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#15 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#21 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#13 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds133x.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds1672.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mly/mly.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mse/mse.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/vimage-commit/src/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_rename.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/param.h#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/vimage-commit/src/sys/mips/include/param.h#4 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#16 integrate .. //depot/projects/vimage-commit/src/sys/net/flowtable.c#1 branch .. //depot/projects/vimage-commit/src/sys/net/flowtable.h#1 branch .. //depot/projects/vimage-commit/src/sys/net/if.c#20 integrate .. //depot/projects/vimage-commit/src/sys/net/if.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if_dead.c#1 branch .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_mib.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_stf.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tun.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#12 integrate .. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#11 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/swtch.S#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/param.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/trap_aim.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_fcntl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/acl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/malloc.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#18 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#5 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $"); #include #include @@ -95,7 +95,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -978,7 +977,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -994,8 +992,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1042,9 +1039,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1069,7 +1063,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.303 2009/04/22 21:40:37 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -354,8 +354,6 @@ } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); - cpu_apic_ids[0] = boot_cpu_id; - apic_cpuids[boot_cpu_id] = 0; /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; @@ -418,28 +416,30 @@ void cpu_mp_announce(void) { - int i, x; const char *hyperthread; + int i; - /* List CPUs */ + /* List active CPUs first. */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { - if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + for (i = 1; i < mp_ncpus; i++) { + if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread) + hyperthread = "/HT"; + else + hyperthread = ""; + printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread, + cpu_apic_ids[i]); + } + + /* List disabled CPUs last. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled) continue; - if (cpu_info[x].cpu_hyperthread) { + if (cpu_info[i].cpu_hyperthread) hyperthread = "/HT"; - } else { + else hyperthread = ""; - } - if (cpu_info[x].cpu_disabled) - printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", - hyperthread, x); - else { - KASSERT(i < mp_ncpus, - ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, - hyperthread, x); - } + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread, + i); } } @@ -693,11 +693,19 @@ /* * Assign CPU IDs to local APIC IDs and disable any CPUs - * beyond MAXCPU. CPU 0 has already been assigned to the BSP, - * so we only have to assign IDs for APs. + * beyond MAXCPU. CPU 0 is always assigned to the BSP. + * + * To minimize confusion for userland, we attempt to number + * CPUs such that all threads and cores in a package are + * grouped together. For now we assume that the BSP is always + * the first thread in a package and just start adding APs + * starting with the BSP's APIC ID. */ mp_ncpus = 1; - for (i = 0; i <= MAX_APIC_ID; i++) { + cpu_apic_ids[0] = boot_cpu_id; + apic_cpuids[boot_cpu_id] = 0; + for (i = boot_cpu_id + 1; i != boot_cpu_id; + i == MAX_APIC_ID ? i = 0 : i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || cpu_info[i].cpu_disabled) continue; ==== //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ machine amd64 @@ -20,3 +20,5 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR + +options FLOWTABLE ==== //depot/projects/vimage-commit/src/sys/amd64/include/param.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.27 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -89,6 +89,12 @@ #define ALIGN(p) _ALIGN(p) #define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ #define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) ==== //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.47 2009/04/23 20:24:19 jhb Exp $"); /* * ARM bus dma support routines @@ -114,7 +114,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -689,10 +688,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - if (pmap != NULL) + if (__predict_true(pmap == pmap_kernel())) + paddr = pmap_kextract(vaddr); + else paddr = pmap_extract(pmap, vaddr); - else - paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -1267,7 +1266,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -1283,8 +1281,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1331,9 +1328,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1358,7 +1352,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#6 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.23 2009/04/22 23:54:41 stas Exp $"); #include #include @@ -418,6 +418,11 @@ AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP }, + { + "at91_cfata", 0, + AT91RM92_CF_BASE, AT91RM92_CF_SIZE, + -1 + }, { 0, 0, 0, 0, 0 } }; @@ -507,6 +512,9 @@ if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) panic("at91_attach: failed to set up ohci memory"); + if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE, + AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0) + panic("at91_attach: failed to set up CompactFlash ATA memory"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_machdep.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.4 2009/04/22 23:54:41 stas Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -179,6 +179,14 @@ PTE_NOCACHE, }, { + /* CompactFlash controller. */ + AT91RM92_CF_BASE, + AT91RM92_CF_PA_BASE, + AT91RM92_CF_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91rm92reg.h#4 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.7 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.8 2009/04/22 23:54:41 stas Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -341,6 +341,10 @@ #define AT91RM92_OHCI_PA_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 +#define AT91RM92_CF_BASE 0xdfd00000 +#define AT91RM92_CF_PA_BASE 0x51400000 +#define AT91RM92_CF_SIZE 0x00100000 + #ifndef AT91C_MASTER_CLOCK #define AT91C_MASTER_CLOCK 60000000 #endif ==== //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#6 (text) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.12 2009/04/22 23:54:41 stas Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard arm/at91/at91.c standard +arm/at91/at91_cfata.c optional at91_cfata arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard ==== //depot/projects/vimage-commit/src/sys/arm/conf/AVILA.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.5 2009/02/03 19:16:04 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.7 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -44,5 +44,5 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 ==== //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#5 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ ident BWCT @@ -51,7 +51,7 @@ #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT -options BOOTP +options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface @@ -101,7 +101,7 @@ #device smb # SPI bus device spibus -#device at45d # at45db642 and maybe others +#device at45d # at45db642 and maybe others device bpf # Berkeley packet filter @@ -109,5 +109,3 @@ #device ohci #device usb #device umass # Disks/Mass storage - Requires scbus and da - -#device at91_qdmmc ==== //depot/projects/vimage-commit/src/sys/arm/conf/BWCT.hints#3 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.1 2007/01/05 02:08:35 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.3 2009/04/21 22:48:12 stas Exp $ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus hint.lm75.0.at="iicbus0" ==== //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.4 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -46,8 +46,8 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # USB is part of the chip hint.ehci.0.at="ixp0" ==== //depot/projects/vimage-commit/src/sys/arm/include/param.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.12 2008/03/27 05:03:25 jb Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.15 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -81,6 +81,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) + #define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) /* Page size */ #define PAGE_MASK (PAGE_SIZE - 1) ==== //depot/projects/vimage-commit/src/sys/bsm/audit.h#5 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +26,15 @@ * (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.h#5 - * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 + * $FreeBSD: src/sys/bsm/audit.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $ */ -#ifndef _BSM_AUDIT_H +#ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H -#ifdef __APPLE__ -/* Temporary until rdar://problem/6133383 is resolved. */ +#include #include -#include -#include -#include -#include -#endif /* __APPLE__ */ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 @@ -101,20 +95,20 @@ /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 +#define A_OLDGETPOLICY 2 +#define A_OLDSETPOLICY 3 #define A_GETKMASK 4 #define A_SETKMASK 5 -#define A_GETQCTRL 6 -#define A_SETQCTRL 7 +#define A_OLDGETQCTRL 6 +#define A_OLDSETQCTRL 7 #define A_GETCWD 8 #define A_GETCAR 9 #define A_GETSTAT 12 #define A_SETSTAT 13 #define A_SETUMASK 14 #define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 +#define A_OLDGETCOND 20 +#define A_OLDSETCOND 21 #define A_GETCLASS 22 #define A_SETCLASS 23 #define A_GETPINFO 24 @@ -126,6 +120,12 @@ #define A_SETKAUDIT 30 #define A_SENDTRIGGER 31 #define A_GETSINFO_ADDR 32 +#define A_GETPOLICY 33 +#define A_SETPOLICY 34 +#define A_GETQCTRL 35 +#define A_SETQCTRL 36 +#define A_GETCOND 37 +#define A_SETCOND 38 /* * Audit policy controls. @@ -216,7 +216,6 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ - u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo auditpinfo_t; @@ -226,15 +225,12 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_addr_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ + u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo_addr auditpinfo_addr_t; struct au_session { auditinfo_addr_t *as_aia_p; /* Ptr to full audit info. */ -#define as_asid as_aia_p->ai_asid -#define as_auid as_aia_p->ai_auid -#define as_termid as_aia_p->ai_termid - au_mask_t as_mask; /* Process Audit Masks. */ }; typedef struct au_session au_session_t; @@ -245,13 +241,22 @@ typedef struct au_token token_t; /* - * Kernel audit queue control parameters. + * Kernel audit queue control parameters: + * Default: Maximum: + * aq_hiwater: AQ_HIWATER (100) AQ_MAXHIGH (10000) + * aq_lowater: AQ_LOWATER (10) +mach_port_name_t audit_session_self(void); +au_asid_t audit_session_join(mach_port_name_t port); +#endif /* __APPLE_API_PRIVATE */ + #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS ==== //depot/projects/vimage-commit/src/sys/bsm/audit_domain.h#2 (text) ==== @@ -26,8 +26,8 @@ * 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_domain.h#1 - * $FreeBSD: src/sys/bsm/audit_domain.h,v 1.1 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_domain.h#2 + * $FreeBSD: src/sys/bsm/audit_domain.h,v 1.2 2009/04/19 16:17:13 rwatson Exp $ */ #ifndef _BSM_AUDIT_DOMAIN_H_ @@ -88,7 +88,7 @@ #define BSM_PF_SCLUSTER 514 /* FreeBSD-specific. */ #define BSM_PF_ARP 515 /* FreeBSD-specific. */ #define BSM_PF_BLUETOOTH 516 /* FreeBSD-specific. */ -#define BSM_PF_IEEE80211 517 /* FreeBSD-specific. */ + /* 517: unallocated. */ #define BSM_PF_AX25 518 /* Linux-specific. */ #define BSM_PF_ROSE 519 /* Linux-specific. */ #define BSM_PF_NETBEUI 520 /* Linux-specific. */ ==== //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#6 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,14 +26,20 @@ * (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_kevents.h#5 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.20 2009/04/19 14:53:17 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* + * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + */ +#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ + ((e) > 43000 && (e) < 45000)) + +/* * Values marked as AUE_NULL are not required to be audited as per CAPP. * * Some conflicts exist in the assignment of name to event number mappings @@ -589,6 +595,8 @@ #define AUE_FSGETPATH 43191 /* Darwin. */ #define AUE_PREAD 43192 /* Darwin/FreeBSD. */ #define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ +#define AUE_FSCTL 43194 /* Darwin. */ +#define AUE_FFSCTL 43195 /* Darwin. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -674,12 +682,10 @@ #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL #define AUE_FDATASYNC AUE_NULL -#define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL #define AUE_FGETXATTR AUE_NULL #define AUE_FLISTXATTR AUE_NULL #define AUE_FREMOVEXATTR AUE_NULL -#define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL #define AUE_FSTATFS64 AUE_NULL ==== //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#6 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005-2008 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,8 +26,8 @@ * (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#9 - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.15 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -286,10 +286,12 @@ */ int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_fcntl_cmd(u_short bsm_fcntl_cmd, int *local_fcntl_cmdp); int au_bsm_to_socket_type(u_short bsm_socket_type, int *local_socket_typep); u_short au_domain_to_bsm(int local_domain); u_char au_errno_to_bsm(int local_errno); +u_short au_fcntl_cmd_to_bsm(int local_fcntl_command); u_short au_socket_type_to_bsm(int local_socket_type); __END_DECLS ==== //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.115 2009/01/10 17:22:49 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.116 2009/04/20 10:40:42 ed Exp $"); #include #include @@ -173,13 +173,9 @@ SA_QUIRK_NO_CPAGE = 0x80 /* Don't use DEVICE COMPRESSION page */ } sa_quirks; -/* units are bits 4-7, 16-21 (1024 units) */ -#define SAUNIT(DEV) \ - (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) - -#define SAMODE(z) ((dev2unit(z) & 0x3)) -#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) +#define SAMODE(z) (dev2unit(z) & 0x3) +#define SADENSITY(z) ((dev2unit(z) >> 2) & 0x3) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 4)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 @@ -188,9 +184,8 @@ #define SA_ATYPE_NR 1 #define SA_ATYPE_ER 2 -#define SAMINOR(ctl, unit, mode, access) \ - ((ctl << 29) | ((unit & 0x3f0) << 16) | ((unit & 0xf) << 4) | \ - (mode << 0x2) | (access & 0x3)) +#define SAMINOR(ctl, mode, access) \ + ((ctl << 4) | (mode << 2) | (access & 0x3)) #define SA_NUM_MODES 4 struct sa_devs { @@ -445,11 +440,8 @@ { struct cam_periph *periph; struct sa_softc *softc; - int unit; int error; - unit = SAUNIT(dev); - periph = (struct cam_periph *)dev->si_drv1; if (cam_periph_acquire(periph) != CAM_REQ_CMP) { return (ENXIO); @@ -460,7 +452,7 @@ softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, - ("saopen(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); + ("saopen(%s): softc=0x%x\n", devtoname(dev), softc->flags)); if (SA_IS_CTRL(dev)) { softc->ctrl_mode = 1; @@ -521,10 +513,9 @@ { struct cam_periph *periph; struct sa_softc *softc; - int unit, mode, error, writing, tmp; + int mode, error, writing, tmp; int closedbits = SA_FLAG_OPEN; - unit = SAUNIT(dev); mode = SAMODE(dev); periph = (struct cam_periph *)dev->si_drv1; if (periph == NULL) @@ -535,7 +526,7 @@ softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, - ("saclose(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); + ("saclose(%s): softc=0x%x\n", devtoname(dev), softc->flags)); softc->open_rdonly = 0; @@ -1496,26 +1487,26 @@ DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_TAPE); softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV, - periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR, + 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR, 0660, "%s%d.ctl", periph->periph_name, periph->unit_number); softc->devs.ctl_dev->si_drv1 = periph; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 23 22:33:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5CC106567B; Thu, 23 Apr 2009 22:33:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B4571065670 for ; Thu, 23 Apr 2009 22:33:32 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC8668FC19 for ; Thu, 23 Apr 2009 22:33:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NMXVAo040184 for ; Thu, 23 Apr 2009 22:33:31 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3NMXVNS040182 for perforce@freebsd.org; Thu, 23 Apr 2009 22:33:31 GMT (envelope-from zec@fer.hr) Date: Thu, 23 Apr 2009 22:33:31 GMT Message-Id: <200904232233.n3NMXVNS040182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Apr 2009 22:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=161008 Change 161008 by zec@zec_amdx2 on 2009/04/23 22:32:54 IFC @ 161003 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_record.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#21 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#30 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#24 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds133x.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds1672.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mlx/mlx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_acl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/mips/include/param.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#20 integrate .. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#1 branch .. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#1 branch .. //depot/projects/vimage-commit2/src/sys/net/if.c#47 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_dead.c#1 branch .. //depot/projects/vimage-commit2/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/at_control.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/swtch.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/param.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_fcntl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_token.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/acl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/malloc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#34 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#6 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $"); #include #include @@ -95,7 +95,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -978,7 +977,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -994,8 +992,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1042,9 +1039,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1069,7 +1063,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.303 2009/04/22 21:40:37 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -354,8 +354,6 @@ } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); - cpu_apic_ids[0] = boot_cpu_id; - apic_cpuids[boot_cpu_id] = 0; /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; @@ -418,28 +416,30 @@ void cpu_mp_announce(void) { - int i, x; const char *hyperthread; + int i; - /* List CPUs */ + /* List active CPUs first. */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { - if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + for (i = 1; i < mp_ncpus; i++) { + if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread) + hyperthread = "/HT"; + else + hyperthread = ""; + printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread, + cpu_apic_ids[i]); + } + + /* List disabled CPUs last. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled) continue; - if (cpu_info[x].cpu_hyperthread) { + if (cpu_info[i].cpu_hyperthread) hyperthread = "/HT"; - } else { + else hyperthread = ""; - } - if (cpu_info[x].cpu_disabled) - printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", - hyperthread, x); - else { - KASSERT(i < mp_ncpus, - ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, - hyperthread, x); - } + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread, + i); } } @@ -693,11 +693,19 @@ /* * Assign CPU IDs to local APIC IDs and disable any CPUs - * beyond MAXCPU. CPU 0 has already been assigned to the BSP, - * so we only have to assign IDs for APs. + * beyond MAXCPU. CPU 0 is always assigned to the BSP. + * + * To minimize confusion for userland, we attempt to number + * CPUs such that all threads and cores in a package are + * grouped together. For now we assume that the BSP is always + * the first thread in a package and just start adding APs + * starting with the BSP's APIC ID. */ mp_ncpus = 1; - for (i = 0; i <= MAX_APIC_ID; i++) { + cpu_apic_ids[0] = boot_cpu_id; + apic_cpuids[boot_cpu_id] = 0; + for (i = boot_cpu_id + 1; i != boot_cpu_id; + i == MAX_APIC_ID ? i = 0 : i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || cpu_info[i].cpu_disabled) continue; ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ machine amd64 @@ -20,3 +20,5 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR + +options FLOWTABLE ==== //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.27 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -89,6 +89,12 @@ #define ALIGN(p) _ALIGN(p) #define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ #define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) ==== //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.47 2009/04/23 20:24:19 jhb Exp $"); /* * ARM bus dma support routines @@ -114,7 +114,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -689,10 +688,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - if (pmap != NULL) + if (__predict_true(pmap == pmap_kernel())) + paddr = pmap_kextract(vaddr); + else paddr = pmap_extract(pmap, vaddr); - else - paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -1267,7 +1266,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -1283,8 +1281,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1331,9 +1328,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1358,7 +1352,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#7 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.23 2009/04/22 23:54:41 stas Exp $"); #include #include @@ -418,6 +418,11 @@ AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP }, + { + "at91_cfata", 0, + AT91RM92_CF_BASE, AT91RM92_CF_SIZE, + -1 + }, { 0, 0, 0, 0, 0 } }; @@ -507,6 +512,9 @@ if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) panic("at91_attach: failed to set up ohci memory"); + if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE, + AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0) + panic("at91_attach: failed to set up CompactFlash ATA memory"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_machdep.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.4 2009/04/22 23:54:41 stas Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -179,6 +179,14 @@ PTE_NOCACHE, }, { + /* CompactFlash controller. */ + AT91RM92_CF_BASE, + AT91RM92_CF_PA_BASE, + AT91RM92_CF_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91rm92reg.h#3 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.7 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.8 2009/04/22 23:54:41 stas Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -341,6 +341,10 @@ #define AT91RM92_OHCI_PA_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 +#define AT91RM92_CF_BASE 0xdfd00000 +#define AT91RM92_CF_PA_BASE 0x51400000 +#define AT91RM92_CF_SIZE 0x00100000 + #ifndef AT91C_MASTER_CLOCK #define AT91C_MASTER_CLOCK 60000000 #endif ==== //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#5 (text) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.12 2009/04/22 23:54:41 stas Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard arm/at91/at91.c standard +arm/at91/at91_cfata.c optional at91_cfata arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard ==== //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA.hints#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.5 2009/02/03 19:16:04 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.7 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -44,5 +44,5 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 ==== //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ ident BWCT @@ -51,7 +51,7 @@ #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT -options BOOTP +options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface @@ -101,7 +101,7 @@ #device smb # SPI bus device spibus -#device at45d # at45db642 and maybe others +#device at45d # at45db642 and maybe others device bpf # Berkeley packet filter @@ -109,5 +109,3 @@ #device ohci #device usb #device umass # Disks/Mass storage - Requires scbus and da - -#device at91_qdmmc ==== //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT.hints#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.1 2007/01/05 02:08:35 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.3 2009/04/21 22:48:12 stas Exp $ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus hint.lm75.0.at="iicbus0" ==== //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.4 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -46,8 +46,8 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # USB is part of the chip hint.ehci.0.at="ixp0" ==== //depot/projects/vimage-commit2/src/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.12 2008/03/27 05:03:25 jb Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.15 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -81,6 +81,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) + #define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) /* Page size */ #define PAGE_MASK (PAGE_SIZE - 1) ==== //depot/projects/vimage-commit2/src/sys/bsm/audit.h#6 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +26,15 @@ * (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.h#5 - * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 + * $FreeBSD: src/sys/bsm/audit.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $ */ -#ifndef _BSM_AUDIT_H +#ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H -#ifdef __APPLE__ -/* Temporary until rdar://problem/6133383 is resolved. */ +#include #include -#include -#include -#include -#include -#endif /* __APPLE__ */ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 @@ -101,20 +95,20 @@ /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 +#define A_OLDGETPOLICY 2 +#define A_OLDSETPOLICY 3 #define A_GETKMASK 4 #define A_SETKMASK 5 -#define A_GETQCTRL 6 -#define A_SETQCTRL 7 +#define A_OLDGETQCTRL 6 +#define A_OLDSETQCTRL 7 #define A_GETCWD 8 #define A_GETCAR 9 #define A_GETSTAT 12 #define A_SETSTAT 13 #define A_SETUMASK 14 #define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 +#define A_OLDGETCOND 20 +#define A_OLDSETCOND 21 #define A_GETCLASS 22 #define A_SETCLASS 23 #define A_GETPINFO 24 @@ -126,6 +120,12 @@ #define A_SETKAUDIT 30 #define A_SENDTRIGGER 31 #define A_GETSINFO_ADDR 32 +#define A_GETPOLICY 33 +#define A_SETPOLICY 34 +#define A_GETQCTRL 35 +#define A_SETQCTRL 36 +#define A_GETCOND 37 +#define A_SETCOND 38 /* * Audit policy controls. @@ -216,7 +216,6 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ - u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo auditpinfo_t; @@ -226,15 +225,12 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_addr_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ + u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo_addr auditpinfo_addr_t; struct au_session { auditinfo_addr_t *as_aia_p; /* Ptr to full audit info. */ -#define as_asid as_aia_p->ai_asid -#define as_auid as_aia_p->ai_auid -#define as_termid as_aia_p->ai_termid - au_mask_t as_mask; /* Process Audit Masks. */ }; typedef struct au_session au_session_t; @@ -245,13 +241,22 @@ typedef struct au_token token_t; /* - * Kernel audit queue control parameters. + * Kernel audit queue control parameters: + * Default: Maximum: + * aq_hiwater: AQ_HIWATER (100) AQ_MAXHIGH (10000) + * aq_lowater: AQ_LOWATER (10) +mach_port_name_t audit_session_self(void); +au_asid_t audit_session_join(mach_port_name_t port); +#endif /* __APPLE_API_PRIVATE */ + #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_domain.h#2 (text) ==== @@ -26,8 +26,8 @@ * 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_domain.h#1 - * $FreeBSD: src/sys/bsm/audit_domain.h,v 1.1 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_domain.h#2 + * $FreeBSD: src/sys/bsm/audit_domain.h,v 1.2 2009/04/19 16:17:13 rwatson Exp $ */ #ifndef _BSM_AUDIT_DOMAIN_H_ @@ -88,7 +88,7 @@ #define BSM_PF_SCLUSTER 514 /* FreeBSD-specific. */ #define BSM_PF_ARP 515 /* FreeBSD-specific. */ #define BSM_PF_BLUETOOTH 516 /* FreeBSD-specific. */ -#define BSM_PF_IEEE80211 517 /* FreeBSD-specific. */ + /* 517: unallocated. */ #define BSM_PF_AX25 518 /* Linux-specific. */ #define BSM_PF_ROSE 519 /* Linux-specific. */ #define BSM_PF_NETBEUI 520 /* Linux-specific. */ ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#7 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,14 +26,20 @@ * (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_kevents.h#5 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.20 2009/04/19 14:53:17 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* + * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + */ +#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ + ((e) > 43000 && (e) < 45000)) + +/* * Values marked as AUE_NULL are not required to be audited as per CAPP. * * Some conflicts exist in the assignment of name to event number mappings @@ -589,6 +595,8 @@ #define AUE_FSGETPATH 43191 /* Darwin. */ #define AUE_PREAD 43192 /* Darwin/FreeBSD. */ #define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ +#define AUE_FSCTL 43194 /* Darwin. */ +#define AUE_FFSCTL 43195 /* Darwin. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -674,12 +682,10 @@ #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL #define AUE_FDATASYNC AUE_NULL -#define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL #define AUE_FGETXATTR AUE_NULL #define AUE_FLISTXATTR AUE_NULL #define AUE_FREMOVEXATTR AUE_NULL -#define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL #define AUE_FSTATFS64 AUE_NULL ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_record.h#6 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005-2008 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,8 +26,8 @@ * (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#9 - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.15 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -286,10 +286,12 @@ */ int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_fcntl_cmd(u_short bsm_fcntl_cmd, int *local_fcntl_cmdp); int au_bsm_to_socket_type(u_short bsm_socket_type, int *local_socket_typep); u_short au_domain_to_bsm(int local_domain); u_char au_errno_to_bsm(int local_errno); +u_short au_fcntl_cmd_to_bsm(int local_fcntl_command); u_short au_socket_type_to_bsm(int local_socket_type); __END_DECLS ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.115 2009/01/10 17:22:49 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.116 2009/04/20 10:40:42 ed Exp $"); #include #include @@ -173,13 +173,9 @@ SA_QUIRK_NO_CPAGE = 0x80 /* Don't use DEVICE COMPRESSION page */ } sa_quirks; -/* units are bits 4-7, 16-21 (1024 units) */ -#define SAUNIT(DEV) \ - (((dev2unit(DEV) & 0xF0) >> 4) | ((dev2unit(DEV) & 0x3f0000) >> 16)) - -#define SAMODE(z) ((dev2unit(z) & 0x3)) -#define SADENSITY(z) (((dev2unit(z) >> 2) & 0x3)) -#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 29)) +#define SAMODE(z) (dev2unit(z) & 0x3) +#define SADENSITY(z) ((dev2unit(z) >> 2) & 0x3) +#define SA_IS_CTRL(z) (dev2unit(z) & (1 << 4)) #define SA_NOT_CTLDEV 0 #define SA_CTLDEV 1 @@ -188,9 +184,8 @@ #define SA_ATYPE_NR 1 #define SA_ATYPE_ER 2 -#define SAMINOR(ctl, unit, mode, access) \ - ((ctl << 29) | ((unit & 0x3f0) << 16) | ((unit & 0xf) << 4) | \ - (mode << 0x2) | (access & 0x3)) +#define SAMINOR(ctl, mode, access) \ + ((ctl << 4) | (mode << 2) | (access & 0x3)) #define SA_NUM_MODES 4 struct sa_devs { @@ -445,11 +440,8 @@ { struct cam_periph *periph; struct sa_softc *softc; - int unit; int error; - unit = SAUNIT(dev); - periph = (struct cam_periph *)dev->si_drv1; if (cam_periph_acquire(periph) != CAM_REQ_CMP) { return (ENXIO); @@ -460,7 +452,7 @@ softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, - ("saopen(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); + ("saopen(%s): softc=0x%x\n", devtoname(dev), softc->flags)); if (SA_IS_CTRL(dev)) { softc->ctrl_mode = 1; @@ -521,10 +513,9 @@ { struct cam_periph *periph; struct sa_softc *softc; - int unit, mode, error, writing, tmp; + int mode, error, writing, tmp; int closedbits = SA_FLAG_OPEN; - unit = SAUNIT(dev); mode = SAMODE(dev); periph = (struct cam_periph *)dev->si_drv1; if (periph == NULL) @@ -535,7 +526,7 @@ softc = (struct sa_softc *)periph->softc; CAM_DEBUG(periph->path, CAM_DEBUG_TRACE|CAM_DEBUG_INFO, - ("saclose(%d): dev=0x%x softc=0x%x\n", unit, unit, softc->flags)); + ("saclose(%s): softc=0x%x\n", devtoname(dev), softc->flags)); softc->open_rdonly = 0; @@ -1496,26 +1487,26 @@ DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_TAPE); softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV, - periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR, + 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR, 0660, "%s%d.ctl", periph->periph_name, periph->unit_number); softc->devs.ctl_dev->si_drv1 = periph; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 23 22:41:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79C41106566C; Thu, 23 Apr 2009 22:41:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20F12106564A for ; Thu, 23 Apr 2009 22:41:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DB7A8FC14 for ; Thu, 23 Apr 2009 22:41:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NMfeQr048776 for ; Thu, 23 Apr 2009 22:41:40 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3NMfeMY048774 for perforce@freebsd.org; Thu, 23 Apr 2009 22:41:40 GMT (envelope-from zec@fer.hr) Date: Thu, 23 Apr 2009 22:41:40 GMT Message-Id: <200904232241.n3NMfeMY048774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161009 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Apr 2009 22:41:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=161009 Change 161009 by zec@zec_amdx2 on 2009/04/23 22:40:40 IFC @ 161003 Affected files ... .. //depot/projects/vimage/src/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/ed.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/man4.i386/glxsb.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/man4.powerpc/tsec.4#1 branch .. //depot/projects/vimage/src/share/man/man4/route.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/u3g.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/vlan.4#2 integrate .. //depot/projects/vimage/src/share/man/man9/altq.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/vimage/src/sys/amd64/include/param.h#6 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#10 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/files.at91#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT.hints#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#3 integrate .. //depot/projects/vimage/src/sys/arm/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#10 integrate .. //depot/projects/vimage/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/vimage/src/sys/bsm/audit_record.h#9 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#8 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#9 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.h#7 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#9 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#47 integrate .. //depot/projects/vimage/src/sys/conf/files#63 integrate .. //depot/projects/vimage/src/sys/conf/options#46 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#14 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/ds133x.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/ds1672.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mly/mly.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mse/mse.c#4 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#14 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#15 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#25 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#5 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rename.c#5 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/vimage/src/sys/i386/include/param.h#5 integrate .. //depot/projects/vimage/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#29 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_acl.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#25 integrate .. //depot/projects/vimage/src/sys/mips/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#10 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#45 integrate .. //depot/projects/vimage/src/sys/net/flowtable.c#1 branch .. //depot/projects/vimage/src/sys/net/flowtable.h#1 branch .. //depot/projects/vimage/src/sys/net/if.c#78 integrate .. //depot/projects/vimage/src/sys/net/if.h#11 integrate .. //depot/projects/vimage/src/sys/net/if_dead.c#1 branch .. //depot/projects/vimage/src/sys/net/if_llatbl.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_mib.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#17 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#16 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#33 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#18 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#31 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#8 integrate .. //depot/projects/vimage/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#25 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#54 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#73 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#54 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#55 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#42 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#32 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#10 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#54 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#48 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#33 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#20 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/locore.S#5 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/swtch.S#3 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/hid.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/include/param.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/trap_aim.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#17 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#14 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_fcntl.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#13 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_private.h#10 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#19 integrate .. //depot/projects/vimage/src/sys/sparc64/include/param.h#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/param.h#3 integrate .. //depot/projects/vimage/src/sys/sys/acl.h#3 integrate .. //depot/projects/vimage/src/sys/sys/malloc.h#6 integrate .. //depot/projects/vimage/src/sys/sys/param.h#49 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#13 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#14 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#21 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#14 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/cpuctl.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.5 2009/01/05 20:46:46 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.6 2009/04/23 08:37:56 brueffer Exp $ .\" .Dd May 31, 2008 .Dt CPUCTL 4 @@ -142,7 +142,7 @@ The .Nm driver first appeared in -.Fx 8.0 . +.Fx 7.2 . .Sh BUGS Yes, probably, report if any. .Sh AUTHORS ==== //depot/projects/vimage/src/share/man/man4/ed.4#4 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ed.4,v 1.60 2009/04/10 15:01:48 imp Exp $ +.\" $FreeBSD: src/share/man/man4/ed.4,v 1.61 2009/04/18 04:21:04 imp Exp $ .\" .Dd April 9, 2009 .Dt ED 4 @@ -311,8 +311,6 @@ .Bl -bullet -compact .It Mitsubishi LAN Adapter B8895 -.It -D-Link DE-650 .El .Sh DIAGNOSTICS .Bl -diag @@ -395,13 +393,6 @@ undocumented. Neither the NE2000 nor the WD83x0 drivers work with this card. .Pp -The D-LINK DE-650 has funky resources that differ from other cards and could -likely be made to work. -Its shared memory interface conflicts with other resources on many -laptops and cannot be moved. -The pccard(4) layer does not support activating a CFE that it fails to -allocate all the resources for. -.Pp .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ==== //depot/projects/vimage/src/share/man/man4/man4.i386/glxsb.4#2 (text+ko) ==== @@ -14,7 +14,7 @@ .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.3 2008/08/11 08:42:31 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/glxsb.4,v 1.4 2009/04/23 08:37:56 brueffer Exp $ .\" .Dd June 8, 2008 .Dt GLXSB 4 i386 @@ -82,7 +82,7 @@ The .Nm device driver was imported into -.Fx 8.0 . +.Fx 7.1 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#3 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.5 2009/01/26 01:08:24 nwhitehorn Exp $ +# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.6 2009/04/22 15:25:00 raj Exp $ MAN= bm.4 \ pmu.4 \ powermac_nvram.4 \ snd_ai2s.4 \ - snd_davbus.4 + snd_davbus.4 \ + tsec.4 MANSUBDIR=/powerpc ==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/bm.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.1 2008/07/04 14:51:42 nwhitehorn Exp $ +.\" $FreeBSD: src/share/man/man4/man4.powerpc/bm.4,v 1.2 2009/04/23 08:37:56 brueffer Exp $ .\" .Dd July 3, 2008 .Dt BM 4 @@ -76,7 +76,7 @@ The .Nm device driver appeared in -.Fx 8.0 . +.Fx 7.1 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/vimage/src/share/man/man4/route.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)route.4 8.6 (Berkeley) 4/19/94 -.\" $FreeBSD: src/share/man/man4/route.4,v 1.21 2008/12/15 06:10:57 qingli Exp $ +.\" $FreeBSD: src/share/man/man4/route.4,v 1.23 2009/04/22 12:52:12 trasz Exp $ .\" .Dd November 4, 2004 .Dt ROUTE 4 @@ -196,6 +196,8 @@ #define RTM_REDIRECT 0x6 /* Told to use different route */ #define RTM_MISS 0x7 /* Lookup failed on this address */ #define RTM_LOCK 0x8 /* fix specified metrics */ +#define RTM_OLDADD 0x9 /* caused by SIOCADDRT */ +#define RTM_OLDDEL 0xa /* caused by SIOCDELRT */ #define RTM_RESOLVE 0xb /* request to resolve dst to LL addr - unused */ #define RTM_NEWADDR 0xc /* address being added to iface */ #define RTM_DELADDR 0xd /* address being removed from iface */ @@ -203,6 +205,7 @@ #define RTM_NEWMADDR 0xf /* mcast group membership being added to if */ #define RTM_DELMADDR 0x10 /* mcast group membership being deleted */ #define RTM_IFANNOUNCE 0x11 /* iface arrival/departure */ +#define RTM_IEEE80211 0x12 /* IEEE80211 wireless event */ .Ed .Pp A message header consists of one of the following: @@ -217,7 +220,7 @@ pid_t rtm_pid; /* identify sender */ int rtm_seq; /* for sender to identify action */ int rtm_errno; /* why failed */ - int rtm_use; /* from rtentry */ + int rtm_fmask; /* bitmask used in RTM_CHANGE message */ u_long rtm_inits; /* which metrics we are initializing */ struct rt_metrics rtm_rmx; /* metrics themselves */ }; @@ -301,6 +304,7 @@ #define RTV_SSTHRESH 0x20 /* init or lock _ssthresh */ #define RTV_RTT 0x40 /* init or lock _rtt */ #define RTV_RTTVAR 0x80 /* init or lock _rttvar */ +#define RTV_WEIGHT 0x100 /* init or lock _weight */ .Ed .Pp Specifiers for which addresses are present in the messages are: ==== //depot/projects/vimage/src/share/man/man4/u3g.4#3 (text+ko) ==== @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.9 2009/02/13 20:09:11 n_hibma Exp $ +.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.10 2009/04/23 08:37:56 brueffer Exp $ .\" .Dd October 7, 2008 .Dt U3G 4 @@ -109,7 +109,7 @@ The .Nm driver appeared in -.Fx 8.0 , +.Fx 7.2 , is based on the .Xr uark 4 driver, and written by ==== //depot/projects/vimage/src/share/man/man4/vlan.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.50 2008/11/12 10:31:06 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.51 2009/04/20 15:01:45 antoine Exp $ .\" .Dd November 12, 2008 .Dt VLAN 4 @@ -36,7 +36,6 @@ place the following lines in your kernel configuration file: .Bd -ragged -offset indent -.Cd "device miibus" .Cd "device vlan" .Ed .Pp @@ -193,18 +192,7 @@ .Nm can be corrected manually if used in conjunction with such a parent interface. .Sh SEE ALSO -.Xr kqueue 2 , -.Xr miibus 4 , .Xr ifconfig 8 , .Xr sysctl 8 .Sh BUGS No 802.1Q features except VLAN tagging are implemented. -.Pp -.Dv EVFILT_NETDEV -events on a -.Nm -interface will be sent through -.Xr kqueue 2 -only if the parent interface uses -.Xr miibus 4 -for link state notification. ==== //depot/projects/vimage/src/share/man/man9/altq.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/altq.9,v 1.5 2004/10/07 12:10:25 mlaier Exp $ +.\" $FreeBSD: src/share/man/man9/altq.9,v 1.6 2009/04/18 20:09:43 rwatson Exp $ .\" .Dd August 25, 2004 .Dt ALTQ 9 @@ -543,11 +543,6 @@ and .Fn IFQ_DRV_PURGE are protected with a mutex of some kind. -Setting -.Dv IFF_NEEDSGIANT -in -.Va if_flags -might also be appropriate. .Ss Attach routine Use .Fn IFQ_SET_MAXLEN ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.90 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.91 2009/04/23 20:24:19 jhb Exp $"); #include #include @@ -95,7 +95,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -978,7 +977,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -994,8 +992,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1042,9 +1039,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1069,7 +1063,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.302 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.303 2009/04/22 21:40:37 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -354,8 +354,6 @@ } else KASSERT(boot_cpu_id == PCPU_GET(apic_id), ("BSP's APIC ID doesn't match boot_cpu_id")); - cpu_apic_ids[0] = boot_cpu_id; - apic_cpuids[boot_cpu_id] = 0; /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; @@ -418,28 +416,30 @@ void cpu_mp_announce(void) { - int i, x; const char *hyperthread; + int i; - /* List CPUs */ + /* List active CPUs first. */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { - if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + for (i = 1; i < mp_ncpus; i++) { + if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread) + hyperthread = "/HT"; + else + hyperthread = ""; + printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread, + cpu_apic_ids[i]); + } + + /* List disabled CPUs last. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled) continue; - if (cpu_info[x].cpu_hyperthread) { + if (cpu_info[i].cpu_hyperthread) hyperthread = "/HT"; - } else { + else hyperthread = ""; - } - if (cpu_info[x].cpu_disabled) - printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", - hyperthread, x); - else { - KASSERT(i < mp_ncpus, - ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, - hyperthread, x); - } + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread, + i); } } @@ -693,11 +693,19 @@ /* * Assign CPU IDs to local APIC IDs and disable any CPUs - * beyond MAXCPU. CPU 0 has already been assigned to the BSP, - * so we only have to assign IDs for APs. + * beyond MAXCPU. CPU 0 is always assigned to the BSP. + * + * To minimize confusion for userland, we attempt to number + * CPUs such that all threads and cores in a package are + * grouped together. For now we assume that the BSP is always + * the first thread in a package and just start adding APs + * starting with the BSP's APIC ID. */ mp_ncpus = 1; - for (i = 0; i <= MAX_APIC_ID; i++) { + cpu_apic_ids[0] = boot_cpu_id; + apic_cpuids[boot_cpu_id] = 0; + for (i = boot_cpu_id + 1; i != boot_cpu_id; + i == MAX_APIC_ID ? i = 0 : i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || cpu_info[i].cpu_disabled) continue; ==== //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.16 2009/04/15 22:38:22 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.17 2009/04/19 00:16:04 kmacy Exp $ machine amd64 @@ -20,3 +20,5 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR + +options FLOWTABLE ==== //depot/projects/vimage/src/sys/amd64/include/param.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.24 2008/10/01 21:59:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.27 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -89,6 +89,12 @@ #define ALIGN(p) _ALIGN(p) #define ALIGNED_POINTER(p,t) _ALIGNED_POINTER(p,t) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ #define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.46 2009/04/17 13:22:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.47 2009/04/23 20:24:19 jhb Exp $"); /* * ARM bus dma support routines @@ -114,7 +114,6 @@ int total_deferred; int map_count; bus_size_t alignment; - bus_size_t boundary; bus_addr_t lowaddr; char zoneid[8]; char lowaddrid[20]; @@ -689,10 +688,10 @@ vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { - if (pmap != NULL) + if (__predict_true(pmap == pmap_kernel())) + paddr = pmap_kextract(vaddr); + else paddr = pmap_extract(pmap, vaddr); - else - paddr = pmap_kextract(vaddr); if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && run_filter(dmat, paddr) != 0) map->pagesneeded++; @@ -1267,7 +1266,6 @@ /* Check to see if we already have a suitable zone */ STAILQ_FOREACH(bz, &bounce_zone_list, links) { if ((dmat->alignment <= bz->alignment) - && (dmat->boundary <= bz->boundary) && (dmat->lowaddr >= bz->lowaddr)) { dmat->bounce_zone = bz; return (0); @@ -1283,8 +1281,7 @@ bz->reserved_bpages = 0; bz->active_bpages = 0; bz->lowaddr = dmat->lowaddr; - bz->alignment = dmat->alignment; - bz->boundary = dmat->boundary; + bz->alignment = MAX(dmat->alignment, PAGE_SIZE); bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; @@ -1331,9 +1328,6 @@ SYSCTL_ADD_INT(busdma_sysctl_tree(bz), SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, "alignment", CTLFLAG_RD, &bz->alignment, 0, ""); - SYSCTL_ADD_INT(busdma_sysctl_tree(bz), - SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO, - "boundary", CTLFLAG_RD, &bz->boundary, 0, ""); return (0); } @@ -1358,7 +1352,7 @@ M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, - bz->boundary); + 0); if (bpage->vaddr == 0) { free(bpage, M_DEVBUF); break; ==== //depot/projects/vimage/src/sys/arm/at91/at91.c#10 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.23 2009/04/22 23:54:41 stas Exp $"); #include #include @@ -418,6 +418,11 @@ AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP }, + { + "at91_cfata", 0, + AT91RM92_CF_BASE, AT91RM92_CF_SIZE, + -1 + }, { 0, 0, 0, 0, 0 } }; @@ -507,6 +512,9 @@ if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) panic("at91_attach: failed to set up ohci memory"); + if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE, + AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0) + panic("at91_attach: failed to set up CompactFlash ATA memory"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + ==== //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.4 2009/04/22 23:54:41 stas Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -179,6 +179,14 @@ PTE_NOCACHE, }, { + /* CompactFlash controller. */ + AT91RM92_CF_BASE, + AT91RM92_CF_PA_BASE, + AT91RM92_CF_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#5 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.7 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91rm92reg.h,v 1.8 2009/04/22 23:54:41 stas Exp $ */ #ifndef AT91RM92REG_H_ #define AT91RM92REG_H_ @@ -341,6 +341,10 @@ #define AT91RM92_OHCI_PA_BASE 0x00300000 #define AT91RM92_OHCI_SIZE 0x00100000 +#define AT91RM92_CF_BASE 0xdfd00000 +#define AT91RM92_CF_PA_BASE 0x51400000 +#define AT91RM92_CF_SIZE 0x00100000 + #ifndef AT91C_MASTER_CLOCK #define AT91C_MASTER_CLOCK 60000000 #endif ==== //depot/projects/vimage/src/sys/arm/at91/files.at91#6 (text) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.11 2009/04/05 18:21:40 thompsa Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.12 2009/04/22 23:54:41 stas Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard arm/at91/at91.c standard +arm/at91/at91_cfata.c optional at91_cfata arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard ==== //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.5 2009/02/03 19:16:04 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.7 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -44,5 +44,5 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 ==== //depot/projects/vimage/src/sys/arm/conf/BWCT#8 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.10 2009/04/17 22:45:57 ticso Exp $ ident BWCT @@ -51,7 +51,7 @@ #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT options BOOTP_NFSROOT -options BOOTP +options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -83,7 +83,7 @@ #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC +#options DIAGNOSTIC device md device at91_twi # TWI: Two Wire Interface @@ -101,7 +101,7 @@ #device smb # SPI bus device spibus -#device at45d # at45db642 and maybe others +#device at45d # at45db642 and maybe others device bpf # Berkeley packet filter @@ -109,5 +109,3 @@ #device ohci #device usb #device umass # Disks/Mass storage - Requires scbus and da - -#device at91_qdmmc ==== //depot/projects/vimage/src/sys/arm/conf/BWCT.hints#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.1 2007/01/05 02:08:35 ticso Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT.hints,v 1.3 2009/04/21 22:48:12 stas Exp $ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus hint.lm75.0.at="iicbus0" ==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.4 2009/04/21 22:48:12 stas Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -46,8 +46,8 @@ hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.ds1672.0.at="iicbus0" -hint.ds1672.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # USB is part of the chip hint.ehci.0.at="ixp0" ==== //depot/projects/vimage/src/sys/arm/include/param.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.12 2008/03/27 05:03:25 jb Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.15 2009/04/20 12:59:23 rwatson Exp $ */ /* @@ -81,6 +81,13 @@ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) +/* + * CACHE_LINE_SIZE is the compile-time maximum cache line size for an + * architecture. It should be used with appropriate caution. + */ +#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) + #define PAGE_SHIFT 12 #define PAGE_SIZE (1 << PAGE_SHIFT) /* Page size */ #define PAGE_MASK (PAGE_SIZE - 1) ==== //depot/projects/vimage/src/sys/bsm/audit.h#10 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +26,15 @@ * (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.h#5 - * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#9 + * $FreeBSD: src/sys/bsm/audit.h,v 1.16 2009/04/19 14:53:17 rwatson Exp $ */ -#ifndef _BSM_AUDIT_H +#ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H -#ifdef __APPLE__ -/* Temporary until rdar://problem/6133383 is resolved. */ +#include #include -#include -#include -#include -#include -#endif /* __APPLE__ */ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 @@ -101,20 +95,20 @@ /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 +#define A_OLDGETPOLICY 2 +#define A_OLDSETPOLICY 3 #define A_GETKMASK 4 #define A_SETKMASK 5 -#define A_GETQCTRL 6 -#define A_SETQCTRL 7 +#define A_OLDGETQCTRL 6 +#define A_OLDSETQCTRL 7 #define A_GETCWD 8 #define A_GETCAR 9 #define A_GETSTAT 12 #define A_SETSTAT 13 #define A_SETUMASK 14 #define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 +#define A_OLDGETCOND 20 +#define A_OLDSETCOND 21 #define A_GETCLASS 22 #define A_SETCLASS 23 #define A_GETPINFO 24 @@ -126,6 +120,12 @@ #define A_SETKAUDIT 30 #define A_SENDTRIGGER 31 #define A_GETSINFO_ADDR 32 +#define A_GETPOLICY 33 +#define A_SETPOLICY 34 +#define A_GETQCTRL 35 +#define A_SETQCTRL 36 +#define A_GETCOND 37 +#define A_SETCOND 38 /* * Audit policy controls. @@ -216,7 +216,6 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ - u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo auditpinfo_t; @@ -226,15 +225,12 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_addr_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ + u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo_addr auditpinfo_addr_t; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 24 07:18:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BF7C1065674; Fri, 24 Apr 2009 07:18: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 3D8F41065670 for ; Fri, 24 Apr 2009 07:18:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C8048FC16 for ; Fri, 24 Apr 2009 07:18:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O7IOvE094190 for ; Fri, 24 Apr 2009 07:18:24 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O7IOhM094188 for perforce@freebsd.org; Fri, 24 Apr 2009 07:18:24 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 07:18:24 GMT Message-Id: <200904240718.n3O7IOhM094188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 07:18:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=161015 Change 161015 by zec@zec_tpx32 on 2009/04/24 07:17:53 Enclose options VIMAGE specific lines in #ifdef, which prevented DEBUG_ORDERING to be compiled in in kern_vimage.c Affected files ... .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#7 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#7 (text+ko) ==== @@ -184,8 +184,10 @@ if (vml->vml_iarg) printf("/%s", vml->vml_iname); printf(": "); +#ifdef VIMAGE if (vmi->vmi_struct_size) printf("malloc(%zu); ", vmi->vmi_struct_size); +#endif if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); @@ -193,7 +195,7 @@ #ifdef VIMAGE if (vmi->vmi_struct_size) { - void *mem = malloc(vmi->vmi_struct_size, M_VNET, + void *mem = malloc(vmi->vmi_size, M_VNET, M_NOWAIT | M_ZERO); if (mem == NULL) /* XXX should return error, not panic. */ panic("vi_alloc: malloc for %s\n", vmi->vmi_name); @@ -220,8 +222,10 @@ printf(": "); if (vmi->vmi_idetach != NULL) printf("idetach(); "); +#ifdef VIMAGE if (vmi->vmi_size) printf("free()"); +#endif printf("\n"); #endif From owner-p4-projects@FreeBSD.ORG Fri Apr 24 07:24:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A200A1065679; Fri, 24 Apr 2009 07:24: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 5FBA71065672 for ; Fri, 24 Apr 2009 07:24:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EA258FC0C for ; Fri, 24 Apr 2009 07:24:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O7OVSO003895 for ; Fri, 24 Apr 2009 07:24:31 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O7OVV5003893 for perforce@freebsd.org; Fri, 24 Apr 2009 07:24:31 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 07:24:31 GMT Message-Id: <200904240724.n3O7OVV5003893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 07:24:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=161016 Change 161016 by zec@zec_tpx32 on 2009/04/24 07:23:39 s/vmi_struct_size/vmi_size/ - still always hidden by #ifdef VIMAGE which is not yet a valid compile-time option. Affected files ... .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#8 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#8 (text+ko) ==== @@ -185,8 +185,8 @@ printf("/%s", vml->vml_iname); printf(": "); #ifdef VIMAGE - if (vmi->vmi_struct_size) - printf("malloc(%zu); ", vmi->vmi_struct_size); + if (vmi->vmi_size) + printf("malloc(%zu); ", vmi->vmi_size); #endif if (vmi->vmi_iattach != NULL) printf("iattach()"); @@ -194,7 +194,7 @@ #endif #ifdef VIMAGE - if (vmi->vmi_struct_size) { + if (vmi->vmi_size) { void *mem = malloc(vmi->vmi_size, M_VNET, M_NOWAIT | M_ZERO); if (mem == NULL) /* XXX should return error, not panic. */ From owner-p4-projects@FreeBSD.ORG Fri Apr 24 07:28:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59F1A1065673; Fri, 24 Apr 2009 07:28:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17C0E1065672 for ; Fri, 24 Apr 2009 07:28:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 068F68FC26 for ; Fri, 24 Apr 2009 07:28:37 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O7SaWQ009435 for ; Fri, 24 Apr 2009 07:28:36 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O7SaDX009431 for perforce@freebsd.org; Fri, 24 Apr 2009 07:28:36 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 07:28:36 GMT Message-Id: <200904240728.n3O7SaDX009431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 07:28:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=161017 Change 161017 by zec@zec_tpx32 on 2009/04/24 07:27:53 Do not call new_unrhdr() and delete_unrhdr() in ng_eiface_mod_event() - they are already called from ng_eiface_iattach() / ng_eiface_idetach(). Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#13 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#13 (text+ko) ==== @@ -603,7 +603,6 @@ switch (event) { case MOD_LOAD: - V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_eiface_modinfo); #else @@ -616,7 +615,6 @@ #else ng_eiface_idetach(NULL); #endif - delete_unrhdr(V_ng_eiface_unit); break; default: error = EOPNOTSUPP; From owner-p4-projects@FreeBSD.ORG Fri Apr 24 08:09:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E295B1065675; Fri, 24 Apr 2009 08:09:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A31AE1065673 for ; Fri, 24 Apr 2009 08:09:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77F108FC14 for ; Fri, 24 Apr 2009 08:09:18 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O89IKP061532 for ; Fri, 24 Apr 2009 08:09:18 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O89IME061526 for perforce@freebsd.org; Fri, 24 Apr 2009 08:09:18 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 08:09:18 GMT Message-Id: <200904240809.n3O89IME061526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 08:09:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=161019 Change 161019 by zec@zec_tpx32 on 2009/04/24 08:09:13 Add a missing vnet_netgraph base pointer initializer, currently a NOP macro but required for subsequent integration steps... Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#13 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#13 (text+ko) ==== @@ -3083,6 +3083,7 @@ static int vnet_netgraph_iattach(const void *arg __unused) { + INITV_VNET_NETGRAPH(curvnet); V_nextID = 1; From owner-p4-projects@FreeBSD.ORG Fri Apr 24 08:11:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F5841065673; Fri, 24 Apr 2009 08:11:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3E9E106566B for ; Fri, 24 Apr 2009 08:11:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98B9A8FC13 for ; Fri, 24 Apr 2009 08:11:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O8BKf1064062 for ; Fri, 24 Apr 2009 08:11:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O8BK3P064060 for perforce@freebsd.org; Fri, 24 Apr 2009 08:11:20 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 08:11:20 GMT Message-Id: <200904240811.n3O8BK3P064060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 08:11:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=161020 Change 161020 by zec@zec_tpx32 on 2009/04/24 08:10:58 WS trim. Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#14 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#14 (text+ko) ==== @@ -3159,7 +3159,6 @@ ngb_mod_event, (NULL) }; - DECLARE_MODULE(netgraph, netgraph_mod, SI_SUB_NETGRAPH, SI_ORDER_MIDDLE); SYSCTL_NODE(_net, OID_AUTO, graph, CTLFLAG_RW, 0, "netgraph Family"); SYSCTL_INT(_net_graph, OID_AUTO, abi_version, CTLFLAG_RD, 0, NG_ABI_VERSION,""); From owner-p4-projects@FreeBSD.ORG Fri Apr 24 08:16:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3763C1065674; Fri, 24 Apr 2009 08:16:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBAAC1065672 for ; Fri, 24 Apr 2009 08:16:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DABF48FC1A for ; Fri, 24 Apr 2009 08:16:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3O8GPwI068014 for ; Fri, 24 Apr 2009 08:16:25 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3O8GPSH068012 for perforce@freebsd.org; Fri, 24 Apr 2009 08:16:25 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 08:16:25 GMT Message-Id: <200904240816.n3O8GPSH068012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 08:16:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=161021 Change 161021 by zec@zec_tpx32 on 2009/04/24 08:16:12 Clarify a comment. Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#11 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#11 (text+ko) ==== @@ -302,7 +302,8 @@ * Do not create / attach an ether node to this ifnet if * a netgraph node with the same name already exists. * This should prevent ether nodes to become attached to - * eiface nodes, which is pointless. + * eiface nodes, which may be problematic due to naming + * clashes. */ if ((node = ng_name2noderef(NULL, ifp->if_xname)) != NULL) { NG_NODE_UNREF(node); From owner-p4-projects@FreeBSD.ORG Fri Apr 24 10:39:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70ACE1065670; Fri, 24 Apr 2009 10:39: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 31437106564A for ; Fri, 24 Apr 2009 10:39:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 061728FC44 for ; Fri, 24 Apr 2009 10:39:31 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OAdUlM031276 for ; Fri, 24 Apr 2009 10:39:30 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OAdUNd031274 for perforce@freebsd.org; Fri, 24 Apr 2009 10:39:30 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 10:39:30 GMT Message-Id: <200904241039.n3OAdUNd031274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 10:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=161027 Change 161027 by zec@zec_tpx32 on 2009/04/24 10:39:10 Fix a typo. Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#15 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#15 (text+ko) ==== @@ -3083,7 +3083,7 @@ static int vnet_netgraph_iattach(const void *arg __unused) { - INITV_VNET_NETGRAPH(curvnet); + INIT_VNET_NETGRAPH(curvnet); V_nextID = 1; From owner-p4-projects@FreeBSD.ORG Fri Apr 24 12:21:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03F961065672; Fri, 24 Apr 2009 12:21: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 835BC106566C for ; Fri, 24 Apr 2009 12:21:15 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7130E8FC16 for ; Fri, 24 Apr 2009 12:21:15 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OCLFGt041250 for ; Fri, 24 Apr 2009 12:21:15 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OCLEZ4041248 for perforce@freebsd.org; Fri, 24 Apr 2009 12:21:14 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 12:21:14 GMT Message-Id: <200904241221.n3OCLEZ4041248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 12:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=161028 Change 161028 by zec@zec_tpx32 on 2009/04/24 12:20:39 Integrate vimage-commit -> vimage-commit2 ... in order to reduce the output of makemeat2.pl. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#21 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#42 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#17 (text+ko) ==== @@ -48,6 +48,7 @@ static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); +static int vnet_mod_destructor(struct vnet_modlink *); #ifdef VIMAGE /* curvnet should be thread-local - this is only a temporary step */ @@ -151,6 +152,36 @@ } while (vml_iter != NULL); } +void +vnet_mod_deregister(const struct vnet_modinfo *vmi) +{ + vnet_mod_deregister_multi(vmi, NULL, NULL); +} + +void +vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) +{ + VNET_ITERATOR_DECL(vnet_iter); + struct vnet_modlink *vml; + + TAILQ_FOREACH(vml, &vnet_modlink_head, vml_mod_le) + if (vml->vml_modinfo == vmi && vml->vml_iarg == iarg) + break; + if (vml == NULL) + panic("cannot deregister unregistered vnet module %s", + vmi->vmi_name); + + VNET_FOREACH(vnet_iter) { + CURVNET_SET_QUIET(vnet_iter); + vnet_mod_destructor(vml); + CURVNET_RESTORE(); + } + + TAILQ_REMOVE(&vnet_modlink_head, vml, vml_mod_le); + free(vml, M_VIMAGE); +} + static int vnet_mod_constructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; @@ -160,8 +191,10 @@ if (vml->vml_iarg) printf("/%s", vml->vml_iname); printf(": "); +#ifdef VIMAGE if (vmi->vmi_size) printf("malloc(%zu); ", vmi->vmi_size); +#endif if (vmi->vmi_iattach != NULL) printf("iattach()"); printf("\n"); @@ -183,6 +216,41 @@ return (0); } + +static int +vnet_mod_destructor(struct vnet_modlink *vml) +{ + const struct vnet_modinfo *vmi = vml->vml_modinfo; + +#ifdef DEBUG_ORDERING + printf("destroying vnet_%s", vmi->vmi_name); + if (vml->vml_iarg) + printf("/%s", vml->vml_iname); + printf(": "); + if (vmi->vmi_idetach != NULL) + printf("idetach(); "); +#ifdef VIMAGE + if (vmi->vmi_size) + printf("free()"); +#endif + printf("\n"); +#endif + + if (vmi->vmi_idetach) + vmi->vmi_idetach(vml->vml_iarg); + +#ifdef VIMAGE + if (vmi->vmi_size) { + if (curvnet->mod_data[vmi->vmi_id] == NULL) + panic("vi_destroy: %s\n", vmi->vmi_name); + free(curvnet->mod_data[vmi->vmi_id], M_VNET); + curvnet->mod_data[vmi->vmi_id] = NULL; + } +#endif + + return (0); +} + /* * vi_symlookup() attempts to resolve name to address queries for * variables which have been moved from global namespace to virtualization ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#26 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#21 (text+ko) ==== @@ -1123,6 +1123,7 @@ struct ng_type *ng_findtype(const char *type); int ng_make_node_common(struct ng_type *typep, node_p *nodep); int ng_name_node(node_p node, const char *name); +node_p ng_name2noderef(node_p node, const char *name); int ng_newtype(struct ng_type *tp); ng_ID_t ng_node2ID(node_p node); item_p ng_package_data(struct mbuf *m, int flags); ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#25 (text+ko) ==== @@ -84,6 +84,8 @@ /* Mutex to protect topology events. */ static struct mtx ng_topo_mtx; +static vnet_attach_fn vnet_netgraph_iattach; + #ifdef NETGRAPH_DEBUG static struct mtx ng_nodelist_mtx; /* protects global node/hook lists */ static struct mtx ngq_mtx; /* protects the queue item list */ @@ -227,7 +229,6 @@ /* Imported, these used to be externally visible, some may go back. */ void ng_destroy_hook(hook_p hook); -node_p ng_name2noderef(node_p node, const char *name); int ng_path2noderef(node_p here, const char *path, node_p *dest, hook_p *lasthook); int ng_make_node(const char *type, node_p *nodepp); @@ -3068,6 +3069,27 @@ return (error); } +#ifndef VIMAGE_GLOBALS +static const vnet_modinfo_t vnet_netgraph_modinfo = { + .vmi_id = VNET_MOD_NETGRAPH, + .vmi_name = "netgraph", +#ifdef VIMAGE + .vmi_size = sizeof(struct vnet_netgraph), +#endif + .vmi_iattach = vnet_netgraph_iattach +}; +#endif + +static int +vnet_netgraph_iattach(const void *arg __unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_nextID = 1; + + return (0); +} + /* * Handle loading and unloading for this code. * The only thing we need to link into is the NETISR strucure. @@ -3083,7 +3105,11 @@ switch (event) { case MOD_LOAD: /* Initialize everything. */ - V_nextID = 1; +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_netgraph_modinfo); +#else + vnet_netgraph_iattach(NULL); +#endif NG_WORKLIST_LOCK_INIT(); mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, MTX_DEF); ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#20 (text+ko) ==== @@ -113,10 +113,23 @@ }; NETGRAPH_INIT(eiface, &typestruct); +static vnet_attach_fn ng_eiface_iattach; +static vnet_detach_fn ng_eiface_idetach; + #ifdef VIMAGE_GLOBALS static struct unrhdr *ng_eiface_unit; #endif +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_eiface_modinfo = { + .vmi_id = VNET_MOD_NG_EIFACE, + .vmi_name = "ng_eiface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_eiface_iattach, + .vmi_idetach = ng_eiface_idetach +}; +#endif + /************************************************************************ INTERFACE STUFF ************************************************************************/ @@ -591,10 +604,18 @@ switch (event) { case MOD_LOAD: - V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_eiface_modinfo); +#else + ng_eiface_iattach(NULL); +#endif break; case MOD_UNLOAD: - delete_unrhdr(V_ng_eiface_unit); +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_eiface_modinfo); +#else + ng_eiface_idetach(NULL); +#endif break; default: error = EOPNOTSUPP; @@ -602,3 +623,21 @@ } return (error); } + +static int ng_eiface_iattach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL); + + return (0); +} + +static int ng_eiface_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + delete_unrhdr(V_ng_eiface_unit); + + return (0); +} ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#13 (text+ko) ==== @@ -75,6 +75,17 @@ #define IFP2NG(ifp) (IFP2AC((ifp))->ac_netgraph) +static vnet_attach_fn ng_ether_iattach; + +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_ether_modinfo = { + .vmi_id = VNET_MOD_NG_ETHER, + .vmi_name = "ng_ether", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_ether_iattach, +}; +#endif + /* Per-node private data */ struct private { struct ifnet *ifp; /* associated interface */ @@ -287,6 +298,18 @@ priv_p priv; node_p node; + /* + * Do not create / attach an ether node to this ifnet if + * a netgraph node with the same name already exists. + * This should prevent ether nodes to become attached to + * eiface nodes, which may be problematic due to naming + * clashes. + */ + if ((node = ng_name2noderef(NULL, ifp->if_xname)) != NULL) { + NG_NODE_UNREF(node); + return; + } + /* Create node */ KASSERT(!IFP2NG(ifp), ("%s: node already exists?", __func__)); if (ng_make_node_common(&ng_ether_typestruct, &node) != 0) { @@ -741,8 +764,6 @@ static int ng_ether_mod_event(module_t mod, int event, void *data) { - INIT_VNET_NET(curvnet); /* XXX move to iattach - revisit! */ - struct ifnet *ifp; int error = 0; int s; @@ -762,14 +783,11 @@ ng_ether_input_orphan_p = ng_ether_input_orphan; ng_ether_link_state_p = ng_ether_link_state; - /* Create nodes for any already-existing Ethernet interfaces */ - IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (ifp->if_type == IFT_ETHER - || ifp->if_type == IFT_L2VLAN) - ng_ether_attach(ifp); - } - IFNET_RUNLOCK(); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_ether_modinfo); +#else + error = ng_ether_iattach(NULL); +#endif break; case MOD_UNLOAD: @@ -782,6 +800,10 @@ * is MOD_UNLOAD, so there's no need to detach any nodes. */ +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_ether_modinfo); +#endif + /* Unregister function hooks */ ng_ether_attach_p = NULL; ng_ether_detach_p = NULL; @@ -799,3 +821,19 @@ return (error); } +static int ng_ether_iattach(const void *unused) +{ + INIT_VNET_NET(curvnet); + struct ifnet *ifp; + + /* Create nodes for any already-existing Ethernet interfaces */ + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if (ifp->if_type == IFT_ETHER + || ifp->if_type == IFT_L2VLAN) + ng_ether_attach(ifp); + } + IFNET_RUNLOCK(); + + return (0); +} ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#19 (text+ko) ==== @@ -209,10 +209,23 @@ }; NETGRAPH_INIT(iface, &typestruct); +static vnet_attach_fn ng_iface_iattach; +static vnet_detach_fn ng_iface_idetach; + #ifdef VIMAGE_GLOBALS static struct unrhdr *ng_iface_unit; #endif +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_ng_iface_modinfo = { + .vmi_id = VNET_MOD_NG_IFACE, + .vmi_name = "ng_iface", + .vmi_dependson = VNET_MOD_NETGRAPH, + .vmi_iattach = ng_iface_iattach, + .vmi_idetach = ng_iface_idetach +}; +#endif + /************************************************************************ HELPER STUFF ************************************************************************/ @@ -837,10 +850,18 @@ switch (event) { case MOD_LOAD: - V_ng_iface_unit = new_unrhdr(0, 0xffff, NULL); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_ng_iface_modinfo); +#else + ng_iface_iattach(NULL); +#endif break; case MOD_UNLOAD: - delete_unrhdr(V_ng_iface_unit); +#ifndef VIMAGE_GLOBALS + vnet_mod_deregister(&vnet_ng_iface_modinfo); +#else + ng_iface_idetach(NULL); +#endif break; default: error = EOPNOTSUPP; @@ -848,3 +869,21 @@ } return (error); } + +static int ng_iface_iattach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_ng_iface_unit = new_unrhdr(0, 0xffff, NULL); + + return (0); +} + +static int ng_iface_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + delete_unrhdr(V_ng_iface_unit); + + return (0); +} ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#42 (text+ko) ==== @@ -123,6 +123,8 @@ int vi_symlookup(struct kld_sym_lookup *, char *); void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); +void vnet_mod_deregister(const struct vnet_modinfo *); +void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); #endif /* !VIMAGE_GLOBALS */ From owner-p4-projects@FreeBSD.ORG Fri Apr 24 12:27:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E48D61065672; Fri, 24 Apr 2009 12:27:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C661106564A for ; Fri, 24 Apr 2009 12:27:21 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79F218FC12 for ; Fri, 24 Apr 2009 12:27:21 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OCRLmk041706 for ; Fri, 24 Apr 2009 12:27:21 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OCRLis041704 for perforce@freebsd.org; Fri, 24 Apr 2009 12:27:21 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 12:27:21 GMT Message-Id: <200904241227.n3OCRLis041704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 12:27:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=161029 Change 161029 by zec@zec_tpx32 on 2009/04/24 12:26:53 Manual merge of INIT_VNET_* changes from vimage-commit2 branch. Affected files ... .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#8 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 edit .. //depot/projects/vimage-commit/src/sys/net/route.c#14 edit .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#13 edit .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#14 edit .. //depot/projects/vimage-commit/src/sys/netinet/in.c#12 edit .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#14 edit .. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#11 edit .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#11 edit .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#14 edit .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#12 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#17 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#13 edit .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#13 edit .. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#12 edit .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#12 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -584,8 +584,10 @@ linux_socket(struct thread *td, struct linux_socket_args *args) { #ifdef INET6 +#ifndef KLD_MODULE INIT_VNET_INET6(curvnet); #endif +#endif struct socket_args /* { int domain; int type; ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 (text+ko) ==== @@ -213,6 +213,7 @@ int ipfattach() { + INIT_VNET_INET(curvnet); #ifdef USE_SPL int s; #endif @@ -264,6 +265,7 @@ */ int ipfdetach() { + INIT_VNET_INET(curvnet); #ifdef USE_SPL int s; #endif @@ -646,6 +648,7 @@ fr_info_t *fin; mb_t *m, **mpp; { + INIT_VNET_INET(curvnet); fr_info_t fnew; ip_t *ip, *oip; int hlen; ==== //depot/projects/vimage-commit/src/sys/net/route.c#14 (text+ko) ==== @@ -178,7 +178,7 @@ static int vnet_route_iattach(const void *unused __unused) { - INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); int table; struct domain *dom; int fam; ==== //depot/projects/vimage-commit/src/sys/net/rtsock.c#13 (text+ko) ==== @@ -1206,7 +1206,6 @@ static void rt_dispatch(struct mbuf *m, const struct sockaddr *sa) { - INIT_VNET_NET(curvnet); struct m_tag *tag; /* ==== //depot/projects/vimage-commit/src/sys/netinet/igmp.c#14 (text+ko) ==== @@ -141,13 +141,8 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS); static int sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS); -#ifdef VIMAGE static vnet_attach_fn vnet_igmp_iattach; static vnet_detach_fn vnet_igmp_idetach; -#else -static int vnet_igmp_iattach(const void *); -static int vnet_igmp_idetach(const void *); -#endif /* VIMAGE */ /* * System-wide globals. @@ -333,6 +328,7 @@ static int sysctl_igmp_default_version(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int new; @@ -372,6 +368,7 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int i; @@ -413,6 +410,7 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); int *name; int error; u_int namelen; @@ -498,6 +496,7 @@ static __inline int igmp_isgroupreported(const struct in_addr addr) { + INIT_VNET_INET(curvnet); if (in_allhosts(addr) || ((!V_igmp_sendlocal && IN_LOCAL_GROUP(ntohl(addr.s_addr))))) @@ -560,6 +559,7 @@ static struct igmp_ifinfo * igi_alloc_locked(/*const*/ struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi; IGMP_LOCK_ASSERT(); @@ -679,6 +679,7 @@ static void igi_delete_locked(const struct ifnet *ifp) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi, *tigi; CTR3(KTR_IGMPV3, "%s: freeing igmp_ifinfo for ifp %p(%s)", @@ -803,6 +804,7 @@ igmp_input_v2_query(struct ifnet *ifp, const struct ip *ip, const struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct ifmultiaddr *ifma; struct igmp_ifinfo *igi; struct in_multi *inm; @@ -895,6 +897,7 @@ static void igmp_v2_update_group(struct in_multi *inm, const int timer) { + INIT_VNET_INET(curvnet); CTR4(KTR_IGMPV3, "%s: %s/%s timer=%d", __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname, timer); @@ -942,6 +945,7 @@ igmp_input_v3_query(struct ifnet *ifp, const struct ip *ip, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(ifp->if_vnet); struct igmp_ifinfo *igi; struct in_multi *inm; uint32_t maxresp, nsrc, qqi; @@ -1086,6 +1090,7 @@ igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifinfo *igi, int timer, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); int retval; uint16_t nsrc; @@ -1188,6 +1193,7 @@ igmp_input_v1_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1294,6 +1300,7 @@ igmp_input_v2_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(ifp->if_vnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1579,21 +1586,15 @@ void igmp_fasttimo(void) { -#ifdef VIMAGE VNET_ITERATOR_DECL(vnet_iter); VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_fasttimo_vnet(); CURVNET_RESTORE(); } VNET_LIST_RUNLOCK(); -#else /* !VIMAGE */ - - igmp_fasttimo_vnet(); -#endif /* VIMAGE */ } /* @@ -1605,6 +1606,7 @@ static void igmp_fasttimo_vnet(void) { + INIT_VNET_INET(curvnet); struct ifqueue scq; /* State-change packets */ struct ifqueue qrq; /* Query response packets */ struct ifnet *ifp; @@ -1727,6 +1729,7 @@ static void igmp_v1v2_process_group_timer(struct in_multi *inm, const int version) { + INIT_VNET_INET(curvnet); int report_timer_expired; IN_MULTI_LOCK_ASSERT(); @@ -1775,6 +1778,7 @@ struct ifqueue *qrq, struct ifqueue *scq, struct in_multi *inm, const int uri_fasthz) { + INIT_VNET_INET(curvnet); int query_response_timer_expired; int state_change_retransmit_timer_expired; @@ -1964,6 +1968,7 @@ static void igmp_v3_cancel_link_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct ifnet *ifp; struct in_multi *inm; @@ -2039,6 +2044,7 @@ static void igmp_v1v2_process_querier_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); IGMP_LOCK_ASSERT(); @@ -2115,20 +2121,15 @@ void igmp_slowtimo(void) { -#ifdef VIMAGE VNET_ITERATOR_DECL(vnet_iter); VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_slowtimo_vnet(); CURVNET_RESTORE(); } VNET_LIST_RUNLOCK(); -#else /* !VIMAGE */ - igmp_slowtimo_vnet(); -#endif /* VIMAGE */ } /* @@ -2137,6 +2138,7 @@ static void igmp_slowtimo_vnet(void) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK(); @@ -2164,9 +2166,6 @@ IGMP_LOCK_ASSERT(); ifp = inm->inm_ifp; - /* XXX are these needed ? */ - INIT_VNET_NET(ifp->if_vnet); - INIT_VNET_INET(ifp->if_vnet); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) @@ -2304,6 +2303,7 @@ static int igmp_initial_join(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct ifqueue *ifq; int error, retval, syncstates; @@ -2432,6 +2432,7 @@ static int igmp_handle_state_change(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; int retval; @@ -2491,6 +2492,7 @@ static void igmp_final_leave(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); int syncstates; syncstates = 1; @@ -3276,6 +3278,7 @@ static void igmp_v3_dispatch_general_query(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma, *tifma; struct ifnet *ifp; struct in_multi *inm; @@ -3357,12 +3360,14 @@ CTR2(KTR_IGMPV3, "%s: transmit %p", __func__, m); /* - * Restore VNET image pointer from enqueued mbuf chain + * Set VNET image pointer from enqueued mbuf chain * before doing anything else. Whilst we use interface * indexes to guard against interface detach, they are * unique to each VIMAGE and must be retrieved. */ CURVNET_SET(m->m_pkthdr.header); + INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); ifindex = igmp_restore_context(m); /* @@ -3444,7 +3449,6 @@ static struct mbuf * igmp_v3_encap_report(struct ifnet *ifp, struct mbuf *m) { - INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); struct igmp_report *igmp; struct ip *ip; @@ -3616,15 +3620,28 @@ return (0); } -#ifdef VIMAGE +/* + * XXX Are igi_head and igmpstat really accessed via kmem / kldsym? + * If so, given that they are members of struct vnet_inet, they should + * be registered with VNET_MOD_INET, not here. Revisit!!! + */ +#if 0 static struct vnet_symmap vnet_igmp_symmap[] = { VNET_SYMMAP(igmp, igi_head), VNET_SYMMAP(igmp, igmpstat), VNET_SYMMAP_END }; -VNET_MOD_DECLARE(IGMP, igmp, vnet_igmp_iattach, vnet_igmp_idetach, - vnet_igmp_symmap); -#endif /* VIMAGE */ +#endif + +#ifndef VIMAGE_GLOBALS +static vnet_modinfo_t vnet_igmp_modinfo = { + .vmi_id = VNET_MOD_IGMP, + .vmi_name = "igmp", + .vmi_dependson = VNET_MOD_INET, + .vmi_iattach = vnet_igmp_iattach, + .vmi_idetach = vnet_igmp_idetach +}; +#endif static int igmp_modevent(module_t mod, int type, void *unused __unused) @@ -3633,22 +3650,20 @@ switch (type) { case MOD_LOAD: igmp_sysinit(); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_igmp_modinfo); #else - (void)vnet_igmp_iattach(NULL); -#endif /* VIMAGE */ + vnet_igmp_iattach(NULL); +#endif break; case MOD_UNLOAD: -#ifdef VIMAGE - /* - * TODO: Allow module unload if any VIMAGE instances - * are using this module. - */ - return (EBUSY); +#ifndef VIMAGE_GLOBALS +#ifdef NOTYET + vnet_mod_deregister(&vnet_igmp_modinfo); +#endif #else - (void)vnet_igmp_idetach(NULL); -#endif /* VIMAGE */ + vnet_igmp_idetach(NULL); +#endif igmp_sysuninit(); break; default: ==== //depot/projects/vimage-commit/src/sys/netinet/in.c#12 (text+ko) ==== @@ -1039,7 +1039,6 @@ static void in_purgemaddrs(struct ifnet *ifp) { - INIT_VNET_INET(ifp->if_vnet); LIST_HEAD(,in_multi) purgeinms; struct in_multi *inm, *tinm; struct ifmultiaddr *ifma; ==== //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#14 (text+ko) ==== @@ -392,7 +392,6 @@ in_getmulti(struct ifnet *ifp, const struct in_addr *group, struct in_multi **pinm) { - INIT_VNET_INET(ifp->if_vnet); struct sockaddr_in gsin; struct ifmultiaddr *ifma; struct in_ifinfo *ii; @@ -1808,6 +1807,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp, const struct sockaddr_in *gsin, const struct in_addr ina) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__)); @@ -1853,7 +1853,6 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); - INIT_VNET_INET(curvnet); struct group_source_req gsr; sockunion_t *gsa, *ssa; struct ifnet *ifp; @@ -2306,6 +2305,7 @@ inp_set_multicast_if(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); struct in_addr addr; struct ip_mreqn mreqn; struct ifnet *ifp; ==== //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#11 (text+ko) ==== @@ -250,6 +250,8 @@ static void in_rtqtimo(void *rock) { + INIT_VNET_NET(curvnet); /* XXX revisit!!! */ + INIT_VNET_INET(curvnet); /* XXX revisit!!! */ int fibnum; void *newrock; struct timeval atv; ==== //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#11 (text+ko) ==== @@ -132,6 +132,7 @@ static void div_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_divcbinfo.ipi_zone, maxsockets); } @@ -723,6 +724,7 @@ static int div_modevent(module_t mod, int type, void *unused) { + INIT_VNET_INET(curvnet); /* XXX move to iattach - revisit!!! */ int err = 0; int n; ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#14 (text+ko) ==== @@ -1818,7 +1818,6 @@ add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, uint32_t value) { - INIT_VNET_IPFW(curvnet); struct radix_node_head *rnh; struct table_entry *ent; struct radix_node *rn; @@ -4535,6 +4534,7 @@ static void ipfw_tick(void * __unused unused) { + INIT_VNET_IPFW(curvnet); struct mbuf *m0, *m, *mnext, **mtailp; int i; ipfw_dyn_rule *q; @@ -4718,6 +4718,7 @@ void ipfw_destroy(void) { + INIT_VNET_IPFW(curvnet); struct ip_fw *reap; ip_fw_chk_ptr = NULL; ==== //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#12 (text+ko) ==== @@ -1709,6 +1709,7 @@ static void X_rsvp_input(struct mbuf *m, int off __unused) { + INIT_VNET_INET(curvnet); if (!V_rsvp_on) m_freem(m); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#17 (text+ko) ==== @@ -288,6 +288,7 @@ static void tcp_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); uma_zone_set_max(V_tcpcb_zone, maxsockets); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#13 (text+ko) ==== @@ -132,6 +132,7 @@ static int sysctl_maxtcptw(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error, new; if (maxtcptw == 0) @@ -158,6 +159,7 @@ void tcp_tw_zone_change(void) { + INIT_VNET_INET(curvnet); if (maxtcptw == 0) uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); ==== //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#13 (text+ko) ==== @@ -155,6 +155,7 @@ static void udp_zone_change(void *tag) { + INIT_VNET_INET(curvnet); uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); } ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#12 (text+ko) ==== @@ -288,9 +288,8 @@ static void in6_rtqtimo(void *rock) { - CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit ! */ + INIT_VNET_INET6(curvnet); /* XXX revisit ! */ struct radix_node_head *rnh = rock; struct rtqk_arg arg; struct timeval atv; @@ -376,9 +375,8 @@ static void in6_mtutimo(void *rock) { - CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); - INIT_VNET_INET6((struct vnet *) rock); + CURVNET_SET_QUIET((struct vnet *) rock); /* XXX revisit! */ + INIT_VNET_INET6(curvnet); /* XXX revisit! */ struct radix_node_head *rnh = rock; struct mtuex_arg arg; struct timeval atv; ==== //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#12 (text+ko) ==== @@ -1549,6 +1549,7 @@ int nd6_prefix_onlink(struct nd_prefix *pr) { + INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); struct ifaddr *ifa; struct ifnet *ifp = pr->ndpr_ifp; From owner-p4-projects@FreeBSD.ORG Fri Apr 24 12:45:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0EA106567A; Fri, 24 Apr 2009 12:45:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F9D5106566B for ; Fri, 24 Apr 2009 12:45:41 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F23818FC19 for ; Fri, 24 Apr 2009 12:45:40 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OCje8j043176 for ; Fri, 24 Apr 2009 12:45:40 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OCjeC6043174 for perforce@freebsd.org; Fri, 24 Apr 2009 12:45:40 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 12:45:40 GMT Message-Id: <200904241245.n3OCjeC6043174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 12:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=161032 Change 161032 by zec@zec_tpx32 on 2009/04/24 12:44:54 Fix a few obvious misintegrations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#26 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#21 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#20 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#26 (text+ko) ==== @@ -3097,7 +3097,6 @@ static int ngb_mod_event(module_t mod, int event, void *data) { - INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach - revisit! */ struct proc *p; struct thread *td; int i, error = 0; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#21 (text+ko) ==== @@ -599,7 +599,6 @@ static int ng_eiface_mod_event(module_t mod, int event, void *data) { - INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach -> revisit! */ int error = 0; switch (event) { ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#20 (text+ko) ==== @@ -845,7 +845,6 @@ static int ng_iface_mod_event(module_t mod, int event, void *data) { - INIT_VNET_NETGRAPH(curvnet); /* XXX move to iattach - revisit! */ int error = 0; switch (event) { From owner-p4-projects@FreeBSD.ORG Fri Apr 24 12:47:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A431065674; Fri, 24 Apr 2009 12:47:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88FF1106566B for ; Fri, 24 Apr 2009 12:47:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77E4C8FC0A for ; Fri, 24 Apr 2009 12:47:43 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OClh0l053149 for ; Fri, 24 Apr 2009 12:47:43 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OClh9t053147 for perforce@freebsd.org; Fri, 24 Apr 2009 12:47:43 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 12:47:43 GMT Message-Id: <200904241247.n3OClh9t053147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 12:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=161033 Change 161033 by zec@zec_tpx32 on 2009/04/24 12:47:09 Bring a comment up to date. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#12 (text+ko) ==== @@ -189,7 +189,7 @@ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ struct vnet *t_vnet; /* pointer to parent vnet */ - void *t_pspare[2]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ + void *t_pspare[2]; /* toe usrreqs / toepcb * / congestion algo / 1 general use */ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; /* TOE pcb pointer */ int t_bytes_acked; /* # bytes acked during current RTT */ From owner-p4-projects@FreeBSD.ORG Fri Apr 24 21:00:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D4731065719; Fri, 24 Apr 2009 21:00:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17517106571F for ; Fri, 24 Apr 2009 21:00:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC64F8FC21 for ; Fri, 24 Apr 2009 21:00:25 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OL0PVi027333 for ; Fri, 24 Apr 2009 21:00:25 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OL0PZZ027331 for perforce@freebsd.org; Fri, 24 Apr 2009 21:00:25 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 21:00:25 GMT Message-Id: <200904242100.n3OL0PZZ027331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 21:00:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=161044 Change 161044 by zec@zec_tpx32 on 2009/04/24 20:59:43 Add blank line per style(9). Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#9 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#9 (text+ko) ==== @@ -148,6 +148,7 @@ void vnet_mod_deregister(const struct vnet_modinfo *vmi) { + vnet_mod_deregister_multi(vmi, NULL, NULL); } From owner-p4-projects@FreeBSD.ORG Fri Apr 24 21:24:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E0811065673; Fri, 24 Apr 2009 21:24:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DA481065670 for ; Fri, 24 Apr 2009 21:24:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21A688FC16 for ; Fri, 24 Apr 2009 21:24:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3OLOpBo030085 for ; Fri, 24 Apr 2009 21:24:51 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3OLOon6030083 for perforce@freebsd.org; Fri, 24 Apr 2009 21:24:50 GMT (envelope-from zec@fer.hr) Date: Fri, 24 Apr 2009 21:24:50 GMT Message-Id: <200904242124.n3OLOon6030083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Apr 2009 21:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=161048 Change 161048 by zec@zec_tpx32 on 2009/04/24 21:24:26 Trailing dot in a comment per style(9). Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#12 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#12 (text+ko) ==== @@ -826,7 +826,7 @@ INIT_VNET_NET(curvnet); struct ifnet *ifp; - /* Create nodes for any already-existing Ethernet interfaces */ + /* Create nodes for any already-existing Ethernet interfaces. */ IFNET_RLOCK(); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_type == IFT_ETHER From owner-p4-projects@FreeBSD.ORG Sat Apr 25 05:40:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE2371065670; Sat, 25 Apr 2009 05:40:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82472106564A for ; Sat, 25 Apr 2009 05:40:14 +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 5715B8FC15 for ; Sat, 25 Apr 2009 05:40:14 +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 n3P5eEhZ069551 for ; Sat, 25 Apr 2009 05:40:14 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3P5eEG1069549 for perforce@freebsd.org; Sat, 25 Apr 2009 05:40:14 GMT (envelope-from gk@FreeBSD.org) Date: Sat, 25 Apr 2009 05:40:14 GMT Message-Id: <200904250540.n3P5eEG1069549@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 161052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 05:40:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=161052 Change 161052 by gk@gk_h1 on 2009/04/25 05:39:33 Add Milestones Affected files ... .. //depot/projects/soc2009/gk_pefs/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 25 13:22:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B80F1106566C; Sat, 25 Apr 2009 13:22: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 7876A106564A for ; Sat, 25 Apr 2009 13:22:09 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CC808FC13 for ; Sat, 25 Apr 2009 13:22:09 +0000 (UTC) (envelope-from zhaoshuai@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PDM9W3086289 for ; Sat, 25 Apr 2009 13:22:09 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PDM99S086283 for perforce@freebsd.org; Sat, 25 Apr 2009 13:22:09 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Sat, 25 Apr 2009 13:22:09 GMT Message-Id: <200904251322.n3PDM99S086283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhaoshuai@FreeBSD.org using -f From: Zhao Shuai To: Perforce Change Reviews Cc: Subject: PERFORCE change 161067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 13:22:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=161067 Change 161067 by zhaoshuai@zhaoshuai on 2009/04/25 13:21:16 Zhao Shuai's first commit Submitted by: Zhao Shuai Affected files ... .. //depot/projects/soc2009/myproject/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 25 16:24:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 545A0106566C; Sat, 25 Apr 2009 16:24:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAEFB106564A for ; Sat, 25 Apr 2009 16:24:45 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6FEB8FC14 for ; Sat, 25 Apr 2009 16:24:45 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PGOjWp060452 for ; Sat, 25 Apr 2009 16:24:45 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PGOPqP060416 for perforce@freebsd.org; Sat, 25 Apr 2009 16:24:25 GMT (envelope-from bz@freebsd.org) Date: Sat, 25 Apr 2009 16:24:25 GMT Message-Id: <200904251624.n3PGOPqP060416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 161070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 16:24:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=161070 Change 161070 by bz@bz_dumpster on 2009/04/25 16:24:20 IFC @161056 Affected files ... .. //depot/projects/s390/MAINTAINERS#16 integrate .. //depot/projects/s390/Makefile#18 integrate .. //depot/projects/s390/Makefile.inc1#28 integrate .. //depot/projects/s390/ObsoleteFiles.inc#8 integrate .. //depot/projects/s390/UPDATING#21 integrate .. //depot/projects/s390/bin/cat/Makefile#2 integrate .. //depot/projects/s390/bin/ls/ls.1#10 integrate .. //depot/projects/s390/bin/ps/extern.h#8 integrate .. //depot/projects/s390/bin/ps/keyword.c#11 integrate .. //depot/projects/s390/bin/ps/print.c#12 integrate .. //depot/projects/s390/bin/sh/alias.c#6 integrate .. //depot/projects/s390/bin/sh/eval.c#9 integrate .. //depot/projects/s390/bin/sh/miscbltin.c#7 integrate .. //depot/projects/s390/bin/sh/parser.c#6 integrate .. //depot/projects/s390/cddl/Makefile.inc#3 integrate .. //depot/projects/s390/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/s390/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/s390/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/s390/contrib/bind9/CHANGES#5 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/s390/contrib/bind9/version#5 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/s390/contrib/csup/proto.c#3 integrate .. //depot/projects/s390/contrib/csup/rcsfile.c#2 integrate .. //depot/projects/s390/contrib/csup/rcsfile.h#2 integrate .. //depot/projects/s390/contrib/csup/rcsparse.c#2 integrate .. //depot/projects/s390/contrib/csup/updater.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-cppbuiltin.c#3 integrate .. //depot/projects/s390/contrib/gcc/c-decl.c#9 integrate .. //depot/projects/s390/contrib/gcc/c-opts.c#4 integrate .. //depot/projects/s390/contrib/gcc/c-tree.h#7 integrate .. //depot/projects/s390/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/s390/contrib/gcc/doc/extend.texi#6 integrate .. //depot/projects/s390/contrib/gdb/FREEBSD-Xlist#5 integrate .. //depot/projects/s390/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/s390/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/s390/contrib/gdtoa/test/Qtest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/README#4 delete .. //depot/projects/s390/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/dItest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/ddtest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/dt.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/dtest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/dtst.out#3 delete .. //depot/projects/s390/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/s390/contrib/gdtoa/test/ftest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/s390/contrib/gdtoa/test/makefile#4 delete .. //depot/projects/s390/contrib/gdtoa/test/obad/strtodt.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/obad/xL.out#2 delete .. //depot/projects/s390/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/s390/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/strtodt.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/s390/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/s390/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/s390/contrib/gdtoa/test/x.ou0#3 delete .. //depot/projects/s390/contrib/gdtoa/test/x.ou1#3 delete .. //depot/projects/s390/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/s390/contrib/gdtoa/test/xL.ou1#3 delete .. //depot/projects/s390/contrib/gdtoa/test/xLtest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/s390/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/s390/contrib/gdtoa/test/xtest.c#3 delete .. //depot/projects/s390/contrib/gdtoa/xsum0.out#6 delete .. //depot/projects/s390/contrib/hostapd/COPYING#3 delete .. //depot/projects/s390/contrib/hostapd/ChangeLog#4 delete .. //depot/projects/s390/contrib/hostapd/FREEBSD-Xlist#4 delete .. //depot/projects/s390/contrib/hostapd/FREEBSD-upgrade#4 delete .. //depot/projects/s390/contrib/hostapd/Makefile#4 delete .. //depot/projects/s390/contrib/hostapd/README#4 delete .. //depot/projects/s390/contrib/hostapd/accounting.c#4 delete .. //depot/projects/s390/contrib/hostapd/accounting.h#3 delete .. //depot/projects/s390/contrib/hostapd/aes.c#4 delete .. //depot/projects/s390/contrib/hostapd/aes.h#2 delete .. //depot/projects/s390/contrib/hostapd/aes_wrap.c#4 delete .. //depot/projects/s390/contrib/hostapd/aes_wrap.h#4 delete .. //depot/projects/s390/contrib/hostapd/ap.h#3 delete .. //depot/projects/s390/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/s390/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/s390/contrib/hostapd/beacon.c#2 delete .. //depot/projects/s390/contrib/hostapd/beacon.h#2 delete .. //depot/projects/s390/contrib/hostapd/build_config.h#2 delete .. //depot/projects/s390/contrib/hostapd/common.c#4 delete .. //depot/projects/s390/contrib/hostapd/common.h#4 delete .. //depot/projects/s390/contrib/hostapd/config.c#4 delete .. //depot/projects/s390/contrib/hostapd/config.h#4 delete .. //depot/projects/s390/contrib/hostapd/config_types.h#3 delete .. //depot/projects/s390/contrib/hostapd/crypto.c#4 delete .. //depot/projects/s390/contrib/hostapd/crypto.h#4 delete .. //depot/projects/s390/contrib/hostapd/ctrl_iface.c#4 delete .. //depot/projects/s390/contrib/hostapd/ctrl_iface.h#3 delete .. //depot/projects/s390/contrib/hostapd/defconfig#4 delete .. //depot/projects/s390/contrib/hostapd/defs.h#4 delete .. //depot/projects/s390/contrib/hostapd/des.c#2 delete .. //depot/projects/s390/contrib/hostapd/developer.txt#2 delete .. //depot/projects/s390/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/s390/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/s390/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/s390/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/s390/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/s390/contrib/hostapd/driver.h#4 delete .. //depot/projects/s390/contrib/hostapd/driver_test.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap.h#4 delete .. //depot/projects/s390/contrib/hostapd/eap_aka.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_defs.h#4 delete .. //depot/projects/s390/contrib/hostapd/eap_gpsk.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_gpsk_common.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_gpsk_common.h#2 delete .. //depot/projects/s390/contrib/hostapd/eap_gtc.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_i.h#4 delete .. //depot/projects/s390/contrib/hostapd/eap_identity.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_md5.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/s390/contrib/hostapd/eap_mschapv2.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_pax.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_pax_common.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_pax_common.h#3 delete .. //depot/projects/s390/contrib/hostapd/eap_peap.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_psk.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_psk_common.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_psk_common.h#3 delete .. //depot/projects/s390/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/s390/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/s390/contrib/hostapd/eap_sim.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_sim_common.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_sim_common.h#4 delete .. //depot/projects/s390/contrib/hostapd/eap_sim_db.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_sim_db.h#3 delete .. //depot/projects/s390/contrib/hostapd/eap_tls.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_tls_common.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_tls_common.h#3 delete .. //depot/projects/s390/contrib/hostapd/eap_tlv.c#3 delete .. //depot/projects/s390/contrib/hostapd/eap_ttls.c#4 delete .. //depot/projects/s390/contrib/hostapd/eap_ttls.h#4 delete .. //depot/projects/s390/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/s390/contrib/hostapd/eapol_sm.c#4 delete .. //depot/projects/s390/contrib/hostapd/eapol_sm.h#4 delete .. //depot/projects/s390/contrib/hostapd/eloop.c#4 delete .. //depot/projects/s390/contrib/hostapd/eloop.h#4 delete .. //depot/projects/s390/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/s390/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/s390/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/s390/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/s390/contrib/hostapd/hostap_common.h#4 delete .. //depot/projects/s390/contrib/hostapd/hostapd.8#3 delete .. //depot/projects/s390/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd.c#4 delete .. //depot/projects/s390/contrib/hostapd/hostapd.conf#4 delete .. //depot/projects/s390/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd.eap_user#4 delete .. //depot/projects/s390/contrib/hostapd/hostapd.h#4 delete .. //depot/projects/s390/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/s390/contrib/hostapd/hostapd_cli.1#3 delete .. //depot/projects/s390/contrib/hostapd/hostapd_cli.c#4 delete .. //depot/projects/s390/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/s390/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/s390/contrib/hostapd/iapp.c#4 delete .. //depot/projects/s390/contrib/hostapd/iapp.h#3 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11.c#4 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11.h#3 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11_auth.c#4 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11_auth.h#3 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/s390/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/s390/contrib/hostapd/ieee802_1x.c#4 delete .. //depot/projects/s390/contrib/hostapd/ieee802_1x.h#4 delete .. //depot/projects/s390/contrib/hostapd/includes.h#2 delete .. //depot/projects/s390/contrib/hostapd/l2_packet.h#4 delete .. //depot/projects/s390/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/s390/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/s390/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/s390/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/s390/contrib/hostapd/madwifi.conf#4 delete .. //depot/projects/s390/contrib/hostapd/md4.c#2 delete .. //depot/projects/s390/contrib/hostapd/md5.c#4 delete .. //depot/projects/s390/contrib/hostapd/md5.h#4 delete .. //depot/projects/s390/contrib/hostapd/milenage.c#2 delete .. //depot/projects/s390/contrib/hostapd/milenage.h#2 delete .. //depot/projects/s390/contrib/hostapd/mlme.c#2 delete .. //depot/projects/s390/contrib/hostapd/mlme.h#2 delete .. //depot/projects/s390/contrib/hostapd/ms_funcs.c#4 delete .. //depot/projects/s390/contrib/hostapd/ms_funcs.h#4 delete .. //depot/projects/s390/contrib/hostapd/os.h#2 delete .. //depot/projects/s390/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/s390/contrib/hostapd/os_none.c#2 delete .. //depot/projects/s390/contrib/hostapd/os_unix.c#2 delete .. //depot/projects/s390/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/s390/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/s390/contrib/hostapd/preauth.c#2 delete .. //depot/projects/s390/contrib/hostapd/preauth.h#2 delete .. //depot/projects/s390/contrib/hostapd/radius.c#4 delete .. //depot/projects/s390/contrib/hostapd/radius.h#4 delete .. //depot/projects/s390/contrib/hostapd/radius_client.c#4 delete .. //depot/projects/s390/contrib/hostapd/radius_client.h#4 delete .. //depot/projects/s390/contrib/hostapd/radius_server.c#4 delete .. //depot/projects/s390/contrib/hostapd/radius_server.h#4 delete .. //depot/projects/s390/contrib/hostapd/rc4.c#4 delete .. //depot/projects/s390/contrib/hostapd/rc4.h#4 delete .. //depot/projects/s390/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/s390/contrib/hostapd/sha1.c#4 delete .. //depot/projects/s390/contrib/hostapd/sha1.h#4 delete .. //depot/projects/s390/contrib/hostapd/sha256.c#2 delete .. //depot/projects/s390/contrib/hostapd/sha256.h#2 delete .. //depot/projects/s390/contrib/hostapd/sta_info.c#4 delete .. //depot/projects/s390/contrib/hostapd/sta_info.h#4 delete .. //depot/projects/s390/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/s390/contrib/hostapd/tls.h#4 delete .. //depot/projects/s390/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/s390/contrib/hostapd/tls_none.c#4 delete .. //depot/projects/s390/contrib/hostapd/tls_openssl.c#4 delete .. //depot/projects/s390/contrib/hostapd/version.h#4 delete .. //depot/projects/s390/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/s390/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/s390/contrib/hostapd/wired.conf#3 delete .. //depot/projects/s390/contrib/hostapd/wme.c#2 delete .. //depot/projects/s390/contrib/hostapd/wme.h#2 delete .. //depot/projects/s390/contrib/hostapd/wpa.c#4 delete .. //depot/projects/s390/contrib/hostapd/wpa.h#4 delete .. //depot/projects/s390/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/s390/contrib/hostapd/wpa_ctrl.c#3 delete .. //depot/projects/s390/contrib/hostapd/wpa_ctrl.h#3 delete .. //depot/projects/s390/contrib/less/line.c#4 integrate .. //depot/projects/s390/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/s390/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/s390/contrib/libpcap/FILES#4 delete .. //depot/projects/s390/contrib/libpcap/FREEBSD-Xlist#1 branch .. //depot/projects/s390/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/s390/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/s390/contrib/libpcap/README#3 integrate .. //depot/projects/s390/contrib/libpcap/README.Win32#2 delete .. //depot/projects/s390/contrib/libpcap/README.aix#3 delete .. //depot/projects/s390/contrib/libpcap/README.dag#3 delete .. //depot/projects/s390/contrib/libpcap/README.hpux#2 delete .. //depot/projects/s390/contrib/libpcap/README.linux#2 delete .. //depot/projects/s390/contrib/libpcap/README.macosx#2 delete .. //depot/projects/s390/contrib/libpcap/README.septel#2 delete .. //depot/projects/s390/contrib/libpcap/README.tru64#2 delete .. //depot/projects/s390/contrib/libpcap/VERSION#5 integrate .. //depot/projects/s390/contrib/libpcap/acsite.m4#2 delete .. //depot/projects/s390/contrib/libpcap/atmuni31.h#2 integrate .. //depot/projects/s390/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/s390/contrib/libpcap/bpf_dump.c#3 integrate .. //depot/projects/s390/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/s390/contrib/libpcap/chmod_bpf#1 branch .. //depot/projects/s390/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/s390/contrib/libpcap/configure#4 integrate .. //depot/projects/s390/contrib/libpcap/configure.in#4 integrate .. //depot/projects/s390/contrib/libpcap/dlpisubs.c#1 branch .. //depot/projects/s390/contrib/libpcap/dlpisubs.h#1 branch .. //depot/projects/s390/contrib/libpcap/doc/pcap.html#2 delete .. //depot/projects/s390/contrib/libpcap/doc/pcap.txt#2 delete .. //depot/projects/s390/contrib/libpcap/doc/pcap.xml#2 delete .. //depot/projects/s390/contrib/libpcap/etherent.c#3 integrate .. //depot/projects/s390/contrib/libpcap/ethertype.h#4 integrate .. //depot/projects/s390/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/s390/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/s390/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/s390/contrib/libpcap/fad-sita.c#1 branch .. //depot/projects/s390/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/s390/contrib/libpcap/filtertest.c#1 branch .. //depot/projects/s390/contrib/libpcap/findalldevstest.c#1 branch .. //depot/projects/s390/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/s390/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/s390/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/s390/contrib/libpcap/ieee80211.h#1 branch .. //depot/projects/s390/contrib/libpcap/inet.c#4 integrate .. //depot/projects/s390/contrib/libpcap/missing/snprintf.c#1 branch .. //depot/projects/s390/contrib/libpcap/mkdep#2 integrate .. //depot/projects/s390/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/s390/contrib/libpcap/net/bpf_filter.c#1 branch .. //depot/projects/s390/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/s390/contrib/libpcap/packaging/pcap.spec.in#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/s390/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-bt-linux.c#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-bt-linux.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-config.1#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-config.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-dag.h#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/s390/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-enet.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-filter.manmisc#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-filter.manmisc.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/s390/contrib/libpcap/pcap-libdlpi.c#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-linktype.manmisc#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-linktype.manmisc.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/s390/contrib/libpcap/pcap-namedb.h#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-nit.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-nit.h#2 delete .. //depot/projects/s390/contrib/libpcap/pcap-null.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-pf.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-pf.h#2 delete .. //depot/projects/s390/contrib/libpcap/pcap-savefile.manfile#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-savefile.manfile.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-septel.c#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-septel.h#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-sita.c#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-sita.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-sita.html#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-snit.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-snoop.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-stdinc.h#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap-usb-linux.c#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-usb-linux.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/s390/contrib/libpcap/pcap.3#5 delete .. //depot/projects/s390/contrib/libpcap/pcap.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/s390/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/s390/contrib/libpcap/pcap/bluetooth.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/bpf.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/namedb.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/pcap.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/sll.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/usb.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap/vlan.h#1 branch .. //depot/projects/s390/contrib/libpcap/pcap1.h#2 delete .. //depot/projects/s390/contrib/libpcap/pcap_activate.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_breakloop.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_can_set_rfmon.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_close.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_compile.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_compile.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_create.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_datalink.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_datalink.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_datalink_name_to_val.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_datalink_val_to_name.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_close.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_file.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_flush.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_ftell.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_open.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_dump_open.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_file.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_fileno.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_findalldevs.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_free_datalinks.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_freealldevs.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_freecode.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_get_selectable_fd.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_geterr.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_inject.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_is_swapped.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_lib_version.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_list_datalinks.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_list_datalinks.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_lookupdev.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_lookupnet.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_loop.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_major_version.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_next_ex.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_offline_filter.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_open_dead.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_open_dead.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_open_live.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_open_offline.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_open_offline.3pcap.in#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_buffer_size.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_datalink.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_promisc.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_rfmon.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_snaplen.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_set_timeout.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_setdirection.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_setfilter.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_setnonblock.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_snapshot.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_stats.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_statustostr.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/pcap_strerror.3pcap#1 branch .. //depot/projects/s390/contrib/libpcap/runlex.sh#1 branch .. //depot/projects/s390/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/s390/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/s390/contrib/libpcap/sll.h#3 delete .. //depot/projects/s390/contrib/ntp/ntpq/ntpq.c#5 integrate .. //depot/projects/s390/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/s390/contrib/openbsm/INSTALL#3 integrate .. //depot/projects/s390/contrib/openbsm/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/NEWS#3 integrate .. //depot/projects/s390/contrib/openbsm/README#5 integrate .. //depot/projects/s390/contrib/openbsm/TODO#5 integrate .. //depot/projects/s390/contrib/openbsm/VERSION#5 integrate .. //depot/projects/s390/contrib/openbsm/aclocal.m4#3 integrate .. //depot/projects/s390/contrib/openbsm/bin/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/audit.8#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/audit/audit.c#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/audit_warn.c#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd.h#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/s390/contrib/openbsm/bin/auditreduce/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bin/praudit/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bsm/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/bsm/audit_uevents.h#4 integrate .. //depot/projects/s390/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/s390/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/s390/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/s390/contrib/openbsm/config/config.h.in#5 integrate .. //depot/projects/s390/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/s390/contrib/openbsm/configure#5 integrate .. //depot/projects/s390/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/s390/contrib/openbsm/etc/audit_class#3 integrate .. //depot/projects/s390/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/s390/contrib/openbsm/etc/audit_event#5 integrate .. //depot/projects/s390/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/s390/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/Makefile.am#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/au_fcntl_cmd.3#1 branch .. //depot/projects/s390/contrib/openbsm/libbsm/audit_submit.3#4 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_audit.c#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_control.c#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_domain.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_fcntl.c#1 branch .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_notify.c#4 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/s390/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/s390/contrib/openbsm/man/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/man/audit_control.5#4 integrate .. //depot/projects/s390/contrib/openbsm/man/auditon.2#4 integrate .. //depot/projects/s390/contrib/openbsm/modules/Makefile.in#4 integrate .. //depot/projects/s390/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate .. //depot/projects/s390/contrib/openbsm/sys/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/Makefile.am#3 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/Makefile.in#3 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/s390/contrib/openbsm/sys/bsm/audit_record.h#3 integrate .. //depot/projects/s390/contrib/openbsm/test/Makefile.in#4 integrate .. //depot/projects/s390/contrib/openbsm/test/bsm/Makefile.in#4 integrate .. //depot/projects/s390/contrib/openbsm/tools/Makefile.in#5 integrate .. //depot/projects/s390/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/s390/contrib/openpam/include/security/openpam.h#6 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_dynamic.c#6 integrate .. //depot/projects/s390/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/s390/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/s390/contrib/tcpdump/FILES#5 delete .. //depot/projects/s390/contrib/tcpdump/FREEBSD-Xlist#1 branch .. //depot/projects/s390/contrib/tcpdump/INSTALL#5 delete .. //depot/projects/s390/contrib/tcpdump/INSTALL.txt#1 branch .. //depot/projects/s390/contrib/tcpdump/Makefile-devel-adds#2 delete .. //depot/projects/s390/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/s390/contrib/tcpdump/PLATFORMS#2 delete .. //depot/projects/s390/contrib/tcpdump/README#5 integrate .. //depot/projects/s390/contrib/tcpdump/Readme.Win32#2 delete .. //depot/projects/s390/contrib/tcpdump/TODO#2 delete .. //depot/projects/s390/contrib/tcpdump/VERSION#6 integrate .. //depot/projects/s390/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/addrtoname.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/af.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/af.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/aodv.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/appletalk.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/arcnet.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/atmuni31.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/bgp.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/bootp.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/bpf_dump.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/chdlc.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/checksum.c#1 branch .. //depot/projects/s390/contrib/tcpdump/config.h.in#5 integrate .. //depot/projects/s390/contrib/tcpdump/configure#5 integrate .. //depot/projects/s390/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/s390/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/decnet.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/enc.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/ether.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/extract.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/fddi.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/gmt2local.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/gmt2local.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/igrp.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/s390/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/ip6.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/ipfc.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/ipsec_doi.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/ipx.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/isakmp.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/l2tp.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/l2vpn.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/l2vpn.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/lane.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/lbl/os-osf4.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/lbl/os-solaris2.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/lbl/os-sunos4.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/lbl/os-ultrix4.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/machdep.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/machdep.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/makemib#2 integrate .. //depot/projects/s390/contrib/tcpdump/missing/addrinfo.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/missing/getaddrinfo.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/getnameinfo.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/inet_aton.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/inet_ntop.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/inet_pton.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/snprintf.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/strdup.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/missing/strlcat.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/strlcpy.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/missing/strsep.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/mpls.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/nameser.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/netbios.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/nfs.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/nfsfh.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/nlpid.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/nlpid.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/ntp.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/oakley.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/ospf6.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/pcap_dump_ftell.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ah.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-arcnet.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-arp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-atalk.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-beep.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-bootp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-bt.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-cdp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-cfm.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-cnfp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-decnet.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-dhcp6.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-dtp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-dvmrp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-eap.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-egp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-esp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-frag6.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-gre.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-hsrp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-icmp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-icmp6.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-igmp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-igrp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-ip6opts.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-ipcomp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-isakmp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-krb.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-l2tp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-lane.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-lldp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-lmp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-lspping.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-lwapp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-lwres.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-mobile.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-mpcp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-mpls.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-msdp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-netbios.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-nfs.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ntp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-ospf6.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-pgm.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-pppoe.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-radius.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-raw.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-rip.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-ripng.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-rrcp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-rt6.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-rx.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-sflow.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-sip.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-sl.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-slow.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-smb.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-snmp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-stp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-sunrpc.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-symantec.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-syslog.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/print-telnet.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-timed.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-token.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-udld.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/print-vjc.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-vqp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-vrrp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-vtp.c#1 branch .. //depot/projects/s390/contrib/tcpdump/print-wb.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-zephyr.c#4 integrate .. //depot/projects/s390/contrib/tcpdump/route6d.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/rx.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/sctpConstants.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/sctpHeader.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/setsignal.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/setsignal.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/slcompress.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/slip.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/sll.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/smb.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/smbutil.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/strcasecmp.c#3 integrate .. //depot/projects/s390/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/s390/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/telnet.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/tests/.cvsignore#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/alltests.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/bgp_vpn_attrset.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/bgp_vpn_attrset.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/eapon1.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/eapon1.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/eapon1.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/eapon1.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/eapon2.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp-secrets.txt#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp0.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp0.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp1.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp1.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp1.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp2.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp2.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp2.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp3.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp3.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp4.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp4.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp5.gdbinit#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp5.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/esp5.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/espudp1.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/espudp1.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/espudp1.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp-delete-segfault.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp-identification-segfault.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp-pointer-loop.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp1.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp1.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp2.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp2.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp3.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp3.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp4.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp4.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/isakmp4500.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/lmp.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/lmp.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/lmp.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/mpls-ldp-hello.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/mpls-ldp-hello.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/mpls-ldp-hello.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/ospf-gmpls.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/ospf-gmpls.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/ospf-gmpls.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-A.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-AA.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-X.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-XX.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-capX.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-capXX.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-flags.puu#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-flags.sh#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-x.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tests/print-xx.out#2 delete .. //depot/projects/s390/contrib/tcpdump/tftp.h#2 integrate .. //depot/projects/s390/contrib/tcpdump/timed.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/token.h#3 integrate .. //depot/projects/s390/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/s390/contrib/tcpdump/util.c#5 integrate .. //depot/projects/s390/contrib/tcpdump/vfprintf.c#3 integrate .. //depot/projects/s390/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/s390/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/s390/contrib/top/install#2 delete .. //depot/projects/s390/contrib/top/install-sh#1 branch .. //depot/projects/s390/contrib/wpa/COPYING#1 branch .. //depot/projects/s390/contrib/wpa/README#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/README#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/s390/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/s390/contrib/wpa/src/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/s390/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/s390/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/s390/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/s390/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/s390/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/s390/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/s390/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/s390/contrib/wpa/src/eap_server/eap_sake.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 25 16:29:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134171065675; Sat, 25 Apr 2009 16:29:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5DCD106566C for ; Sat, 25 Apr 2009 16:29:51 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B29088FC0C for ; Sat, 25 Apr 2009 16:29:51 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PGTpKC061810 for ; Sat, 25 Apr 2009 16:29:51 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PGTp6k061808 for perforce@freebsd.org; Sat, 25 Apr 2009 16:29:51 GMT (envelope-from bz@freebsd.org) Date: Sat, 25 Apr 2009 16:29:51 GMT Message-Id: <200904251629.n3PGTp6k061808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 161071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 16:29:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=161071 Change 161071 by bz@bz_dumpster on 2009/04/25 16:29:35 IFC with -Di -Dt fixups @161069 Affected files ... .. //depot/projects/s390/contrib/bind9/lib/bind/aclocal.m4#3 branch .. //depot/projects/s390/contrib/bind9/lib/bind/config.h.in#4 branch .. //depot/projects/s390/sys/amd64/ia32/ia32_misc.c#3 branch .. //depot/projects/s390/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/s390/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/s390/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/s390/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/s390/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/s390/sys/dev/usb/usb.h#8 integrate .. //depot/projects/s390/sys/dev/usb/usb_if.m#3 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/s390/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_misc.c#7 branch .. //depot/projects/s390/sys/modules/usb/Makefile#6 integrate .. //depot/projects/s390/sys/powerpc/powerpc/uio_machdep.c#3 branch Differences ... ==== //depot/projects/s390/sys/dev/ata/ata-usb.c#3 (text) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2006 - 2008 Søren Schmidt * All rights reserved. * + * Copyright (c) 2006 Hans Petter Selasky + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,950 +28,1071 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.8 2008/04/10 13:05:05 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.14 2009/03/02 05:37:05 thompsa Exp $"); + +#include "usbdevs.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include -#include "opt_ata.h" -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include + #include #include +#define ATAUSB_BULK_SIZE (1<<17) + /* Command Block Wrapper */ struct bbb_cbw { - u_int8_t signature[4]; -#define CBWSIGNATURE 0x43425355 + uint8_t signature[4]; +#define CBWSIGNATURE 0x43425355 - u_int8_t tag[4]; - u_int8_t transfer_length[4]; - u_int8_t flags; -#define CBWFLAGS_OUT 0x00 -#define CBWFLAGS_IN 0x80 + uint8_t tag[4]; + uint8_t transfer_length[4]; + uint8_t flags; +#define CBWFLAGS_OUT 0x00 +#define CBWFLAGS_IN 0x80 - u_int8_t lun; - u_int8_t length; -#define CBWCDBLENGTH 16 + uint8_t lun; + uint8_t length; +#define CBWCDBLENGTH 16 - u_int8_t cdb[CBWCDBLENGTH]; -}; + uint8_t cdb[CBWCDBLENGTH]; +} __packed; /* Command Status Wrapper */ struct bbb_csw { - u_int8_t signature[4]; -#define CSWSIGNATURE 0x53425355 + uint8_t signature[4]; +#define CSWSIGNATURE 0x53425355 - u_int8_t tag[4]; - u_int8_t residue[4]; - u_int8_t status; -#define CSWSTATUS_GOOD 0x0 -#define CSWSTATUS_FAILED 0x1 -#define CSWSTATUS_PHASE 0x2 -}; + uint8_t tag[4]; + uint8_t residue[4]; + uint8_t status; +#define CSWSTATUS_GOOD 0x0 +#define CSWSTATUS_FAILED 0x1 +#define CSWSTATUS_PHASE 0x2 +} __packed; /* USB-ATA 'controller' softc */ -struct atausb_softc { - device_t dev; /* base device */ - usbd_interface_handle iface; /* interface */ - int ifaceno; /* interface number */ - u_int8_t bulkin; /* endpoint address's */ - u_int8_t bulkout; - u_int8_t bulkirq; - usbd_pipe_handle bulkin_pipe; /* pipe handle's */ - usbd_pipe_handle bulkout_pipe; - usbd_pipe_handle bulkirq_pipe; - int maxlun; - int timeout; - struct ata_request *ata_request; - usb_device_request_t usb_request; - struct bbb_cbw cbw; - struct bbb_csw csw; +struct atausb2_softc { + struct bbb_cbw cbw; + struct bbb_csw csw; + struct mtx locked_mtx; + + struct ata_channel *locked_ch; + struct ata_channel *restart_ch; + struct ata_request *ata_request; + +#define ATAUSB_T_BBB_RESET1 0 +#define ATAUSB_T_BBB_RESET2 1 +#define ATAUSB_T_BBB_RESET3 2 +#define ATAUSB_T_BBB_COMMAND 3 +#define ATAUSB_T_BBB_DATA_READ 4 +#define ATAUSB_T_BBB_DATA_RD_CS 5 +#define ATAUSB_T_BBB_DATA_WRITE 6 +#define ATAUSB_T_BBB_DATA_WR_CS 7 +#define ATAUSB_T_BBB_STATUS 8 +#define ATAUSB_T_BBB_MAX 9 + +#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX -#define ATAUSB_T_BBB_CBW 0 -#define ATAUSB_T_BBB_DATA 1 -#define ATAUSB_T_BBB_DCLEAR 2 -#define ATAUSB_T_BBB_CSW1 3 -#define ATAUSB_T_BBB_CSW2 4 -#define ATAUSB_T_BBB_SCLEAR 5 -#define ATAUSB_T_BBB_RESET1 6 -#define ATAUSB_T_BBB_RESET2 7 -#define ATAUSB_T_BBB_RESET3 8 -#define ATAUSB_T_MAX 9 - usbd_xfer_handle transfer[ATAUSB_T_MAX]; + struct usb2_xfer *xfer[ATAUSB_T_MAX]; + caddr_t ata_data; + device_t dev; - int state; -#define ATAUSB_S_ATTACH 0 -#define ATAUSB_S_IDLE 1 -#define ATAUSB_S_BBB_COMMAND 2 -#define ATAUSB_S_BBB_DATA 3 -#define ATAUSB_S_BBB_DCLEAR 4 -#define ATAUSB_S_BBB_STATUS1 5 -#define ATAUSB_S_BBB_SCLEAR 6 -#define ATAUSB_S_BBB_STATUS2 7 -#define ATAUSB_S_BBB_RESET1 8 -#define ATAUSB_S_BBB_RESET2 9 -#define ATAUSB_S_BBB_RESET3 10 -#define ATAUSB_S_DETACH 11 + uint32_t timeout; + uint32_t ata_donecount; + uint32_t ata_bytecount; - struct mtx locked_mtx; - struct ata_channel *locked_ch; - struct ata_channel *restart_ch; + uint8_t last_xfer_no; + uint8_t usb2_speed; + uint8_t intr_stalled; + uint8_t maxlun; + uint8_t iface_no; + uint8_t status_try; }; -static int atausbdebug = 0; +static const int atausbdebug = 0; + +/* prototypes */ + +static device_probe_t atausb2_probe; +static device_attach_t atausb2_attach; +static device_detach_t atausb2_detach; + +static usb2_callback_t atausb2_t_bbb_reset1_callback; +static usb2_callback_t atausb2_t_bbb_reset2_callback; +static usb2_callback_t atausb2_t_bbb_reset3_callback; +static usb2_callback_t atausb2_t_bbb_command_callback; +static usb2_callback_t atausb2_t_bbb_data_read_callback; +static usb2_callback_t atausb2_t_bbb_data_rd_cs_callback; +static usb2_callback_t atausb2_t_bbb_data_write_callback; +static usb2_callback_t atausb2_t_bbb_data_wr_cs_callback; +static usb2_callback_t atausb2_t_bbb_status_callback; +static usb2_callback_t atausb2_tr_error; + +static void atausb2_cancel_request(struct atausb2_softc *sc); +static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no); +static void atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static int ata_usbchannel_begin_transaction(struct ata_request *request); +static int ata_usbchannel_end_transaction(struct ata_request *request); -/* prototypes*/ -static usbd_status atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static usbd_status atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, usb_device_request_t *req, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static void atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer); -static void atausb_bbb_reset(struct atausb_softc *sc); -static int atausb_bbb_start(struct ata_request *request); -static void atausb_bbb_finish(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err); -int ata_usbchannel_begin_transaction(struct ata_request *request); -int ata_usbchannel_end_transaction(struct ata_request *request); +static device_probe_t ata_usbchannel_probe; +static device_attach_t ata_usbchannel_attach; +static device_detach_t ata_usbchannel_detach; +static ata_setmode_t ata_usbchannel_setmode; +static ata_locking_t ata_usbchannel_locking; /* * USB frontend part */ -USB_DECLARE_DRIVER(atausb); -DRIVER_MODULE(atausb, uhub, atausb_driver, atausb_devclass, 0, 0); + +struct usb2_config atausb2_config[ATAUSB_T_BBB_MAX] = { + + [ATAUSB_T_BBB_RESET1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset1_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 500, /* 500 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset2_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset3_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_COMMAND] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = sizeof(struct bbb_cbw), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_command_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_READ] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_read_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_RD_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_rd_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_WRITE] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_write_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_WR_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_wr_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_STATUS] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = sizeof(struct bbb_csw), + .mh.flags = {.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_status_callback, + .mh.timeout = 5000, /* ms */ + }, +}; + +static devclass_t atausb2_devclass; + +static device_method_t atausb2_methods[] = { + DEVMETHOD(device_probe, atausb2_probe), + DEVMETHOD(device_attach, atausb2_attach), + DEVMETHOD(device_detach, atausb2_detach), + {0, 0} +}; + +static driver_t atausb2_driver = { + .name = "atausb", + .methods = atausb2_methods, + .size = sizeof(struct atausb2_softc), +}; + +DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0); +MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); static int -atausb_match(device_t dev) +atausb2_probe(device_t dev) +{ + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; + + if (uaa->usb2_mode != USB_MODE_HOST) { + return (ENXIO); + } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } + id = usb2_get_interface_descriptor(uaa->iface); + if ((!id) || (id->bInterfaceClass != UICLASS_MASS)) { + return (ENXIO); + } + switch (id->bInterfaceSubClass) { + case UISUBCLASS_QIC157: + case UISUBCLASS_RBC: + case UISUBCLASS_SCSI: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + case UISUBCLASS_UFI: + switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_CBI: + case UIPROTO_MASS_CBI_I: + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + return (0); + default: + return (0); + } + break; + default: + return (0); + } +} + +static int +atausb2_attach(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; + struct atausb2_softc *sc = device_get_softc(dev); + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; + const char *proto, *subclass; + struct usb2_device_request request; + device_t child; + uint16_t i; + uint8_t maxlun; + uint8_t has_intr; + int err; - if (uaa->iface == NULL) - return UMATCH_NONE; + device_set_usb2_desc(dev); - id = usbd_get_interface_descriptor(uaa->iface); - if (!id || id->bInterfaceClass != UICLASS_MASS) - return UMATCH_NONE; + sc->dev = dev; + sc->maxlun = 0; + sc->locked_ch = NULL; + sc->restart_ch = NULL; + sc->usb2_speed = usb2_get_speed(uaa->device); + mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, (MTX_DEF | MTX_RECURSE)); - switch (id->bInterfaceSubClass) { - case UISUBCLASS_QIC157: - case UISUBCLASS_RBC: - case UISUBCLASS_SCSI: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - case UISUBCLASS_UFI: + id = usb2_get_interface_descriptor(uaa->iface); switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + proto = "Bulk-Only"; + break; case UIPROTO_MASS_CBI: + proto = "CBI"; + break; case UIPROTO_MASS_CBI_I: - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO; + proto = "CBI with CCI"; + break; + default: + proto = "Unknown"; + } + + switch (id->bInterfaceSubClass) { + case UISUBCLASS_RBC: + subclass = "RBC"; + break; + case UISUBCLASS_QIC157: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + subclass = "ATAPI"; + break; + case UISUBCLASS_SCSI: + subclass = "SCSI"; + break; + case UISUBCLASS_UFI: + subclass = "UFI"; + break; default: - return UMATCH_IFACECLASS_IFACESUBCLASS; + subclass = "Unknown"; + } + + has_intr = (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I); + sc->iface_no = id->bInterfaceNumber; + + device_printf(dev, "using %s over %s\n", subclass, proto); + if (strcmp(proto, "Bulk-Only") || + (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) { + goto detach; + } + err = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, + sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc, + &sc->locked_mtx); + + /* skip reset first time */ + sc->last_xfer_no = ATAUSB_T_BBB_COMMAND; + + if (err) { + device_printf(sc->dev, "could not setup required " + "transfers, %s\n", usb2_errstr(err)); + goto detach; + } + /* get number of devices so we can add matching channels */ + request.bmRequestType = UT_READ_CLASS_INTERFACE; + request.bRequest = 0xfe; /* GET_MAX_LUN; */ + USETW(request.wValue, 0); + USETW(request.wIndex, sc->iface_no); + USETW(request.wLength, sizeof(maxlun)); + err = usb2_do_request(uaa->device, &Giant, &request, &maxlun); + + if (err) { + if (bootverbose) { + device_printf(sc->dev, "get maxlun not supported %s\n", + usb2_errstr(err)); + } + } else { + sc->maxlun = maxlun; + if (bootverbose) { + device_printf(sc->dev, "maxlun=%d\n", sc->maxlun); + } + } + + /* ata channels are children to this USB control device */ + for (i = 0; i <= sc->maxlun; i++) { + if ((child = device_add_child(sc->dev, "ata", + devclass_find_free_unit(ata_devclass, 2))) == NULL) { + device_printf(sc->dev, "failed to add ata child device\n"); + } else + device_set_ivars(child, (void *)(intptr_t)i); } - break; - default: - return UMATCH_IFACECLASS; - } + bus_generic_attach(sc->dev); + + return (0); + +detach: + atausb2_detach(dev); + return (ENXIO); } static int -atausb_attach(device_t dev) +atausb2_detach(device_t dev) { - struct atausb_softc *sc = device_get_softc(dev); - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - usbd_device_handle udev; - usb_device_request_t request; - char devinfo[1024], *proto, *subclass; - u_int8_t maxlun; - int err, i; + struct atausb2_softc *sc = device_get_softc(dev); + device_t *children; + int nchildren, i; + + /* teardown our statemachine */ - sc->dev = dev; - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(dev, devinfo); - sc->bulkin = sc->bulkout = sc->bulkirq = -1; - sc->bulkin_pipe = sc->bulkout_pipe= sc->bulkirq_pipe = NULL; - sc->iface = uaa->iface; - sc->ifaceno = uaa->ifaceno; - sc->maxlun = 0; - sc->timeout = 5000; - sc->locked_ch = NULL; - sc->restart_ch = NULL; - mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, MTX_DEF); + usb2_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); - id = usbd_get_interface_descriptor(sc->iface); - switch (id->bInterfaceProtocol) { - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - proto = "Bulk-Only"; - break; - case UIPROTO_MASS_CBI: - proto = "CBI"; - break; - case UIPROTO_MASS_CBI_I: - proto = "CBI with CCI"; - break; - default: - proto = "Unknown"; - } - switch (id->bInterfaceSubClass) { - case UISUBCLASS_RBC: - subclass = "RBC"; - break; - case UISUBCLASS_QIC157: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - subclass = "ATAPI"; - break; - case UISUBCLASS_SCSI: - subclass = "SCSI"; - break; - case UISUBCLASS_UFI: - subclass = "UFI"; - break; - default: - subclass = "Unknown"; - } - device_printf(dev, "using %s over %s\n", subclass, proto); - if (strcmp(proto, "Bulk-Only") || - (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) - return ENXIO; + /* detach & delete all children, if any */ - for (i = 0 ; i < id->bNumEndpoints ; i++) { - if (!(ed = usbd_interface2endpoint_descriptor(sc->iface, i))) { - device_printf(sc->dev, "could not read endpoint descriptor\n"); - return ENXIO; + if (!device_get_children(dev, &children, &nchildren)) { + for (i = 0; i < nchildren; i++) { + device_delete_child(dev, children[i]); + } + free(children, M_TEMP); } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkin = ed->bEndpointAddress; + mtx_destroy(&sc->locked_mtx); + return (0); +} + +static void +atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no) +{ + if (atausbdebug) { + device_printf(sc->dev, "BBB transfer %d\n", xfer_no); } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkout = ed->bEndpointAddress; + if (sc->xfer[xfer_no]) { + sc->last_xfer_no = xfer_no; + usb2_transfer_start(sc->xfer[xfer_no]); + } else { + atausb2_cancel_request(sc); } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I && - UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) { - sc->bulkirq = ed->bEndpointAddress; +} + +static void +atausb2_t_bbb_reset1_callback(struct usb2_xfer *xfer) +{ + struct atausb2_softc *sc = xfer->priv_sc; + struct usb2_device_request req; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start(sc, ATAUSB_T_BBB_RESET2); + return; + + case USB_ST_SETUP: + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = 0xff; /* bulk-only reset */ + USETW(req.wValue, 0); + req.wIndex[0] = sc->iface_no; + req.wIndex[1] = 0; + USETW(req.wLength, 0); + + usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + + xfer->frlengths[0] = sizeof(req); + xfer->nframes = 1; + usb2_start_hardware(xfer); + return; + + default: /* Error */ + atausb2_tr_error(xfer); + return; + } - } +} + +static void +atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, + ATAUSB_T_BBB_DATA_READ); +} - /* check whether we found at least the endpoints we need */ - if (!sc->bulkin || !sc->bulkout) { - device_printf(sc->dev, "needed endpoints not found (%d,%d)\n", - sc->bulkin, sc->bulkout); - atausb_detach(dev); - return ENXIO; - } +static void +atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, + ATAUSB_T_BBB_DATA_WRITE); +} - /* open the pipes */ - if (usbd_open_pipe(sc->iface, sc->bulkout, - USBD_EXCLUSIVE_USE, &sc->bulkout_pipe)) { - device_printf(sc->dev, "cannot open bulkout pipe (%d)\n", sc->bulkout); - atausb_detach(dev); - return ENXIO; - } - if (usbd_open_pipe(sc->iface, sc->bulkin, - USBD_EXCLUSIVE_USE, &sc->bulkin_pipe)) { - device_printf(sc->dev, "cannot open bulkin pipe (%d)\n", sc->bulkin); - atausb_detach(dev); - return ENXIO; - } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I) { - if (usbd_open_pipe(sc->iface, sc->bulkirq, - USBD_EXCLUSIVE_USE, &sc->bulkirq_pipe)) { - device_printf(sc->dev, "cannot open bulkirq pipe (%d)\n", - sc->bulkirq); - atausb_detach(dev); - return ENXIO; - } - } - sc->state = ATAUSB_S_ATTACH; +static void +atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, + uint8_t next_xfer, + uint8_t stall_xfer) +{ + struct atausb2_softc *sc = xfer->priv_sc; - /* alloc needed number of transfer handles */ - for (i = 0; i < ATAUSB_T_MAX; i++) { - sc->transfer[i] = usbd_alloc_xfer(uaa->device); - if (!sc->transfer[i]) { - device_printf(sc->dev, "out of memory\n"); - atausb_detach(dev); - return ENXIO; - } - } + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: +tr_transferred: + atausb2_transfer_start(sc, next_xfer); + return; - /* driver is ready to process requests here */ - sc->state = ATAUSB_S_IDLE; + case USB_ST_SETUP: + if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { + goto tr_transferred; + } + return; - /* get number of devices so we can add matching channels */ - usbd_interface2device_handle(sc->iface, &udev); - request.bmRequestType = UT_READ_CLASS_INTERFACE; - request.bRequest = 0xfe; //GET_MAX_LUN; - USETW(request.wValue, 0); - USETW(request.wIndex, sc->ifaceno); - USETW(request.wLength, sizeof(maxlun)); - switch ((err = usbd_do_request(udev, &request, &maxlun))) { - case USBD_NORMAL_COMPLETION: - if (bootverbose) - device_printf(sc->dev, "maxlun=%d\n", maxlun); - sc->maxlun = maxlun; - break; - default: - if (bootverbose) - device_printf(sc->dev, "get maxlun not supported %s\n", - usbd_errstr(err)); - } + default: /* Error */ + atausb2_tr_error(xfer); + return; - /* ata channels are children to this USB control device */ - for (i = 0; i <= sc->maxlun; i++) { - if (!device_add_child(sc->dev, "ata", - devclass_find_free_unit(ata_devclass, 2))) { - device_printf(sc->dev, "failed to attach ata child device\n"); - atausb_detach(dev); - return ENXIO; } - } - bus_generic_attach(sc->dev); - return 0; } -static int -atausb_detach(device_t dev) +static void +atausb2_t_bbb_command_callback(struct usb2_xfer *xfer) { - struct atausb_softc *sc = device_get_softc(dev); - usbd_device_handle udev; - device_t *children; - int nchildren, i; + struct atausb2_softc *sc = xfer->priv_sc; + struct ata_request *request = sc->ata_request; + struct ata_channel *ch; + uint32_t tag; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start + (sc, ((request->flags & ATA_R_READ) ? ATAUSB_T_BBB_DATA_READ : + (request->flags & ATA_R_WRITE) ? ATAUSB_T_BBB_DATA_WRITE : + ATAUSB_T_BBB_STATUS)); + return; - /* signal that device is going away */ - sc->state = ATAUSB_S_DETACH; + case USB_ST_SETUP: - /* abort all the pipes in case there are active transfers */ - usbd_interface2device_handle(sc->iface, &udev); - usbd_abort_default_pipe(udev); - if (sc->bulkout_pipe) - usbd_abort_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_abort_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_abort_pipe(sc->bulkirq_pipe); + sc->status_try = 0; - /* detach & delete all children */ - if (!device_get_children(dev, &children, &nchildren)) { - for (i = 0; i < nchildren; i++) - device_delete_child(dev, children[i]); - free(children, M_TEMP); - } + if (request) { + ch = device_get_softc(request->parent); - /* free the transfers */ - for (i = 0; i < ATAUSB_T_MAX; i++) - if (sc->transfer[i]) - usbd_free_xfer(sc->transfer[i]); + sc->timeout = (request->timeout * 1000) + 5000; - /* remove all the pipes */ - if (sc->bulkout_pipe) - usbd_close_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_close_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_close_pipe(sc->bulkirq_pipe); + tag = UGETDW(sc->cbw.tag) + 1; - mtx_destroy(&sc->locked_mtx); - return 0; -} + USETDW(sc->cbw.signature, CBWSIGNATURE); + USETDW(sc->cbw.tag, tag); + USETDW(sc->cbw.transfer_length, request->bytecount); + sc->cbw.flags = (request->flags & ATA_R_READ) ? CBWFLAGS_IN : CBWFLAGS_OUT; + sc->cbw.lun = ch->unit; + sc->cbw.length = 16; + bzero(sc->cbw.cdb, 16); + bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ + usb2_copy_in(xfer->frbuffers, 0, &sc->cbw, sizeof(sc->cbw)); -/* - * Generic USB transfer routines - */ -static usbd_status -atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, - void *buffer, int buflen, int flags, usbd_xfer_handle xfer) -{ - usbd_status err; + xfer->frlengths[0] = sizeof(sc->cbw); + usb2_start_hardware(xfer); + } + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + atausb2_tr_error(xfer); + return; - usbd_setup_xfer(xfer, pipe, (void *)sc, buffer, buflen, flags, - sc->timeout, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } -static usbd_status -atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, - usb_device_request_t *req, void *buffer, int buflen, int flags, - usbd_xfer_handle xfer) +static void +atausb2_t_bbb_data_read_callback(struct usb2_xfer *xfer) { - usbd_status err; + struct atausb2_softc *sc = xfer->priv_sc; + uint32_t max_bulk = xfer->max_data_length; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + + usb2_copy_out(xfer->frbuffers, 0, + sc->ata_data, xfer->actlen); + + sc->ata_bytecount -= xfer->actlen; + sc->ata_data += xfer->actlen; + sc->ata_donecount += xfer->actlen; + + if (xfer->actlen < xfer->sumlen) { + /* short transfer */ + sc->ata_bytecount = 0; + } + case USB_ST_SETUP: + + if (atausbdebug > 1) { + device_printf(sc->dev, "%s: max_bulk=%d, ata_bytecount=%d\n", + __FUNCTION__, max_bulk, sc->ata_bytecount); + } + if (sc->ata_bytecount == 0) { + atausb2_transfer_start(sc, ATAUSB_T_BBB_STATUS); + return; + } + if (max_bulk > sc->ata_bytecount) { + max_bulk = sc->ata_bytecount; + } + xfer->timeout = sc->timeout; + xfer->frlengths[0] = max_bulk; + + usb2_start_hardware(xfer); + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + if (xfer->error == USB_ERR_CANCELLED) { + atausb2_tr_error(xfer); + } else { + atausb2_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); + } + return; - usbd_setup_default_xfer(xfer, udev, (void *)sc, sc->timeout, req, - buffer, buflen, flags, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup ctl transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } static void -atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, - usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer) +atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) { - usbd_device_handle udev; - - if (atausbdebug) - device_printf(sc->dev, "clear endpoint 0x%02x stall\n", endpt); - usbd_interface2device_handle(sc->iface, &udev); - sc->state = state; - usbd_clear_endpoint_toggle(pipe); - sc->usb_request.bmRequestType = UT_WRITE_ENDPOINT; - sc->usb_request.bRequest = UR_CLEAR_FEATURE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 25 20:08:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3A361065674; Sat, 25 Apr 2009 20:08:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80908106566C for ; Sat, 25 Apr 2009 20:08:34 +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 554968FC0C for ; Sat, 25 Apr 2009 20:08:34 +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 n3PK8YGq079765 for ; Sat, 25 Apr 2009 20:08:34 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PK8XF6079763 for perforce@freebsd.org; Sat, 25 Apr 2009 20:08:33 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 25 Apr 2009 20:08:33 GMT Message-Id: <200904252008.n3PK8XF6079763@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 161074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 20:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=161074 Change 161074 by pgj@beehive on 2009/04/25 20:07:53 Add a Milestones files for my Summer of Code 2009 project Affected files ... .. //depot/projects/soc2009/pgj_libstat/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 25 20:28:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 758F51065672; Sat, 25 Apr 2009 20:28:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 359CD106566B for ; Sat, 25 Apr 2009 20:28:55 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A22D8FC13 for ; Sat, 25 Apr 2009 20:28:55 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PKSsYQ085333 for ; Sat, 25 Apr 2009 20:28:54 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PKSsCI085331 for perforce@freebsd.org; Sat, 25 Apr 2009 20:28:54 GMT (envelope-from truncs@FreeBSD.org) Date: Sat, 25 Apr 2009 20:28:54 GMT Message-Id: <200904252028.n3PKSsCI085331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 161075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 20:28:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=161075 Change 161075 by truncs@aditya on 2009/04/25 20:27:58 MileStones for Improving ext2fs and making it GPL free. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/MileStones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 25 20:38:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 406E41065679; Sat, 25 Apr 2009 20:38:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F202A1065674 for ; Sat, 25 Apr 2009 20:38:04 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C832A8FC20 for ; Sat, 25 Apr 2009 20:38:04 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PKc4FF088190 for ; Sat, 25 Apr 2009 20:38:04 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PKc4v7088188 for perforce@freebsd.org; Sat, 25 Apr 2009 20:38:04 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sat, 25 Apr 2009 20:38:04 GMT Message-Id: <200904252038.n3PKc4v7088188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Cc: Subject: PERFORCE change 161078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 20:38:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=161078 Change 161078 by dforsyth@squirrel on 2009/04/25 20:37:35 Adding Milestones file for Summer of Code 2009 project -- libpkg. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Apr 25 21:34:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CB1E1065674; Sat, 25 Apr 2009 21:34:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF88F106564A for ; Sat, 25 Apr 2009 21:34:01 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDD2F8FC24 for ; Sat, 25 Apr 2009 21:34:01 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PLY1OJ018780 for ; Sat, 25 Apr 2009 21:34:01 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3PLY1t5018778 for perforce@freebsd.org; Sat, 25 Apr 2009 21:34:01 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 25 Apr 2009 21:34:01 GMT Message-Id: <200904252134.n3PLY1t5018778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 161084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 21:34:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=161084 Change 161084 by antab@antab_farm on 2009/04/25 21:33:55 Fix interrupt handling to get ithreads working Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/intr.c#6 edit .. //depot/projects/avr32/src/sys/avr32/include/intr.h#5 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/intr.c#6 (text+ko) ==== @@ -24,6 +24,15 @@ * SUCH DAMAGE. */ +/** + * AVR32 has 4 interrupt priorities and 64 interrupt sources. Individual + * interrupt sources can not be masked, only the priority groups they + * belong to. + * + * INT3 will be permanently masked so we can mask individual sources to + * implement ithread support. + */ + #include __FBSDID("$FreeBSD: $"); @@ -45,7 +54,9 @@ #include /* Private data */ +static void intr_change_priority(int irq, int pri); static struct intr_event *intr_event[IRQ_COUNT]; +static int intr_intlevel[IRQ_COUNT]; static int intrcnt_tab[IRQ_COUNT]; static int intrcnt_index = 0; extern vm_offset_t _evba; @@ -84,6 +95,7 @@ /* Setup INTC, every interrupt is at priority 0 */ for (i = 0; i < IRQ_COUNT; i++) { + intr_intlevel[i] = 0; offset = AT32AP700X_BASE + AT32AP700X_INTC_OFFSET + (i * sizeof(register_t)); @@ -91,19 +103,31 @@ (vm_offset_t)intr_handle0 - (vm_offset_t)&_evba); } - /* Enable interrupts */ + /* Enable interrupts, note, INT3 is always masked */ sysreg_write(COMPARE, 0); - sysreg_write(SR, sysreg_read(SR) & ~INTR_MASK); + sysreg_write(SR, (sysreg_read(SR) & ~INTR_MASK) | + bit_offset(SYS, SR, I3M)); +} + +static void +intr_change_priority(int irq, int pri) +{ + size_t offset; + + /* Few sanity checks */ + KASSERT(irq < IRQ_COUNT, ("Invalid interrupt group")); + KASSERT(pri < 4, ("Invalid priority level")); + + offset = AT32AP700X_BASE + AT32AP700X_INTC_OFFSET + + (irq * sizeof(register_t)); + reg_write(offset, INTC, IPR, + (reg_read(offset, INTC, IPR) & ~bit_mask(INTC, IPR, INTLEVEL)) | + (pri << bit_shift(INTC, IPR, INTLEVEL))); } void intr_handle(struct trapframe *tf, int irq, int pri) { - if (!intr_event[irq] || TAILQ_EMPTY(&intr_event[irq]->ie_handlers)) { - printf("stray interrupt %d, priority %d\n", irq, pri); - return; - } - if (intr_event_handle(intr_event[irq], tf) != 0) { panic("stray interrupt %d, priority %d\n", irq, pri); } @@ -113,23 +137,19 @@ void avr32_mask_irq(uintptr_t irq) { - int pri; + /* Sanity check */ + KASSERT(irq < IRQ_COUNT, ("Invalid interrupt group")); - pri = bit_value(INTC, IPR, INTLEVEL, - reg_read(AT32AP700X_BASE + AT32AP700X_INTC_OFFSET + - (irq * sizeof(register_t)), INTC, IPR)); - sysreg_write(SR, sysreg_read(SR) | (bit_offset(SYS, SR, I0M) << pri)); + intr_change_priority(irq, 3); } void avr32_unmask_irq(uintptr_t irq) { - int pri; + /* Sanity check */ + KASSERT(irq < IRQ_COUNT, ("Invalid interrupt group")); - pri = bit_value(INTC, IPR, INTLEVEL, - reg_read(AT32AP700X_BASE + AT32AP700X_INTC_OFFSET + - (irq * sizeof(register_t)), INTC, IPR)); - sysreg_write(SR, sysreg_read(SR) | ~(bit_offset(SYS, SR, I0M) << pri)); + intr_change_priority(irq, intr_intlevel[irq]); } void @@ -161,6 +181,7 @@ intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); } + int avr32_remove_irqhandler(int irq, void *cookie) { ==== //depot/projects/avr32/src/sys/avr32/include/intr.h#5 (text+ko) ==== @@ -34,8 +34,7 @@ (bit_offset(SYS, SR, GM) | \ bit_offset(SYS, SR, I0M) | \ bit_offset(SYS, SR, I1M) | \ - bit_offset(SYS, SR, I2M) | \ - bit_offset(SYS, SR, I3M)) + bit_offset(SYS, SR, I2M)) #ifndef LOCORE